Refactoring to match Master branch.

*Basic framework for Staves is now done.*

Changelog.txt

@@ -7,112 +7,27 @@ Key:
   ! Change
   - Removal
 
-Version 1.3.08
- + Added more notifications about Vampirism and Hardcore mode on player death
- + Added information about Hardcore mode when joining a server running Hardcore mode
- + Added new hidden.yml inside the jar for very sensitive config options for advanced users
- + Added option to disable Chunklets for servers which do not have doubledrops and do not care about xp farming
- + Added new "Max_Seconds" setting in config.yml to limit the max time of abilities
- + Added new repair configs to allow customization of the repair skill
- + Added message to inform users about hardcore mode on login
- = Fixed exploit where you could gain tons of Acrobatics XP from spamming Ender Pearls
- = Fixed normal pistons marking a block as user-placed on retract if it wasn't a sticky piston (thanks turt2live!)
- = Fixed handling of the Unbreaking enchantment so that tools are actually damaged as they should now
- = Fixed hurting pet cats with serrated strikes
- ! Changed Hardcore Vampirism to require the victim to have at least half the skill level of the killer in order for vampirism to proc (this is to avoid exploitation)
- ! Changed Hardcore Vampirism to steal a minimum of 1 skill level from a player no matter the percentage
- ! Changed Hardcore & Vampirism to not be executed if percentages were set to zero or below
- ! Changed Vampirism to actually remove stats from the victim
- ! Changed Vampirism to inform the victim of their stat loss
- ! Changed Mining to allow Silk Touch to work again since the dupe exploit has been fixed.
- ! Changed Metrics to also report if the server uses plugin profiling
- - Removed level and item settings from Repair skill in config.yml
-
-Version 1.3.07
- + Added ability to gain XP from custom blocks. Enable custom blocks in the config file, then enter the data in the blocks.yml file.
- + Added ability to gain XP with custom tools. Enable custom tools in the config file, then enter the data in the tools.yml file.
- + Added ability to repair custom tools. Enable custom tools in the config file, then enter the data in the tools.yml file.
- + Added ability to repair custom armor. Enable custom armor in the config file, then enter the data in the armor.yml file.
- + Added functionality which makes a new folder in all world files "mcmmo_data" to store player placed block information in
- + Added new configurable Hardcore mode functionality to mcMMO
- + Added new configurable Vampirism PVP stat leech for Hardcore mode
- + Added new bypass permission node for the negative penalties of Hardcore mode 'mcmmo.bypass.hardcoremode'
- + Added configurable level curve multiplier which allows for tweaking the steepness of the XP needed to level formula
- + Added a permission node for Archery bonus damage
- + Added a permission node for Greater Impact ability
- + Added permission nodes for Treasure & Magic Hunter for Fishing
- + Added a permission node for Farmer's Diet
- + Added config options for enabling/disabling specific double drops
- + Added automatic zip backup of flatfile database & config files
- + Added config options to enable/disable specific skills for PVP & PVE
- = Fixed bug where Tree Feller was looking at the wrong blocks for determining how much to take down.
- = Fixed bug where Green Terra consumed seeds even on Mossy Stone Brick
- = Fixed bug where the client didn't reflect the Stone Brick to Mossy Stone Brick change
- = Fixed bug where an arrow could bounce off entities on daze proc
- = Fixed bug where a player could gain Acrobatics experience while riding a cart
- = Fixed /party not working properly with 2 arguments
- = Fixed /party not showing properly the member list
- = Fixed /ability not checking the right permission
- = Fixed rare NPE on /party command
- = Fixed Arrow Retrieval dropping only one arrow
- = Fixed /p and /a incompatibilities with bChatManager
- = Fixed Iron Grip working reversely
- = Fixed NPE when user clicked the HUD button with Spout
- = Fixed bug where the permission node for Impact didn't work
- = Fixed some bypass nodes defaulting true for Ops
- = Fixed bug with trying to use Chimera Wing while standing on a half-block
- = Fixed duplication bug when a placed block was mined after a server restart
- = Fixed exploit where shooting yourself with an arrow gave Archery XP
- ! Changed the mcMMO motd to link to the new website rather than the wiki
- ! Changed bleeding ticks damage to 1 from 2
- ! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch
- ! Changed Super Breaker to be non-functional when used with a Silk Touch enchanted pick
- ! Changed MySQL to save player information 50ms apart from each other to reduce the load on the MySQL server
- ! Changed the permission node for Blast Mining detonation to mcmmo.ability.blastmining.detonate (was mcmmo.skills.blastmining) for the sake of consistency
- ! Changed skill commands to only display what you have permissions for
- ! Changed mcMMO to use a new storage system for player placed blocks
- - Removed some unused permission nodes
- - Removed a few config options in favor of permissions nodes (Hunger Bonus, Armor/Tool Repair, Instant Wheat Regrowth)
- - Removed level requirement for repairing string tools from the config file
-
-Version 1.3.06
- + Added Iron Golem XP for aggressive golems
+Version 1.3.06-dev
  + Added permissions check to skill functions
  + Added API functions for obtaining offline profiles & profiles via player names
  + Added API functions for admin & party chat
  + Added Iron Grip skill to Unarmed which gives players an chance to keep from being disarmed.
- + Added some new languages to the locale files.
- = Fixed Green Thumb consuming 2 seeds instead of 1
- = Fixed exploit where you could teleport to yourself with PTP to prevent things like fall damage
- = Fixed NPE error with Metrics on startup
  = Fixed bug where Herbalism required double drops permission to give XP
  = Fixed bug where {0} would be displayed in front of your power level in mcstats
- = Fixed mmoupdate not being useable from console
+ = Fixed mmoupdate not being useable from console
  = Fixed bug with repairing wooden tools
  = Fixed bug with Nether Wart not awarding XP
  = Fixed bug with fishing treasures when treasures list is empty
  = Fixed bug with only getting one level when there was enough XP for multiple levels.
- = Fixed bugs with the way /mctop displayed
- = Fixed issues with custom characters & locale files.
- = Fixed double explosion for Blast Mining
- = Fixed Blast Mining not giving triple drops when it should
- ! Changed Bleeding to now stack to a finite number on Monsters and will wear off eventually
- ! Changed how we handled the config file to prevent any bugs when returning values
- ! Changed locale files to use a new naming scheme. This breaks ALL old locale files. If you want to assist with re-translating anything, go to getlocalization.com/mcMMO
- ! Changed /mcremove to check for users in the MySQL DB before sending queries to remove them
  ! Changed how the tree feller threshold worked for the better
- ! Changed /mcremove to no longer kick players when they are removed from database
- ! Changed /mcremove to work on offline users for FlatFile
+ ! Changed mcremove to no longer kick players when they are removed from database
+ ! Changed mcremove to work on offline users for FlatFile
  ! Changed PlayerProfile constructor to always take a boolean
  ! Changed getPlayerProfile function to work for online & offline users
  ! Changed Archery's Daze to deal 4 DMG on proc (2 Hearts)
  ! Changed /addlevel command to work for offline users
- ! Changed party & admin chat handling to be nicer to developers
- ! Changed /mcrefresh to work from console
- ! Changed /mcrefresh to work for offline players
- ! Changed UpdateXPBar function to hopefully avoid errors
- ! Changed /party to show offline party members
- ! Changed Blast Mining requirements, now asks for the player to be crouching
+ ! Changed party & admin chat handling to be nicer to developers
+ ! Changed UpdateXPBar function to hopefully avoid errors
 
 Version 1.3.05
  + Added Skill Shot to Archery which increases damage dealt by 10% every 50 skill levels (caps at 200%)

README.creole

@@ -1,9 +1,6 @@
 == mcMMO
 **The RPG lovers mod**
 
-=== Forums
-http://forums.mcmmo.info Talk with developers and the community about mcMMO here
-
 === Brief Description
 mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
 

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

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.3.08</version>
+    <version>1.3.06-dev</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>

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

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.api;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ChatAPI {
     /**
@@ -21,7 +21,7 @@ public class ChatAPI {
      */
     public void sendPartyChat(String sender, String party, String message) {
         McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+        Bukkit.getPluginManager().callEvent(chatEvent);
 
         if (chatEvent.isCancelled()) {
             return;
@@ -29,9 +29,9 @@ public class ChatAPI {
 
         String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
 
-        mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+        Bukkit.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
             if (Users.getProfile(player).inParty()) {
                 if (Users.getProfile(player).getParty().equalsIgnoreCase(chatEvent.getParty())) {
                     player.sendMessage(pPrefix + chatEvent.getMessage());
@@ -50,7 +50,7 @@ public class ChatAPI {
      */
     public void sendAdminChat(String sender, String message) {
         McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+        Bukkit.getPluginManager().callEvent(chatEvent);
 
         if (chatEvent.isCancelled()) {
             return;
@@ -58,10 +58,10 @@ public class ChatAPI {
 
         String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
 
-        mcMMO.p.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+        Bukkit.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            if (Permissions.getInstance().adminChat(player) || player.isOp())
+        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

@@ -61,7 +61,7 @@ public class ExperienceAPI {
      * @param XP The amount of XP to add
      */
     public void addXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXP(player, skillType, XP);
+        Users.getProfile(player).addXP(skillType, XP);
         checkXP(player, skillType);
     }
 

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

@@ -1,7 +1,10 @@
 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;
@@ -54,7 +57,47 @@ public class PartyAPI {
      * @return the list of parties.
      */
     public ArrayList<String> getParties() {
-        return Party.getInstance().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);
     }
 
     /**
@@ -79,64 +122,4 @@ public class PartyAPI {
     public void removeFromParty(Player player) {
         Party.getInstance().removeFromParty(player, Users.getProfile(player));
     }
-
-    /**
-     * 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 Player getPartyLeader(String partyName) {
-        return Party.getInstance().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 void setPartyLeader(String partyName, String player) {
-        Party.getInstance().setPartyLeader(partyName, player);
-    }
-
-    /**
-     * Get a list of all players in this player's party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to check
-     * @return all the players in the player's party
-     */
-    public ArrayList<Player> getAllMembers(Player player) {
-        return Party.getInstance().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 ArrayList<Player> getOnlineMembers(String partyName) {
-        return Party.getInstance().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 ArrayList<Player> getOnlineMembers(Player player) {
-        return Party.getInstance().getOnlineMembers(player);
-    }
 }

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

@@ -5,10 +5,10 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class CommandHelper {
 
@@ -23,8 +23,8 @@ public class CommandHelper {
         if (sender instanceof Player) {
             Player player = (Player) sender;
 
-            if (player != null && !Permissions.getInstance().permission(player, permission)) {
-                player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            if (player != null && !mcPermissions.getInstance().permission(player, permission)) {
+                player.sendMessage(mcLocale.getString("mcPlayerListener.NoPermission"));
                 return true;
             }
         }
@@ -34,43 +34,44 @@ public class CommandHelper {
 
     public static boolean noConsoleUsage(CommandSender sender) {
         if (!(sender instanceof Player)) {
-            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
+            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(LocaleLoader.getString("Stats.Header.Gathering"));
+            display.sendMessage(mcLocale.getString("Stats.GatheringHeader"));
 
-            if (Permissions.getInstance().excavation(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+            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 (Permissions.getInstance().fishing(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+            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 (Permissions.getInstance().herbalism(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+            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 (Permissions.getInstance().mining(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+            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 (Permissions.getInstance().woodcutting(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+            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) }));
             }
         }
     }
@@ -84,31 +85,32 @@ public class CommandHelper {
      *
      * @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(LocaleLoader.getString("Stats.Header.Combat"));
+            display.sendMessage(mcLocale.getString("Stats.CombatHeader"));
 
-            if (Permissions.getInstance().axes(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+            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 (Permissions.getInstance().archery(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+            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 (Permissions.getInstance().swords(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
+            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 (Permissions.getInstance().taming(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+            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 (Permissions.getInstance().unarmed(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+            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) }));
             }
         }
     }
@@ -122,18 +124,19 @@ public class CommandHelper {
      *
      * @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(LocaleLoader.getString("Stats.Header.Misc"));
+            display.sendMessage(mcLocale.getString("Stats.MiscHeader"));
 
-            if (Permissions.getInstance().acrobatics(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+            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 (Permissions.getInstance().repair(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+            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) }));
             }
         }
     }

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

@@ -11,16 +11,16 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.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 plugin) {
-        this.plugin = plugin;
+    public AddlevelsCommand(mcMMO instance) {
+        this.plugin = instance;
     }
 
     @Override
@@ -30,7 +30,7 @@ public class AddlevelsCommand implements CommandExecutor{
         int levels;
         SkillType skill;
         String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels [player] <skill> <level>"; //TODO: Needs more locale.
+        String usage = ChatColor.RED + "Proper usage is /addlevels [playername] <skill> <level>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -39,12 +39,7 @@ public class AddlevelsCommand implements CommandExecutor{
         switch (args.length) {
         case 2:
             if (sender instanceof Player) {
-                if (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
+                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
                     modifiedPlayer = (Player) sender;
                     levels = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
@@ -54,7 +49,7 @@ public class AddlevelsCommand implements CommandExecutor{
                         skillName = "all skills";
                     }
                     else {
-                        skillName = Misc.getCapitalized(skill.toString());
+                        skillName = m.getCapitalized(skill.toString());
                     }
 
                     PP.addLevels(skill, levels);
@@ -73,16 +68,11 @@ public class AddlevelsCommand implements CommandExecutor{
             PP = Users.getProfile(modifiedPlayer);
 
             if (!PP.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
                 return true;
             }
 
-            if (!Skills.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (Misc.isInt(args[2])) {
+            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
                 levels = Integer.valueOf(args[2]);
                 skill = Skills.getSkillType(args[1]);
                 String message;
@@ -94,7 +84,7 @@ public class AddlevelsCommand implements CommandExecutor{
                     message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
                 }
                 else {
-                    skillName = Misc.getCapitalized(skill.toString());
+                    skillName = m.getCapitalized(skill.toString());
                     message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
                 }
 

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

@@ -9,17 +9,16 @@ 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.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
 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 plugin) {
-        this.plugin = plugin;
+    public AddxpCommand(mcMMO instance) {
+        this.plugin = instance;
     }
 
     @Override
@@ -28,7 +27,7 @@ public class AddxpCommand implements CommandExecutor {
         int xp;
         SkillType skill;
         String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addxp [playername] <skill> <xp>"; //TODO: Needs more locale.
+        String usage = ChatColor.RED + "Proper usage is /addxp [player] <skill> <xp>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -37,12 +36,7 @@ public class AddxpCommand implements CommandExecutor {
         switch (args.length) {
         case 2:
             if (sender instanceof Player) {
-                if (!Skills.isSkill(args[1])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
+                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
                     modifiedPlayer = (Player) sender;
                     xp = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
@@ -53,7 +47,7 @@ public class AddxpCommand implements CommandExecutor {
                         skillName = "all skills";
                     }
                     else {
-                        skillName = Misc.getCapitalized(skill.toString());
+                        skillName = m.getCapitalized(skill.toString());
                     }
 
                     modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
@@ -65,9 +59,6 @@ public class AddxpCommand implements CommandExecutor {
                         Skills.XpCheckSkill(skill, modifiedPlayer);
                     }
                 }
-                else {
-                    sender.sendMessage(usage);
-                }
             }
             else {
                 sender.sendMessage(usage);
@@ -79,17 +70,7 @@ public class AddxpCommand implements CommandExecutor {
             modifiedPlayer = plugin.getServer().getPlayer(args[0]);
             String playerName = modifiedPlayer.getName();
 
-            if (!Users.getProfile(modifiedPlayer).isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!Skills.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (Misc.isInt(args[2])) {
+            if (modifiedPlayer != null && m.isInt(args[2]) && Skills.isSkill(args[1])) {
                 xp = Integer.valueOf(args[2]);
                 skill = Skills.getSkillType(args[1]);
                 String message;
@@ -101,7 +82,7 @@ public class AddxpCommand implements CommandExecutor {
                     message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
                 }
                 else {
-                    skillName = Misc.getCapitalized(skill.toString());
+                    skillName = m.getCapitalized(skill.toString());
                     message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
                 }
 

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

@@ -10,16 +10,15 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+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 plugin) {
-        this.plugin = plugin;
+    public InspectCommand(mcMMO instance) {
+        this.plugin = instance;
     }
 
     @Override
@@ -40,49 +39,49 @@ public class InspectCommand implements CommandExecutor {
             if (target.isOnline()) {
                 Player player = (Player) target;
 
-                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                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(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
+                sender.sendMessage(mcLocale.getString("Inspect.Stats", new Object[] { target.getName() }));
                 CommandHelper.printGatheringSkills(player, sender);
                 CommandHelper.printCombatSkills(player, sender);
                 CommandHelper.printMiscSkills(player, sender);
-                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { PP.getPowerLevel() }));
+                sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
 
                 return true;
             }
             else {
-                if (sender instanceof Player && !sender.isOp() && !Permissions.getInstance().inspectOfflineBypass((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                if (sender instanceof Player && !sender.isOp()) {
+                    sender.sendMessage(mcLocale.getString("Inspect.Offline"));
                     return true;
                 }
 
                 if (!PP.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
                     return true;
                 }
 
-                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", new Object[] { args[0] }));
+                sender.sendMessage(mcLocale.getString("Inspect.OfflineStats", new Object[] { args[0] }));
 
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+                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(LocaleLoader.getString("Stats.Header.Combat"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+                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(LocaleLoader.getString("Stats.Header.Misc"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+                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;
             }

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
 
 public class McstatsCommand implements CommandExecutor {
@@ -21,14 +21,14 @@ public class McstatsCommand implements CommandExecutor {
         Player player = (Player) sender;
         PlayerProfile PP = Users.getProfile(player);
 
-        player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
-        player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+        player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
+        player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
 
         CommandHelper.printGatheringSkills(player);
         CommandHelper.printCombatSkills(player);
         CommandHelper.printMiscSkills(player);
-
-        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(PP.getPowerLevel()) }));
+
+        player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
 
         return true;
     }

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

@@ -11,16 +11,16 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.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 plugin) {
-        this.plugin = plugin;
+    public MmoeditCommand(mcMMO instance) {
+        this.plugin = instance;
     }
 
     @Override
@@ -39,12 +39,7 @@ public class MmoeditCommand implements CommandExecutor {
         switch (args.length) {
         case 2:
             if (sender instanceof Player) {
-                if (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
+                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
                     modifiedPlayer = (Player) sender;
                     newValue = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
@@ -54,15 +49,12 @@ public class MmoeditCommand implements CommandExecutor {
                         skillName = "all skills";
                     }
                     else {
-                        skillName = Misc.getCapitalized(skill.toString());
+                        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);
-                }
             }
             else {
                 sender.sendMessage(usage);
@@ -76,16 +68,11 @@ public class MmoeditCommand implements CommandExecutor {
             PP = Users.getProfile(modifiedPlayer);
 
             if (!PP.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
                 return true;
             }
 
-            if (!Skills.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (Misc.isInt(args[2])) {
+            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
                 newValue = Integer.valueOf(args[2]);
                 skill = Skills.getSkillType(args[1]);
                 String message;
@@ -97,7 +84,7 @@ public class MmoeditCommand implements CommandExecutor {
                     message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
                 }
                 else {
-                    skillName = Misc.getCapitalized(skill.toString());
+                    skillName = m.getCapitalized(skill.toString());
                     message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
                 }
 

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

@@ -1,23 +1,18 @@
 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.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.runnables.SQLConversionTask;
 import com.gmail.nossr50.util.Users;
 
 public class MmoupdateCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public MmoupdateCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -29,7 +24,7 @@ public class MmoupdateCommand implements CommandExecutor {
         Users.clearUsers();
         convertToMySQL();
 
-        for (Player x : plugin.getServer().getOnlinePlayers()) {
+        for (Player x : Bukkit.getServer().getOnlinePlayers()) {
             Users.addUser(x);
         }
 
@@ -42,10 +37,10 @@ public class MmoupdateCommand implements CommandExecutor {
      * Convert FlatFile data to MySQL data.
      */
     private void convertToMySQL() {
-        if (!Config.getInstance().getUseMySQL()) {
+        if (!LoadProperties.useMySQL) {
             return;
         }
 
-        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, new SQLConversionTask(plugin), 1);
+        Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1);
     }
 }

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

@@ -1,30 +1,25 @@
 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.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.m;
 
 public class XprateCommand implements CommandExecutor {
-    private final mcMMO plugin;
-    private static int oldrate = Config.getInstance().xpGainMultiplier;
+    private static int oldrate = LoadProperties.xpGainMultiplier;
     public static boolean xpevent = false;
 
-    public XprateCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage1 = LocaleLoader.getString("Commands.xprate.proper.0");
-        String usage2 = LocaleLoader.getString("Commands.xprate.proper.1");
-        String usage3 = LocaleLoader.getString("Commands.xprate.proper.2");
+        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;
@@ -34,18 +29,18 @@ public class XprateCommand implements CommandExecutor {
         case 1:
             if (args[0].equalsIgnoreCase("reset")) {
                 if (xpevent) {
-                    for (Player x : plugin.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    for (Player x : Bukkit.getServer().getOnlinePlayers()) {
+                        x.sendMessage(mcLocale.getString("Commands.xprate.over"));
                     }
 
                     xpevent = !xpevent;
-                    Config.getInstance().xpGainMultiplier = oldrate;
+                    LoadProperties.xpGainMultiplier = oldrate;
                 }
                 else {
-                    Config.getInstance().xpGainMultiplier = oldrate;
+                    LoadProperties.xpGainMultiplier = oldrate;
                 }
             }
-            else if (Misc.isInt(args[0])) {
+            else if (m.isInt(args[0])) {
                 sender.sendMessage(usage3);
             }
             else {
@@ -55,8 +50,8 @@ public class XprateCommand implements CommandExecutor {
             return true;
 
         case 2:
-            if (Misc.isInt(args[0])) {
-                oldrate = Config.getInstance().xpGainMultiplier;
+            if (m.isInt(args[0])) {
+                oldrate = LoadProperties.xpGainMultiplier;
 
                 if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
                     xpevent = Boolean.valueOf(args[1]);
@@ -65,16 +60,16 @@ public class XprateCommand implements CommandExecutor {
                     sender.sendMessage(usage3);
                 }
 
-                Config.getInstance().xpGainMultiplier = Misc.getInt(args[0]);
+                LoadProperties.xpGainMultiplier = m.getInt(args[0]);
 
                 if (xpevent) {
-                    for (Player x : plugin.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {Config.getInstance().xpGainMultiplier}));
+                    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 " + Config.getInstance().xpGainMultiplier); //TODO: Locale
+                    sender.sendMessage("The XP RATE was modified to " + LoadProperties.xpGainMultiplier); //TODO: Locale
                 }
             }
             else {

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
@@ -18,17 +18,17 @@ public class McabilityCommand implements CommandExecutor {
             return true;
         }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ability")) {
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
             return true;
         }
 
         PlayerProfile PP = Users.getProfile((Player) sender);
 
         if (PP.getAbilityUse()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
         }
 
         PP.toggleAbilityUse();

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

@@ -7,10 +7,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.mcPermissions;
 
-//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
+//TODO: Rework this whole thing. It's ugly.
 public class MccCommand implements CommandExecutor {
 
     @Override
@@ -23,49 +23,49 @@ public class MccCommand implements CommandExecutor {
 
         player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
 
-        if (Permissions.getInstance().party(player)) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            player.sendMessage("/party " + LocaleLoader.getString("Commands.Party"));
-            player.sendMessage("/party q " + LocaleLoader.getString("Commands.Party.Quit"));
+        if (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 (Permissions.getInstance().partyChat(player)) {
-                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
+            if (mcPermissions.getInstance().partyChat(player)) {
+                player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
             }
 
-            player.sendMessage("/invite " + LocaleLoader.getString("Commands.Party.Invite"));
-            player.sendMessage("/accept " + LocaleLoader.getString("Commands.Party.Accept"));
+            player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
+            player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
 
-            if (Permissions.getInstance().partyTeleport(player)) {
-                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
+            if (mcPermissions.getInstance().partyTeleport(player)) {
+                player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
             }
         }
 
-        player.sendMessage(LocaleLoader.getString("Commands.Other"));
-        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+        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 (Permissions.getInstance().mcAbility(player)) {
-            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        if (mcPermissions.getInstance().mcAbility(player)) {
+            player.sendMessage("/mcability " + ChatColor.RED + mcLocale.getString("m.mccToggleAbility"));
         }
 
-        if (Permissions.getInstance().adminChat(player)) {
-            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
+        if (mcPermissions.getInstance().adminChat(player)) {
+            player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
         }
 
-        if (Permissions.getInstance().inspect(player)) {
-            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+        if (mcPermissions.getInstance().inspect(player)) {
+            player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
         }
 
-        if (Permissions.getInstance().mmoedit(player)) {
-            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        if (mcPermissions.getInstance().mmoedit(player)) {
+            player.sendMessage("/mmoedit " + mcLocale.getString("m.mccMmoedit"));
         }
 
-        if (Permissions.getInstance().mcgod(player)) {
-            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        if (mcPermissions.getInstance().mcgod(player)) {
+            player.sendMessage("/mcgod " + ChatColor.RED + mcLocale.getString("m.mccMcGod"));
         }
 
-        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
-        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
+        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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
 
 public class McgodCommand implements CommandExecutor {
@@ -25,10 +25,10 @@ public class McgodCommand implements CommandExecutor {
         PlayerProfile PP = Users.getProfile((Player) sender);
 
         if (PP.getGodMode()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
         }
 
         PP.toggleGodMode();

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

@@ -7,26 +7,29 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
+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 = LocaleLoader.getString("mcMMO.Description");
+        String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
         String[] mcSplit = description.split(",");
-        sender.sendMessage(mcSplit);
 
-        if (Config.getInstance().getDonateMessageEnabled()) {
-            if (Config.getInstance().spoutEnabled && sender instanceof SpoutPlayer) {
+        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 + "mcmmodev@gmail.com", Material.DIAMOND);
+                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 + "mcmmodev@gmail.com" + ChatColor.GOLD + " Paypal");
+            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
         }
 
         return true;

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

@@ -1,75 +1,68 @@
 package com.gmail.nossr50.commands.mc;
 
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+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;
+	private final mcMMO plugin;
 
-    public McrefreshCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
+	public McrefreshCommand(mcMMO instance) {
+		this.plugin = instance;
+	}
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer player;
-        PlayerProfile PP;
-        String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
-            return true;
-        }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-        switch (args.length) {
-        case 0:
-            if (sender instanceof Player) {
-                player = (Player) sender;
-                PP = Users.getProfile(player);
-            }
-            else {
-                sender.sendMessage(usage);
-                return true;
-            }
-            break;
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
 
-        case 1:
-            player = plugin.getServer().getOfflinePlayer(args[0]);
-            PP = Users.getProfile(player);
-            String playerName = player.getName();
+		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]);
+		}
 
-            if (!PP.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
+		/*
+		 * 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);
 
-            sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale
+		//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);
 
-            break;
+		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
 
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-
-        PP.setRecentlyHurt((long) 0);
-        PP.resetCooldowns();
-        PP.resetToolPrepMode();
-        PP.resetAbilityMode();
-
-        if (player.isOnline()) {
-            ((Player) player).sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-        }
-
-        return true;
-    }
+		return true;
+	}
 }

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

@@ -4,6 +4,7 @@ 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;
@@ -11,133 +12,114 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.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 {
-    private final String location;
-    private final mcMMO plugin;
-
-    public McremoveCommand (mcMMO plugin) {
-        this.plugin = plugin;
-        this.location = plugin.usersFile;
-    }
-
+    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
+    
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String playerName;
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        String databaseName = Config.getInstance().getMySQLDatabaseName();
-        String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
-        String success;
+        Player player = null;
+        
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
+        if (player != null && !mcPermissions.getInstance().mcremove(player)) {
+            player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
             return true;
         }
-
-        switch (args.length) {
-        case 1:
-            playerName = args[0];
-            success = ChatColor.GREEN + playerName + "was successfully removed from the database!"; //TODO: Locale
-            break;
-
-        default:
-            sender.sendMessage(usage);
+        
+        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);
 
-        /* MySQL */
-        if (Config.getInstance().getUseMySQL()) {
-            int userId = 0;
-            userId = mcMMO.database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
-
-            if (userId > 0) {
-                mcMMO.database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "users WHERE "
-                        + tablePrefix + "users.id=" + userId);
-
-                mcMMO.database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "cooldowns WHERE "
-                        + tablePrefix + "cooldowns.user_id=" + userId);
-
-                mcMMO.database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "huds WHERE "
-                        + tablePrefix + "huds.user_id=" + userId);
-
-                mcMMO.database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "skills WHERE "
-                        + tablePrefix + "skills.user_id=" + userId);
-
-                mcMMO.database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "experience WHERE "
-                        + tablePrefix + "experience.user_id=" + userId);
-
-                sender.sendMessage(success);
-
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            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!");
             }
         }
-        else {
-            if (removeFlatFileUser(playerName)) {
-                sender.sendMessage(success);
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            }
-        }
-
+        
         //Force PlayerProfile stuff to update
-        Player player = plugin.getServer().getPlayer(playerName);
-
-        if (player != null && Users.players.containsKey(playerName.toLowerCase())) {
-            Users.removeUser(player);
-            Users.addUser(player);
+        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)) {
+                /* 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 {
+                } 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) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+        } 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

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

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

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

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

@@ -1,68 +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.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.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 {
-    private final mcMMO plugin;
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-    public AcceptCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-    @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);
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
+		if (!mcPermissions.getInstance().party(player)) {
+			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+			return true;
+		}
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		if (PP.hasPartyInvite()) {
+			Party Pinstance = Party.getInstance();
 
-        if (PP.hasPartyInvite()) {
-            Party partyInstance = Party.getInstance();
-
-            if (PP.inParty()) {
+			if (PP.inParty()) {
                 McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), PP.getInvite(), EventReason.CHANGED_PARTIES);
-                plugin.getServer().getPluginManager().callEvent(event);
+                Bukkit.getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
                 }
 
-                partyInstance.removeFromParty(player, PP);
-            }
-            else {
+				Pinstance.removeFromParty(player, PP);
+			}
+			else {
                 McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, PP.getInvite(), EventReason.JOINED_PARTY);
-                plugin.getServer().getPluginManager().callEvent(event);
+                Bukkit.getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
                 }
-            }
+			}
             PP.acceptInvite();
-            partyInstance.addToParty(player, PP, PP.getParty(), true, null);
+            Pinstance.addToParty(player, PP, PP.getParty(), true, null);
 
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
-        }
+		} else {
+			player.sendMessage(mcLocale.getString("mcPlayerListener.NoInvites"));
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

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

@@ -7,70 +7,60 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
-//TODO: Make this work from console.
 public class InviteCommand implements CommandExecutor {
-    private final mcMMO plugin;
+	private final mcMMO plugin;
 
-    public InviteCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
+	public InviteCommand(mcMMO instance) {
+		this.plugin = instance;
+	}
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /invite <player>"; //TODO: Needs more locale.
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
 
-        switch (args.length) {
-        case 1:
-            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 partyInstance = Party.getInstance();
+		Party Pinstance = Party.getInstance();
 
-            if (!PP.inParty()) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return true;
-            }
+		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 target = plugin.getServer().getPlayer(args[0]);
+				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;
+			}
+		}
 
-            if (target != null) {
-                if (partyInstance.canInvite(player, PP)) {
-                    PlayerProfile PPt = Users.getProfile(target);
-                    PPt.modifyInvite(PP.getParty());
-
-                    player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] { PPt.getInvite(), player.getName() }));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
-                    return true;
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                    return true;
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-                return true;
-            }
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
+		return true;
+	}
 }

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

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

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

@@ -1,267 +1,269 @@
 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.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 {
-    private final mcMMO plugin;
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-    public PartyCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-    @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);
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
+		if (!mcPermissions.getInstance().party(player)) {
+			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+			return true;
+		}
 
-        Player player = (Player) sender;
-        String playerName = player.getName();
-        PlayerProfile PP = Users.getProfile(player);
+		Party Pinstance = Party.getInstance();
 
-        Party partyInstance = Party.getInstance();
-        boolean inParty = PP.inParty();
-        String partyName = PP.getParty();
-        boolean isLeader = partyInstance.isPartyLeader(playerName, partyName);
+		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
+			Pinstance.addToParty(player, PP, PP.getParty(), false, null);
+		}
 
-        if (PP.inParty() && (!partyInstance.isParty(PP.getParty()) || !partyInstance.isInParty(player, PP))) {
-            partyInstance.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()) {
 
-        switch (args.length) {
-        case 0:
-            if (!inParty) {
-                player.sendMessage(LocaleLoader.getString("Party.Help.0"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.2"));
-            }
-            else {
-                String tempList = "";
-
-                for (Player p : partyInstance.getAllMembers(player)) {
-                    if (p.equals(partyInstance.getPartyLeader(partyName))) {
-                        tempList += ChatColor.GOLD;
-                    }
-                    else {
-                        tempList += ChatColor.WHITE;
-                    }
-
-                    tempList += p.getName() + " ";
-                }
-
-                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] { partyName }));
-                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] { tempList }));
-            }
-
-            return true;
-
-        case 1:
-            if (args[0].equalsIgnoreCase("q")) {
-                if (inParty) {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.LEFT_PARTY);
-                    plugin.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    partyInstance.removeFromParty(player, PP);
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
-                }
-                else {
-                    player.sendMessage("Commands.Party.None");
-                }
-            }
-            else if (args[0].equals("?")) {
-                player.sendMessage(LocaleLoader.getString("Party.Help.3"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.4"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.5"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.6"));
-                player.sendMessage(LocaleLoader.getString("Party.Help.7"));
-            }
-            else if (args[0].equalsIgnoreCase("lock")) {
-                if (inParty) {
-                    if (isLeader) {
-                        if (partyInstance.isPartyLocked(partyName)) {
-                            player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
-                        }
-                        else {
-                            partyInstance.lockParty(partyName);
-                            player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                        }
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else {
-                    player.sendMessage("Commands.Party.None");
-                }
-            }
-            else if (args[0].equalsIgnoreCase("unlock")) {
-                if (inParty) {
-                    if (isLeader) {
-                        if (!partyInstance.isPartyLocked(partyName)) {
-                            player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
-                        }
-                        else {
-                            partyInstance.unlockParty(partyName);
-                            player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
-                        }
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else {
-                    player.sendMessage("Commands.Party.None");
-                }
-            }
-            else {
-                if (inParty) {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, args[0], EventReason.CHANGED_PARTIES);
-                    plugin.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    partyInstance.removeFromParty(player, PP);
-                }
-                else {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-                    plugin.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-                }
-
-                partyInstance.addToParty(player, PP, args[0], false, null);
-            }
-
-            return true;
-
-        case 2:
-            if (PP.inParty()) {
-                if (args[0].equalsIgnoreCase("password")) {
-                    if (isLeader) {
-                        if (!partyInstance.isPartyLocked(partyName)) {
-                            partyInstance.lockParty(partyName);
-                        }
-
-                        partyInstance.setPartyPassword(partyName, args[1]);
-                        player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] { args[1] }));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else if (args[0].equalsIgnoreCase("kick")) {
-                    if (isLeader) {
-                        Player target = plugin.getServer().getPlayer(args[1]);
-
-                        if (target == null) {
-                            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-                            return true;
-                        }
-
-                        PlayerProfile PPt = Users.getProfile(target);
-                        String targetName = target.getName();
-
-                        if (!partyInstance.inSameParty(player, (Player) target)) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
-                            return true;
-                        }
-
-                        else {
-                            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
-                            plugin.getServer().getPluginManager().callEvent(event);
-
-                            if (event.isCancelled()) {
-                                return true;
-                            }
-
-                            partyInstance.removeFromParty(target, PPt);
-                            target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", new Object[] { partyName }));
-                        }
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else if (args[0].equalsIgnoreCase("owner")) {
-                    if (isLeader) {
-                        Player target = plugin.getServer().getPlayer(args[1]);
-
-                        if (target == null) {
-                            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-                            return true;
-                        }
-
-                        String targetName = target.getName();
-
-                        if (!partyInstance.inSameParty(player, (Player) target)) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
-                            return true;
-                        }
-
-                        else {
-                            partyInstance.setPartyLeader(partyName, targetName);
-                        }
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, args[0], EventReason.CHANGED_PARTIES);
-                    plugin.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    partyInstance.removeFromParty(player, PP);
-                    partyInstance.addToParty(player, PP, args[0], false, args[1]);
-                }
-            }
-            else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-                plugin.getServer().getPluginManager().callEvent(event);
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), null, EventReason.LEFT_PARTY);
+                Bukkit.getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
                 }
 
-                partyInstance.addToParty(player, PP, args[0], false, args[1]);
+				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;
-
-        default:
-            player.sendMessage(LocaleLoader.getString("Party.Help.0"));
-            player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-            player.sendMessage(LocaleLoader.getString("Party.Help.2"));
-            return true;
-        }
-    }
+		return true;
+	}
 }

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

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -7,87 +8,81 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
+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;
+	private final mcMMO plugin;
 
-    public PtpCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
+	public PtpCommand(mcMMO instance) {
+		this.plugin = instance;
+	}
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /ptp <player>"; //TODO: Needs more locale.
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
-            return true;
-        }
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
 
-        switch (args.length) {
-        case 1:
-            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 (!Party.getInstance().isInParty(player, PP)) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return true;
-            }
+		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 (PP.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
-                return true;
-            }
+			    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.
+			}
+		}
 
-            Player target = plugin.getServer().getPlayer(args[0]);
-
-            if (player.equals(target)) {
-                player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale
-                return true;
-            }
-
-            if (target == null) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Invalid"));
-                return true;
-            }
-
-            if (target.isDead()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
-                return true;
-            }
-
-            if (Party.getInstance().inSameParty(player, target)) {
-                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, PP.getParty());
-                plugin.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                player.teleport(target);
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { target.getName() }));
-                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { player.getName() }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
-                return true;
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-   }
-}
+		return true;
+	}
+}

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

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,109 +8,54 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class AcrobaticsCommand implements CommandExecutor {
-    private float skillValue;
-    private String dodgeChance;
-    private String rollChance;
-    private String gracefulRollChance;
-
-    private boolean canDodge;
-    private boolean canRoll;
-    private boolean canGracefulRoll;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        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);
 
-        skillValue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		if (PP.getSkillLevel(SkillType.ACROBATICS) <= 800)
+			dodgepercentage = String.valueOf((skillvalue / 4000 * 100));
+		else
+			dodgepercentage = "20";
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Acrobatics.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Acrobatics") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", 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.SkillAcrobatics") }));
+		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAcrobatics") }));
 
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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) }));
 
-        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
-        }
-
-        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3") }));
-        }
-
-        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5") }));
-        }
-
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
-        }
-
-        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
-        }
-
-        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        if (skillValue >= 1000) {
-            dodgeChance = "20.00%";
-            rollChance = "100.00%";
-            gracefulRollChance = "100.00%";
-        }
-        else if (skillValue >= 800) {
-            dodgeChance = "20.00%";
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = "100.00%";
-        }
-        else if (skillValue >= 500) {
-            dodgeChance = percent.format(skillValue / 4000);
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = "100.00%";
-        }
-        else {
-            dodgeChance = percent.format(skillValue / 4000);
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = percent.format(skillValue / 500);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canDodge = permInstance.dodge(player);
-        canRoll = permInstance.roll(player);
-        canGracefulRoll = permInstance.gracefulRoll(player);
-    }
+		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,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,99 +8,59 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ArcheryCommand implements CommandExecutor {
-    private float skillValue;
-    private String skillShotBonus;
-    private String dazeChance;
-    private String retrieveChance;
-
-    private boolean canSkillShot;
-    private boolean canDaze;
-    private boolean canRetrieve;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        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
 
-        skillValue = (float) PP.getSkillLevel(SkillType.ARCHERY);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		String percentagedaze;
+		if (PP.getSkillLevel(SkillType.ARCHERY) < 1000)
+			percentagedaze = String.valueOf((skillvalue / 2000) * 100);
+		else
+			percentagedaze = "50";
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Archery.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Archery") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", 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.SkillArchery") }));
+		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainArchery") }));
 
-        if (canSkillShot || canDaze || canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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) }));
 
-        if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
-        }
+		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.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);
 
-        if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3") }));
-        }
-
-        if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5") }));
-        }
-
-        if (canSkillShot || canDaze || canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
-        }
-
-        if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
-        }
-
-        if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        if (skillValue >= 1000) {
-            skillShotBonus = "200.00%";
-            dazeChance = "50.00%";
-            retrieveChance = "100.00%";
-        }
-        else {
-            skillShotBonus = percent.format(((int) skillValue / 50) * 0.1D); //TODO: Not sure if this is the best way to calculate this or not...
-            dazeChance = percent.format(skillValue / 2000);
-            retrieveChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canSkillShot = permInstance.archeryBonus(player);
-        canDaze = permInstance.daze(player);
-        canRetrieve = permInstance.trackArrows(player);
-    }
+		return true;
+	}
 }

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

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,124 +8,65 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class AxesCommand implements CommandExecutor {
-    private float skillValue;
-    private String critChance;
-    private String bonusDamage;
-    private String impactDamage;
-    private String greaterImpactDamage;
-    private String skullSplitterLength;
-
-    private boolean canSkullSplitter;
-    private boolean canCritical;
-    private boolean canBonusDamage;
-    private boolean canImpact;
-    private boolean canGreaterImpact;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		String percentage;
 
-        skillValue = (float) PP.getSkillLevel(SkillType.AXES);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		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;
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Axes.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Axes") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+		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++;
+		}
 
-        if (canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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 (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
-        }
+		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) }));
 
-        if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3") }));
-        }
+		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 }));
 
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5") }));
-        }
-
-        if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7") }));
-        }
-
-        if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9") }));
-        }
-
-        if (canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", new Object[] {bonusDamage}) }));
-        }
-
-        if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", new Object[] {impactDamage}) }));
-        }
-
-        if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", new Object[] {greaterImpactDamage}) }));
-        }
-
-        if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
-        }
-
-        if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
-        }
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        impactDamage = String.valueOf(5 + ((int) skillValue / 30));
-        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
-        greaterImpactDamage = "2";
-
-        if (skillValue >= 750) {
-            critChance = "37.50";
-            bonusDamage = "4";
-        }
-        else if (skillValue >= 200) {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = "4";
-        }
-        else {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = String.valueOf((int) skillValue / 50);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canSkullSplitter = permInstance.skullSplitter(player);
-        canCritical = permInstance.criticalHit(player);
-        canBonusDamage = permInstance.axeBonus(player);
-        canImpact = permInstance.impact(player);
-        canGreaterImpact = permInstance.greaterImpact(player);
-    }
+		return true;
+	}
 }

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

@@ -8,69 +8,47 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ExcavationCommand implements CommandExecutor {
-    private float skillValue;
-    private String gigaDrillBreakerLength;
-
-    private boolean canGigaDrill;
-    private boolean canTreasureHunt;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		int ticks = 2;
+		int x = PP.getSkillLevel(SkillType.EXCAVATION);
+		while (x >= 50) {
+			x -= 50;
+			ticks++;
+		}
 
-        skillValue = (float) PP.getSkillLevel(SkillType.EXCAVATION);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		player.sendMessage("");
+		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
+		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Excavation.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Excavation") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+		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) }));
 
-        if (canGigaDrill || canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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 }));
 
-        if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
-        }
-
-        if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3") }));
-        }
-
-        if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canGigaDrill = permInstance.gigaDrillBreaker(player);
-        canTreasureHunt = permInstance.excavationTreasures(player);
-    }
+		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
+		
+		return true;
+	}
 }

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

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,95 +8,48 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.gathering.Fishing;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class FishingCommand implements CommandExecutor {
-    private int lootTier;
-    private String magicChance;
-
-    private boolean canTreasureHunt;
-    private boolean canMagicHunt;
-    private boolean canShake;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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 player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
 
-        lootTier = Fishing.getFishingLootTier(PP);
-        dataCalculations(lootTier);
-        permissionsCheck(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") }));
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Fishing.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Fishing") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+		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) }));
 
-        if (canTreasureHunt || canMagicHunt || canShake) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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 (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
-        }
+		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);
 
-        if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3") }));
-        }
-
-        if (canShake) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
-        }
-
-        if (canTreasureHunt || canMagicHunt || canShake) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", new Object[] { lootTier }));
-        }
-
-        if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }));
-        }
-
-        if (canShake) {
-            //TODO: Do we really need to display this twice? Not like there are any associated stats.
-            if (PP.getSkillLevel(SkillType.FISHING) < 150) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake"));
-            }
-        }
-
-        Page.grabGuidePageForSkill(SkillType.FISHING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(int lootTier) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        magicChance = percent.format((float) lootTier / 15);
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canTreasureHunt = permInstance.fishingTreasures(player);
-        canMagicHunt = permInstance.fishingMagic(player);
-        canShake = permInstance.shakeMob(player);
-    }
+		return true;
+	}
 }

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

@@ -1,168 +1,77 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class HerbalismCommand implements CommandExecutor {
-    private float skillValue;
-    private String greenTerraLength;
-    private String greenThumbChance;
-    private String greenThumbStage;
-    private String farmersDietRank;
-    private String doubleDropChance;
-
-    private boolean canGreenTerra;
-    private boolean canGreenThumbWheat;
-    private boolean canGreenThumbBlocks;
-    private boolean canFarmersDiet;
-    private boolean canDoubleDrop;
-    private boolean doubleDropsDisabled;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        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++;
 
-        skillValue = (float) PP.getSkillLevel(SkillType.HERBALISM);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		int ticks = 2;
+		int x = PP.getSkillLevel(SkillType.HERBALISM);
+		while (x >= 50) {
+			x -= 50;
+			ticks++;
+		}
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Herbalism.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Herbalism") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+		float skillvalue = (float) PP.getSkillLevel(SkillType.HERBALISM);
 
-        if (canGreenTerra || (canDoubleDrop && !doubleDropsDisabled )|| canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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 (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
-        }
+		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) }));
 
-        if (canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
-        }
+		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);
 
-        if (canGreenThumbBlocks) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5") }));
-        }
-
-        if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
-        }
-
-        if (canGreenTerra || (canDoubleDrop && !doubleDropsDisabled ) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
-        }
-
-        if (canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
-        }
-
-        if (canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
-        }
-
-        if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        greenTerraLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1500) {
-            greenThumbChance = "100.00%";
-            greenThumbStage = "4";
-            farmersDietRank = "5";
-            doubleDropChance = "100.00%";
-        }
-        else if (skillValue >= 1000) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "4";
-            farmersDietRank = "5";
-            doubleDropChance = "100.00%";
-        }
-        else if (skillValue >= 800) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "4";
-            farmersDietRank = "4";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 600) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "4";
-            farmersDietRank = "3";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 400) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "3";
-            farmersDietRank = "2";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 200) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "2";
-            farmersDietRank = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "1";
-            farmersDietRank = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-        Config configInstance = Config.getInstance();
-
-        canGreenTerra = permInstance.greenTerra(player);
-        canGreenThumbWheat = permInstance.greenThumbWheat(player);
-        canGreenThumbBlocks = permInstance.greenThumbBlocks(player);
-        canFarmersDiet = permInstance.farmersDiet(player);
-        canDoubleDrop = permInstance.herbalismDoubleDrops(player);
-        doubleDropsDisabled = configInstance.herbalismDoubleDropsDisabled();
-    }
+		return true;
+	}
 }

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

@@ -1,196 +1,137 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class MiningCommand implements CommandExecutor {
-    private float skillValue;
-    private String doubleDropChance;
-    private String superBreakerLength;
-    private String blastMiningRank;
-    private String blastRadiusIncrease;
-    private String blastDamageDecrease;
-
-    private boolean canSuperBreaker;
-    private boolean canDoubleDrop;
-    private boolean canBlast;
-    private boolean canBiggerBombs;
-    private boolean canDemoExpert;
-    private boolean doubleDropsDisabled;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        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") }));
 
-        skillValue = (float) PP.getSkillLevel(SkillType.MINING);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		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(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Mining.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Mining") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-
-        if (canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled ) || canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3") }));
-        }
-
-        if (canBlast) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5") }));
-        }
-
-        if (canBiggerBombs) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7") }));
-        }
-
-        if (canDemoExpert) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9") }));
-        }
-
-        if (canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled ) || canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
-        }
-
-        if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
-        }
-
-        if (canBlast) {
-            if (PP.getSkillLevel(SkillType.MINING) < 125) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
-            }
-        }
-
-        if (canBiggerBombs) {
-            if (PP.getSkillLevel(SkillType.MINING) < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
-            }
-        }
-
-        if (canDemoExpert) {
-            if (PP.getSkillLevel(SkillType.MINING) < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
-            }
-        }
-
-        Page.grabGuidePageForSkill(SkillType.MINING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        superBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1000) {
-            blastMiningRank = "8";
-            blastDamageDecrease = "100.00%";
-            blastRadiusIncrease = "4";
-            doubleDropChance = "100.00%";
-        }
-        else if (skillValue >= 875) {
-            blastMiningRank = "7";
-            blastDamageDecrease = "50.00%";
-            blastRadiusIncrease = "3";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 750) {
-            blastMiningRank = "6";
-            blastDamageDecrease = "50.00%";
-            blastRadiusIncrease = "3";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 625) {
-            blastMiningRank = "5";
-            blastDamageDecrease = "25.00%";
-            blastRadiusIncrease = "2";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 500) {
-            blastMiningRank = "4";
-            blastDamageDecrease = "25.00%";
-            blastRadiusIncrease = "2";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 375) {
-            blastMiningRank = "3";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 250) {
-            blastMiningRank = "2";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else if (skillValue >= 125) {
-            blastMiningRank = "1";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "0";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-        else {
-            blastMiningRank = "0";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "0";
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-        Config configInstance = Config.getInstance();
-
-        canBiggerBombs = permInstance.biggerBombs(player);
-        canBlast = permInstance.blastMining(player);
-        canDemoExpert = permInstance.demolitionsExpertise(player);
-        canDoubleDrop = permInstance.miningDoubleDrops(player);
-        canSuperBreaker = permInstance.superBreaker(player);
-        doubleDropsDisabled = configInstance.miningDoubleDropsDisabled();
-    }
+		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,169 +1,58 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.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.locale.mcLocale;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class RepairCommand implements CommandExecutor {
-    private float skillValue;
-    private String repairMasteryBonus;
-    private String superRepairChance;
-
-    private boolean canSuperRepair;
-    private boolean canMasterRepair;
-    private boolean canArcaneForge;
-    private boolean canRepairStone;
-    private boolean canRepairIron;
-    private boolean canRepairGold;
-    private boolean canRepairDiamond;
-    private boolean canRepairString;
-    private boolean canRepairLeather;
-    private boolean canRepairWood;
-
-    private int diamondLevel;
-    private int goldLevel;
-    private int ironLevel;
-    private int stoneLevel;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        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") }));
 
-        skillValue = (float) PP.getSkillLevel(SkillType.REPAIR);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		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) }));
 
-        int arcaneForgingRank = Repair.getArcaneForgingRank(PP);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Repair.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Repair") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-
-        if (canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
-
-        if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3") }));
-        }
-
-        if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5") }));
-        }
-
-        /* Repair Level Requirements */
-
-        if (canRepairStone && stoneLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.14", new Object[] { stoneLevel }), LocaleLoader.getString("Repair.Effect.15") }));
-        }
-
-        if (canRepairIron && ironLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.12", new Object[] { ironLevel }), LocaleLoader.getString("Repair.Effect.13") }));
-        }
-
-        if (canRepairGold && goldLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.10", new Object[] { goldLevel }), LocaleLoader.getString("Repair.Effect.11") }));
-        }
-
-        if (canRepairDiamond && diamondLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.6", new Object[] { diamondLevel }), LocaleLoader.getString("Repair.Effect.7") }));
-        }
-
-        if (canArcaneForge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
-        }
-
-        if (canArcaneForge || canMasterRepair || canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", new Object[] { repairMasteryBonus }));
-        }
-
-        if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }));
-        }
-
-        if (canArcaneForge) {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", new Object[] { arcaneForgingRank }));
-
-            if (Config.getInstance().getArcaneForgingEnchantLossEnabled()) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", new Object[] { Repair.getEnchantChance(arcaneForgingRank) }));
-            }
-
-            if (Config.getInstance().getArcaneForgingDowngradeEnabled()) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { Repair.getDowngradeChance(arcaneForgingRank) }));
-            }
-        }
-
-        Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        // We're using pickaxes here, not the best but works
-        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
-        Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
-        Repairable ironRepairable = mcMMO.repairManager.getRepairable(257);
-        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(274);
-
-        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
-        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
-        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
-        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
-
-        repairMasteryBonus = percent.format(skillValue / 500);
-
-        if (skillValue >= 1000) {
-            superRepairChance = "100.00%";
-        }
-        else {
-            superRepairChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canSuperRepair = permInstance.repairBonus(player);
-        canMasterRepair = permInstance.repairMastery(player);
-        canArcaneForge = permInstance.arcaneForging(player);
-        canRepairDiamond = permInstance.diamondRepair(player);
-        canRepairGold = permInstance.goldRepair(player);
-        canRepairIron = permInstance.ironRepair(player);
-        canRepairStone = permInstance.stoneRepair(player);
-        canRepairString = permInstance.stringRepair(player);
-        canRepairLeather = permInstance.leatherRepair(player);
-        canRepairWood = permInstance.woodRepair(player);
-    }
+		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/SwordsCommand.java

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,110 +8,69 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class SwordsCommand implements CommandExecutor {
-    private float skillValue;
-    private String counterAttackChance;
-    private String bleedLength;
-    private String bleedChance;
-    private String serratedStrikesLength;
-
-    private boolean canCounter;
-    private boolean canSerratedStrike;
-    private boolean canBleed;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		int bleedrank = 2;
+		String percentage, counterattackpercentage;
 
-        skillValue = (float) PP.getSkillLevel(SkillType.SWORDS);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		float skillvalue = (float) PP.getSkillLevel(SkillType.SWORDS);
+		if (PP.getSkillLevel(SkillType.SWORDS) < 750)
+			percentage = String.valueOf((skillvalue / 1000) * 100);
+		else
+			percentage = "75";
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Swords.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Swords") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
+		if (skillvalue >= 750)
+			bleedrank += 1;
 
-        if (canBleed || canCounter || canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		if (PP.getSkillLevel(SkillType.SWORDS) <= 600)
+			counterattackpercentage = String.valueOf((skillvalue / 2000) * 100);
+		else
+			counterattackpercentage = "30";
 
-        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
-        }
+		int ticks = 2;
+		int x = PP.getSkillLevel(SkillType.SWORDS);
+		while (x >= 50) {
+			x -= 50;
+			ticks++;
+		}
 
-        if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3") }));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5") }));
-        }
+		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);
 
-        if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7") }));
-        }
-
-        if (canBleed || canCounter || canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
-        }
-
-        if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
-        }
-
-        if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.SWORDS, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        serratedStrikesLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 750) {
-            bleedLength = "3";
-            bleedChance = "75.00%";
-            counterAttackChance = "30.00%";
-        }
-        else if (skillValue >= 600) {
-            bleedLength = "2";
-            bleedChance = percent.format(skillValue / 1000);
-            counterAttackChance = "30.00%";
-        }
-        else {
-            bleedLength = "2";
-            bleedChance = percent.format(skillValue / 1000);
-            counterAttackChance = percent.format(skillValue / 2000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canBleed = permInstance.swordsBleed(player);
-        canCounter = permInstance.counterAttack(player);
-        canSerratedStrike = permInstance.serratedStrikes(player);
-    }
+		return true;
+	}
 }

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

@@ -1,172 +1,82 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class TamingCommand implements CommandExecutor {
-    private float skillValue;
-    private String goreChance;
-
-    private boolean canBeastLore;
-    private boolean canGore;
-    private boolean canSharpenedClaws;
-    private boolean canEnvironmentallyAware;
-    private boolean canThickFur;
-    private boolean canShockProof;
-    private boolean canCallWild;
-    private boolean canFastFood;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		float skillvalue = (float) PP.getSkillLevel(SkillType.TAMING);
+		String percentage = String.valueOf((skillvalue / 1000) * 100);
 
-        skillValue = (float) PP.getSkillLevel(SkillType.TAMING);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillTaming") }));
+		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainTaming") }));
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Taming.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Taming") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+		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) }));
 
-        if (canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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 (canBeastLore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
-        }
+		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 (canGore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3") }));
-        }
+		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 (canSharpenedClaws) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5") }));
-        }
+		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 (canEnvironmentallyAware) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7") }));
-        }
+		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);
 
-        if (canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9") }));
-        }
-
-        if (canShockProof) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11") }));
-        }
-
-        if (canFastFood) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17") }));
-        }
-
-        if (canCallWild) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13") }));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", new Object[] { Config.getInstance().getTamingCOTWOcelotCost() }));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", new Object[] { Config.getInstance().getTamingCOTWWolfCost() }));
-        }
-
-        if (canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canFastFood) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 50) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9") }));
-            }
-        }
-
-        if (canEnvironmentallyAware) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 100) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1") }));
-            }
-        }
-
-        if (canThickFur) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3") }));
-            }
-        }
-
-        if (canShockProof) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5") }));
-            }
-        }
-
-        if (canSharpenedClaws) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 750) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7") }));
-            }
-        }
-
-        if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.TAMING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        if (skillValue >= 1000) {
-            goreChance = "100.00%";
-        }
-        else {
-            goreChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canBeastLore = permInstance.beastLore(player);
-        canCallWild = permInstance.callOfTheWild(player);
-        canEnvironmentallyAware = permInstance.environmentallyAware(player);
-        canFastFood = permInstance.fastFoodService(player);
-        canGore = permInstance.gore(player);
-        canSharpenedClaws = permInstance.sharpenedClaws(player);
-        canShockProof = permInstance.shockProof(player);
-        canThickFur = permInstance.thickFur(player);
-    }
+		return true;
+	}
 }

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

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,117 +8,72 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class UnarmedCommand implements CommandExecutor {
-    private float skillValue;
-    private String berserkLength;
-    private String deflectChance;
-    private String disarmChance;
-    private String ironArmBonus;
-
-    private boolean canBerserk;
-    private boolean canDisarm;
-    private boolean canBonusDamage;
-    private boolean canDeflect;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+		String percentage, arrowpercentage;
+		float skillvalue = (float) PP.getSkillLevel(SkillType.UNARMED);
 
-        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
+			percentage = String.valueOf((skillvalue / 3000) * 100);
+		else
+			percentage = "33.3";
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Unarmed.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Unarmed") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
+			arrowpercentage = String.valueOf((skillvalue / 2000) * 100);
+		else
+			arrowpercentage = "50";
 
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+		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;
 
-        if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
-        }
+		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 (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
-        }
+		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) }));
 
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
-        }
+		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 }));
 
-        if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
-        }
+		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) }));
 
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
 
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
-        }
-
-        if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
-        }
-
-        if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
-        }
-
-        if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1000) {
-            disarmChance = "33.33%";
-            deflectChance = "50.00%";
-            ironArmBonus = "8";
-        }
-        else if (skillValue >= 250) {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = "8";
-        }
-        else {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canBerserk = permInstance.berserk(player);
-        canBonusDamage = permInstance.unarmedBonus(player);
-        canDeflect = permInstance.deflect(player);
-        canDisarm = permInstance.disarm(player);
-    }
+		return true;
+	}
 }

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

@@ -1,115 +1,63 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class WoodcuttingCommand implements CommandExecutor {
-    private float skillValue;
-    private String treeFellerLength;
-    private String doubleDropChance;
-
-    private boolean canTreeFell;
-    private boolean canLeafBlow;
-    private boolean canDoubleDrop;
-    private boolean doubleDropsDisabled;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+	@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);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Woodcutting.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.WoodCutting") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-
-        if ((canDoubleDrop && !doubleDropsDisabled ) || canLeafBlow || canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") }));
-        }
-
-        if (canLeafBlow) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5") }));
-        }
-
-        if ((canDoubleDrop && !doubleDropsDisabled ) || canLeafBlow || canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        //TODO: Remove? Basically duplicates the above.
-        if (canLeafBlow) {
-            if (PP.getSkillLevel(SkillType.WOODCUTTING) < 100) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1") }));
-            }
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }));
-        }
-
-        if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1000) {
-            doubleDropChance = "100.00%";
-        }
-        else {
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-        Config configInstance = Config.getInstance();
-
-        canTreeFell = permInstance.treeFeller(player);
-        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
-        canLeafBlow = permInstance.leafBlower(player);
-        doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
-    }
+		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,77 +1,50 @@
 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.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Users;
 
 public class MchudCommand implements CommandExecutor {
-    private final mcMMO plugin;
+	@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;
+		}
 
-    public MchudCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /mchud <hud-type>"; //TODO: Locale
-        String invalid = ChatColor.RED + "That is not a valid HUD type."; //TODO: Locale
-
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (!Config.getInstance().spoutEnabled || !Config.getInstance().getSpoutXPBarEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            Player player = (Player) sender;
-            PlayerProfile PP = Users.getProfile(player);
-            HUDType hud;
-
-            if (args[0].equalsIgnoreCase("disabled")) {
-                hud = HUDType.DISABLED;
-            }
-            else if (args[0].equalsIgnoreCase("standard")) {
-                hud = HUDType.STANDARD;
-            }
-            else if (args[0].equalsIgnoreCase("small")) {
-                hud = HUDType.SMALL;
-            }
-            else if (args[0].equalsIgnoreCase("retro")) {
-                hud = HUDType.RETRO;
-            }
-            else {
-                player.sendMessage(invalid);
-                return true;
-            }
-
-            if (SpoutStuff.playerHUDs.containsKey(player)) {
-                SpoutStuff.playerHUDs.get(player).resetHUD();
-                SpoutStuff.playerHUDs.remove(player);
-                PP.setHUDType(hud);
-                SpoutStuff.playerHUDs.put(player, new HUDmmo(player, plugin));
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            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/XplockCommand.java

@@ -6,74 +6,57 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 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) {
-        String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
+	@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 (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
 
-        if (!Config.getInstance().spoutEnabled || !Config.getInstance().getSpoutXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
-            return true;
-        }
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
 
-        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;
+		}
 
-        switch (args.length) {
-        case 0:
-            if (PP.getXpBarLocked()) {
-                PP.toggleXpBarLocked();
-                player.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
-                return true;
-            }
-
-            SkillType lastGained = PP.getLastGained();
-
-            if (lastGained != null) {
-                PP.toggleXpBarLocked();
-                PP.setSkillLock(lastGained);
-                player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
-                return true;
-            }
-
-        case 1:
-            if (Skills.isSkill(args[0])) {
-                if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
-                    PP.setXpBarLocked(true);
-                    PP.setSkillLock(Skills.getSkillType(args[0]));
-                    SpoutStuff.updateXpBar(player);
-
-                    player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
-                    return true;
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-                    return true;
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-        default:
-            player.sendMessage(usage);
-            return true;
-        }
-    }
+		return true;
+	}
 }

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

@@ -1,475 +0,0 @@
-package com.gmail.nossr50.config;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.HUDType;
-
-public class Config extends ConfigLoader {
-    public int xpGainMultiplier = 1;
-    private static Config instance;
-
-    public static Config getInstance() {
-        if (instance == null) {
-            instance = new Config(mcMMO.p);
-            instance.load();
-        }
-
-        return instance;
-    }
-
-    /*
-     * 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 int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
-    public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
-    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
-
-    /* mySQL */
-    public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
-    public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
-    public String getMySQLDatabaseName() { return config.getString("MySQL.Database.Name", "DatabaseName"); }
-    public String getMySQLUserName() { return config.getString("MySQL.Database.User_Name", "UserName"); } //Really should be labeled under MySQL.User_Name instead...
-    public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
-    public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
-
-    public String getMySQLUserPassword() {
-        if (config.getString("MySQL.Database.User_Password", null) != null) {
-            return config.getString("MySQL.Database.User_Password", null);
-        }
-        else {
-            return "";
-        }
-    }
-
-    /* Hardcore Mode */
-    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5); }
-    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
-
-    /* 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); }
-
-    /* Commands */
-    public boolean getCommandXPLockEnabled() { return config.getBoolean("Commands.xplock.Enabled", true); }
-    public boolean getCommandXPRateEnabled() { return config.getBoolean("Commands.xprate.Enabled", true); }
-    public boolean getCommandMCTopEnabled() { return config.getBoolean("Commands.mctop.Enabled", true); }
-    public boolean getCommandAddXPEnabled() { return config.getBoolean("Commands.addxp.Enabled", true); }
-    public boolean getCommandAddLevelsEnabled() { return config.getBoolean("Commands.addlevels.Enabled", true); }
-    public boolean getCommandMCAbilityEnabled() { return config.getBoolean("Commands.mcability.Enabled", true); }
-    public boolean getCommandMCRefreshEnabled() { return config.getBoolean("Commands.mcrefresh.Enabled", true); }
-    public boolean getCommandmcMMOEnabled() { return config.getBoolean("Commands.mcmmo.Enabled", true); }
-    public boolean getCommandMCCEnabled() { return config.getBoolean("Commands.mcc.Enabled", true); }
-    public boolean getCommandMCGodEnabled() { return config.getBoolean("Commands.mcgod.Enabled", true); }
-    public boolean getCommandMCStatsEnabled() { return config.getBoolean("Commands.mcstats.Enabled", true); }
-    public boolean getCommandMmoeditEnabled() { return config.getBoolean("Commands.mmoedit.Enabled", true); }
-    public boolean getCommandMCRemoveEnabled() { return config.getBoolean("Commands.mcremove.Enable", true); }
-    public boolean getCommandPTPEnabled() { return config.getBoolean("Commands.ptp.Enabled", true); }
-    public boolean getCommandPartyEnabled() { return config.getBoolean("Commands.party.Enabled", true); }
-    public boolean getCommandInspectEnabled() { return config.getBoolean("Commands.inspect.Enabled", true); }
-    public boolean getCommandInviteEnabled() { return config.getBoolean("Commands.invite.Enabled", true); }
-    public boolean getCommandAcceptEnabled() { return config.getBoolean("Commands.accept.Enabled", true); }
-    public boolean getCommandAdminChatAEnabled() { return config.getBoolean("Commands.a.Enabled", true); }
-    public boolean getCommandPartyChatPEnabled() { return config.getBoolean("Commands.p.Enabled", true); }
-
-    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
-    public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
-
-    /* Items */
-    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
-    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
-    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
-
-    /*
-     * 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); }
-
-    /* Durability Settings */
-    public boolean getAbilitiesDamageTools() { return config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true); }
-    public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }
-
-    /* Cooldowns */
-    public int getAbilityCooldownGreenTerra() { return config.getInt("Abilities.Cooldowns.Green_Terra", 240); }
-    public int getAbilityCooldownSuperBreaker() { return config.getInt("Abilities.Cooldowns.Super_Breaker", 240); }
-    public int getAbilityCooldownGigaDrillBreaker() { return config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240); }
-    public int getAbilityCooldownTreeFeller() { return config.getInt("Abilities.Cooldowns.Tree_Feller", 240); }
-    public int getAbilityCooldownBerserk() { return config.getInt("Abilities.Cooldowns.Berserk", 240); }
-    public int getAbilityCooldownSerratedStrikes() { return config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240); }
-    public int getAbilityCooldownSkullSplitter() { return config.getInt("Abilities.Cooldowns.Skull_Splitter", 240); }
-    public int getAbilityCooldownBlastMining() { return config.getInt("Abilities.Cooldowns.Blast_Mining", 60); }
-
-    /* Max ticks */
-    public int getAbilityMaxTicksGreenTerra() { return config.getInt("Abilities.Max_Seconds.Green_Terra", 0); }
-    public int getAbilityMaxTicksSuperBreaker() { return config.getInt("Abilities.Max_Seconds.Super_Breaker", 0); }
-    public int getAbilityMaxTicksGigaDrillBreaker() { return config.getInt("Abilities.Max_Seconds.Giga_Drill_Breaker", 0); }
-    public int getAbilityMaxTicksTreeFeller() { return config.getInt("Abilities.Max_Seconds.Tree_Feller", 0); }
-    public int getAbilityMaxTicksBerserk() { return config.getInt("Abilities.Max_Seconds.Berserk", 0); }
-    public int getAbilityMaxTicksSerratedStrikes() { return config.getInt("Abilities.Max_Seconds.Serrated_Strikes", 0); }
-    public int getAbilityMaxTicksSkullSplitter() { return config.getInt("Abilities.Max_Seconds.Skull_Splitter", 0); }
-    public int getAbilityMaxTicksBlastMining() { return config.getInt("Abilities.Max_Seconds.Blast_Mining", 0); }
-
-    /* Thresholds */
-    public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
-
-    /*
-     * SKILL SETTINGS
-     */
-
-    /* Tool Requirements */
-    public boolean getMiningRequiresTool() { return config.getBoolean("Skills.Mining.Requires_Pickaxe", true); }
-    public boolean getExcavationRequiresTool() { return config.getBoolean("Skills.Excavation.Requires_Shovel", true); }
-    public boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); }
-
-    /* Excavation */
-    public int getExcavationBaseXP() { return config.getInt("Experience.Excavation.Base", 40); }
-
-    /* Fishing */
-    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
-    public boolean getFishingDropsEnabled() { return config.getBoolean("Fishing.Drops_Enabled", true); }
-    public int getFishingTierLevelsTier1() { return config.getInt("Fishing.Tier_Levels.Tier1", 0); }
-    public int getFishingTierLevelsTier2() { return config.getInt("Fishing.Tier_Levels.Tier2", 200); }
-    public int getFishingTierLevelsTier3() { return config.getInt("Fishing.Tier_Levels.Tier3", 400); }
-    public int getFishingTierLevelsTier4() { return config.getInt("Fishing.Tier_Levels.Tier4", 600); }
-    public int getFishingTierLevelsTier5() { return config.getInt("Fishing.Tier_Levels.Tier5", 800); }
-
-    /* Herbalism */
-    public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }
-    public int getHerbalismXPWheat() { return config.getInt("Experience.Herbalism.Wheat", 50); }
-    public int getHerbalismXPCactus() { return config.getInt("Experience.Herbalism.Cactus", 30); }
-    public int getHerbalismXPPumpkin() { return config.getInt("Experience.Herbalism.Pumpkin", 20); }
-    public int getHerbalismXPFlowers() { return config.getInt("Experience.Herbalism.Flowers", 100); }
-    public int getHerbalismXPMushrooms() { return config.getInt("Experience.Herbalism.Mushrooms", 150); }
-    public int getHerbalismXPMelon() { return config.getInt("Experience.Herbalism.Melon", 20); }
-    public int getHerbalismXPNetherWart() { return config.getInt("Experience.Herbalism.Nether_Wart", 50); }
-    public int getHerbalismXPLilyPads() { return config.getInt("Experience.Herbalism.Lily_Pads", 100); }
-    public int getHerbalismXPVines() { return config.getInt("Experience.Herbalism.Vines", 10); }
-
-    public boolean getHerbalismGreenThumbCobbleToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); }
-    public boolean getHerbalismGreenThumbSmoothbrickToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); }
-    public boolean getHerbalismGreenThumbDirtToGrass() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true); }
-
-    public boolean getBrownMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Brown_Mushrooms", true); }
-    public boolean getCactiDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cacti", true); }
-    public boolean getWheatDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Wheat", true); }
-    public boolean getMelonsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Melons", true); }
-    public boolean getNetherWartsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Nether_Warts", true); }
-    public boolean getPumpkinsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Pumpkins", true); }
-    public boolean getRedMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Mushrooms", true); }
-    public boolean getRedRosesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Roses", true); }
-    public boolean getSugarCaneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Sugar_Cane", true); }
-    public boolean getVinesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Vines", true); }
-    public boolean getWaterLiliesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Water_Lilies", true); }
-    public boolean getYellowFlowersDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Yellow_Flowers", true); }
-
-    public boolean herbalismDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Herbalism");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Herbalism." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
-
-    /* Mining */
-    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); } 
-    public int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
-    public int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
-    public int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
-    public int getMiningXPLapisOre() { return config.getInt("Experience.Mining.Lapis", 400); }
-    public int getMiningXPObsidian() { return config.getInt("Experience.Mining.Obsidian", 150); }
-    public int getMiningXPNetherrack() { return config.getInt("Experience.Mining.Netherrack", 30); }
-    public int getMiningXPGlowstone() { return config.getInt("Experience.Mining.Glowstone", 30); }
-    public int getMiningXPCoalOre() { return config.getInt("Experience.Mining.Coal", 100); }
-    public int getMiningXPStone() { return config.getInt("Experience.Mining.Stone", 30); }
-    public int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
-    public int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
-    public int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
-
-    public boolean getCoalDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Coal", true); }
-    public boolean getDiamondDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Diamond", true); }
-    public boolean getEndStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.End_Stone", true); }
-    public boolean getGlowstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Glowstone", true); }
-    public boolean getGoldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Gold", true); }
-    public boolean getIronDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Iron", true); }
-    public boolean getLapisDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Lapis", true); }
-    public boolean getMossyCobblestoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Moss_Stone", true); }
-    public boolean getNetherrackDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Netherrack", true); }
-    public boolean getObsidianDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Obsidian", true); }
-    public boolean getRedstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Redstone", true); }
-    public boolean getSandstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Sandstone", true); }
-    public boolean getStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Stone", true); }
-
-    public boolean miningDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Mining");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Mining." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
-
-    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
-
-    /* Repair */
-    public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
-    public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
-
-    /* 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 boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
-    public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
-    public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
-    public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
-
-    public boolean woodcuttingDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Woodcutting");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Woodcutting." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
-
-    /* Arcane Forging */
-    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Arcane_Forging.Downgrades.Enabled", true); }
-    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
-    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
-    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
-    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
-    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Arcane_Forging.May_Lose_Enchants", true); }
-    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
-    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
-    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
-    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
-    public int getArcaneForgingRankLevels1() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_1", 100); }
-    public int getArcaneForgingRankLevels2() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_2", 250); }
-    public int getArcaneForgingRankLevels3() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_3", 500); }
-    public int getArcaneForgingRankLevels4() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_4", 750); }
-
-    /* Level Caps */
-    public int getLevelCapAcrobatics() { return config.getInt("Skills.Acrobatics.Level_Cap", 0); }
-    public int getLevelCapArchery() { return config.getInt("Skills.Archery.Level_Cap", 0); }
-    public int getLevelCapAxes() { return config.getInt("Skills.Axes.Level_Cap", 0); }
-    public int getLevelCapExcavation() { return config.getInt("Skills.Excavation.Level_Cap", 0); }
-    public int getLevelCapFishing() { return config.getInt("Skills.Fishing.Level_Cap", 0); }
-    public int getLevelCapHerbalism() { return config.getInt("Skills.Herbalism.Level_Cap", 0); }
-    public int getLevelCapMining() { return config.getInt("Skills.Mining.Level_Cap", 0); }
-    public int getLevelCapRepair() { return config.getInt("Skills.Repair.Level_Cap", 0); }
-    public int getLevelCapSwords() { return config.getInt("Skills.Swords.Level_Cap", 0); }
-    public int getLevelCapTaming() { return config.getInt("Skills.Taming.Level_Cap", 0); }
-    public int getLevelCapUnarmed() { return config.getInt("Skills.Unarmed.Level_Cap", 0); }
-    public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); }
-    public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); }
-
-    /* PVP & PVE Settings */
-    public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }
-    public boolean getAcrobaticsPVE() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVE", true); }
-    public boolean getArcheryPVP() { return config.getBoolean("Skills.Archery.Enabled_For_PVP", true); }
-    public boolean getArcheryPVE() { return config.getBoolean("Skills.Archery.Enabled_For_PVE", true); }
-    public boolean getAxesPVP() { return config.getBoolean("Skills.Axes.Enabled_For_PVP", true); }
-    public boolean getAxesPVE() { return config.getBoolean("Skills.Axes.Enabled_For_PVE", true); }
-    public boolean getSwordsPVP() { return config.getBoolean("Skills.Swords.Enabled_For_PVP", true); }
-    public boolean getSwordsPVE() { return config.getBoolean("Skills.Swords.Enabled_For_PVE", true); }
-    public boolean getTamingPVP() { return config.getBoolean("Skills.Taming.Enabled_For_PVP", true); }
-    public boolean getTamingPVE() { return config.getBoolean("Skills.Taming.Enabled_For_PVE", true); }
-    public boolean getUnarmedPVP() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVP", true); }
-    public boolean getUnarmedPVE() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVE", true); }
-
-    /*
-     * XP SETTINGS
-     */
-
-    /* General Settings */
-    public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
-    public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
-    public int getExperienceGainsGlobalMultiplier() { return config.getInt("Experience.Gains.Multiplier.Global", 1); }
-
-    /* Combat XP Multipliers */
-    public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
-    
-    public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
-    public double getCreeperXP() { return config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0); }
-    public double getSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0); }
-    public double getSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Spider", 3.0); }
-    public double getGhastXP() { return config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0); }
-    public double getSlimeXP() { return config.getDouble("Experience.Combat.Multiplier.Slime", 2.0); }
-    public double getZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0); }
-    public double getPigZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0); }
-    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0); }
-    public double getCaveSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0); }
-    public double getSilverfishXP() { return config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0); }
-    public double getBlazeXP() { return config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0); }
-    public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); }
-    public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); }
-    public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); }
-
-    /* XP Formula Multiplier */
-    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getFormulaMultiplierTaming() { return config.getDouble("Experience.Formula.Multiplier.Taming", 1.0); }
-    public double getFormulaMultiplierMining() { return config.getDouble("Experience.Formula.Multiplier.Mining", 1.0); }
-    public double getFormulaMultiplierRepair() { return config.getDouble("Experience.Formula.Multiplier.Repair", 1.0); }
-    public double getFormulaMultiplierWoodcutting() { return config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0); }
-    public double getFormulaMultiplierUnarmed() { return config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0); }
-    public double getFormulaMultiplierHerbalism() { return config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0); }
-    public double getFormulaMultiplierExcavation() { return config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0); }
-    public double getFormulaMultiplierArchery() { return config.getDouble("Experience.Formula.Multiplier.Archery", 1.0); }
-    public double getFormulaMultiplierSwords() { return config.getDouble("Experience.Formula.Multiplier.Swords", 1.0); }
-    public double getFormulaMultiplierAxes() { return config.getDouble("Experience.Formula.Multiplier.Axes", 1.0); }
-    public double getFormulaMultiplierAcrobatics() { return config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); }
-    public double getFormulaMultiplierFishing() { return config.getDouble("Experience.Formula.Multiplier.Fishing", 1.0); }
-
-    /*
-     * SPOUT SETTINGS
-     */
-
-    public boolean spoutEnabled;
-    public boolean getShowPowerLevelForSpout() { return config.getBoolean("Spout.HUD.Show_Power_Level", true); }
-
-    /* Spout XP Bar */
-    public boolean getSpoutXPBarEnabled() { return config.getBoolean("Spout.XP.Bar.Enabled", true); }
-    public boolean getSpoutXPBarIconEnabled() { return config.getBoolean("Spout.XP.Icon.Enabled", true); }
-    public int getSpoutXPBarXPosition() { return config.getInt("Spout.XP.Bar.X_POS", 95); }
-    public int getSpoutXPBarYPosition() { return config.getInt("Spout.XP.Bar.Y_POS", 6); }
-    public int getSpoutXPIconXPosition() { return config.getInt("Spout.XP.Icon.X_POS", 78); }
-    public int getSpoutXPIconYPosition() { return config.getInt("Spout.XP.Icon.Y_POS", 2); }
-
-    /* Spout HUD Colors */
-    public double getSpoutRetroHUDXPBorderRed() { return config.getDouble("Spout.HUD.Retro.Colors.Border.RED", 0.0); }
-    public double getSpoutRetroHUDXPBorderGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Border.GREEN", 0.0); }
-    public double getSpoutRetroHUDXPBorderBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Border.BLUE", 0.0); }
-    public double getSpoutRetroHUDXPBackgroundRed() { return config.getDouble("Spout.HUD.Retro.Colors.Background.RED", 0.75); }
-    public double getSpoutRetroHUDXPBackgroundGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75); }
-    public double getSpoutRetroHUDXPBackgroundBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75); }
-    
-    public double getSpoutRetroHUDAcrobaticsRed() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3); }
-    public double getSpoutRetroHUDAcrobaticsGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3); }
-    public double getSpoutRetroHUDAcrobaticsBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75); }
-    public double getSpoutRetroHUDArcheryRed() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.RED", 0.3); }
-    public double getSpoutRetroHUDArcheryGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3); }
-    public double getSpoutRetroHUDArcheryBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75); }
-    public double getSpoutRetroHUDAxesRed() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.RED", 0.3); }
-    public double getSpoutRetroHUDAxesGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3); }
-    public double getSpoutRetroHUDAxesBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75); }
-    public double getSpoutRetroHUDExcavationRed() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.RED", 0.3); }
-    public double getSpoutRetroHUDExcavationGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3); }
-    public double getSpoutRetroHUDExcavationBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75); }
-    public double getSpoutRetroHUDHerbalismRed() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3); }
-    public double getSpoutRetroHUDHerbalismGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3); }
-    public double getSpoutRetroHUDHerbalismBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75); }
-    public double getSpoutRetroHUDMiningRed() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.RED", 0.3); }
-    public double getSpoutRetroHUDMiningGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3); }
-    public double getSpoutRetroHUDMiningBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75); }
-    public double getSpoutRetroHUDRepairRed() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.RED", 0.3); }
-    public double getSpoutRetroHUDRepairGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3); }
-    public double getSpoutRetroHUDRepairBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75); }
-    public double getSpoutRetroHUDSwordsRed() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.RED", 0.3); }
-    public double getSpoutRetroHUDSwordsGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3); }
-    public double getSpoutRetroHUDSwordsBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75); }
-    public double getSpoutRetroHUDTamingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.RED", 0.3); }
-    public double getSpoutRetroHUDTamingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3); }
-    public double getSpoutRetroHUDTamingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75); }
-    public double getSpoutRetroHUDUnarmedRed() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3); }
-    public double getSpoutRetroHUDUnarmedGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3); }
-    public double getSpoutRetroHUDUnarmedBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75); }
-    public double getSpoutRetroHUDWoodcuttingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3); }
-    public double getSpoutRetroHUDWoodcuttingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3); }
-    public double getSpoutRetroHUDWoodcuttingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75); }
-    public double getSpoutRetroHUDFishingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.RED", 0.3); }
-    public double getSpoutRetroHUDFishingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3); }
-    public double getSpoutRetroHUDFishingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75); }
-
-    /*
-     * CONFIG LOADING
-     */
-
-    public HUDType defaulthud;
-
-    private Config(mcMMO plugin) {
-        super(plugin, "config.yml");
-        config = plugin.getConfig();
-        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
-    }
-
-    @Override
-    protected void load() {
-        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().toLowerCase().equalsIgnoreCase(temp.toString().toLowerCase())) {
-                defaulthud = x;
-            }
-        }
-
-        if(defaulthud == null)
-            defaulthud = HUDType.STANDARD;
-    }
-}

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

@@ -9,10 +9,10 @@ import com.gmail.nossr50.mcMMO;
 
 public abstract class ConfigLoader {
 
-    protected File configFile;
-    protected File dataFolder;
+    protected static File configFile;
+    protected static File dataFolder;
     protected final mcMMO plugin;
-    protected FileConfiguration config;
+    protected static FileConfiguration config;
 
     public ConfigLoader(mcMMO plugin, String fileName){
         this.plugin = plugin;
@@ -28,7 +28,7 @@ public abstract class ConfigLoader {
     /**
      * Save this config file.
      */
-    private void saveConfig() {
+    private static void saveConfig() {
         try {
             config.save(configFile);
         }
@@ -41,6 +41,7 @@ public abstract class ConfigLoader {
      * Add the defaults to this config file.
      */
     protected void addDefaults() {
+
         // Load from included config.yml
         config.options().copyDefaults(true);
         saveConfig();

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

@@ -1,44 +0,0 @@
-package com.gmail.nossr50.config;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import com.gmail.nossr50.mcMMO;
-
-public class HiddenConfig extends ConfigLoader {
-    private static String fileName;
-    private static HiddenConfig instance;
-    private static YamlConfiguration config;
-
-    private static boolean chunkletsEnabled;
-
-    public HiddenConfig(mcMMO plugin, String fileName) {
-        super(plugin, fileName);
-        HiddenConfig.fileName = fileName;
-    }
-
-
-    public static HiddenConfig getInstance() {
-        if (instance == null) {
-            instance = new HiddenConfig(mcMMO.p, "hidden.yml");
-            instance.load();
-        }
-
-        return instance;
-    }
-
-    @Override
-    protected void load() {
-        if(plugin.isInJar(fileName)) loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        config = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
-
-        chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
-    }
-
-    public boolean getChunkletsEnabled() {
-        return chunkletsEnabled;
-    }
-}

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

@@ -7,6 +7,7 @@ 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;
@@ -16,38 +17,30 @@ import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
 import com.gmail.nossr50.datatypes.treasure.Treasure;
 
-public class TreasuresConfig extends ConfigLoader{
-    private static TreasuresConfig instance;
+public class LoadTreasures extends ConfigLoader{
 
-    public static TreasuresConfig getInstance() {
-        if (instance == null) {
-            instance = new TreasuresConfig(mcMMO.p);
-            instance.load();
-        }
+    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>();
 
-        return 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<FishingTreasure> fishingRewardsTier1 = new ArrayList<FishingTreasure>();
-    public List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
-    public List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
-    public List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
-    public List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
-
-    private TreasuresConfig(mcMMO plugin) {
+    public LoadTreasures(mcMMO plugin) {
         super(plugin, "treasures.yml");
         config = plugin.getTreasuresConfig();
     }
 
     @Override
-    protected void load() {
+    public void load() {
+
+        // If it doesn't exist, copy it from the .jar
         if (!configFile.exists()) {
             dataFolder.mkdir();
             plugin.saveTreasuresConfig();
@@ -93,7 +86,7 @@ public class TreasuresConfig extends ConfigLoader{
             int data = config.getInt("Treasures." + treasureName + ".Data");
 
             if (Material.getMaterial(id) == null) {
-                reason.add("Invalid id: " + id);
+                reason.add("Invlid id: " + id);
             }
 
             if (amount < 1) {
@@ -220,23 +213,23 @@ public class TreasuresConfig extends ConfigLoader{
                 int dropLevel = fTreasure.getDropLevel();
                 int maxLevel = fTreasure.getMaxLevel();
 
-                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier1() && maxLevel >= Config.getInstance().getFishingTierLevelsTier1()) {
+                if(dropLevel <= LoadProperties.fishingTier1 && maxLevel >= LoadProperties.fishingTier1) {
                     fishingRewardsTier1.add(fTreasure);
                 }
 
-                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier2() && maxLevel >= Config.getInstance().getFishingTierLevelsTier2()) {
+                if(dropLevel <= LoadProperties.fishingTier2 && maxLevel >= LoadProperties.fishingTier2) {
                     fishingRewardsTier2.add(fTreasure);
                 }
 
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier3() && maxLevel >= Config.getInstance().getFishingTierLevelsTier3()) {
+                if (dropLevel <= LoadProperties.fishingTier3 && maxLevel >= LoadProperties.fishingTier3) {
                     fishingRewardsTier3.add(fTreasure);
                 }
 
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier4() && maxLevel >= Config.getInstance().getFishingTierLevelsTier4()) {
+                if (dropLevel <= LoadProperties.fishingTier4 && maxLevel >= LoadProperties.fishingTier4) {
                     fishingRewardsTier4.add(fTreasure);
                 }
 
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier5() && maxLevel >= Config.getInstance().getFishingTierLevelsTier5()) {
+                if (dropLevel <= LoadProperties.fishingTier5 && maxLevel >= LoadProperties.fishingTier5) {
                     fishingRewardsTier5.add(fTreasure);
                 }
 
@@ -285,7 +278,7 @@ public class TreasuresConfig extends ConfigLoader{
         }
         else {
             for (String issue : issues) {
-                plugin.getLogger().warning(issue);
+                Bukkit.getLogger().warning(issue);
             }
             return false;
         }

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

@@ -1,111 +0,0 @@
-package com.gmail.nossr50.config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.RepairItemType;
-import com.gmail.nossr50.skills.repair.RepairMaterialType;
-import com.gmail.nossr50.skills.repair.Repairable;
-import com.gmail.nossr50.skills.repair.RepairableFactory;
-
-public class RepairConfig extends ConfigLoader {
-    private final String fileName;
-    private List<Repairable> repairables;
-
-    public RepairConfig(mcMMO plugin, String fileName) {
-        super(plugin, fileName);
-        this.fileName = fileName;
-        this.config = YamlConfiguration.loadConfiguration(this.configFile);
-    }
-
-    @Override
-    protected void load() {
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        repairables = new ArrayList<Repairable>();
-
-        ConfigurationSection section = config.getConfigurationSection("Repairables");
-        Set<String> keys = section.getKeys(false);
-        for(String key : keys) {
-            // Validate all the things!
-            List<String> reason = new ArrayList<String>();
-
-            if(!config.contains("Repairables." + key + ".ItemId")) {
-                reason.add(key + " is missing ItemId");
-            }
-
-            if(!config.contains("Repairables." + key + ".RepairMaterialId")) {
-                reason.add(key + " is missing RepairMaterialId");
-            }
-
-            if(!config.contains("Repairables." + key + ".MaximumDurability")) {
-                reason.add(key + " is missing MaximumDurability");
-            }
-
-            int itemId = config.getInt("Repairables." + key + ".ItemId", 0);
-            int repairMaterialId = config.getInt("Repairables." + key + ".RepairMaterialId", 0);
-            int maximumDurability = config.getInt("Repairables." + key + ".MaximumDurability", 0);
-
-            int repairMetadata = config.getInt("Repairables." + key + ".RepairMaterialMetadata", -1);
-            int minimumLevel = config.getInt("Repairables." + key + ".MinimumLevel", 0);
-            int minimumQuantity = config.getInt("Repairables." + key + ".MinimumQuantity", 2);
-            double xpMultiplier = config.getDouble("Repairables." + key + ".XpMultiplier", 1);
-
-            RepairItemType repairItemType = RepairItemType.OTHER;
-            RepairMaterialType repairMaterialType = RepairMaterialType.OTHER;
-
-            String repairItemTypeString = config.getString("Repairables." + key + ".ItemType", "OTHER");
-            String repairMaterialTypeString = config.getString("Repairables." + key + ".MaterialType", "OTHER");
-
-            if(minimumLevel < 0) {
-                reason.add(key + " has an invalid MinimumLevel of " + minimumLevel);
-            }
-
-            if(minimumQuantity < 0) {
-                reason.add(key + " has an invalid MinimumQuantity of " + minimumQuantity);
-            }
-
-            try {
-                repairItemType = RepairItemType.valueOf(repairItemTypeString);
-            } catch (IllegalArgumentException ex) {
-                reason.add(key + " has an invalid ItemType of " + repairItemTypeString);
-            }
-
-            try {
-                repairMaterialType = RepairMaterialType.valueOf(repairMaterialTypeString);
-            } catch (IllegalArgumentException ex) {
-                reason.add(key + " has an invalid MaterialType of " + repairMaterialTypeString);
-            }
-
-            if(noErrorsInRepairable(reason)) {
-                Repairable repairable = RepairableFactory.getRepairable(itemId, repairMaterialId, (byte) repairMetadata, minimumLevel, minimumQuantity, (short) maximumDurability, repairItemType, repairMaterialType, xpMultiplier);
-                repairables.add(repairable);
-            }
-        }
-    }
-
-    protected List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
-
-    private boolean noErrorsInRepairable(List<String> issues) {
-        if (issues.isEmpty()) {
-            return true;
-        }
-        else {
-            for (String issue : issues) {
-                plugin.getLogger().warning(issue);
-            }
-            return false;
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.gmail.nossr50.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.Repairable;
-
-public class RepairConfigManager {
-    private List<Repairable> repairables;
-
-    public RepairConfigManager(mcMMO plugin) {
-        repairables = new ArrayList<Repairable>();
-
-        Pattern pattern = Pattern.compile("repair\\.(?:.+)\\.yml");
-        File dataFolder = plugin.getDataFolder();
-
-        File vanilla = new File(dataFolder, "repair.vanilla.yml");
-        if(!vanilla.exists()) {
-            plugin.saveResource("repair.vanilla.yml", false);
-        }
-
-        for(String location : dataFolder.list()) {
-            if(!pattern.matcher(location).matches()) continue;
-
-            plugin.getLogger().info("Loading " + location + " repair config file...");
-
-            File file = new File(dataFolder, location);
-            if(file.isDirectory()) continue;
-
-            RepairConfig rConfig = new RepairConfig(plugin, location);
-            rConfig.load();
-
-            List<Repairable> rConfigRepairables = rConfig.getLoadedRepairables();
-            if(rConfigRepairables != null) {
-                repairables.addAll(rConfigRepairables);
-            }
-        }
-    }
-
-    public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
-}

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

@@ -1,109 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.mods.CustomItem;
-import com.gmail.nossr50.skills.repair.Repairable;
-import com.gmail.nossr50.skills.repair.RepairableFactory;
-
-public class CustomArmorConfig extends ModConfigLoader{
-    private static CustomArmorConfig instance;
-
-    public static CustomArmorConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomArmorConfig(mcMMO.p);
-        }
-
-        return instance;
-    }
-
-    private List<Repairable> repairables;
-
-    public List<Integer> customBootIDs = new ArrayList<Integer>();
-    public List<Integer> customChestplateIDs = new ArrayList<Integer>();
-    public List<Integer> customHelmetIDs = new ArrayList<Integer>();
-    public List<Integer> customLeggingIDs = new ArrayList<Integer>();
-
-    public List<Integer> customIDs = new ArrayList<Integer>();
-    public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
-    public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();
-
-    public CustomArmorConfig(mcMMO plugin) {
-        super(plugin, "armor.yml");
-        config = plugin.getArmorConfig();
-    }
-
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveArmorConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO armor.yml File...");
-        repairables = new ArrayList<Repairable>();
-
-        loadArmor("Boots", customBootIDs);
-        loadArmor("Chestplates", customChestplateIDs);
-        loadArmor("Helmets", customHelmetIDs);
-        loadArmor("Leggings", customLeggingIDs);
-    }
-
-    private void loadArmor(String armorType, List<Integer> idList) {
-        ConfigurationSection armorSection = config.getConfigurationSection(armorType);
-        Set<String> armorConfigSet = armorSection.getKeys(false);
-        Iterator<String> iterator = armorConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String armorName = iterator.next();
-
-            int id = config.getInt(armorType + "." + armorName + ".ID", 0);
-            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
-            int repairID = config.getInt(armorType + "." + armorName + ".Repair_Material_ID", 0);
-            byte repairData = (byte) config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Value", 0);
-            int repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Quantity", 0);
-            short durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 0);
-
-            if (id == 0) {
-                plugin.getLogger().warning("Missing ID. This item will be skipped.");
-                continue;
-            }
-
-            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
-                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
-                repairable = false;
-            }
-
-            CustomItem armor;
-
-            if (repairable) {
-                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
-            }
-
-            armor = new CustomItem(id);
-
-            idList.add(id);
-            customIDs.add(id);
-            customArmorList.add(armor);
-            customArmor.put(id, armor);
-        }
-    }
-
-    public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
-}

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

@@ -1,122 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-
-public class CustomBlocksConfig extends ModConfigLoader{
-    private static CustomBlocksConfig instance;
-
-    public static CustomBlocksConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomBlocksConfig(mcMMO.p);
-        }
-
-        return instance;
-    }
-
-    public List<ItemStack> customExcavationBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customHerbalismBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customMiningBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customWoodcuttingBlocks = new ArrayList<ItemStack>();
-
-    public List<ItemStack> customOres = new ArrayList<ItemStack>();
-    public List<ItemStack> customLogs = new ArrayList<ItemStack>();
-    public List<ItemStack> customLeaves = new ArrayList<ItemStack>();
-
-    public List<ItemStack> customItems = new ArrayList<ItemStack>();
-    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
-
-    public CustomBlocksConfig(mcMMO plugin) {
-        super(plugin, "blocks.yml");
-        config = plugin.getBlocksConfig();
-    }
-
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveBlocksConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO blocks.yml File...");
-
-        loadBlocks("Excavation", customExcavationBlocks);
-        loadBlocks("Herbalism", customHerbalismBlocks);
-        loadBlocks("Mining", customMiningBlocks);
-        loadBlocks("Woodcutting", customWoodcuttingBlocks);
-    }
-
-    private void loadBlocks(String skillType, List<ItemStack> blockList) {
-        ConfigurationSection skillSection = config.getConfigurationSection(skillType);
-        Set<String> skillConfigSet = skillSection.getKeys(false);
-        Iterator<String> iterator = skillConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String blockName = iterator.next();
-
-            int id = config.getInt(skillType + "." + blockName + ".ID", 0);
-            byte data = (byte) config.getInt(skillType + "." + blockName + ".Data_Value", 0);
-            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain", 0);
-            int tier = config.getInt(skillType + "." + blockName + ".Tier", 1);
-            boolean dropItem = config.getBoolean(skillType + "." + blockName + ".Drop_Item", false);
-            int dropID = config.getInt(skillType + "." + blockName + ".Drop_Item_ID", 0);
-            byte dropData = (byte) config.getInt(skillType + "." + blockName + ".Drop_Item_Data_Value", 0);
-            int dropAmount = config.getInt(skillType + "." + blockName + ".Drop_Item_Amount", 1);
-
-            if (id == 0) {
-                plugin.getLogger().warning("Missing ID. This block will be skipped.");
-                continue;
-            }
-
-            if (dropItem && dropID == 0) {
-                plugin.getLogger().warning("Incomplete item drop information. This block will drop itself.");
-                dropItem = false;
-            }
-
-            CustomBlock block;
-            ItemStack itemDrop;
-            ItemStack blockItem;
-
-            if (dropItem) {
-                itemDrop = new ItemStack(dropID, dropAmount, (short) 0, dropData);
-            }
-            else {
-                itemDrop = new ItemStack(id, dropAmount, (short) 0, data);
-            }
-
-            block = new CustomBlock(itemDrop, tier, xp, data, id);
-            blockItem = new ItemStack(id, 1, (short) 0, data);
-
-            if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
-                customOres.add(blockItem);
-            }
-            else if (skillType.equals("Woodcutting")) {
-                if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockItem);
-                }
-                else {
-                    customLeaves.add(blockItem);
-                    block.setXpGain(0); //Leaves don't grant XP
-                }
-            }
-
-            blockList.add(blockItem);
-            customItems.add(blockItem);
-            customBlocks.add(block);
-        }
-    }
-}

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

@@ -1,116 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
-import com.gmail.nossr50.skills.repair.Repairable;
-import com.gmail.nossr50.skills.repair.RepairableFactory;
-
-public class CustomToolsConfig extends ModConfigLoader {
-    private static CustomToolsConfig instance;
-
-    public static CustomToolsConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomToolsConfig(mcMMO.p);
-        }
-
-        return instance;
-    }
-
-    private List<Repairable> repairables;
-
-    public List<Integer> customAxeIDs = new ArrayList<Integer>();
-    public List<Integer> customBowIDs = new ArrayList<Integer>();
-    public List<Integer> customHoeIDs = new ArrayList<Integer>();
-    public List<Integer> customPickaxeIDs = new ArrayList<Integer>();
-    public List<Integer> customShovelIDs = new ArrayList<Integer>();
-    public List<Integer> customSwordIDs = new ArrayList<Integer>();
-
-    public List<Integer> customIDs = new ArrayList<Integer>();
-    public List<CustomTool> customToolList = new ArrayList<CustomTool>();
-    public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
-
-    private CustomToolsConfig(mcMMO plugin) {
-        super(plugin, "tools.yml");
-        config = plugin.getToolsConfig();
-    }
-
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveToolsConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO tools.yml File...");
-        repairables = new ArrayList<Repairable>();
-
-        loadTool("Axes", customAxeIDs);
-        loadTool("Bows", customBowIDs);
-        loadTool("Hoes", customHoeIDs);
-        loadTool("Pickaxes", customPickaxeIDs);
-        loadTool("Shovels", customShovelIDs);
-        loadTool("Swords", customSwordIDs);
-    }
-
-    private void loadTool(String toolType, List<Integer> idList) {
-        ConfigurationSection toolSection = config.getConfigurationSection(toolType);
-        Set<String> toolConfigSet = toolSection.getKeys(false);
-        Iterator<String> iterator = toolConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String toolName = iterator.next();
-
-            int id = config.getInt(toolType + "." + toolName + ".ID", 0);
-            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
-            boolean abilityEnabled = config.getBoolean(toolType + "." + toolName + ".Ability_Enabled", true);
-            int tier = config.getInt(toolType + "." + toolName + ".Tier", 1);
-            boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
-            int repairID = config.getInt(toolType + "." + toolName + ".Repair_Material_ID", 0);
-            byte repairData = (byte) config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Value", 0);
-            int repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Quantity", 0);
-            short durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 0);
-
-            if (id == 0) {
-                plugin.getLogger().warning("Missing ID. This item will be skipped.");
-                continue;
-            }
-
-            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
-                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
-                repairable = false;
-            }
-
-            CustomTool tool;
-
-            if (repairable) {
-                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
-            }
-
-            tool = new CustomTool(tier, abilityEnabled, multiplier, id);
-
-            idList.add(id);
-            customIDs.add(id);
-            customToolList.add(tool);
-            customTools.put(id, tool);
-        }
-    }
-
-    public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
-}

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

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import java.io.File;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.ConfigLoader;
-
-public abstract class ModConfigLoader extends ConfigLoader{
-
-    public ModConfigLoader(mcMMO plugin, String fileName) {
-        super(plugin, "ModConfigs" + File.separator + fileName);
-    }
-}

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

@@ -1,212 +1,134 @@
-package com.gmail.nossr50.datatypes;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.Permissions;
-
-public enum AbilityType {
-    BERSERK(
-            Config.getInstance().getAbilityCooldownBerserk(),
-            Config.getInstance().getAbilityMaxTicksBerserk(),
-            "Unarmed.Skills.Berserk.On",
-            "Unarmed.Skills.Berserk.Off",
-            "Unarmed.Skills.Berserk.Other.On",
-            "Unarmed.Skills.Berserk.Refresh",
-            "Unarmed.Skills.Berserk.Other.Off"),
-
-    SUPER_BREAKER(
-            Config.getInstance().getAbilityCooldownSuperBreaker(),
-            Config.getInstance().getAbilityMaxTicksSuperBreaker(),
-            "Mining.Skills.SuperBreaker.On",
-            "Mining.Skills.SuperBreaker.Off",
-            "Mining.Skills.SuperBreaker.Other.On",
-            "Mining.Skills.SuperBreaker.Refresh",
-            "Mining.Skills.SuperBreaker.Other.Off"),
-
-    GIGA_DRILL_BREAKER(
-            Config.getInstance().getAbilityCooldownGigaDrillBreaker(),
-            Config.getInstance().getAbilityMaxTicksGigaDrillBreaker(),
-            "Excavation.Skills.GigaDrillBreaker.On",
-            "Excavation.Skills.GigaDrillBreaker.Off",
-            "Excavation.Skills.GigaDrillBreaker.Other.On",
-            "Excavation.Skills.GigaDrillBreaker.Refresh",
-            "Excavation.Skills.GigaDrillBreaker.Other.Off"),
-
-    GREEN_TERRA(
-            Config.getInstance().getAbilityCooldownGreenTerra(),
-            Config.getInstance().getAbilityMaxTicksGreenTerra(),
-            "Herbalism.Skills.GTe.On",
-            "Herbalism.Skills.GTe.Off",
-            "Herbalism.Skills.GTe.Other.On",
-            "Herbalism.Skills.GTe.Refresh",
-            "Herbalism.Skills.GTe.Other.Off"),
-
-    SKULL_SPLIITER(
-            Config.getInstance().getAbilityCooldownSkullSplitter(),
-            Config.getInstance().getAbilityMaxTicksSkullSplitter(),
-            "Axes.Skills.SS.On",
-            "Axes.Skills.SS.Off",
-            "Axes.Skills.SS.Other.On",
-            "Axes.Skills.SS.Refresh",
-            "Axes.Skills.SS.Other.Off"),
-
-    TREE_FELLER(
-            Config.getInstance().getAbilityCooldownTreeFeller(),
-            Config.getInstance().getAbilityMaxTicksTreeFeller(),
-            "Woodcutting.Skills.TreeFeller.On",
-            "Woodcutting.Skills.TreeFeller.Off",
-            "Woodcutting.Skills.TreeFeller.Other.On",
-            "Woodcutting.Skills.TreeFeller.Refresh",
-            "Woodcutting.Skills.TreeFeller.Other.Off"),
-
-    SERRATED_STRIKES(
-            Config.getInstance().getAbilityCooldownSerratedStrikes(),
-            Config.getInstance().getAbilityMaxTicksSerratedStrikes(),
-            "Swords.Skills.SS.On",
-            "Swords.Skills.SS.Off",
-            "Swords.Skills.SS.Other.On",
-            "Swords.Skills.SS.Refresh",
-            "Swords.Skills.SS.Other.Off"),
-
-    BLAST_MINING(
-            Config.getInstance().getAbilityCooldownBlastMining(),
-            Config.getInstance().getAbilityMaxTicksBlastMining(),
-            null,
-            null,
-            "Mining.Blast.Other.On",
-            "Mining.Blast.Refresh",
-            null),
-
-    LEAF_BLOWER(
-            0,
-            0,
-            null,
-            null,
-            null,
-            null,
-            null);
-
-    private int cooldown;
-    private int maxTicks;
-    private String abilityOn;
-    private String abilityOff;
-    private String abilityPlayer;
-    private String abilityRefresh;
-    private String abilityPlayerOff;
-
-    private AbilityType(int cooldown, int maxTicks, String abilityOn, String abilityOff, String abilityPlayer, String abilityRefresh, String abilityPlayerOff) {
-        this.cooldown = cooldown;
-        this.maxTicks = maxTicks;
-        this.abilityOn = abilityOn;
-        this.abilityOff = abilityOff;
-        this.abilityPlayer = abilityPlayer;
-        this.abilityRefresh = abilityRefresh;
-        this.abilityPlayerOff = abilityPlayerOff;
-    }
-
-    public int getCooldown() {
-        return this.cooldown;
-    }
-
-    public String getAbilityOn() {
-        return LocaleLoader.getString(this.abilityOn);
-    }
-
-    public String getAbilityOff() {
-        return LocaleLoader.getString(this.abilityOff);
-    }
-
-    public String getAbilityPlayer(Player player) {
-        return LocaleLoader.getString(this.abilityPlayer, new Object[] {player.getName()});
-    }
-
-    public String getAbilityPlayerOff(Player player) {
-        return LocaleLoader.getString(this.abilityPlayerOff, new Object[] {player.getName()});
-    }
-
-    public String getAbilityRefresh() {
-        return LocaleLoader.getString(this.abilityRefresh);
-    }
-
-    public int getMaxTicks() {
-        return this.maxTicks;
-    }
-
-    /**
-     * Get the permissions for this ability.
-     *
-     * @param player Player to check permissions for
-     * @return true if the player has permissions, false otherwise
-     */
-    public boolean getPermissions(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        switch (this) {
-        case BERSERK:
-            return permInstance.berserk(player);
-
-        case BLAST_MINING:
-            return permInstance.blastMining(player);
-
-        case GIGA_DRILL_BREAKER:
-            return permInstance.gigaDrillBreaker(player);
-
-        case GREEN_TERRA:
-            return permInstance.greenTerra(player);
-
-        case LEAF_BLOWER:
-            return permInstance.leafBlower(player);
-
-        case SERRATED_STRIKES:
-            return permInstance.serratedStrikes(player);
-
-        case SKULL_SPLIITER:
-            return permInstance.skullSplitter(player);
-
-        case SUPER_BREAKER:
-            return permInstance.superBreaker(player);
-
-        case TREE_FELLER:
-            return permInstance.treeFeller(player);
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Check if a block is affected by this ability.
-     *
-     * @param Block the block to check
-     * @return true if the block is affected by this ability, false otherwise
-     */
-    public boolean blockCheck(Block block) {
-        switch (this) {
-        case BERSERK:
-            return (BlockChecks.canBeGigaDrillBroken(block) || block.getType() == Material.SNOW);
-
-        case GIGA_DRILL_BREAKER:
-            return BlockChecks.canBeGigaDrillBroken(block);
-
-        case GREEN_TERRA:
-            return BlockChecks.makeMossy(block);
-
-        case LEAF_BLOWER:
-            return block.getType() == Material.LEAVES;
-
-        case SUPER_BREAKER:
-            return BlockChecks.canBeSuperBroken(block);
-
-        case TREE_FELLER:
-            return block.getType() == Material.LOG;
-
-        default:
-            return false;
-        }
-    }
-}
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.gathering.Excavation;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.gathering.Mining;
+import com.gmail.nossr50.util.mcPermissions;
+
+public enum AbilityType {
+    BERSERK(LoadProperties.berserkCooldown, mcLocale.getString("Skills.BerserkOn"), mcLocale.getString("Skills.BerserkOff"), "Skills.BerserkPlayer", mcLocale.getString("Skills.YourBerserk"), "Skills.BerserkPlayerOff"),
+    SUPER_BREAKER(LoadProperties.superBreakerCooldown, mcLocale.getString("Skills.SuperBreakerOn"), mcLocale.getString("Skills.SuperBreakerOff"), "Skills.SuperBreakerPlayer", mcLocale.getString("Skills.YourSuperBreaker"), "Skills.SuperBreakerPlayerOff"),
+    GIGA_DRILL_BREAKER(LoadProperties.gigaDrillBreakerCooldown, mcLocale.getString("Skills.GigaDrillBreakerOn"), mcLocale.getString("Skills.GigaDrillBreakerOff"), "Skills.GigaDrillBreakerPlayer", mcLocale.getString("Skills.YourGigaDrillBreaker"), "Skills.GigaDrillBreakerPlayerOff"),
+    GREEN_TERRA(LoadProperties.greenTerraCooldown, mcLocale.getString("Skills.GreenTerraOn"), mcLocale.getString("Skills.GreenTerraOff"), "Skills.GreenTerraPlayer", mcLocale.getString("Skills.YourGreenTerra"), mcLocale.getString("Skills.GreenTerraPlayerOff")),
+    SKULL_SPLIITER(LoadProperties.skullSplitterCooldown, mcLocale.getString("Skills.SkullSplitterOn"), mcLocale.getString("Skills.SkullSplitterOff"), "Skills.SkullSplitterPlayer", mcLocale.getString("Skills.YourSkullSplitter"), "Skills.SkullSplitterPlayerOff"),
+    TREE_FELLER(LoadProperties.treeFellerCooldown, mcLocale.getString("Skills.TreeFellerOn"), mcLocale.getString("Skills.TreeFellerOff"), "Skills.TreeFellerPlayer", mcLocale.getString("Skills.YourTreeFeller"), "Skills.TreeFellerPlayerOff"),
+    SERRATED_STRIKES(LoadProperties.skullSplitterCooldown, mcLocale.getString("Skills.SerratedStrikesOn"), mcLocale.getString("Skills.SerratedStrikesOff"), "Skills.SerratedStrikesPlayer", mcLocale.getString("Skills.YourSerratedStrikes"), "Skills.SerratedStrikesPlayerOff"),
+    BLAST_MINING(LoadProperties.blastMiningCooldown, null, null, "Skills.BlastMiningPlayer", mcLocale.getString("Skills.YourBlastMining"), null),
+    LEAF_BLOWER(0, null, null, null, null, null);
+
+    private int cooldown;
+    private String abilityOn;
+    private String abilityOff;
+    private String abilityPlayer;
+    private String abilityRefresh;
+    private String abilityPlayerOff;
+
+    private AbilityType(int cooldown, String abilityOn, String abilityOff, String abilityPlayer, String abilityRefresh, String abilityPlayerOff) {
+        this.cooldown = cooldown;
+        this.abilityOn = abilityOn;
+        this.abilityOff = abilityOff;
+        this.abilityPlayer = abilityPlayer;
+        this.abilityRefresh = abilityRefresh;
+        this.abilityPlayerOff = abilityPlayerOff;
+    }
+
+    public int getCooldown() {
+        return this.cooldown;
+    }
+
+    public String getAbilityOn() {
+        return this.abilityOn;
+    }
+
+    public String getAbilityOff() {
+        return this.abilityOff;
+    }
+
+    public String getAbilityPlayer(Player player) {
+        return mcLocale.getString(this.abilityPlayer, new Object[] {player.getName()});
+    }
+
+    public String getAbilityPlayerOff(Player player) {
+        return mcLocale.getString(this.abilityPlayerOff, new Object[] {player.getName()});
+    }
+
+    public String getAbilityRefresh() {
+        return this.abilityRefresh;
+    }
+
+    /**
+     * Get the permissions for this ability.
+     *
+     * @param player Player to check permissions for
+     * @return true if the player has permissions, false otherwise
+     */
+    public boolean getPermissions(Player player) {
+        switch (this) {
+        case BERSERK:
+            return mcPermissions.getInstance().berserk(player);
+
+        case BLAST_MINING:
+            return mcPermissions.getInstance().blastMining(player);
+
+        case GIGA_DRILL_BREAKER:
+            return mcPermissions.getInstance().gigaDrillBreaker(player);
+
+        case GREEN_TERRA:
+            return mcPermissions.getInstance().greenTerra(player);
+
+        case LEAF_BLOWER:
+            return mcPermissions.getInstance().leafBlower(player);
+
+        case SERRATED_STRIKES:
+            return mcPermissions.getInstance().serratedStrikes(player);
+
+        case SKULL_SPLIITER:
+            return mcPermissions.getInstance().skullSplitter(player);
+
+        case SUPER_BREAKER:
+            return mcPermissions.getInstance().superBreaker(player);
+
+        case TREE_FELLER:
+            return mcPermissions.getInstance().treeFeller(player);
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Check if a block is affected by this ability.
+     *
+     * @param material The block type to check
+     * @return true if the block is affected by this ability, false otherwise
+     */
+    public boolean blockCheck(Material material) {
+        switch (this) {
+        case BERSERK:
+            return (Excavation.canBeGigaDrillBroken(material) || material.equals(Material.SNOW));
+
+        case GIGA_DRILL_BREAKER:
+            return Excavation.canBeGigaDrillBroken(material);
+
+        case GREEN_TERRA:
+            return Herbalism.makeMossy(material);
+
+        case LEAF_BLOWER:
+            return material.equals(Material.LEAVES);
+
+        case SUPER_BREAKER:
+            return Mining.canBeSuperBroken(material);
+
+        case TREE_FELLER:
+            return material.equals(Material.LOG);
+
+        default:
+            return false;
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.gui.Color;
@@ -10,16 +11,15 @@ import org.getspout.spoutapi.gui.Widget;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class HUDmmo {
     private int center_x = 427 / 2;
 
-    private String playerName;
-    private final mcMMO plugin;
+    private String playerName = null;
 
     private Widget xpbar = null;
     private GenericGradient xpfill = null;
@@ -28,9 +28,10 @@ public class HUDmmo {
     private GenericGradient xpicon_border = null;
     private GenericTexture xpicon = null;
 
-    public HUDmmo(Player player, mcMMO plugin) {
-        this.playerName = player.getName();
-        this.plugin = plugin;
+    private mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
+
+    public HUDmmo(Player player) {
+        playerName = player.getName();
         initializeHUD(player);
     }
 
@@ -119,9 +120,9 @@ public class HUDmmo {
      * @param sPlayer Player to initialize XP bar for
      */
     private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) {
-        Color border = new Color((float) Config.getInstance().getSpoutRetroHUDXPBorderRed(), (float) Config.getInstance().getSpoutRetroHUDXPBorderGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBorderBlue(), 1f);
+        Color border = new Color((float) LoadProperties.xpborder_r, (float) LoadProperties.xpborder_g, (float) LoadProperties.xpborder_b, 1f);
         Color green = new Color(0f, 1f, 0f, 1f);
-        Color background = new Color((float) Config.getInstance().getSpoutRetroHUDXPBackgroundRed(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundBlue(), 1f);
+        Color background = new Color((float) LoadProperties.xpbackground_r, (float) LoadProperties.xpbackground_g, (float) LoadProperties.xpbackground_b, 1f);
         Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
 
         xpicon = new GenericTexture();
@@ -185,12 +186,12 @@ public class HUDmmo {
         xpbg.setPriority(RenderPriority.Low);
         xpbg.setDirty(true);
 
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
+        if (LoadProperties.xpbar) {
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
             sPlayer.getMainScreen().attachWidget(plugin, xpfill);
             sPlayer.getMainScreen().attachWidget(plugin, xpbg);
 
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
+            if (LoadProperties.xpicon) {
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon_bg);
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon_border);
@@ -206,26 +207,26 @@ public class HUDmmo {
      * @param sPlayer Player to initialize XP bar for
      */
     public void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
+        if (LoadProperties.xpbar) {
             xpbar = new GenericTexture();
 
             ((GenericTexture) xpbar).setUrl("xpbar_inc000.png");
 
-            xpbar.setX(Config.getInstance().getSpoutXPBarXPosition());
-            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
+            xpbar.setX(LoadProperties.xpbar_x);
+            xpbar.setY(LoadProperties.xpbar_y);
             xpbar.setHeight(8);
             xpbar.setWidth(256);
 
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
 
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
+            if (LoadProperties.xpicon) {
                 xpicon = new GenericTexture();
 
                 xpicon.setUrl("Icon.png");
                 xpicon.setHeight(16);
                 xpicon.setWidth(32);
-                xpicon.setX(Config.getInstance().getSpoutXPIconXPosition());
-                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition());
+                xpicon.setX(LoadProperties.xpicon_x);
+                xpicon.setY(LoadProperties.xpicon_y);
                 xpicon.setDirty(true);
 
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
@@ -241,25 +242,25 @@ public class HUDmmo {
      * @param sPlayer Player to initialize XP bar for
      */
     private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) {
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
+        if (LoadProperties.xpbar) {
             xpbar = new GenericTexture();
 
             ((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
             xpbar.setX(center_x - 64);
-            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
+            xpbar.setY(LoadProperties.xpbar_y);
             xpbar.setHeight(4);
             xpbar.setWidth(128);
 
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
 
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
+            if (LoadProperties.xpicon) {
                 xpicon = new GenericTexture();
 
                 xpicon.setUrl("Icon.png");
                 xpicon.setHeight(8);
                 xpicon.setWidth(16);
                 xpicon.setX(center_x - (8 + 64));
-                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition() + 2);
+                xpicon.setY(LoadProperties.xpicon_y + 2);
                 xpicon.setDirty(true);
 
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
@@ -276,7 +277,7 @@ public class HUDmmo {
      * @param PP Profile of the given player
      */
     private void updateXpBarStandard(Player player, PlayerProfile PP) {
-        if (!Config.getInstance().getSpoutXPBarEnabled()) {
+        if (!LoadProperties.xpbar) {
             return;
         }
 
@@ -286,7 +287,7 @@ public class HUDmmo {
             return;
         }
 
-        ((GenericTexture) xpicon).setUrl(Misc.getCapitalized(theType.toString()) + ".png");
+        ((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString()) + ".png");
         xpicon.setDirty(true);
 
         ((GenericTexture) xpbar).setUrl(getUrlBar(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
@@ -302,7 +303,7 @@ public class HUDmmo {
      * @param PP Profile of the given player
      */
     private void updateXpBarRetro(Player player, PlayerProfile PP) {
-        if (!Config.getInstance().getSpoutXPBarEnabled()) {
+        if (!LoadProperties.xpbar) {
             return;
         }
 
@@ -314,7 +315,7 @@ public class HUDmmo {
 
         Color color = getRetroColor(theType);
 
-        xpicon.setUrl(Misc.getCapitalized(theType.toString()) + "_r.png");
+        xpicon.setUrl(m.getCapitalized(theType.toString()) + "_r.png");
 
         xpfill.setBottomColor(color);
         xpfill.setTopColor(color);
@@ -327,40 +328,40 @@ public class HUDmmo {
     private static Color getRetroColor(SkillType type) {
         switch (type) {
             case ACROBATICS:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDAcrobaticsRed(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsGreen(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsBlue(), 1f);
+                return new Color((float) LoadProperties.acrobatics_r, (float) LoadProperties.acrobatics_g, (float) LoadProperties.acrobatics_b, 1f);
 
             case ARCHERY:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDArcheryRed(), (float) Config.getInstance().getSpoutRetroHUDArcheryGreen(), (float) Config.getInstance().getSpoutRetroHUDArcheryBlue(), 1f);
+                return new Color((float) LoadProperties.archery_r, (float) LoadProperties.archery_g, (float) LoadProperties.archery_b, 1f);
 
             case AXES:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDAxesRed(), (float) Config.getInstance().getSpoutRetroHUDAxesGreen(), (float) Config.getInstance().getSpoutRetroHUDAxesBlue(), 1f);
+                return new Color((float) LoadProperties.axes_r, (float) LoadProperties.axes_g, (float) LoadProperties.axes_b, 1f);
 
             case EXCAVATION:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDExcavationRed(), (float) Config.getInstance().getSpoutRetroHUDExcavationGreen(), (float) Config.getInstance().getSpoutRetroHUDExcavationBlue(), 1f);
+                return new Color((float) LoadProperties.excavation_r, (float) LoadProperties.excavation_g, (float) LoadProperties.excavation_b, 1f);
 
             case HERBALISM:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDHerbalismRed(), (float) Config.getInstance().getSpoutRetroHUDHerbalismGreen(), (float) Config.getInstance().getSpoutRetroHUDHerbalismBlue(), 1f);
+                return new Color((float) LoadProperties.herbalism_r, (float) LoadProperties.herbalism_g, (float) LoadProperties.herbalism_b, 1f);
 
             case MINING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDMiningRed(), (float) Config.getInstance().getSpoutRetroHUDMiningGreen(), (float) Config.getInstance().getSpoutRetroHUDMiningBlue(), 1f);
+                return new Color((float) LoadProperties.mining_r, (float) LoadProperties.mining_g, (float) LoadProperties.mining_b, 1f);
 
             case REPAIR:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDRepairRed(), (float) Config.getInstance().getSpoutRetroHUDRepairGreen(), (float) Config.getInstance().getSpoutRetroHUDRepairBlue(), 1f);
+                return new Color((float) LoadProperties.repair_r, (float) LoadProperties.repair_g, (float) LoadProperties.repair_b, 1f);
 
             case SWORDS:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDSwordsRed(), (float) Config.getInstance().getSpoutRetroHUDSwordsGreen(), (float) Config.getInstance().getSpoutRetroHUDSwordsBlue(), 1f);
+                return new Color((float) LoadProperties.swords_r, (float) LoadProperties.swords_g, (float) LoadProperties.swords_b, 1f);
 
             case TAMING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDTamingRed(), (float) Config.getInstance().getSpoutRetroHUDTamingGreen(), (float) Config.getInstance().getSpoutRetroHUDTamingBlue(), 1f);
+                return new Color((float) LoadProperties.taming_r, (float) LoadProperties.taming_g, (float) LoadProperties.taming_b, 1f);
 
             case UNARMED:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDUnarmedRed(), (float) Config.getInstance().getSpoutRetroHUDUnarmedGreen(), (float) Config.getInstance().getSpoutRetroHUDUnarmedBlue(), 1f);
+                return new Color((float) LoadProperties.unarmed_r, (float) LoadProperties.unarmed_g, (float) LoadProperties.unarmed_b, 1f);
 
             case WOODCUTTING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDWoodcuttingRed(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingGreen(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingBlue(), 1f);
+                return new Color((float) LoadProperties.woodcutting_r, (float) LoadProperties.woodcutting_g, (float) LoadProperties.woodcutting_b, 1f);
 
             case FISHING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDFishingRed(), (float) Config.getInstance().getSpoutRetroHUDFishingGreen(), (float) Config.getInstance().getSpoutRetroHUDFishingBlue(), 1f);
+                return new Color((float) LoadProperties.fishing_r, (float) LoadProperties.fishing_g, (float) LoadProperties.fishing_b, 1f);
 
             default:
                 return new Color(0.3f, 0.3f, 0.75f, 1f);

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

@@ -7,21 +7,21 @@ import java.io.FileWriter;
 import java.util.HashMap;
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 import com.gmail.nossr50.mcMMO;
 
 public class PlayerProfile {
 
+    final static int MAX_BLEED_TICKS = 10;
+
     /* HUD */
     private HUDType hud;
     private int xpbarinc = 0;
@@ -36,7 +36,7 @@ public class PlayerProfile {
     private boolean loaded = false;
     private boolean partyhud = true, spoutcraft = false, xpbarlocked = false;
     private boolean placedAnvil = false;
-    private boolean partyChatMode = false, adminChatMode = false;
+    private boolean partyChatMode = false, partyChatOnly = false, adminChatMode = false;
     private boolean godMode = false;
     private boolean greenTerraMode, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, serratedStrikesMode, skullSplitterMode, berserkMode;
     private boolean greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true,
@@ -53,6 +53,7 @@ public class PlayerProfile {
     /* mySQL STUFF */
     private int lastlogin = 0;
     private int userid = 0;
+    private int bleedticks = 0;
 
     HashMap<SkillType, Integer> skills = new HashMap<SkillType, Integer>(); //Skills and Levels
     HashMap<SkillType, Integer> skillsXp = new HashMap<SkillType, Integer>(); //Skills and XP
@@ -60,10 +61,10 @@ public class PlayerProfile {
     HashMap<ToolType, Integer> toolATS = new HashMap<ToolType, Integer>();
 
     private String playerName;
-    private final String location = mcMMO.p.usersFile;
+    private String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
 
     public PlayerProfile(String name, boolean addNew) {
-        hud = Config.getInstance().defaulthud;
+        hud = LoadProperties.defaulthud;
         playerName = name;
 
         for (AbilityType abilityType : AbilityType.values()) {
@@ -77,7 +78,7 @@ public class PlayerProfile {
             }
         }
 
-        if (Config.getInstance().getUseMySQL()) {
+        if (LoadProperties.useMySQL) {
             if (!loadMySQL() && addNew) {
                 addMySQLPlayer();
             }
@@ -90,25 +91,17 @@ public class PlayerProfile {
         lastlogin = ((Long) (System.currentTimeMillis() / 1000)).intValue();
     }
 
-    public String getPlayerName() {
-        return this.playerName;
-    }
-
-    public Player getPlayer() {
-        return mcMMO.p.getServer().getPlayer(playerName);
-    }
-
     public boolean loadMySQL() {
         int id = 0;
-        id = mcMMO.database.getInt("SELECT id FROM "+Config.getInstance().getMySQLTablePrefix()+"users WHERE user = '" + playerName + "'");
-        
+        id = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
+        if(id == 0)
+            return false;
         this.userid = id;
-        
         if (id > 0) {
-            HashMap<Integer, ArrayList<String>> huds = mcMMO.database.read("SELECT hudtype FROM "+Config.getInstance().getMySQLTablePrefix()+"huds WHERE user_id = " + id);
+            HashMap<Integer, ArrayList<String>> huds = mcMMO.database.read("SELECT hudtype FROM "+LoadProperties.MySQLtablePrefix+"huds WHERE user_id = " + id);
             if(huds.get(1) == null)
             {
-                mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"huds (user_id) VALUES ("+id+")");
+                mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"huds (user_id) VALUES ("+id+")");
             } else {
                 if(huds.get(1).get(0) != null)
                 {
@@ -120,20 +113,20 @@ public class PlayerProfile {
                     }
                 }
                 } else {
-                    hud = Config.getInstance().defaulthud;
+                    hud = LoadProperties.defaulthud;
                 }
             }
-            HashMap<Integer, ArrayList<String>> users = mcMMO.database.read("SELECT lastlogin, party FROM "+Config.getInstance().getMySQLTablePrefix()+"users WHERE id = " + id);
+            HashMap<Integer, ArrayList<String>> users = mcMMO.database.read("SELECT lastlogin, party FROM "+LoadProperties.MySQLtablePrefix+"users WHERE id = " + id);
                 //lastlogin = Integer.parseInt(users.get(1).get(0));
                 party = users.get(1).get(1);
-            HashMap<Integer, ArrayList<String>> cooldowns = mcMMO.database.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM "+Config.getInstance().getMySQLTablePrefix()+"cooldowns WHERE user_id = " + id);
+            HashMap<Integer, ArrayList<String>> cooldowns = mcMMO.database.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM "+LoadProperties.MySQLtablePrefix+"cooldowns WHERE user_id = " + id);
             /*
              * I'm still learning MySQL, this is a fix for adding a new table
              * its not pretty but it works
              */
             if(cooldowns.get(1) == null)
             {
-                mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"cooldowns (user_id) VALUES ("+id+")");
+                mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
             }
             else
             {
@@ -146,7 +139,7 @@ public class PlayerProfile {
                 skillsDATS.put(AbilityType.SKULL_SPLIITER, Integer.valueOf(cooldowns.get(1).get(6)));
                 skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(cooldowns.get(1).get(7)));
             }
-            HashMap<Integer, ArrayList<String>> stats = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+Config.getInstance().getMySQLTablePrefix()+"skills WHERE user_id = " + id);
+            HashMap<Integer, ArrayList<String>> stats = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"skills WHERE user_id = " + id);
                 skills.put(SkillType.TAMING, Integer.valueOf(stats.get(1).get(0)));
                 skills.put(SkillType.MINING, Integer.valueOf(stats.get(1).get(1)));
                 skills.put(SkillType.REPAIR, Integer.valueOf(stats.get(1).get(2)));
@@ -159,7 +152,7 @@ public class PlayerProfile {
                 skills.put(SkillType.AXES, Integer.valueOf(stats.get(1).get(9)));
                 skills.put(SkillType.ACROBATICS, Integer.valueOf(stats.get(1).get(10)));
                 skills.put(SkillType.FISHING, Integer.valueOf(stats.get(1).get(11)));
-            HashMap<Integer, ArrayList<String>> experience = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+Config.getInstance().getMySQLTablePrefix()+"experience WHERE user_id = " + id);
+            HashMap<Integer, ArrayList<String>> experience = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"experience WHERE user_id = " + id);
                 skillsXp.put(SkillType.TAMING, Integer.valueOf(experience.get(1).get(0)));
                 skillsXp.put(SkillType.MINING, Integer.valueOf(experience.get(1).get(1)));
                 skillsXp.put(SkillType.REPAIR, Integer.valueOf(experience.get(1).get(2)));
@@ -182,11 +175,11 @@ public class PlayerProfile {
 
     public void addMySQLPlayer() {
         int id = 0;
-        mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"users (user, lastlogin) VALUES ('" + playerName + "'," + System.currentTimeMillis() / 1000 +")");
-        id = mcMMO.database.getInt("SELECT id FROM "+Config.getInstance().getMySQLTablePrefix()+"users WHERE user = '" + playerName + "'");
-        mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"cooldowns (user_id) VALUES ("+id+")");
-        mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"skills (user_id) VALUES ("+id+")");
-        mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"experience (user_id) VALUES ("+id+")");
+        mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"users (user, lastlogin) VALUES ('" + playerName + "'," + System.currentTimeMillis() / 1000 +")");
+        id = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
+        mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
+        mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"skills (user_id) VALUES ("+id+")");
+        mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"experience (user_id) VALUES ("+id+")");
         this.userid = id;
     }
 
@@ -205,53 +198,53 @@ public class PlayerProfile {
                 if(!character[0].equals(playerName)){continue;}
                 
                 //Get Mining
-                if(character.length > 1 && Misc.isInt(character[1]))
+                if(character.length > 1 && m.isInt(character[1]))
                     skills.put(SkillType.MINING, Integer.valueOf(character[1]));
                 //Party
                 if(character.length > 3)
                     party = character[3];
                 //Mining XP
-                if(character.length > 4 && Misc.isInt(character[4]))
+                if(character.length > 4 && m.isInt(character[4]))
                     skillsXp.put(SkillType.MINING, Integer.valueOf(character[4]));
-                if(character.length > 5 && Misc.isInt(character[5]))
+                if(character.length > 5 && m.isInt(character[5]))
                     skills.put(SkillType.WOODCUTTING, Integer.valueOf(character[5]));
-                if(character.length > 6 && Misc.isInt(character[6]))
+                if(character.length > 6 && m.isInt(character[6]))
                     skillsXp.put(SkillType.WOODCUTTING, Integer.valueOf(character[6]));
-                if(character.length > 7 && Misc.isInt(character[7]))
+                if(character.length > 7 && m.isInt(character[7]))
                     skills.put(SkillType.REPAIR, Integer.valueOf(character[7]));
-                if(character.length > 8 && Misc.isInt(character[8]))
+                if(character.length > 8 && m.isInt(character[8]))
                     skills.put(SkillType.UNARMED,  Integer.valueOf(character[8]));
-                if(character.length > 9 && Misc.isInt(character[9]))
+                if(character.length > 9 && m.isInt(character[9]))
                     skills.put(SkillType.HERBALISM, Integer.valueOf(character[9]));
-                if(character.length > 10 && Misc.isInt(character[10]))
+                if(character.length > 10 && m.isInt(character[10]))
                     skills.put(SkillType.EXCAVATION, Integer.valueOf(character[10]));
-                if(character.length > 11 && Misc.isInt(character[11]))
+                if(character.length > 11 && m.isInt(character[11]))
                     skills.put(SkillType.ARCHERY, Integer.valueOf(character[11]));
-                if(character.length > 12 && Misc.isInt(character[12]))
+                if(character.length > 12 && m.isInt(character[12]))
                     skills.put(SkillType.SWORDS, Integer.valueOf(character[12]));
-                if(character.length > 13 && Misc.isInt(character[13]))
+                if(character.length > 13 && m.isInt(character[13]))
                     skills.put(SkillType.AXES, Integer.valueOf(character[13]));
-                if(character.length > 14 && Misc.isInt(character[14]))
+                if(character.length > 14 && m.isInt(character[14]))
                     skills.put(SkillType.ACROBATICS, Integer.valueOf(character[14]));
-                if(character.length > 15 && Misc.isInt(character[15]))
+                if(character.length > 15 && m.isInt(character[15]))
                     skillsXp.put(SkillType.REPAIR, Integer.valueOf(character[15]));
-                if(character.length > 16 && Misc.isInt(character[16]))
+                if(character.length > 16 && m.isInt(character[16]))
                     skillsXp.put(SkillType.UNARMED, Integer.valueOf(character[16]));
-                if(character.length > 17 && Misc.isInt(character[17]))
+                if(character.length > 17 && m.isInt(character[17]))
                     skillsXp.put(SkillType.HERBALISM, Integer.valueOf(character[17]));
-                if(character.length > 18 && Misc.isInt(character[18]))
+                if(character.length > 18 && m.isInt(character[18]))
                     skillsXp.put(SkillType.EXCAVATION, Integer.valueOf(character[18]));
-                if(character.length > 19 && Misc.isInt(character[19]))
+                if(character.length > 19 && m.isInt(character[19]))
                     skillsXp.put(SkillType.ARCHERY, Integer.valueOf(character[19]));
-                if(character.length > 20 && Misc.isInt(character[20]))
+                if(character.length > 20 && m.isInt(character[20]))
                     skillsXp.put(SkillType.SWORDS, Integer.valueOf(character[20]));
-                if(character.length > 21 && Misc.isInt(character[21]))
+                if(character.length > 21 && m.isInt(character[21]))
                     skillsXp.put(SkillType.AXES, Integer.valueOf(character[21]));
-                if(character.length > 22 && Misc.isInt(character[22]))
+                if(character.length > 22 && m.isInt(character[22]))
                     skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(character[22]));
-                if(character.length > 24 && Misc.isInt(character[24]))
+                if(character.length > 24 && m.isInt(character[24]))
                     skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
-                if(character.length > 25 && Misc.isInt(character[25]))
+                if(character.length > 25 && m.isInt(character[25]))
                     skillsXp.put(SkillType.TAMING, Integer.valueOf(character[25]));
                 if(character.length > 26)
                     skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(character[26]));
@@ -289,20 +282,22 @@ public class PlayerProfile {
             }
             in.close();
         } catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
         return false;
     }
 
-    public void save() {
-        Long timestamp = System.currentTimeMillis() / 1000; //Convert to seconds
-        // if we are using mysql save to database
-        if (Config.getInstance().getUseMySQL()) {
-            
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"huds SET hudtype = '"+hud.toString()+"' WHERE user_id = "+this.userid);
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"users SET lastlogin = " + timestamp.intValue() + " WHERE id = " + this.userid);
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"users SET party = '"+this.party+"' WHERE id = " +this.userid);
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"cooldowns SET "
+    public void save()
+    {
+        Long timestamp = System.currentTimeMillis()/1000; //Convert to seconds
+        // if we are using mysql save to database
+        if (LoadProperties.useMySQL) 
+        {
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"huds SET "
+                    +" hudtype = '"+hud.toString()+"' WHERE user_id = "+this.userid);
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET lastlogin = " + timestamp.intValue() + " WHERE id = " + this.userid);
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET party = '"+this.party+"' WHERE id = " +this.userid);
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"cooldowns SET "
                     +" mining = " + skillsDATS.get(AbilityType.SUPER_BREAKER)
                     +", woodcutting = " + skillsDATS.get(AbilityType.TREE_FELLER)
                     +", unarmed = " + skillsDATS.get(AbilityType.BERSERK)
@@ -312,7 +307,7 @@ public class PlayerProfile {
                     +", axes = " + skillsDATS.get(AbilityType.SKULL_SPLIITER)
                     +", blast_mining = " + skillsDATS.get(AbilityType.BLAST_MINING)
                     +" WHERE user_id = "+this.userid);
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"skills SET "
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"skills SET "
                     +"  taming = "+skills.get(SkillType.TAMING)
                     +", mining = "+skills.get(SkillType.MINING)
                     +", repair = "+skills.get(SkillType.REPAIR)
@@ -326,7 +321,7 @@ public class PlayerProfile {
                     +", acrobatics = "+skills.get(SkillType.ACROBATICS)
                     +", fishing = "+skills.get(SkillType.FISHING)
                     +" WHERE user_id = "+this.userid);
-            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"experience SET "
+            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"experience SET "
                     +"  taming = "+skillsXp.get(SkillType.TAMING)
                     +", mining = "+skillsXp.get(SkillType.MINING)
                     +", repair = "+skillsXp.get(SkillType.REPAIR)
@@ -340,8 +335,8 @@ public class PlayerProfile {
                     +", acrobatics = "+skillsXp.get(SkillType.ACROBATICS)
                     +", fishing = "+skillsXp.get(SkillType.FISHING)
                     +" WHERE user_id = "+this.userid);
-        }
-        else {
+        } else 
+        {
             // otherwise save to flatfile
             try {
                 //Open the file
@@ -349,16 +344,18 @@ public class PlayerProfile {
                 BufferedReader in = new BufferedReader(file);
                 StringBuilder writer = new StringBuilder();
                 String line = "";
-
+                
                 //While not at the end of the file
-                while ((line = in.readLine()) != null) {
+                while((line = in.readLine()) != null)
+                {
                     //Read the line in and copy it to the output it's not the player
                     //we want to edit
-                    if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                    if(!line.split(":")[0].equalsIgnoreCase(playerName))
+                    {
                         writer.append(line).append("\r\n");
-                    }
-                    else {
-                      //Otherwise write the new player information
+                        
+                    //Otherwise write the new player information
+                    } else {
                         writer.append(playerName + ":");
                         writer.append(skills.get(SkillType.MINING) + ":");
                         writer.append("" + ":");
@@ -398,18 +395,16 @@ public class PlayerProfile {
                         writer.append(skills.get(SkillType.FISHING) + ":");
                         writer.append(skillsXp.get(SkillType.FISHING) + ":");
                         writer.append(String.valueOf(skillsDATS.get(AbilityType.BLAST_MINING)) + ":");
-                        writer.append("\r\n");
+                        writer.append("\r\n");                               
                     }
                 }
-
                 in.close();
                 //Write the new file
                 FileWriter out = new FileWriter(location);
                 out.write(writer.toString());
                 out.close();
-            }
-            catch (Exception e) {
-                mcMMO.p.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            } catch (Exception e) {
+                Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
             }
         }
     }
@@ -474,7 +469,7 @@ public class PlayerProfile {
             out.append(0+":"); //DATS
             out.append(0+":"); //DATS
             out.append(0+":"); //DATS
-            out.append(Config.getInstance().defaulthud.toString()+":");//HUD
+            out.append(LoadProperties.defaulthud.toString()+":");//HUD
             out.append(0+":"); //Fishing
             out.append(0+":"); //FishingXP
             out.append(0+":"); //Blast Mining
@@ -484,7 +479,7 @@ public class PlayerProfile {
             out.newLine();
             out.close();
         } catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
     }
 
@@ -553,10 +548,6 @@ public class PlayerProfile {
         save();
     }
 
-    public void setXpBarLocked(boolean locked) {
-        xpbarlocked = locked;
-    }
-
     public boolean getXpBarLocked() {
         return xpbarlocked;
     }
@@ -609,6 +600,38 @@ public class PlayerProfile {
         partyChatMode = !partyChatMode;
     }
 
+    public boolean getPartyChatOnlyToggle() {
+        return partyChatOnly;
+    }
+
+    public void togglePartyChatOnly() {
+        partyChatOnly = !partyChatOnly;
+    }
+
+    /*
+     * Bleed Stuff
+     */
+
+    public void decreaseBleedTicks() {
+        bleedticks--;
+    }
+
+    public int getBleedTicks() {
+        return bleedticks;
+    }
+
+    public void resetBleedTicks() {
+        bleedticks = 0;
+    }
+
+    public void addBleedTicks(int newvalue){
+        bleedticks += newvalue;
+
+        if (bleedticks > MAX_BLEED_TICKS) {
+            bleedticks = MAX_BLEED_TICKS;
+        }
+    }
+
     /*
      * Exploit Prevention
      */
@@ -625,15 +648,6 @@ public class PlayerProfile {
      * Tools
      */
 
-    /**
-     * Reset the prep modes of all tools.
-     */
-    public void resetToolPrepMode() {
-        for (ToolType tool : ToolType.values()) {
-            setToolPreparationMode(tool, false);
-        }
-    }
-
     /**
      * Get the current prep mode of a tool.
      *
@@ -727,15 +741,6 @@ public class PlayerProfile {
      * Abilities
      */
 
-    /**
-     * Reset the prep modes of all tools.
-     */
-    public void resetAbilityMode() {
-        for (AbilityType ability : AbilityType.values()) {
-            setAbilityMode(ability, false);
-        }
-    }
-
     /**
      * Get the mode of an ability.
      *
@@ -970,7 +975,7 @@ public class PlayerProfile {
      * @param newValue The amount of XP to add
      */
     public void addXPOverride(SkillType skillType, int newValue) {
-        Player player = mcMMO.p.getServer().getPlayer(playerName);
+        Player player = Bukkit.getPlayer(playerName);
 
         if (skillType.equals(SkillType.ALL)) {
             for (SkillType x : SkillType.values()) {
@@ -978,12 +983,12 @@ public class PlayerProfile {
                     continue;
                 }
 
-                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
+                Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
                 skillsXp.put(x, skillsXp.get(x) + newValue);
             }
         }
         else {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
+            Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
             skillsXp.put(skillType, skillsXp.get(skillType) + newValue);
             lastgained = skillType;
         }
@@ -996,18 +1001,20 @@ public class PlayerProfile {
      * @param newValue The amount of XP to add
      */
     public void addXPOverrideBonus(SkillType skillType, int newValue) {
-        int xp = newValue * Config.getInstance().xpGainMultiplier;
+        int xp = newValue * LoadProperties.xpGainMultiplier;
         addXPOverride(skillType, xp);
     }
 
     /**
      * Adds XP to the player, this is affected by skill modifiers and XP Rate
      *
-     * @param player The player to add XP to
      * @param skillType The skill to add XP to
      * @param newvalue The amount of XP to add
+     * @param player The player to add XP to
      */
-    public void addXP(Player player, SkillType skillType, int newValue) {
+    public void addXP(SkillType skillType, int newValue) {
+        Player player = Bukkit.getPlayer(playerName);
+
         if (System.currentTimeMillis() < ((xpGainATS * 1000) + 250) || player.getGameMode().equals(GameMode.CREATIVE)) {
             return;
         }
@@ -1019,7 +1026,7 @@ public class PlayerProfile {
             bonusModifier = partyModifier(skillType);
         }
 
-        int xp = (int) (newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier;
+        int xp = (int) (newValue / skillType.getXpModifier()) * LoadProperties.xpGainMultiplier;
 
         if (bonusModifier > 0) {
             if (bonusModifier >= 2) {
@@ -1030,16 +1037,7 @@ public class PlayerProfile {
             xp += trueBonus;
         }
 
-        if (Config.getInstance().getToolModsEnabled()) {
-            ItemStack item = player.getItemInHand();
-            CustomTool tool = ModChecks.getToolFromItemStack(item);
-
-            if (tool != null) {
-                xp = (int) (xp * tool.getXpMultiplier());
-            }
-        }
-
-        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
+        Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
         skillsXp.put(skillType, skillsXp.get(skillType) + xp);
         lastgained = skillType;
     }
@@ -1122,7 +1120,7 @@ public class PlayerProfile {
      * @return the XP remaining until next level
      */
     public int getXpToLevel(SkillType skillType) {
-        return 1020 + (skills.get(skillType) *  Config.getInstance().getFormulaMultiplierCurve()); //Do we REALLY need to cast to int here?
+        return (int) (1020 + (skills.get(skillType) *  20)); //Do we REALLY need to cast to int here?
     }
 
     /**
@@ -1131,7 +1129,7 @@ public class PlayerProfile {
      * @return the power level of the player
      */
     public int getPowerLevel() {
-        Player player = mcMMO.p.getServer().getPlayer(playerName);
+        Player player = Bukkit.getPlayer(playerName);
         int powerLevel = 0;
 
         for (SkillType type : SkillType.values()) {
@@ -1150,20 +1148,18 @@ public class PlayerProfile {
      * @return the party bonus multiplier
      */
     private double partyModifier(SkillType skillType) {
-        Player player = getPlayer();
+        Player player = Bukkit.getPlayer(playerName);
         double bonusModifier = 0.0;
 
-        for (Player x : Party.getInstance().getOnlineMembers(player)) {
-            String memberName = x.getName();
-
-            if (!memberName.equals(playerName) && Party.getInstance().isPartyLeader(memberName, getParty())) {
-                if (Misc.isNear(player.getLocation(), x.getLocation(), 25.0)) {
+        for (Player x : Party.getInstance().getPartyMembers(player)) {
+            if (x.isOnline() && !x.getName().equals(player.getName()) && Party.getInstance().isPartyLeader(x.getName(), this.getParty())) {
+                if (m.isNear(player.getLocation(), x.getLocation(), 25.0)) {
                     PlayerProfile PartyLeader = Users.getProfile(x);
-                    int leaderSkill = PartyLeader.getSkillLevel(skillType);
-                    int playerSkill = getSkillLevel(skillType);
 
-                    if (leaderSkill >= playerSkill) {
-                        int difference = leaderSkill - playerSkill;
+                    if (PartyLeader.getSkillLevel(skillType) >= this.getSkillLevel(skillType)) {
+
+                        int leaderLevel = PartyLeader.getSkillLevel(skillType);
+                        int difference = leaderLevel - this.getSkillLevel(skillType);
                         bonusModifier = (difference * 0.75) / 100.0;
                     }
                 }

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

@@ -2,24 +2,24 @@ package com.gmail.nossr50.datatypes;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public enum SkillType {
-    ACROBATICS(Config.getInstance().getLevelCapAcrobatics(), Config.getInstance().getFormulaMultiplierAcrobatics()),
+    ACROBATICS(LoadProperties.levelCapAcrobatics, LoadProperties.acrobaticsxpmodifier),
     ALL, //This one is just for convenience
-    ARCHERY(Config.getInstance().getLevelCapArchery(), Config.getInstance().getFormulaMultiplierArchery()),
-    AXES(AbilityType.SKULL_SPLIITER, Config.getInstance().getLevelCapAxes(), ToolType.AXE, Config.getInstance().getFormulaMultiplierAxes()),
-    EXCAVATION(AbilityType.GIGA_DRILL_BREAKER, Config.getInstance().getLevelCapExcavation(), ToolType.SHOVEL, Config.getInstance().getFormulaMultiplierExcavation()),
-    FISHING(Config.getInstance().getLevelCapFishing(), Config.getInstance().getFormulaMultiplierFishing()),
-    HERBALISM(AbilityType.GREEN_TERRA, Config.getInstance().getLevelCapHerbalism(), ToolType.HOE, Config.getInstance().getFormulaMultiplierHerbalism()),
-    MINING(AbilityType.SUPER_BREAKER, Config.getInstance().getLevelCapMining(), ToolType.PICKAXE, Config.getInstance().getFormulaMultiplierMining()),
-    REPAIR(Config.getInstance().getLevelCapRepair(), Config.getInstance().getFormulaMultiplierRepair()),
-    SWORDS(AbilityType.SERRATED_STRIKES, Config.getInstance().getLevelCapSwords(), ToolType.SWORD, Config.getInstance().getFormulaMultiplierSwords()),
-    TAMING(Config.getInstance().getLevelCapTaming(), Config.getInstance().getFormulaMultiplierTaming()),
-    UNARMED(AbilityType.BERSERK, Config.getInstance().getLevelCapUnarmed(), ToolType.FISTS, Config.getInstance().getFormulaMultiplierUnarmed()),
-    WOODCUTTING(AbilityType.TREE_FELLER, Config.getInstance().getLevelCapWoodcutting(), ToolType.AXE, Config.getInstance().getFormulaMultiplierWoodcutting());
+    ARCHERY(LoadProperties.levelCapArchery, LoadProperties.archeryxpmodifier),
+    AXES(AbilityType.SKULL_SPLIITER, LoadProperties.levelCapAxes, ToolType.AXE, LoadProperties.axesxpmodifier),
+    EXCAVATION(AbilityType.GIGA_DRILL_BREAKER, LoadProperties.levelCapExcavation, ToolType.SHOVEL, LoadProperties.excavationxpmodifier),
+    FISHING(LoadProperties.levelCapFishing, LoadProperties.fishingxpmodifier),
+    HERBALISM(AbilityType.GREEN_TERRA, LoadProperties.levelCapHerbalism, ToolType.HOE, LoadProperties.herbalismxpmodifier),
+    MINING(AbilityType.SUPER_BREAKER, LoadProperties.levelCapMining, ToolType.PICKAXE, LoadProperties.miningxpmodifier),
+    REPAIR(LoadProperties.levelCapRepair, LoadProperties.repairxpmodifier),
+    SWORDS(AbilityType.SERRATED_STRIKES, LoadProperties.levelCapSwords, ToolType.SWORD, LoadProperties.swordsxpmodifier),
+    TAMING(LoadProperties.levelCapTaming, LoadProperties.tamingxpmodifier),
+    UNARMED(AbilityType.BERSERK, LoadProperties.levelCapUnarmed, ToolType.FISTS, LoadProperties.unarmedxpmodifier),
+    WOODCUTTING(AbilityType.TREE_FELLER, LoadProperties.levelCapWoodcutting, ToolType.AXE, LoadProperties.woodcuttingxpmodifier);
 
     private AbilityType ability;
     private int maxLevel;
@@ -75,40 +75,40 @@ public enum SkillType {
     public boolean getPermissions(Player player) {
         switch (this) {
         case ACROBATICS:
-            return Permissions.getInstance().acrobatics(player);
+            return mcPermissions.getInstance().acrobatics(player);
 
         case ARCHERY:
-            return Permissions.getInstance().archery(player);
+            return mcPermissions.getInstance().archery(player);
 
         case AXES:
-            return Permissions.getInstance().axes(player);
+            return mcPermissions.getInstance().axes(player);
 
         case EXCAVATION:
-            return Permissions.getInstance().excavation(player);
+            return mcPermissions.getInstance().excavation(player);
 
         case FISHING:
-            return Permissions.getInstance().fishing(player);
+            return mcPermissions.getInstance().fishing(player);
 
         case HERBALISM:
-            return Permissions.getInstance().herbalism(player);
+            return mcPermissions.getInstance().herbalism(player);
 
         case MINING:
-            return Permissions.getInstance().mining(player);
+            return mcPermissions.getInstance().mining(player);
 
         case REPAIR:
-            return Permissions.getInstance().repair(player);
+            return mcPermissions.getInstance().repair(player);
 
         case SWORDS:
-            return Permissions.getInstance().swords(player);
+            return mcPermissions.getInstance().swords(player);
 
         case TAMING:
-            return Permissions.getInstance().taming(player);
+            return mcPermissions.getInstance().taming(player);
 
         case UNARMED:
-            return Permissions.getInstance().unarmed(player);
+            return mcPermissions.getInstance().unarmed(player);
 
         case WOODCUTTING:
-            return Permissions.getInstance().woodcutting(player);
+            return mcPermissions.getInstance().woodcutting(player);
 
         default:
             return false;

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

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.datatypes;
+
+public enum StaffType {
+    BLAZE_ROD,
+    STICK,
+    BONE;
+}

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

@@ -3,16 +3,16 @@ package com.gmail.nossr50.datatypes;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.ItemChecks;
 
 public enum ToolType {
-    AXE(LocaleLoader.getString("Axes.Ability.Lower"), LocaleLoader.getString("Axes.Ability.Ready")),
-    FISTS(LocaleLoader.getString("Unarmed.Ability.Lower"), LocaleLoader.getString("Unarmed.Ability.Ready")),
-    HOE(LocaleLoader.getString("Herbalism.Ability.Lower"), LocaleLoader.getString("Herbalism.Ability.Ready")),
-    PICKAXE(LocaleLoader.getString("Mining.Ability.Lower"), LocaleLoader.getString("Mining.Ability.Ready")),
-    SHOVEL(LocaleLoader.getString("Excavation.Ability.Lower"), LocaleLoader.getString("Excavation.Ability.Ready")),
-    SWORD(LocaleLoader.getString("Swords.Ability.Lower"), LocaleLoader.getString("Swords.Ability.Ready"));
+    AXE(mcLocale.getString("Skills.LowerAxe"), mcLocale.getString("Skills.ReadyAxe")),
+    FISTS(mcLocale.getString("Skills.LowerFists"), mcLocale.getString("Skills.ReadyFists")),
+    HOE(mcLocale.getString("Skills.LowerHoe"), mcLocale.getString("Skills.ReadyHoe")),
+    PICKAXE(mcLocale.getString("Skills.LowerPickAxe"), mcLocale.getString("Skills.ReadyPickAxe")),
+    SHOVEL(mcLocale.getString("Skills.LowerShovel"), mcLocale.getString("Skills.ReadyShovel")),
+    SWORD(mcLocale.getString("Skills.LowerSword"), mcLocale.getString("Skills.ReadySword"));
 
     private String lowerTool;
     private String raiseTool;
@@ -48,7 +48,7 @@ public enum ToolType {
             return ItemChecks.isHoe(is);
 
         case PICKAXE:
-            return ItemChecks.isPickaxe(is);
+            return ItemChecks.isMiningPick(is);
 
         case SHOVEL:
             return ItemChecks.isShovel(is);

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

@@ -1,59 +0,0 @@
-package com.gmail.nossr50.datatypes.mods;
-
-import org.bukkit.inventory.ItemStack;
-
-public class CustomBlock {
-    private int itemID;
-    private byte dataValue;
-    private int xpGain;
-    private int tier;
-    private ItemStack itemDrop;
-
-    public CustomBlock(ItemStack itemDrop, int tier, int xpGain, byte dataValue, int itemID) {
-        this.itemID = itemID;
-        this.dataValue = dataValue;
-        this.xpGain = xpGain;
-        this.tier = tier;
-        this.itemDrop = itemDrop;
-    }
-
-    public int getItemID() {
-        return itemID;
-    }
-
-    public void setItemID(int itemID) {
-        this.itemID = itemID;
-    }
-
-    public byte getDataValue() {
-        return dataValue;
-    }
-
-    public void setDataValue(byte dataValue) {
-        this.dataValue = dataValue;
-    }
-
-    public int getXpGain() {
-        return xpGain;
-    }
-
-    public void setXpGain(int xpGain) {
-        this.xpGain = xpGain;
-    }
-
-    public int getTier() {
-        return tier;
-    }
-
-    public void setTier(int tier) {
-        this.tier = tier;
-    }
-
-    public ItemStack getItemDrop() {
-        return itemDrop;
-    }
-
-    public void setItemDrop(ItemStack itemDrop) {
-        this.itemDrop = itemDrop;
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.gmail.nossr50.datatypes.mods;
-
-public class CustomItem {
-    protected int itemID;
-
-    public CustomItem(int itemID) {
-        this.itemID = itemID;
-    }
-
-    public int getItemID() {
-        return itemID;
-    }
-
-    public void setItemID(int itemID) {
-        this.itemID = itemID;
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.gmail.nossr50.datatypes.mods;
-
-public class CustomTool extends CustomItem {
-    private double xpMultiplier;
-    private boolean abilityEnabled;
-    private int tier;
-
-    public CustomTool(int tier, boolean abilityEnabled, double xpMultiplier, int itemID) {
-        super(itemID);
-        this.xpMultiplier = xpMultiplier;
-        this.abilityEnabled = abilityEnabled;
-        this.tier = tier;
-    }
-
-    public double getXpMultiplier() {
-        return xpMultiplier;
-    }
-
-    public void setXpMultiplier(Double xpMultiplier) {
-        this.xpMultiplier = xpMultiplier;
-    }
-
-    public boolean isAbilityEnabled() {
-        return abilityEnabled;
-    }
-
-    public void setAbilityEnabled(boolean abilityEnabled) {
-        this.abilityEnabled = abilityEnabled;
-    }
-
-    public int getTier() {
-        return tier;
-    }
-
-    public void setTier(int tier) {
-        this.tier = tier;
-    }
-}

src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java

@@ -5,13 +5,16 @@ import org.bukkit.entity.Player;
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
 import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
+import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
 
 public class PopupMMO extends GenericPopup {
 
     private ButtonHUDStyle HUDButton = null;
+    private ButtonPartyToggle PartyButton = null;
     private ButtonEscape EscapeButton = null;
     private GenericLabel mcMMO_label = new GenericLabel();
     private GenericLabel tip_escape = new GenericLabel();
@@ -36,6 +39,14 @@ public class PopupMMO extends GenericPopup {
         HUDButton.setY(center_y / 2);
         HUDButton.setDirty(true);
 
+        if (LoadProperties.partybar) {
+            PartyButton = new ButtonPartyToggle(PP);
+            PartyButton.setX(center_x - (PartyButton.getWidth() / 2));
+            PartyButton.setY((center_y / 2) + PartyButton.getHeight());
+            PartyButton.setDirty(true);
+            this.attachWidget(plugin, PartyButton);
+        }
+
         EscapeButton = new ButtonEscape();
         EscapeButton.setX(center_x - (EscapeButton.getWidth() / 2));
         EscapeButton.setY((center_y / 2) + (HUDButton.getHeight() * 2) + 5);
@@ -51,7 +62,7 @@ public class PopupMMO extends GenericPopup {
 
     public void updateButtons(PlayerProfile PP) {
         HUDButton.updateText(PP);
-        //PartyButton.updateText(PP);
+        PartyButton.updateText(PP);
         this.setDirty(true);
     }
 }

src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java

@@ -4,7 +4,7 @@ import org.bukkit.inventory.ItemStack;
 
 public abstract class Treasure {
     private int xp;
-    private double dropChance;
+    private Double dropChance;
     private int dropLevel;
     private ItemStack drop;
 
@@ -31,7 +31,7 @@ public abstract class Treasure {
         this.xp = xp;
     }
 
-    public double getDropChance() {
+    public Double getDropChance() {
         return dropChance;
     }
 

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

@@ -1,340 +1,305 @@
-package com.gmail.nossr50.listeners;
-
-import java.util.List;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.AbilityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.skills.gathering.Excavation;
-import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.skills.gathering.Mining;
-import com.gmail.nossr50.skills.gathering.WoodCutting;
-import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.spout.SpoutSounds;
-import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.ItemChecks;
-import com.gmail.nossr50.util.ModChecks;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.inventory.ItemStack;
-
-import org.getspout.spoutapi.sound.SoundEffect;
-
-public class BlockListener implements Listener {
-    private final mcMMO plugin;
-
-    public BlockListener(final mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Monitor BlockPistonExtend events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-        List<Block> blocks = event.getBlocks();
-        BlockFace direction = event.getDirection();
-
-        for (Block b : blocks) {
-            if (mcMMO.placeStore.isTrue(b)) {
-                mcMMO.placeStore.setTrue(b.getRelative(direction));
-                mcMMO.placeStore.setFalse(b);
-            }
-        }
-
-        for (Block b : blocks) {
-            if (mcMMO.placeStore.isTrue(b.getRelative(direction))) {
-                mcMMO.placeStore.setTrue(b.getRelative(direction));
-                mcMMO.placeStore.setFalse(b);
-            }
-        }
-    }
-
-    /**
-     * Monitor BlockPistonRetract events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        Block block = event.getRetractLocation().getBlock();
-
-        if (event.isSticky() && mcMMO.placeStore.isTrue(block)) {
-            mcMMO.placeStore.setFalse(block);
-            mcMMO.placeStore.setTrue(event.getBlock().getRelative(event.getDirection()));
-        }
-    }
-
-    /**
-     * Monitor BlockPlace events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockPlace(BlockPlaceEvent event) {
-        Config configInstance = Config.getInstance();
-
-        Block block = event.getBlock();
-        Player player = event.getPlayer();
-        int id = block.getTypeId();
-        Material mat = block.getType();
-
-        /* Code to prevent issues with placed falling Sand/Gravel not being tracked */
-        if (mat.equals(Material.SAND) || mat.equals(Material.GRAVEL)) {
-            for (int y = -1;  y + block.getY() >= 0; y--) {
-                if (block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
-                    continue;
-                }
-                else {
-                    Block newLocation = block.getRelative(0, y + 1, 0);
-                    mcMMO.placeStore.setTrue(newLocation);
-                    break;
-                }
-            }
-        }
-
-        /* Check if the blocks placed should be monitored so they do not give out XP in the future */
-        if (BlockChecks.shouldBeWatched(block)) {
-            mcMMO.placeStore.setTrue(block);
-        }
-
-        if (id == configInstance.getRepairAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) {
-            Repair.placedAnvilCheck(player, id);
-        }
-    }
-
-    /**
-     * Monitor BlockBreak events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockBreak(BlockBreakEvent event) {
-        Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
-        Block block = event.getBlock();
-        ItemStack inHand = player.getItemInHand();
-
-        Config configInstance = Config.getInstance();
-        Permissions permInstance = Permissions.getInstance();
-
-        if (event instanceof FakeBlockBreakEvent) {
-            return;
-        }
-
-        /* HERBALISM */
-        if (BlockChecks.canBeGreenTerra(block)) {
-            /* Green Terra */
-            if (PP.getToolPreparationMode(ToolType.HOE) && permInstance.greenTerra(player)) {
-                Skills.abilityCheck(player, SkillType.HERBALISM);
-            }
-
-            /* Triple drops */
-            if (PP.getAbilityMode(AbilityType.GREEN_TERRA)) {
-                Herbalism.herbalismProcCheck(block, player, event, plugin);
-            }
-
-            if (permInstance.herbalism(player)) {
-                Herbalism.herbalismProcCheck(block, player, event, plugin);
-            }
-        }
-
-        /* MINING */
-        else if (BlockChecks.canBeSuperBroken(block) && permInstance.mining(player)) {
-            if (configInstance.getMiningRequiresTool()) {
-                if (ItemChecks.isPickaxe(inHand)) {
-                    Mining.miningBlockCheck(player, block);
-                }
-            }
-            else {
-                Mining.miningBlockCheck(player, block);
-            }
-        }
-
-        /* WOOD CUTTING */
-        else if (BlockChecks.isLog(block) && permInstance.woodcutting(player)) {
-            if (configInstance.getWoodcuttingRequiresTool()) {
-                if (ItemChecks.isAxe(inHand)) {
-                    WoodCutting.woodcuttingBlockCheck(player, block);
-                }
-            }
-            else {
-                WoodCutting.woodcuttingBlockCheck(player, block);
-            }
-
-            if (PP.getAbilityMode(AbilityType.TREE_FELLER) && permInstance.treeFeller(player) && ItemChecks.isAxe(inHand)) {
-                if (ModChecks.isCustomTool(inHand)) {
-                    if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                        WoodCutting.treeFeller(event);
-                    }
-                }
-                else {
-                    WoodCutting.treeFeller(event);
-                }
-            }
-        }
-
-        /* EXCAVATION */
-        else if (BlockChecks.canBeGigaDrillBroken(block) && permInstance.excavation(player) && !mcMMO.placeStore.isTrue(block)) {
-            if (configInstance.getExcavationRequiresTool()) {
-                if (ItemChecks.isShovel(inHand)) {
-                    Excavation.excavationProcCheck(block, player);
-                }
-            }
-            else {
-                Excavation.excavationProcCheck(block, player);
-            }
-        }
-
-        //Remove metadata when broken
-        if (mcMMO.placeStore.isTrue(block) && BlockChecks.shouldBeWatched(block)) {
-            mcMMO.placeStore.setFalse(block);
-        }
-    }
-
-    /**
-     * Monitor BlockDamage events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockDamage(BlockDamageEvent event) {
-        final int LEAF_BLOWER_LEVEL = 100;
-
-        Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
-        ItemStack inHand = player.getItemInHand();
-        Block block = event.getBlock();
-        Material material = block.getType();
-
-        Config configInstance = Config.getInstance();
-        Permissions permInstance = Permissions.getInstance();
-
-        /*
-         * ABILITY PREPARATION CHECKS
-         */
-        if (BlockChecks.abilityBlockCheck(block)) {
-            if (PP.getToolPreparationMode(ToolType.HOE) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.makeMossy(block))) {
-                Skills.abilityCheck(player, SkillType.HERBALISM);
-            }
-            else if (PP.getToolPreparationMode(ToolType.AXE) && BlockChecks.isLog(block) && permInstance.treeFeller(player)) {  //TODO: Why are we checking the permissions here?
-                Skills.abilityCheck(player, SkillType.WOODCUTTING);
-            }
-            else if (PP.getToolPreparationMode(ToolType.PICKAXE) && BlockChecks.canBeSuperBroken(block)) {
-                Skills.abilityCheck(player, SkillType.MINING);
-            }
-            else if (PP.getToolPreparationMode(ToolType.SHOVEL) && BlockChecks.canBeGigaDrillBroken(block)) {
-                Skills.abilityCheck(player, SkillType.EXCAVATION);
-            }
-            else if (PP.getToolPreparationMode(ToolType.FISTS) && (BlockChecks.canBeGigaDrillBroken(block) || material.equals(Material.SNOW))) {
-                Skills.abilityCheck(player, SkillType.UNARMED);
-            }
-        }
-
-        /* TREE FELLER SOUNDS */
-        if (configInstance.spoutEnabled && BlockChecks.isLog(block) && PP.getAbilityMode(AbilityType.TREE_FELLER)) {
-            SpoutSounds.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
-        }
-
-        /*
-         * ABILITY TRIGGER CHECKS
-         */
-        if (PP.getAbilityMode(AbilityType.GREEN_TERRA) && permInstance.greenTerra(player) && BlockChecks.makeMossy(block)) {
-            if (ModChecks.isCustomTool(inHand)) {
-                if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                    Herbalism.greenTerra(player, block);
-                }
-            }
-            else {
-                Herbalism.greenTerra(player, block);
-            }
-        }
-        else if (PP.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
-            if (configInstance.getExcavationRequiresTool()) {
-                if (ItemChecks.isShovel(inHand)) {
-                    if (ModChecks.isCustomTool(inHand)) {
-                        if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                            event.setInstaBreak(true);
-                            Excavation.gigaDrillBreaker(player, block);
-                        }
-                    }
-                    else {
-                        event.setInstaBreak(true);
-                        Excavation.gigaDrillBreaker(player, block);
-                    }
-                }
-            }
-            else {
-                event.setInstaBreak(true);
-                Excavation.gigaDrillBreaker(player, block);
-            }
-        }
-        else if (PP.getAbilityMode(AbilityType.BERSERK) && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
-            if (inHand.getType().equals(Material.AIR)) {
-                FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
-                plugin.getServer().getPluginManager().callEvent(armswing);
-
-                event.setInstaBreak(true);
-            }
-
-            if (configInstance.spoutEnabled) {
-                SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
-            }
-        }
-        else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
-            if (configInstance.getMiningRequiresTool()) {
-                if (ItemChecks.isPickaxe(inHand)) {
-                    if (ModChecks.isCustomTool(inHand)) {
-                        if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                            event.setInstaBreak(true);
-                            Mining.superBreakerBlockCheck(player, block);
-                        }
-                    }
-                    else {
-                        event.setInstaBreak(true);
-                        Mining.superBreakerBlockCheck(player, block);
-                    }
-                }
-            }
-            else {
-                event.setInstaBreak(true);
-                Mining.superBreakerBlockCheck(player, block);
-            }
-        }
-        else if (PP.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && (material.equals(Material.LEAVES) || (configInstance.getBlockModsEnabled() && ModChecks.isCustomLeafBlock(block)))) {
-            if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
-                if (configInstance.getWoodcuttingRequiresTool()) {
-                    if (ItemChecks.isAxe(inHand)) {
-                        event.setInstaBreak(true);
-                        WoodCutting.leafBlower(player, block);
-                    }
-                }
-                else if (!inHand.getType().equals(Material.SHEARS)) {
-                    event.setInstaBreak(true);
-                    WoodCutting.leafBlower(player, block);
-                }
-            }
-        }
-    }
-}
+package com.gmail.nossr50.listeners;
+
+import java.util.List;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.datatypes.AbilityType;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.datatypes.ToolType;
+import com.gmail.nossr50.skills.gathering.Excavation;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.gathering.Mining;
+import com.gmail.nossr50.skills.gathering.WoodCutting;
+import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.spout.SpoutSounds;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
+import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+
+import org.bukkit.Bukkit;
+import org.bukkit.CropState;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
+
+import org.getspout.spoutapi.sound.SoundEffect;
+
+public class BlockListener implements Listener {
+    private final mcMMO plugin;
+
+    public BlockListener(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Monitor BlockPistonExtend events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        List<Block> blocks = event.getBlocks();
+        BlockFace direction = event.getDirection();
+
+        for (Block b : blocks) {
+            if (b.hasMetadata("mcmmoPlacedBlock")) {
+                b.getRelative(direction).setMetadata("mcmmoNeedsTracking", new FixedMetadataValue(plugin, true));
+                b.removeMetadata("mcmmoPlacedBlock", plugin);
+                }
+        }
+
+        for (Block b : blocks) {
+            if (b.getRelative(direction).hasMetadata("mcmmoNeedsTracking")) {
+                b.getRelative(direction).setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+                b.getRelative(direction).removeMetadata("mcmmoNeedsTracking", plugin);
+            }
+        }
+    }
+
+    /**
+     * Monitor BlockPistonRetract events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        Block block = event.getRetractLocation().getBlock();
+
+        if (block.hasMetadata("mcmmoPlacedBlock")) {
+            block.removeMetadata("mcmmoPlacedBlock", plugin);
+            event.getBlock().getRelative(event.getDirection()).setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+        }
+    }
+
+    /**
+     * Monitor BlockPlace events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block block = event.getBlock();
+        Player player = event.getPlayer();
+        int id = block.getTypeId();
+        Material mat = block.getType();
+
+        /* Code to prevent issues with placed falling Sand/Gravel not being tracked */
+        if (mat.equals(Material.SAND) || mat.equals(Material.GRAVEL)) {
+            for (int y = -1;  y + block.getY() >= 0; y--) {
+                if (block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
+                    continue;
+                }
+                else {
+                    Block newLocation = block.getRelative(0, y + 1, 0);
+                    newLocation.setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+                    break;
+                }
+            }
+        }
+
+        /* Check if the blocks placed should be monitored so they do not give out XP in the future */
+        if (BlockChecks.shouldBeWatched(mat)) {
+            block.setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+        }
+
+        if (id == LoadProperties.anvilID && LoadProperties.anvilmessages) {
+            Repair.placedAnvilCheck(player, id);
+        }
+    }
+
+    /**
+     * Monitor BlockBreak events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockBreak(BlockBreakEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        Block block = event.getBlock();
+        Material mat = block.getType();
+        ItemStack inhand = player.getItemInHand();
+
+        if (event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
+        /*
+         * HERBALISM
+         */
+
+        /* Green Terra */
+        if (PP.getToolPreparationMode(ToolType.HOE) && mcPermissions.getInstance().greenTerra(player) && ((mat.equals(Material.CROPS) && block.getData() == CropState.RIPE.getData()) || Herbalism.canBeGreenTerra(mat))) {
+            Skills.abilityCheck(player, SkillType.HERBALISM);
+        }
+
+        /* Triple drops */
+        if (PP.getAbilityMode(AbilityType.GREEN_TERRA) && Herbalism.canBeGreenTerra(mat)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+        }
+
+        if (mcPermissions.getInstance().herbalism(player) && Herbalism.canBeGreenTerra(mat)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+        }
+
+        /*
+         * MINING
+         */
+
+        if (mcPermissions.getInstance().mining(player) && Mining.canBeSuperBroken(mat)) {
+            if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) {
+                Mining.miningBlockCheck(player, block);
+            }
+            else if (!LoadProperties.miningrequirespickaxe) {
+                Mining.miningBlockCheck(player, block);
+            }
+        }
+
+        /*
+         * WOOD CUTTING
+         */
+
+        if (mcPermissions.getInstance().woodcutting(player) && mat.equals(Material.LOG)) {
+            if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+            else if (!LoadProperties.woodcuttingrequiresaxe) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+        }
+
+        if (PP.getAbilityMode(AbilityType.TREE_FELLER) && mcPermissions.getInstance().treeFeller(player)) {
+            WoodCutting.treeFeller(event);
+        }
+
+        /*
+         * EXCAVATION
+         */
+
+        if (Excavation.canBeGigaDrillBroken(mat) && mcPermissions.getInstance().excavation(player) && !block.hasMetadata("mcmmoPlacedBlock")) {
+            if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
+                Excavation.excavationProcCheck(block, player);
+            }
+            else if (!LoadProperties.excavationRequiresShovel) {
+                Excavation.excavationProcCheck(block, player);
+            }
+        }
+
+        //Remove metadata when broken
+        if (block.hasMetadata("mcmmoPlacedBlock") && BlockChecks.shouldBeWatched(mat)) {
+            block.removeMetadata("mcmmoPlacedBlock", plugin);
+        }
+    }
+
+    /**
+     * Monitor BlockDamage events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockDamage(BlockDamageEvent event) {
+        final int LEAF_BLOWER_LEVEL = 100;
+
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        ItemStack inhand = player.getItemInHand();
+        Block block = event.getBlock();
+        Material mat = block.getType();
+
+        /*
+         * ABILITY PREPARATION CHECKS
+         */
+        if (BlockChecks.abilityBlockCheck(mat)) {
+            if (PP.getToolPreparationMode(ToolType.HOE) && (Herbalism.canBeGreenTerra(mat) || Herbalism.makeMossy(mat))) {
+                Skills.abilityCheck(player, SkillType.HERBALISM);
+            }
+            else if (PP.getToolPreparationMode(ToolType.AXE) && mat.equals(Material.LOG) && mcPermissions.getInstance().treeFeller(player)) {  //Why are we checking the permissions here?
+                Skills.abilityCheck(player, SkillType.WOODCUTTING);
+            }
+            else if (PP.getToolPreparationMode(ToolType.PICKAXE) && Mining.canBeSuperBroken(mat)) {
+                Skills.abilityCheck(player, SkillType.MINING);
+            }
+            else if (PP.getToolPreparationMode(ToolType.SHOVEL) && Excavation.canBeGigaDrillBroken(mat)) {
+                Skills.abilityCheck(player, SkillType.EXCAVATION);
+            }
+            else if (PP.getToolPreparationMode(ToolType.FISTS) && (Excavation.canBeGigaDrillBroken(mat) || mat.equals(Material.SNOW))) {
+                Skills.abilityCheck(player, SkillType.UNARMED);
+            }
+        }
+
+        /* TREE FELLER SOUNDS */
+        if (LoadProperties.spoutEnabled && mat.equals(Material.LOG) && PP.getAbilityMode(AbilityType.TREE_FELLER)) {
+            SpoutSounds.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
+        }
+
+        /*
+         * ABILITY TRIGGER CHECKS
+         */
+        if (PP.getAbilityMode(AbilityType.GREEN_TERRA) && mcPermissions.getInstance().greenTerra(player) && Herbalism.makeMossy(mat)) {
+            Herbalism.greenTerra(player, block);
+        }
+        else if (PP.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
+            if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
+                event.setInstaBreak(true);
+                Excavation.gigaDrillBreaker(player, block);
+            }
+            else if (!LoadProperties.excavationRequiresShovel) {
+                event.setInstaBreak(true);
+                Excavation.gigaDrillBreaker(player, block);
+            }
+        }
+        else if (PP.getAbilityMode(AbilityType.BERSERK) && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
+            if (inhand.getType().equals(Material.AIR)) {
+                FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
+                Bukkit.getPluginManager().callEvent(armswing);
+
+                event.setInstaBreak(true);
+            }
+
+            if (LoadProperties.spoutEnabled) {
+                SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+            }
+        }
+        else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
+            if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) {
+                event.setInstaBreak(true);
+                Mining.SuperBreakerBlockCheck(player, block);
+            }
+            else if (!LoadProperties.miningrequirespickaxe) {
+                event.setInstaBreak(true);
+                Mining.SuperBreakerBlockCheck(player, block);
+            }
+        }
+        else if (PP.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && mat.equals(Material.LEAVES)) {
+            if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) {
+                if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+                    event.setInstaBreak(true);
+                    WoodCutting.leafBlower(player, block);
+                }
+            }
+            else if (!LoadProperties.woodcuttingrequiresaxe && !inhand.getType().equals(Material.SHEARS)) {
+                if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+                    event.setInstaBreak(true);
+                    WoodCutting.leafBlower(player, block);
+                }
+            }
+        }
+    }
+}

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

@@ -1,320 +1,318 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.Material;
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.entity.Tameable;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.EntityTameEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.metadata.FixedMetadataValue;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
-import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.skills.combat.Archery;
-import com.gmail.nossr50.skills.combat.Taming;
-import com.gmail.nossr50.skills.gathering.BlastMining;
-import com.gmail.nossr50.skills.misc.Acrobatics;
-import com.gmail.nossr50.util.Combat;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-public class EntityListener implements Listener {
-    private final mcMMO plugin;
-
-    public EntityListener(final mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Monitor EntityDamageByEntity events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        if (event instanceof FakeEntityDamageByEntityEvent) {
-            return;
-        }
-
-        Entity attacker = event.getDamager();
-
-        if (attacker instanceof Projectile) {
-            attacker = ((Projectile) attacker).getShooter();
-        }
-        else if (attacker instanceof Tameable) {
-            AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
-
-            if (animalTamer instanceof Player) {
-                attacker = (Player) animalTamer;
-            }
-        }
-
-        Entity defender = event.getEntity();
-
-        if (attacker instanceof Player && defender instanceof Player) {
-            if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        /* Check for invincibility */
-        if (defender instanceof LivingEntity) {
-            LivingEntity livingDefender = (LivingEntity)defender;
-
-            if (!Misc.isInvincible(livingDefender, event)) {
-                Combat.combatChecks(event, plugin);
-            }
-        }
-    }
-
-    /**
-     * Monitor EntityDamage events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityDamage(EntityDamageEvent event) {
-        if (event instanceof FakeEntityDamageEvent) {
-            return;
-        }
-
-        Entity entity = event.getEntity();
-        DamageCause cause = event.getCause();
-
-        if (!(entity instanceof LivingEntity)) {
-            return;
-        }
-
-        LivingEntity lEntity = (LivingEntity) entity;
-
-        if (lEntity instanceof Player) {
-            /* Check for invincibility */
-            Player player = (Player) entity;
-            PlayerProfile PP = Users.getProfile(player);
-
-            if (PP.getGodMode()) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (!Misc.isInvincible(player, event)) {
-                if (cause == DamageCause.FALL && Permissions.getInstance().acrobatics(player) && !player.isInsideVehicle() && !player.getItemInHand().getType().equals(Material.ENDER_PEARL)) {
-                    Acrobatics.acrobaticsCheck(player, event);
-                }
-                else if (cause == DamageCause.BLOCK_EXPLOSION && Permissions.getInstance().demolitionsExpertise(player)) {
-                    BlastMining.demolitionsExpertise(player, event);
-                }
-
-                if (event.getDamage() >= 1) {
-                    PP.setRecentlyHurt(System.currentTimeMillis());
-                }
-            }
-        } else if (lEntity instanceof Tameable) {
-            Tameable pet = (Tameable) lEntity;
-
-            if ((!Misc.isInvincible(lEntity, event)) && pet.isTamed() && (pet.getOwner() instanceof Player)) {
-                Taming.preventDamage(event);
-            }
-        }
-    }
-
-    /**
-     * Monitor EntityDeath events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.MONITOR)
-    public void onEntityDeath(EntityDeathEvent event) {
-        LivingEntity entity = event.getEntity();
-
-        entity.setFireTicks(0);
-        BleedTimer.remove(entity);
-        Archery.arrowRetrievalCheck(entity);
-    }
-
-    /**
-     * Monitor CreatureSpawn events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.MONITOR)
-    public void onCreatureSpawn(CreatureSpawnEvent event) {
-        SpawnReason reason = event.getSpawnReason();
-
-        if ((reason.equals(SpawnReason.SPAWNER) || reason.equals(SpawnReason.SPAWNER_EGG)) && !Config.getInstance().getExperienceGainsMobspawnersEnabled()) {
-            event.getEntity().setMetadata("mcmmoFromMobSpawner", new FixedMetadataValue(plugin, true));
-        }
-    }
-
-    /**
-     * Monitor ExplosionPrime events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onExplosionPrime(ExplosionPrimeEvent event) {
-        Entity entity = event.getEntity();
-
-        if (entity instanceof TNTPrimed) {
-            int id = entity.getEntityId();
-
-            if (plugin.tntTracker.containsKey(id)) {
-                Player player = plugin.tntTracker.get(id);
-
-                if (Permissions.getInstance().biggerBombs(player)) {
-                    BlastMining.biggerBombs(player, event);
-                }
-            }
-        }
-    }
-
-    /**
-     * Monitor EntityExplode events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEnitityExplode(EntityExplodeEvent event) {
-        Entity entity = event.getEntity();
-
-        if (event.getEntity() instanceof TNTPrimed) {
-            int id = entity.getEntityId();
-
-            if (plugin.tntTracker.containsKey(id)) {
-                Player player = plugin.tntTracker.get(id);
-                BlastMining.dropProcessing(player, event);
-                plugin.tntTracker.remove(id);
-            }
-        }
-    }
-
-    /**
-     * Monitor FoodLevelChange events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.LOW)
-    public void onFoodLevelChange(FoodLevelChangeEvent event) {
-        if (event.getEntity() instanceof Player) {
-            Player player = (Player) event.getEntity();
-            PlayerProfile PP = Users.getProfile(player);
-            int currentFoodLevel = player.getFoodLevel();
-            int newFoodLevel = event.getFoodLevel();
-
-            if (!Permissions.getInstance().farmersDiet(player)) {
-                return;
-            }
-
-            /*
-             * Some foods have 3 ranks
-             * Some foods have 5 ranks
-             * The number of ranks is based on how 'common' the item is
-             * We can adjust this quite easily if we find something is giving too much of a bonus
-             */
-
-            if (newFoodLevel > currentFoodLevel) {
-                Material food = player.getItemInHand().getType();
-                int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
-                int foodChange = newFoodLevel - currentFoodLevel;
-                int rankChange = 0;
-
-                switch (food) {
-                case BREAD:
-                    /* BREAD RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
-                    rankChange = 200;
-                    break;
-
-                case COOKIE:
-                    /* COOKIE RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
-                    rankChange = 400;
-                    break;
-
-                case MELON:
-                    /* MELON RESTORES  1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
-                    rankChange = 400;
-                    break;
-
-                case MUSHROOM_SOUP:
-                    /* MUSHROOM SOUP RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
-                    rankChange = 200;
-                    break;
-
-                default:
-                    return;
-                }
-
-                for (int i = 200; i <= 1000; i += rankChange) {
-                    if (herbLevel >= i) {
-                        foodChange++;
-                    }
-                }
-
-                /* Make sure we don't go over the max value */
-                newFoodLevel = currentFoodLevel + foodChange;
-                if (newFoodLevel > 20) {
-                    event.setFoodLevel(20);
-                }
-                else {
-                    event.setFoodLevel(newFoodLevel);
-                }
-            }
-        }
-    }
-
-    /**
-     * Monitor EntityTame events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler (priority = EventPriority.MONITOR)
-    public void onEntityTame(EntityTameEvent event) {
-        Player player = (Player) event.getOwner();
-
-        if (Permissions.getInstance().taming(player) && !event.getEntity().hasMetadata("mcmmoSummoned")) {
-            PlayerProfile PP = Users.getProfile(player);
-            EntityType type = event.getEntityType();
-            int xp = 0;
-
-            switch (type) {
-            case WOLF:
-                xp = Config.getInstance().getTamingXPWolf();
-                break;
-
-            case OCELOT:
-                xp = Config.getInstance().getTamingXPOcelot();
-                break;
-
-            default:
-                break;
-            }
-
-            PP.addXP(player, SkillType.TAMING, xp);
-            Skills.XpCheckSkill(SkillType.TAMING, player);
-        }
-    }
-}
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityTameEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.runnables.mcBleedTimer;
+import com.gmail.nossr50.skills.combat.Archery;
+import com.gmail.nossr50.skills.combat.Staves;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.misc.Acrobatics;
+import com.gmail.nossr50.util.Combat;
+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 EntityListener implements Listener {
+    private final mcMMO plugin;
+
+    public EntityListener(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Monitor EntityDamageByEntity events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (event instanceof FakeEntityDamageByEntityEvent) {
+            return;
+        }
+
+        Entity defender = event.getEntity();
+        Entity attacker = event.getDamager();
+
+        if (attacker instanceof Player && defender instanceof Player) {
+            if (!defender.getWorld().getPVP()) {
+                return;
+            }
+
+            if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        /* Check for invincibility */
+        if (defender instanceof LivingEntity) {
+            LivingEntity livingDefender = (LivingEntity)defender;
+
+            if (!m.isInvincible(livingDefender, event)) {
+                Combat.combatChecks(event, plugin);
+                Staves.altFireCheck(event);
+            }
+        }
+    }
+
+    /**
+     * Monitor EntityDamage events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageEvent event) {
+        if (event instanceof FakeEntityDamageEvent) {
+            return;
+        }
+
+        Entity entity = event.getEntity();
+        EntityType type = entity.getType();
+        DamageCause cause = event.getCause();
+        
+        switch(type) {
+        case PLAYER:
+
+            /* Check for invincibility */
+            Player player = (Player) entity;
+            PlayerProfile PP = Users.getProfile(player);
+
+            if (PP.getGodMode()) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (!m.isInvincible(player, event)) {
+                if (cause == DamageCause.FALL && mcPermissions.getInstance().acrobatics(player)) {
+                    Acrobatics.acrobaticsCheck(player, event);
+                }
+                else if (cause == DamageCause.BLOCK_EXPLOSION && mcPermissions.getInstance().demolitionsExpertise(player)) {
+                    BlastMining.demolitionsExpertise(player, event);
+                }
+
+                if (event.getDamage() >= 1) {
+                    PP.setRecentlyHurt(System.currentTimeMillis());
+                }
+            }
+            break;
+
+        case WOLF:
+            Wolf wolf = (Wolf) entity;
+
+            if ((!m.isInvincible(wolf, event)) && wolf.isTamed() && (wolf.getOwner() instanceof Player)) {
+                Taming.preventDamage(event);
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * Monitor EntityDeath events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onEntityDeath(EntityDeathEvent event) {
+        LivingEntity x = event.getEntity();
+        x.setFireTicks(0);
+
+        /* Remove bleed track */
+        mcBleedTimer.remove(x);
+
+        Archery.arrowRetrievalCheck(x, plugin);
+
+        if (x instanceof Player) {
+            Users.getProfile((Player)x).resetBleedTicks();
+        }
+    }
+
+    /**
+     * Monitor CreatureSpawn events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onCreatureSpawn(CreatureSpawnEvent event) {
+        SpawnReason reason = event.getSpawnReason();
+
+        if ((reason.equals(SpawnReason.SPAWNER) || reason.equals(SpawnReason.SPAWNER_EGG)) && !LoadProperties.xpGainsMobSpawners) {
+            event.getEntity().setMetadata("mcmmoFromMobSpawner", new FixedMetadataValue(plugin, true));
+        }
+    }
+
+    /**
+     * Monitor ExplosionPrime events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onExplosionPrime(ExplosionPrimeEvent event) {
+        Entity entity = event.getEntity();
+
+        if (entity instanceof TNTPrimed) {
+            int id = entity.getEntityId();
+
+            if (plugin.tntTracker.containsKey(id)) {
+                Player player = plugin.tntTracker.get(id);
+
+                if (mcPermissions.getInstance().biggerBombs(player)) {
+                    BlastMining.biggerBombs(player, event);
+                }
+            }
+        }
+    }
+
+    /**
+     * Monitor EntityExplode events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEnitityExplode(EntityExplodeEvent event) {
+        Entity entity = event.getEntity();
+
+        if (event.getEntity() instanceof TNTPrimed) {
+            int id = entity.getEntityId();
+
+            if (plugin.tntTracker.containsKey(id)) {
+                Player player = plugin.tntTracker.get(id);
+                BlastMining.dropProcessing(player, event);
+                plugin.tntTracker.remove(id);
+            }
+        }
+    }
+
+    /**
+     * Monitor FoodLevelChange events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.LOW)
+    public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        if (LoadProperties.herbalismHungerBonus) {
+            if (event.getEntity() instanceof Player) {
+                Player player = (Player) event.getEntity();
+                PlayerProfile PP = Users.getProfile(player);
+                int currentFoodLevel = player.getFoodLevel();
+                int newFoodLevel = event.getFoodLevel();
+
+                /* Some foods have 3 ranks
+                 * Some foods have 5 ranks
+                 * The number of ranks is based on how 'common' the item is
+                 * We can adjust this quite easily if we find something is giving too much of a bonus
+                 */
+
+                if (newFoodLevel > currentFoodLevel) {
+                    Material food = player.getItemInHand().getType();
+                    int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
+                    int foodChange = newFoodLevel - currentFoodLevel;
+                    int rankChange = 0;
+
+                    switch (food) {
+                    case BREAD:
+                        /* BREAD RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
+                        rankChange = 200;
+                        break;
+
+                    case COOKIE:
+                        /* COOKIE RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
+                        rankChange = 400;
+                        break;
+
+                    case MELON:
+                        /* MELON RESTORES  1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
+                        rankChange = 400;
+                        break;
+
+                    case MUSHROOM_SOUP:
+                        /* MUSHROOM SOUP RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
+                        rankChange = 200;
+                        break;
+
+                    default:
+                        return;
+                    }
+
+                    for (int i = 200; i <= 1000; i += rankChange) {
+                        if (herbLevel >= i) {
+                            foodChange++;
+                        }
+                    }
+
+                    /* Make sure we don't go over the max value */
+                    newFoodLevel = currentFoodLevel + foodChange;
+                    if (newFoodLevel > 20) {
+                        event.setFoodLevel(20);
+                    }
+                    else {
+                        event.setFoodLevel(newFoodLevel);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Monitor EntityTame events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onEntityTame(EntityTameEvent event) {
+        Player player = (Player) event.getOwner();
+
+        if (mcPermissions.getInstance().taming(player) && !event.getEntity().hasMetadata("mcmmoSummoned")) {
+            PlayerProfile PP = Users.getProfile(player);
+            EntityType type = event.getEntityType();
+            int xp = 0;
+
+            switch (type) {
+            case WOLF:
+                xp = LoadProperties.mtameWolf;
+                break;
+
+            case OCELOT:
+                xp = LoadProperties.mtameOcelot;
+                break;
+
+            default:
+                break;
+            }
+
+            PP.addXP(SkillType.TAMING, xp);
+            Skills.XpCheckSkill(SkillType.TAMING, player);
+        }
+    }
+}

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

@@ -1,27 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Hardcore;
-import com.gmail.nossr50.util.Permissions;
-
-public class HardcoreListener implements Listener {
-    
-    @EventHandler()
-    public void PlayerDeathEvent(PlayerDeathEvent event) {
-        Player player = event.getEntity(); //Note this returns a Player object for this subevent
-        
-        if(!Permissions.getInstance().hardcoremodeBypass(player)) {
-            if(player.getKiller() instanceof Player) {
-                if(Config.getInstance().getHardcoreVampirismEnabled()) {
-                    Hardcore.invokeVampirism(((Player)player.getKiller()), player);
-                }
-            }
-            Hardcore.invokeStatPenalty(player);
-        }
-    }
-}

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

@@ -1,381 +1,392 @@
-package com.gmail.nossr50.listeners;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerFishEvent;
-import org.bukkit.event.player.PlayerFishEvent.State;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.general.XprateCommand;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.datatypes.AbilityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.combat.Taming;
-import com.gmail.nossr50.skills.gathering.BlastMining;
-import com.gmail.nossr50.skills.gathering.Fishing;
-import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.Item;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-public class PlayerListener implements Listener {
-    private final mcMMO plugin;
-
-    public PlayerListener(final mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Monitor PlayerChangedWorld events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
-
-        if (PP.getGodMode()) {
-            if (!Permissions.getInstance().mcgod(player)) {
-                PP.toggleGodMode();
-                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden"));
-            }
-        }
-
-        if (PP.inParty()) {
-            if (!Permissions.getInstance().party(player)) {
-                PP.removeParty();
-                player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
-            }
-        }
-    }
-
-    /**
-     * Monitor PlayerFish events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerFish(PlayerFishEvent event) {
-        Player player = event.getPlayer();
-
-        if (Permissions.getInstance().fishing(player)) {
-            State state = event.getState();
-
-            switch (state) {
-            case CAUGHT_FISH:
-                Fishing.processResults(event);
-                break;
-
-            case CAUGHT_ENTITY:
-                if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= 150 && Permissions.getInstance().shakeMob(player)) {
-                    Fishing.shakeMob(event);
-                }
-                break;
-
-            default:
-                break;
-            }
-        }
-    }
-
-    /**
-     * Monitor PlaterPickupItem events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(ignoreCancelled = true)
-    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
-        if (Users.getProfile(event.getPlayer()).getAbilityMode(AbilityType.BERSERK)) {
-             event.setCancelled(true);
-        }
-    }
-
-    /**
-     * Monitor PlayerLogin events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        Users.addUser(event.getPlayer());
-    }
-
-    /**
-     * Monitor PlayerQuit events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-
-        /* GARBAGE COLLECTION */
-
-        //Remove Spout Stuff
-        if (Config.getInstance().spoutEnabled && SpoutStuff.playerHUDs.containsKey(player)) {
-            SpoutStuff.playerHUDs.remove(player);
-        }
-
-        //Bleed it out
-        BleedTimer.bleedOut(player);
-
-        //Schedule PlayerProfile removal 2 minutes after quitting
-        plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RemoveProfileFromMemoryTask(player.getName()), 2400);
-    }
-
-    /**
-     * Monitor PlayerJoin events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        
-        if (Config.getInstance().getMOTDEnabled() && Permissions.getInstance().motd(player)) {
-            String prefix = ChatColor.GOLD+"[mcMMO] ";
-            
-            player.sendMessage(prefix+ChatColor.YELLOW+"Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale
-            
-            if(Config.getInstance().getHardcoreEnabled()) {
-                if(Config.getInstance().getHardcoreVampirismEnabled()) {
-                    player.sendMessage(prefix+ChatColor.DARK_RED+"Hardcore & Vampirism enabled.");
-                    player.sendMessage(prefix+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"% "+ChatColor.DARK_AQUA+"Vampirism Stat Leech: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreVampirismStatLeechPercentage()+"%");
-                } else {
-                    player.sendMessage(prefix+ChatColor.DARK_RED+"Hardcore enabled.");
-                    player.sendMessage(prefix+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"%");
-                }
-            }
-            
-            player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.GREEN+ "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale
-            //player.sendMessage(LocaleLoader.getString("mcMMO.MOTD", new Object[] {plugin.getDescription().getVersion()}));
-            //player.sendMessage(LocaleLoader.getString("mcMMO.Website"));
-        }
-
-        //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
-        if (XprateCommand.xpevent) {
-            player.sendMessage(LocaleLoader.getString("XPRate.Event", new Object[] {Config.getInstance().xpGainMultiplier}));
-        }
-        
-        
-    }
-
-    /**
-     * Monitor PlayerInteract events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        Player player = event.getPlayer();
-        Action action = event.getAction();
-        Block block = event.getClickedBlock();
-        ItemStack inHand = player.getItemInHand();
-        Material material;
-
-        /* Fix for NPE on interacting with air */
-        if (block == null) {
-            material = Material.AIR;
-        }
-        else {
-            material = block.getType();
-        }
-
-        switch (action) {
-        case RIGHT_CLICK_BLOCK:
-
-            /* REPAIR CHECKS */
-            if (Permissions.getInstance().repair(player) && block.getTypeId() == Config.getInstance().getRepairAnvilId()) {
-                if (mcMMO.repairManager.isRepairable(inHand)) {
-                    mcMMO.repairManager.handleRepair(player, inHand);
-                    event.setCancelled(true);
-                    player.updateInventory();
-                }
-            }
-
-            /* ACTIVATION CHECKS */
-            if (Config.getInstance().getAbilitiesEnabled() && BlockChecks.abilityBlockCheck(block)) {
-                if (!material.equals(Material.DIRT) && !material.equals(Material.GRASS) && !material.equals(Material.SOIL)) {
-                    Skills.activationCheck(player, SkillType.HERBALISM);
-                }
-
-                Skills.activationCheck(player, SkillType.AXES);
-                Skills.activationCheck(player, SkillType.EXCAVATION);
-                Skills.activationCheck(player, SkillType.MINING);
-                Skills.activationCheck(player, SkillType.SWORDS);
-                Skills.activationCheck(player, SkillType.UNARMED);
-                Skills.activationCheck(player, SkillType.WOODCUTTING);
-            }
-
-            /* GREEN THUMB CHECK */
-            if (inHand.getType().equals(Material.SEEDS) && BlockChecks.makeMossy(block) && Permissions.getInstance().greenThumbBlocks(player)) {
-                Herbalism.greenThumbBlocks(inHand, player, block);
-            }
-
-            /* ITEM CHECKS */
-            if (BlockChecks.abilityBlockCheck(block)) {
-                Item.itemChecks(player);
-            }
-
-            /* BLAST MINING CHECK */
-            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.getInstance().blastMining(player)) {
-                BlastMining.detonate(event, player, plugin);
-            }
-
-            break;
-
-        case RIGHT_CLICK_AIR:
-
-            /* ACTIVATION CHECKS */
-            if (Config.getInstance().getAbilitiesEnabled()) {
-                Skills.activationCheck(player, SkillType.AXES);
-                Skills.activationCheck(player, SkillType.EXCAVATION);
-                Skills.activationCheck(player, SkillType.HERBALISM);
-                Skills.activationCheck(player, SkillType.MINING);
-                Skills.activationCheck(player, SkillType.SWORDS);
-                Skills.activationCheck(player, SkillType.UNARMED);
-                Skills.activationCheck(player, SkillType.WOODCUTTING);
-            }
-
-            /* ITEM CHECKS */
-            Item.itemChecks(player);
-
-            /* BLAST MINING CHECK */
-            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.getInstance().blastMining(player)) {
-                BlastMining.detonate(event, player, plugin);
-            }
-
-            break;
-
-        case LEFT_CLICK_AIR:
-        case LEFT_CLICK_BLOCK:
-
-            /* CALL OF THE WILD CHECKS */
-            if (player.isSneaking() && Permissions.getInstance().taming(player)) {
-                if (inHand.getType().equals(Material.RAW_FISH)) {
-                    Taming.animalSummon(EntityType.OCELOT, player, plugin);
-                }
-                else if (inHand.getType().equals(Material.BONE)) {
-                    Taming.animalSummon(EntityType.WOLF, player, plugin);
-                }
-            }
-
-            break;
-
-        default:
-            break;
-        }
-    }
-
-    /**
-     * Monitor PlayerChat events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onPlayerChat(PlayerChatEvent event) {
-        Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
-
-        if (PP.getPartyChatMode()) {
-            if (!PP.inParty()) {
-                player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
-                return;
-            }
-
-            McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage());
-            plugin.getServer().getPluginManager().callEvent(chatEvent);
-
-            if (chatEvent.isCancelled()) {
-                return;
-            }
-
-            event.setMessage(chatEvent.getMessage());
-
-            Set<Player> intendedRecipients = new HashSet<Player>();
-
-            for (Player x : Party.getInstance().getOnlineMembers(player)) {
-                intendedRecipients.add(x);
-            }
-
-            ChatColor bracketColor = ChatColor.GREEN;
-
-            event.setFormat(bracketColor + "(" + ChatColor.WHITE + "%1$s" + bracketColor + ") %2$s");
-            event.getRecipients().retainAll(intendedRecipients);
-        }
-        else if (PP.getAdminChatMode()) {
-            McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage());
-            plugin.getServer().getPluginManager().callEvent(chatEvent);
-
-            if (chatEvent.isCancelled()) {
-                return;
-            }
-
-            event.setMessage(chatEvent.getMessage());
-
-            Set<Player> intendedRecipients = new HashSet<Player>();
-
-            for (Player x : plugin.getServer().getOnlinePlayers()) {
-                if (x.isOp() || Permissions.getInstance().adminChat(x)) {
-                    intendedRecipients.add(x);
-                }
-            }
-
-            ChatColor bracketColor = ChatColor.AQUA;
-
-            event.setFormat(bracketColor + "{" + ChatColor.WHITE + "%1$s" + bracketColor + "} %2$s");
-            event.getRecipients().retainAll(intendedRecipients);
-        }
-    }
-
-    /**
-     * Monitor PlayerCommandPreprocess events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        String message = event.getMessage();
-        String command = message.substring(1).split(" ")[0];
-        String lowerCaseCommand = command.toLowerCase();
-
-        if (plugin.aliasMap.containsKey(lowerCaseCommand)) {
-            //We should find a better way to avoid string replacement where the alias is equals to the command
-            if (command.equals(plugin.aliasMap.get(lowerCaseCommand))) {
-                return;
-            }
-
-            event.setMessage(message.replace(command, plugin.aliasMap.get(lowerCaseCommand)));
-        }
-    }
+package com.gmail.nossr50.listeners;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerEggThrowEvent;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.bukkit.event.player.PlayerFishEvent.State;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.general.XprateCommand;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask;
+import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.datatypes.AbilityType;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.skills.combat.Staves;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.Item;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+public class PlayerListener implements Listener {
+    private mcMMO plugin;
+
+    public PlayerListener(mcMMO instance) {
+        plugin = instance;
+    }
+
+    /**
+     * Monitor PlayerChangedWorld events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+
+        if (PP.getGodMode()) {
+            if (!mcPermissions.getInstance().mcgod(player)) {
+                PP.toggleGodMode();
+                player.sendMessage(mcLocale.getString("GodMode.Forbidden"));
+            }
+        }
+
+        if (PP.inParty()) {
+            if (!mcPermissions.getInstance().party(player)) {
+                PP.removeParty();
+                player.sendMessage(mcLocale.getString("Party.Forbidden"));
+            }
+        }
+    }
+
+    /**
+     * Monitor PlayerFish events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerFish(PlayerFishEvent event) {
+        Player player = event.getPlayer();
+
+        if (mcPermissions.getInstance().fishing(player)) {
+            State state = event.getState();
+
+            switch (state) {
+            case CAUGHT_FISH:
+                Fishing.processResults(event);
+                break;
+
+            case CAUGHT_ENTITY:
+                if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= 150 && mcPermissions.getInstance().shakeMob(player)) {
+                    Fishing.shakeMob(event);
+                }
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+
+    /**
+     * Monitor PlaterPickupItem events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+        if (Users.getProfile(event.getPlayer()).getAbilityMode(AbilityType.BERSERK)) {
+             event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Monitor PlayerLogin events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Users.addUser(event.getPlayer());
+    }
+
+    /**
+     * Monitor PlayerQuit events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+
+        /* GARBAGE COLLECTION */
+
+        //Remove Spout Stuff
+        if (LoadProperties.spoutEnabled && SpoutStuff.playerHUDs.containsKey(player)) {
+            SpoutStuff.playerHUDs.remove(player);
+        }
+
+        //Bleed it out
+        if(PP.getBleedTicks() > 0) {
+            Combat.dealDamage(player, PP.getBleedTicks()*2);
+        }
+
+        //Schedule PlayerProfile removal 2 minutes after quitting
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveProfileFromMemoryTask(player), 2400);
+    }
+
+    /**
+     * Monitor PlayerJoin events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        if (mcPermissions.getInstance().motd(player) && LoadProperties.enableMotd) {
+            player.sendMessage(mcLocale.getString("mcPlayerListener.MOTD", new Object[] {plugin.getDescription().getVersion(), "mcmmo"}));
+            player.sendMessage(mcLocale.getString("mcPlayerListener.WIKI"));
+        }
+
+        //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
+        if (XprateCommand.xpevent) {
+            player.sendMessage(mcLocale.getString("XPRate.Event", new Object[] {LoadProperties.xpGainMultiplier}));
+        }
+    }
+
+    /**
+     * Monitor PlayerInteract events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+
+        Action action = event.getAction();
+        Block block = event.getClickedBlock();
+        ItemStack is = player.getItemInHand();
+        Material mat;
+
+        /* Fix for NPE on interacting with air */
+        if (block == null) {
+            mat = Material.AIR;
+        }
+        else {
+            mat = block.getType();
+        }
+
+        switch (action) {
+        case RIGHT_CLICK_BLOCK:
+
+            /* REPAIR CHECKS */
+            if (mcPermissions.getInstance().repair(player) && block.getTypeId() == LoadProperties.anvilID && (ItemChecks.isTool(is) || ItemChecks.isArmor(is))) {
+                Repair.repairCheck(player, is);
+                event.setCancelled(true);
+                player.updateInventory();
+            }
+
+            /* ACTIVATION CHECKS */
+            if (LoadProperties.enableAbilities && BlockChecks.abilityBlockCheck(mat)) {
+                if (!mat.equals(Material.DIRT) && !mat.equals(Material.GRASS) && !mat.equals(Material.SOIL)) {
+                    Skills.activationCheck(player, SkillType.HERBALISM);
+                }
+
+                Skills.activationCheck(player, SkillType.AXES);
+                Skills.activationCheck(player, SkillType.EXCAVATION);
+                Skills.activationCheck(player, SkillType.MINING);
+                Skills.activationCheck(player, SkillType.SWORDS);
+                Skills.activationCheck(player, SkillType.UNARMED);
+                Skills.activationCheck(player, SkillType.WOODCUTTING);
+            }
+
+            /* GREEN THUMB CHECK */
+            if (mcPermissions.getInstance().greenThumbBlocks(player) && Herbalism.makeMossy(mat) && is.getType().equals(Material.SEEDS)) {
+                Herbalism.greenThumbBlocks(is, player, block);
+            }
+
+            /* ITEM CHECKS */
+            if (BlockChecks.abilityBlockCheck(mat)) {
+                Item.itemchecks(player);
+            }
+
+            /* BLAST MINING CHECK */
+            if (mcPermissions.getInstance().blastMining(player) && is.getTypeId() == LoadProperties.detonatorID) {
+                BlastMining.remoteDetonation(player, plugin);
+            }
+
+            /* STAFF CHECKS */
+            Staves.altFire(is.getType(), player, plugin);
+
+            break;
+
+        case RIGHT_CLICK_AIR:
+
+            /* ACTIVATION CHECKS */
+            if (LoadProperties.enableAbilities) {
+                Skills.activationCheck(player, SkillType.AXES);
+                Skills.activationCheck(player, SkillType.EXCAVATION);
+                Skills.activationCheck(player, SkillType.HERBALISM);
+                Skills.activationCheck(player, SkillType.MINING);
+                Skills.activationCheck(player, SkillType.SWORDS);
+                Skills.activationCheck(player, SkillType.UNARMED);
+                Skills.activationCheck(player, SkillType.WOODCUTTING);
+            }
+
+            /* ITEM CHECKS */
+            Item.itemchecks(player);
+
+            /* BLAST MINING CHECK */
+            if (mcPermissions.getInstance().blastMining(player) && is.getTypeId() == LoadProperties.detonatorID) {
+                BlastMining.remoteDetonation(player, plugin);
+            }
+
+            /* STAFF CHECKS */
+            Staves.altFire(is.getType(), player, plugin);
+
+            break;
+
+        case LEFT_CLICK_AIR:
+        case LEFT_CLICK_BLOCK:
+
+            /* CALL OF THE WILD CHECKS */
+            if (player.isSneaking() && mcPermissions.getInstance().taming(player)) {
+                if (is.getType().equals(Material.RAW_FISH)) {
+                    Taming.animalSummon(EntityType.OCELOT, player, plugin);
+                }
+                else if (is.getType().equals(Material.BONE)) {
+                    Taming.animalSummon(EntityType.WOLF, player, plugin);
+                }
+            }
+
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * Monitor PlayerChat events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onPlayerChat(PlayerChatEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        boolean partyChat = PP.getPartyChatMode();
+        boolean adminChat = PP.getAdminChatMode();
+        Set<Player> recipients = event.getRecipients();
+
+        Set<Player> intendedRecipients = new HashSet<Player>();
+        ChatColor color = null;
+
+        if (partyChat || adminChat) {
+            if (partyChat) {
+                if (!PP.inParty()) {
+                    player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
+                    return;
+                }
+
+                color = ChatColor.GREEN;
+
+                McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage());
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if(chatEvent.isCancelled()) return;
+
+                event.setMessage(chatEvent.getMessage());
+
+                for (Player x : plugin.getServer().getOnlinePlayers()) {
+                    if (Party.getInstance().inSameParty(player, x)) {
+                        intendedRecipients.add(x);
+                    }
+                }
+
+                event.setFormat(color + "(" + ChatColor.WHITE + "%1$s" + color + ") %2$s");
+            }
+
+            if (adminChat) {
+                color = ChatColor.AQUA;
+
+                McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage());
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if(chatEvent.isCancelled()) return;
+
+                event.setMessage(chatEvent.getMessage());
+
+                for (Player x : plugin.getServer().getOnlinePlayers()) {
+                    if (x.isOp() || mcPermissions.getInstance().adminChat(x)) {
+                        intendedRecipients.add(x);
+                    }
+                }
+
+                event.setFormat(color + "{" + ChatColor.WHITE + "%1$s" + color + "} %2$s");
+            }
+
+            recipients.retainAll(intendedRecipients);
+        }
+    }
+
+    // Dynamically aliasing commands need to be re-done.
+    // For now, using a command with an alias will send both the original command, and the mcMMO command
+
+    /**
+     * Monitor PlayerCommandPreprocess events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+        String message = event.getMessage();
+        
+        if (!message.startsWith("/")) {
+            return;
+        }
+
+        String command = message.substring(1).split(" ")[0];
+
+        if (plugin.aliasMap.containsKey(command)) {
+            if (command.equalsIgnoreCase(plugin.aliasMap.get(command))) {
+                return;
+            }
+            event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
+        if (event.getEgg().hasMetadata("mcmmoFiredFromStaff") && event.isHatching()) {
+            event.setHatching(false);
+        }
+    }
 }

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

@@ -1,48 +1,48 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.getspout.spoutapi.event.input.KeyPressedEvent;
-import org.getspout.spoutapi.gui.ScreenType;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.popups.PopupMMO;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Users;
-
-public class SpoutInputListener implements Listener {
-    private mcMMO plugin;
-
-    public SpoutInputListener(mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Monitor Spout KeyPressed events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onKeyPressedEvent(KeyPressedEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-
-        if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
-            return;
-        }
-
-        if (event.getKey() == SpoutStuff.keypress) {
-            if (!SpoutStuff.playerScreens.containsKey(sPlayer)) {
-                PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
-
-                SpoutStuff.playerScreens.put(sPlayer, mmoPop);
-                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
-                sPlayer.getMainScreen().setDirty(true);
-            }
-            else {
-                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
-                sPlayer.getMainScreen().setDirty(true);
-            }
-        }
-    }
-}
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.getspout.spoutapi.event.input.KeyPressedEvent;
+import org.getspout.spoutapi.gui.ScreenType;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.popups.PopupMMO;
+import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
+
+public class SpoutInputListener implements Listener {
+    private mcMMO plugin;
+
+    public SpoutInputListener(mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Monitor Spout KeyPressed events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onKeyPressedEvent(KeyPressedEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
+
+        if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
+            return;
+        }
+
+        if (event.getKey() == SpoutStuff.keypress) {
+            if (!SpoutStuff.playerScreens.containsKey(sPlayer)) {
+                PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
+
+                SpoutStuff.playerScreens.put(sPlayer, mmoPop);
+                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
+                sPlayer.getMainScreen().setDirty(true);
+            }
+            else {
+                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
+                sPlayer.getMainScreen().setDirty(true);
+            }
+        }
+    }
+}

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

@@ -1,46 +1,46 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.ChatColor;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-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 SpoutListener implements Listener {
-    //Why do we have this here? We never use it...
-    mcMMO plugin = null;
-
-    public SpoutListener(mcMMO pluginx) {
-        plugin = pluginx;
-    }
-
-    /**
-     * Monitor SpoutCraftEnable events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-        PlayerProfile PPs = Users.getProfile(sPlayer);
-
-        //TODO: Add custom titles based on skills
-        if (Config.getInstance().getShowPowerLevelForSpout()) {
-            sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl"
-        + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(PPs.getPowerLevel()));
-        }
-
-        if (sPlayer.isSpoutCraftEnabled()) {
-            SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer, plugin)); //Setup Party HUD stuff
-            
-            PPs.toggleSpoutEnabled();
-        }
-    }
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
+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 SpoutListener implements Listener {
+    //Why do we have this here? We never use it...
+    mcMMO plugin = null;
+
+    public SpoutListener(mcMMO pluginx) {
+        plugin = pluginx;
+    }
+
+    /**
+     * Monitor SpoutCraftEnable events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
+        PlayerProfile PPs = Users.getProfile(sPlayer);
+
+        //TODO: Add custom titles based on skills
+        if (LoadProperties.showPowerLevel) {
+            sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl"
+        + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(PPs.getPowerLevel()));
+        }
+
+        if (sPlayer.isSpoutCraftEnabled()) {
+            SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff
+            
+            PPs.toggleSpoutEnabled();
+        }
+    }
 }

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

@@ -1,91 +1,91 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.getspout.spoutapi.event.screen.ButtonClickEvent;
-import org.getspout.spoutapi.event.screen.ScreenCloseEvent;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.HUDType;
-import com.gmail.nossr50.datatypes.HUDmmo;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
-import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
-import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
-import com.gmail.nossr50.datatypes.popups.PopupMMO;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Users;
-
-public class SpoutScreenListener implements Listener {
-    //Why do we have this here? We never use it...
-    mcMMO plugin = null;
-
-    public SpoutScreenListener(mcMMO pluginx) {
-        plugin = pluginx;
-    }
-
-    /**
-     * Monitor Spout ButtonClick events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onButtonClick(ButtonClickEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(sPlayer);
-        
-        if (event.getButton() instanceof ButtonHUDStyle) {
-            if (SpoutStuff.playerHUDs.containsKey(sPlayer)) {
-                SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
-                SpoutStuff.playerHUDs.remove(sPlayer);
-                
-                switch (PP.getHUDType()) {
-                case RETRO:
-                    PP.setHUDType(HUDType.STANDARD);
-                    break;
-
-                case STANDARD:
-                    PP.setHUDType(HUDType.SMALL);
-                    break;
-
-                case SMALL:
-                    PP.setHUDType(HUDType.DISABLED);
-                    break;
-
-                case DISABLED:
-                    PP.setHUDType(HUDType.RETRO);
-                    break;
-
-                default:
-                    break;
-                }
-
-                SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer, plugin));
-                SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP);
-            }
-        }
-        else if (event.getButton() instanceof ButtonEscape) {
-            sPlayer.getMainScreen().closePopup();
-        }
-        else if (event.getButton() instanceof ButtonPartyToggle) {
-            PP.togglePartyHUD();
-            ButtonPartyToggle bpt = (ButtonPartyToggle) event.getButton();
-            bpt.updateText(PP);
-            SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
-            SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer);
-        }
-    }
-
-    /**
-     * Monitor Spout ScreenClose events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onScreenClose(ScreenCloseEvent event) {
-        if (event.getScreen() instanceof PopupMMO) {
-            SpoutStuff.playerScreens.remove(event.getPlayer());
-        }
-    }
-}
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.getspout.spoutapi.event.screen.ButtonClickEvent;
+import org.getspout.spoutapi.event.screen.ScreenCloseEvent;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.HUDType;
+import com.gmail.nossr50.datatypes.HUDmmo;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
+import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
+import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
+import com.gmail.nossr50.datatypes.popups.PopupMMO;
+import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
+
+public class SpoutScreenListener implements Listener {
+    //Why do we have this here? We never use it...
+    mcMMO plugin = null;
+
+    public SpoutScreenListener(mcMMO pluginx) {
+        plugin = pluginx;
+    }
+
+    /**
+     * Monitor Spout ButtonClick events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onButtonClick(ButtonClickEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(sPlayer);
+        
+        if (event.getButton() instanceof ButtonHUDStyle) {
+            if (SpoutStuff.playerHUDs.containsKey(sPlayer)) {
+                SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
+                SpoutStuff.playerHUDs.remove(sPlayer);
+                
+                switch (PP.getHUDType()) {
+                case RETRO:
+                    PP.setHUDType(HUDType.STANDARD);
+                    break;
+
+                case STANDARD:
+                    PP.setHUDType(HUDType.SMALL);
+                    break;
+
+                case SMALL:
+                    PP.setHUDType(HUDType.DISABLED);
+                    break;
+
+                case DISABLED:
+                    PP.setHUDType(HUDType.RETRO);
+                    break;
+
+                default:
+                    break;
+                }
+
+                SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer));
+                SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP);
+            }
+        }
+        else if (event.getButton() instanceof ButtonEscape) {
+            sPlayer.getMainScreen().closePopup();
+        }
+        else if (event.getButton() instanceof ButtonPartyToggle) {
+            PP.togglePartyHUD();
+            ButtonPartyToggle bpt = (ButtonPartyToggle) event.getButton();
+            bpt.updateText(PP);
+            SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
+            SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer);
+        }
+    }
+
+    /**
+     * Monitor Spout ScreenClose events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onScreenClose(ScreenCloseEvent event) {
+        if (event.getScreen() instanceof PopupMMO) {
+            SpoutStuff.playerScreens.remove(event.getPlayer());
+        }
+    }
+}

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

@@ -1,43 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import java.io.File;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.ChunkUnloadEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldSaveEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
-
-import com.gmail.nossr50.mcMMO;
-
-public class WorldListener implements Listener {
-    @EventHandler
-    public void onWorldLoad(WorldLoadEvent event) {
-        File dataDir = new File(event.getWorld().getWorldFolder(), "mcmmo_data");
-        if(!dataDir.exists()) {
-            dataDir.mkdir();
-        }
-    }
-
-    @EventHandler
-    public void onWorldUnload(WorldUnloadEvent event) {
-        mcMMO.placeStore.unloadWorld(event.getWorld());
-    }
-
-    @EventHandler
-    public void onWorldSave(WorldSaveEvent event) {
-        mcMMO.placeStore.saveWorld(event.getWorld());
-    }
-
-    @EventHandler
-    public void onChunkLoad(ChunkLoadEvent event) {
-        mcMMO.placeStore.chunkLoaded(event.getChunk().getX(), event.getChunk().getZ(), event.getChunk().getWorld());
-    }
-
-    @EventHandler
-    public void onChunkUnload(ChunkUnloadEvent event) {
-        mcMMO.placeStore.chunkUnloaded(event.getChunk().getX(), event.getChunk().getZ(), event.getChunk().getWorld());
-    }
-}

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

@@ -1,81 +1,77 @@
-package com.gmail.nossr50.locale;
-
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.bukkit.ChatColor;
-
-import com.gmail.nossr50.config.Config;
-
-public class LocaleLoader {
-    private static final String BUNDLE_NAME = "com.gmail.nossr50.locale.locale";
-    private static ResourceBundle RESOURCE_BUNDLE = null;
-
-    public static String getString(String key) {
-        return getString(key, null);
-    }
-
-    /**
-     * Gets the appropriate string from the Locale files.
-     *
-     * @param key The key to look up the string with
-     * @param messageArguments Any arguments to be added to the string
-     * @return The properly formatted locale string
-     */
-    public static String getString(String key, Object[] messageArguments) {
-        try {
-            if (RESOURCE_BUNDLE == null) {
-                Locale.setDefault(new Locale("en", "US"));
-                Locale locale = null;
-                String[] myLocale = Config.getInstance().getLocale().split("[-_ ]");
-
-                if (myLocale.length == 1) {
-                    locale = new Locale(myLocale[0]);
-                }
-                else if (myLocale.length >= 2) {
-                    locale = new Locale(myLocale[0], myLocale[1]);
-                }
-
-                RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, locale);
-            }
-
-            String output = RESOURCE_BUNDLE.getString(key);
-
-            if (messageArguments != null) {
-                MessageFormat formatter = new MessageFormat("");
-                formatter.applyPattern(output);
-                output = formatter.format(messageArguments);
-            }
-
-            output = addColors(output);
-
-            return output;
-        }
-        catch (MissingResourceException e) {
-            return '!' + key + '!';
-        }
-    }
-
-    private static String addColors(String input) {
-        input = input.replaceAll("\\Q[[BLACK]]\\E", ChatColor.BLACK.toString());
-        input = input.replaceAll("\\Q[[DARK_BLUE]]\\E", ChatColor.DARK_BLUE.toString());
-        input = input.replaceAll("\\Q[[DARK_GREEN]]\\E", ChatColor.DARK_GREEN.toString());
-        input = input.replaceAll("\\Q[[DARK_AQUA]]\\E", ChatColor.DARK_AQUA.toString());
-        input = input.replaceAll("\\Q[[DARK_RED]]\\E", ChatColor.DARK_RED.toString());
-        input = input.replaceAll("\\Q[[DARK_PURPLE]]\\E", ChatColor.DARK_PURPLE.toString());
-        input = input.replaceAll("\\Q[[GOLD]]\\E", ChatColor.GOLD.toString());
-        input = input.replaceAll("\\Q[[GRAY]]\\E", ChatColor.GRAY.toString());
-        input = input.replaceAll("\\Q[[DARK_GRAY]]\\E", ChatColor.DARK_GRAY.toString());
-        input = input.replaceAll("\\Q[[BLUE]]\\E", ChatColor.BLUE.toString());
-        input = input.replaceAll("\\Q[[GREEN]]\\E", ChatColor.GREEN.toString());
-        input = input.replaceAll("\\Q[[AQUA]]\\E", ChatColor.AQUA.toString());
-        input = input.replaceAll("\\Q[[RED]]\\E", ChatColor.RED.toString());
-        input = input.replaceAll("\\Q[[LIGHT_PURPLE]]\\E", ChatColor.LIGHT_PURPLE.toString());
-        input = input.replaceAll("\\Q[[YELLOW]]\\E", ChatColor.YELLOW.toString());
-        input = input.replaceAll("\\Q[[WHITE]]\\E", ChatColor.WHITE.toString());
-
-        return input;
-    }
-}
+package com.gmail.nossr50.locale;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.bukkit.ChatColor;
+
+import com.gmail.nossr50.config.LoadProperties;
+
+public class mcLocale {
+    private static final String BUNDLE_NAME = "com.gmail.nossr50.locale.locale";
+    private static ResourceBundle RESOURCE_BUNDLE = null;
+
+    public static String getString(String key) {
+        return getString(key, null);
+    }
+
+    /**
+     * Gets the appropriate string from the Locale files.
+     *
+     * @param key The key to look up the string with
+     * @param messageArguments Any arguements to be added to the string
+     * @return The properly formatted locale string
+     */
+    public static String getString(String key, Object[] messageArguments) {
+        try {
+            if (RESOURCE_BUNDLE == null) {
+                String myLocale = LoadProperties.locale.toLowerCase();
+                try {
+                    //attempt to get the locale denoted
+                    RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, new Locale(myLocale));
+                }
+                catch (MissingResourceException e) {
+                    RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, new Locale("en_us"));
+                }
+            }
+
+            String output = RESOURCE_BUNDLE.getString(key);
+
+            if (messageArguments != null) {
+                MessageFormat formatter = new MessageFormat("");
+                formatter.applyPattern(output);
+                output = formatter.format(messageArguments);
+            }
+
+            output = addColors(output);
+
+            return output;
+        }
+        catch (MissingResourceException e) {
+            return '!' + key + '!';
+        }
+    }
+
+    private static String addColors(String input) {
+        input = input.replaceAll("\\Q[[BLACK]]\\E", ChatColor.BLACK.toString());
+        input = input.replaceAll("\\Q[[DARK_BLUE]]\\E", ChatColor.DARK_BLUE.toString());
+        input = input.replaceAll("\\Q[[DARK_GREEN]]\\E", ChatColor.DARK_GREEN.toString());
+        input = input.replaceAll("\\Q[[DARK_AQUA]]\\E", ChatColor.DARK_AQUA.toString());
+        input = input.replaceAll("\\Q[[DARK_RED]]\\E", ChatColor.DARK_RED.toString());
+        input = input.replaceAll("\\Q[[DARK_PURPLE]]\\E", ChatColor.DARK_PURPLE.toString());
+        input = input.replaceAll("\\Q[[GOLD]]\\E", ChatColor.GOLD.toString());
+        input = input.replaceAll("\\Q[[GRAY]]\\E", ChatColor.GRAY.toString());
+        input = input.replaceAll("\\Q[[DARK_GRAY]]\\E", ChatColor.DARK_GRAY.toString());
+        input = input.replaceAll("\\Q[[BLUE]]\\E", ChatColor.BLUE.toString());
+        input = input.replaceAll("\\Q[[GREEN]]\\E", ChatColor.GREEN.toString());
+        input = input.replaceAll("\\Q[[AQUA]]\\E", ChatColor.AQUA.toString());
+        input = input.replaceAll("\\Q[[RED]]\\E", ChatColor.RED.toString());
+        input = input.replaceAll("\\Q[[LIGHT_PURPLE]]\\E", ChatColor.LIGHT_PURPLE.toString());
+        input = input.replaceAll("\\Q[[YELLOW]]\\E", ChatColor.YELLOW.toString());
+        input = input.replaceAll("\\Q[[WHITE]]\\E", ChatColor.WHITE.toString());
+
+        return input;
+    }
+}

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

@@ -6,127 +6,119 @@ import com.gmail.nossr50.commands.spout.*;
 import com.gmail.nossr50.commands.mc.*;
 import com.gmail.nossr50.commands.party.*;
 import com.gmail.nossr50.commands.general.*;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.RepairConfigManager;
-import com.gmail.nossr50.config.TreasuresConfig;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomToolsConfig;
+import com.gmail.nossr50.config.*;
 import com.gmail.nossr50.runnables.*;
-import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.repair.RepairManagerFactory;
-import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Metrics;
-import com.gmail.nossr50.util.Metrics.Graph;
 import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.blockmeta.ChunkletManager;
-import com.gmail.nossr50.util.blockmeta.ChunkletManagerFactory;
 import com.gmail.nossr50.listeners.BlockListener;
 import com.gmail.nossr50.listeners.EntityListener;
-import com.gmail.nossr50.listeners.HardcoreListener;
 import com.gmail.nossr50.listeners.PlayerListener;
-import com.gmail.nossr50.listeners.WorldListener;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-import net.shatteredlands.shatt.backup.ZipLibrary;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.party.Party;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class mcMMO extends JavaPlugin {
 
+    public static String maindirectory = "plugins" + File.separator + "mcMMO";
+    public static File file = new File(maindirectory + File.separator + "config.yml");
+    public static File versionFile = new File(maindirectory + File.separator + "VERSION");
+
     private final PlayerListener playerListener = new PlayerListener(this);
     private final BlockListener blockListener = new BlockListener(this);
     private final EntityListener entityListener = new EntityListener(this);
-    private final WorldListener worldListener = new WorldListener();
-    private final HardcoreListener hardcoreListener = new HardcoreListener();
 
-    public HashMap<String, String> aliasMap = new HashMap<String, String>(); //Alias - Command
+    //Alias - Command
+    public HashMap<String, String> aliasMap = new HashMap<String, String>();
+
+    //Various trackers
+    public HashMap<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
     public HashMap<Integer, Player> tntTracker = new HashMap<Integer, Player>();
 
-    public static File versionFile;
-    public static Database database;
-    public static mcMMO p;
+    public static Database database = null;
 
-    public static ChunkletManager placeStore;
-    public static RepairManager repairManager;
+    //Config file stuff
+    LoadProperties config;
+    LoadTreasures config2;
 
-    /* Jar Stuff */
-    public File mcmmo;
-
-    //File Paths
-    public String mainDirectory, flatFileDirectory, usersFile, leaderboardDirectory, modDirectory;
+    //Jar stuff
+    public static File mcmmo;
 
     /**
      * Things to be run when the plugin is enabled.
      */
     public void onEnable() {
-        p = this;
-        setupFilePaths();
+        final Plugin thisPlugin = this;
+        mcmmo = this.getFile();
+        new File(maindirectory).mkdir();
 
-        //Force the loading of config files
-        Config configInstance = Config.getInstance();
-        TreasuresConfig.getInstance();
-        HiddenConfig.getInstance();
+        if (!versionFile.exists()) {
+            updateVersion();
+        }
+        else {
+            String vnum = readVersion();
 
-        List<Repairable> repairables = new ArrayList<Repairable>();
+            //This will be changed to whatever version preceded when we actually need updater code.
+            //Version 1.0.48 is the first to implement this, no checking before that version can be done.
+            if (vnum.equalsIgnoreCase("1.0.48")) {
+                updateFrom(1);
+            }
 
-        if (configInstance.getToolModsEnabled()) {
-            CustomToolsConfig.getInstance().load();
-            repairables.addAll(CustomToolsConfig.getInstance().getLoadedRepairables());
+            //Just add in more else if blocks for versions that need updater code.  Increment the updateFrom age int as we do so.
+            //Catch all for versions not matching and no specific code being needed
+            else if (!vnum.equalsIgnoreCase(this.getDescription().getVersion())) {
+                updateFrom(-1);
+            }
         }
 
-        if (configInstance.getArmorModsEnabled()) {
-            CustomArmorConfig.getInstance().load();
-            repairables.addAll(CustomArmorConfig.getInstance().getLoadedRepairables());
-        }
+        this.config = new LoadProperties(this);
+        this.config.load();
 
-        if (configInstance.getBlockModsEnabled()) {
-            CustomBlocksConfig.getInstance().load();
-        }
+        this.config2 = new LoadTreasures(this);
+        this.config2.load();
 
-        //Load repair configs, make manager, and register them at this time
-        RepairConfigManager rManager = new RepairConfigManager(this);
-        repairables.addAll(rManager.getLoadedRepairables());
-        repairManager = RepairManagerFactory.getRepairManager(repairables.size());
-        repairManager.registerRepairables(repairables);
+        Party.getInstance().loadParties();
+        new Party(this);
 
-        if (!configInstance.getUseMySQL()) {
-            Users.loadUsers();
+        if (!LoadProperties.useMySQL) {
+            Users.getInstance().loadUsers();
         }
 
         PluginManager pm = getServer().getPluginManager();
 
+        Bukkit.getScheduler().scheduleSyncDelayedTask(this, new SpoutStart(this), 20); //Schedule Spout Activation 1 second after start-up
+
         //Register events
         pm.registerEvents(playerListener, this);
         pm.registerEvents(blockListener, this);
         pm.registerEvents(entityListener, this);
-        pm.registerEvents(worldListener, this);
 
-        if (configInstance.getHardcoreEnabled()) {
-            pm.registerEvents(hardcoreListener, this);
-        }
-
-        PluginDescriptionFile pdfFile = getDescription();
+        PluginDescriptionFile pdfFile = this.getDescription();
 
         //Setup the leaderboards
-        if (configInstance.getUseMySQL()) {
+        if (LoadProperties.useMySQL) {
             database = new Database(this);
             database.createStructure();
         }
@@ -142,60 +134,32 @@ public class mcMMO extends JavaPlugin {
 
         BukkitScheduler scheduler = getServer().getScheduler();
 
-        //Schedule Spout Activation 1 second after start-up
-        scheduler.scheduleSyncDelayedTask(this, new SpoutStart(this), 20);
         //Periodic save timer (Saves every 10 minutes)
-        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(this), 0, configInstance.getSaveInterval() * 1200);
+        scheduler.scheduleSyncRepeatingTask(this, new mcSaveTimer(this), 0, LoadProperties.saveInterval * 1200);
         //Regen & Cooldown timer (Runs every second)
-        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(this), 0, 20);
+        scheduler.scheduleSyncRepeatingTask(this, new mcTimer(this), 0, 20);
         //Bleed timer (Runs every two seconds)
-        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
+        scheduler.scheduleSyncRepeatingTask(this, new mcBleedTimer(this), 0, 40);
 
         registerCommands();
 
-        if (configInstance.getStatsTrackingEnabled()) {
-            try {
-                Metrics metrics = new Metrics(this);
+        if (LoadProperties.statsTracking) {
+            //Plugin Metrics running in a new thread
+            new Thread(new Runnable() {
+                public void run() {
+                    try {
+                        // create a new metrics object
+                        Metrics metrics = new Metrics();
 
-                Graph graph = metrics.createGraph("Percentage of servers using timings");
-
-                if(pm.useTimings()) {
-                    graph.addPlotter(new Metrics.Plotter("Enabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                } else {
-                    graph.addPlotter(new Metrics.Plotter("Disabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
+                        // 'this' in this context is the Plugin object
+                        metrics.beginMeasuringPlugin(thisPlugin);
+                    }
+                    catch (IOException e) {
+                        System.out.println("Failed to submit stats.");
+                    }
                 }
-
-                metrics.start();
-            }
-            catch (IOException e) {
-                System.out.println("Failed to submit stats.");
-            }
+            }).start();
         }
-
-        // Get our ChunkletManager
-        placeStore = ChunkletManagerFactory.getChunkletManager();
-    }
-
-    /**
-     * Setup the various storage file paths
-     */
-    public void setupFilePaths() {
-        mcmmo = getFile();
-        mainDirectory = getDataFolder().getPath() + File.separator;
-        flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
-        usersFile = flatFileDirectory + "mcmmo.users";
-        leaderboardDirectory = flatFileDirectory + "Leaderboards" + File.separator;
-        modDirectory = mainDirectory + "ModConfigs" + File.separator;
     }
 
     /**
@@ -215,7 +179,7 @@ public class mcMMO extends JavaPlugin {
      * </br>
      * This function is designed for API usage.
      *
-     * @param playerName Name of player whose profile to get
+     * @param player Name of player whose profile to get
      * @return the PlayerProfile object
      */
     public PlayerProfile getPlayerProfileByName(String playerName) {
@@ -238,27 +202,13 @@ public class mcMMO extends JavaPlugin {
      * Things to be run when the plugin is disabled.
      */
     public void onDisable() {
+
         //Make sure to save player information if the server shuts down
         for (PlayerProfile x : Users.getProfiles().values()) {
             x.save();
         }
 
-        getServer().getScheduler().cancelTasks(this); //This removes our tasks
-
-        //Save our metadata
-        placeStore.saveAll();
-
-        //Cleanup empty metadata stores
-        placeStore.cleanUp();
-
-        //Remove other tasks BEFORE starting the Backup, or we just cancel it straight away.
-        try {
-            ZipLibrary.mcMMObackup();
-        }
-        catch (IOException e) {
-            getLogger().severe(e.toString());
-        }
-
+        Bukkit.getServer().getScheduler().cancelTasks(this); //This removes our tasks
         System.out.println("mcMMO was disabled."); //How informative!
     }
 
@@ -266,20 +216,21 @@ public class mcMMO extends JavaPlugin {
      * Register the commands.
      */
     private void registerCommands() {
+
         //Register aliases with the aliasmap (used in the playercommandpreprocessevent to ugly alias them to actual commands)
         //Skills commands
-        aliasMap.put(LocaleLoader.getString("Acrobatics.SkillName").toLowerCase(), "acrobatics");
-        aliasMap.put(LocaleLoader.getString("Archery.SkillName").toLowerCase(), "archery");
-        aliasMap.put(LocaleLoader.getString("Axes.SkillName").toLowerCase(), "axes");
-        aliasMap.put(LocaleLoader.getString("Excavation.SkillName").toLowerCase(), "excavation");
-        aliasMap.put(LocaleLoader.getString("Fishing.SkillName").toLowerCase(), "fishing");
-        aliasMap.put(LocaleLoader.getString("Herbalism.SkillName").toLowerCase(), "herbalism");
-        aliasMap.put(LocaleLoader.getString("Mining.SkillName").toLowerCase(), "mining");
-        aliasMap.put(LocaleLoader.getString("Repair.SkillName").toLowerCase(), "repair");
-        aliasMap.put(LocaleLoader.getString("Swords.SkillName").toLowerCase(), "swords");
-        aliasMap.put(LocaleLoader.getString("Taming.SkillName").toLowerCase(), "taming");
-        aliasMap.put(LocaleLoader.getString("Unarmed.SkillName").toLowerCase(), "unarmed");
-        aliasMap.put(LocaleLoader.getString("Woodcutting.SkillName").toLowerCase(), "woodcutting");
+        aliasMap.put(mcLocale.getString("m.SkillAcrobatics").toLowerCase(), "acrobatics");
+        aliasMap.put(mcLocale.getString("m.SkillArchery").toLowerCase(), "archery");
+        aliasMap.put(mcLocale.getString("m.SkillAxes").toLowerCase(), "axes");
+        aliasMap.put(mcLocale.getString("m.SkillExcavation").toLowerCase(), "excavation");
+        aliasMap.put(mcLocale.getString("m.SkillFishing").toLowerCase(), "fishing");
+        aliasMap.put(mcLocale.getString("m.SkillHerbalism").toLowerCase(), "herbalism");
+        aliasMap.put(mcLocale.getString("m.SkillMining").toLowerCase(), "mining");
+        aliasMap.put(mcLocale.getString("m.SkillRepair").toLowerCase(), "repair");
+        aliasMap.put(mcLocale.getString("m.SkillSwords").toLowerCase(), "swords");
+        aliasMap.put(mcLocale.getString("m.SkillTaming").toLowerCase(), "taming");
+        aliasMap.put(mcLocale.getString("m.SkillUnarmed").toLowerCase(), "unarmed");
+        aliasMap.put(mcLocale.getString("m.SkillWoodCutting").toLowerCase(), "woodcutting");
 
         //Register commands
         //Skills commands
@@ -296,99 +247,175 @@ public class mcMMO extends JavaPlugin {
         getCommand("unarmed").setExecutor(new UnarmedCommand());
         getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
 
-        Config configInstance = Config.getInstance();
-
         //mc* commands
-        if (configInstance.getCommandMCRemoveEnabled()) {
-            getCommand("mcremove").setExecutor(new McremoveCommand(this));
+        if (LoadProperties.mcremoveEnable) {
+            getCommand("mcremove").setExecutor(new McremoveCommand());
         }
 
-        if (configInstance.getCommandMCAbilityEnabled()) {
+        if (LoadProperties.mcabilityEnable) {
             getCommand("mcability").setExecutor(new McabilityCommand());
         }
 
-        if (configInstance.getCommandMCCEnabled()) {
+        if (LoadProperties.mccEnable) {
             getCommand("mcc").setExecutor(new MccCommand());
         }
 
-        if (configInstance.getCommandMCGodEnabled()) {
+        if (LoadProperties.mcgodEnable) {
             getCommand("mcgod").setExecutor(new McgodCommand());
         }
 
-        if (configInstance.getCommandmcMMOEnabled()) {
+        if (LoadProperties.mcmmoEnable) {
             getCommand("mcmmo").setExecutor(new McmmoCommand());
         }
 
-        if (configInstance.getCommandMCRefreshEnabled()) {
+        if (LoadProperties.mcrefreshEnable) {
             getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
         }
 
-        if (configInstance.getCommandMCTopEnabled()) {
+        if (LoadProperties.mctopEnable) {
             getCommand("mctop").setExecutor(new MctopCommand());
         }
 
-        if (configInstance.getCommandMCStatsEnabled()) {
+        if (LoadProperties.mcstatsEnable) {
             getCommand("mcstats").setExecutor(new McstatsCommand());
         }
 
         //Party commands
-        if (configInstance.getCommandAcceptEnabled()) {
-            getCommand("accept").setExecutor(new AcceptCommand(this));
+        if (LoadProperties.acceptEnable) {
+            getCommand("accept").setExecutor(new AcceptCommand());
         }
 
-        if (configInstance.getCommandAdminChatAEnabled()) {
-            getCommand("a").setExecutor(new ACommand(this));
+        if (LoadProperties.aEnable) {
+            getCommand("a").setExecutor(new ACommand());
         }
 
-        if (configInstance.getCommandInviteEnabled()) {
+        if (LoadProperties.inviteEnable) {
             getCommand("invite").setExecutor(new InviteCommand(this));
         }
 
-        if (configInstance.getCommandPartyEnabled()) {
-            getCommand("party").setExecutor(new PartyCommand(this));
+        if (LoadProperties.partyEnable) {
+            getCommand("party").setExecutor(new PartyCommand());
         }
 
-        if (configInstance.getCommandPartyChatPEnabled()) {
-            getCommand("p").setExecutor(new PCommand(this));
+        if (LoadProperties.pEnable) {
+            getCommand("p").setExecutor(new PCommand());
         }
 
-        if (configInstance.getCommandPTPEnabled()) {
+        if (LoadProperties.ptpEnable) {
             getCommand("ptp").setExecutor(new PtpCommand(this));
         }
 
         //Other commands
-        if (configInstance.getCommandAddXPEnabled()) {
+        if (LoadProperties.addxpEnable) {
             getCommand("addxp").setExecutor(new AddxpCommand(this));
         }
 
-        if (configInstance.getCommandAddLevelsEnabled()) {
+        if (LoadProperties.addlevelsEnable) {
             getCommand("addlevels").setExecutor(new AddlevelsCommand(this));
         }
 
-        if (configInstance.getCommandMmoeditEnabled()) {
+        if (LoadProperties.mmoeditEnable) {
             getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
         }
 
-        if (configInstance.getCommandInspectEnabled()) {
+        if (LoadProperties.inspectEnable) {
             getCommand("inspect").setExecutor(new InspectCommand(this));
         }
 
-        if (configInstance.getCommandXPRateEnabled()) {
-            getCommand("xprate").setExecutor(new XprateCommand(this));
+        if (LoadProperties.xprateEnable) {
+            getCommand("xprate").setExecutor(new XprateCommand());
         }
 
-        getCommand("mmoupdate").setExecutor(new MmoupdateCommand(this));
+        getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
 
         //Spout commands
-        if (configInstance.getCommandXPLockEnabled()) {
+        if (LoadProperties.xplockEnable) {
             getCommand("xplock").setExecutor(new XplockCommand());
         }
 
-        getCommand("mchud").setExecutor(new MchudCommand(this));
+        getCommand("mchud").setExecutor(new MchudCommand());
+    }
+
+    /**
+     * Update mcMMO from a given version
+     * </p>
+     * It is important to always assume that you are updating from the lowest possible version.
+     * Thus, every block of updater code should be complete and self-contained; finishing all 
+     * SQL transactions and closing all file handlers, such that the next block of updater code
+     * if called will handle updating as expected.
+     *
+     * @param age Specifies which updater code to run
+     */
+    public void updateFrom(int age) {
+
+        //No updater code needed, just update the version.
+        if (age == -1) {
+            updateVersion();
+            return;
+        }
+
+        //Updater code from age 1 goes here
+        if (age <= 1) {
+            //Since age 1 is an example for now, we will just let it do nothing.
+        }
+
+        //If we are updating from age 1 but we need more to reach age 2, this will run too.
+        if (age <= 2) {
+
+        }
+        updateVersion();
+    }
+
+    /**
+     * Update the version file.
+     */
+    public void updateVersion() {
+        try {
+            versionFile.createNewFile();
+            BufferedWriter vout = new BufferedWriter(new FileWriter(versionFile));
+            vout.write(this.getDescription().getVersion());
+            vout.close();
+        }
+        catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        catch (SecurityException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    /**
+     * Get the current mcMMO version.
+     *
+     * @return a String representing the current mcMMO version
+     */
+    public String readVersion() {
+        byte[] buffer = new byte[(int) versionFile.length()];
+        BufferedInputStream f = null;
+
+        try {
+            f = new BufferedInputStream(new FileInputStream(versionFile));
+            f.read(buffer);
+        }
+        catch (FileNotFoundException ex) {
+            ex.printStackTrace();
+        }
+        catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        finally {
+            if (f != null) {
+                try {
+                    f.close();
+                    }
+                catch (IOException ignored) {}
+            }
+        }
+        return new String(buffer);
     }
 
     /*
-     * Boilerplate Custom Config Stuff (Treasures)
+     * Boilerplate Custom Config Stuff
      */
 
     private FileConfiguration treasuresConfig = null;
@@ -403,9 +430,9 @@ public class mcMMO extends JavaPlugin {
         }
 
         treasuresConfig = YamlConfiguration.loadConfiguration(treasuresConfigFile);
+        InputStream defConfigStream = getResource("treasures.yml"); // Look for defaults in the jar
 
-        if (isInJar("treasures.yml")) {
-            InputStream defConfigStream = getResource("treasures.yml");
+        if (defConfigStream != null) {
             YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
             treasuresConfig.setDefaults(defConfig);
         }
@@ -436,171 +463,7 @@ public class mcMMO extends JavaPlugin {
             treasuresConfig.save(treasuresConfigFile);
         }
         catch (IOException ex) {
-            getLogger().severe("Could not save config to " + treasuresConfigFile + ex.toString());
+            Bukkit.getLogger().severe("Could not save config to " + treasuresConfigFile + ex.toString());
         }
     }
-
-    /*
-     * Boilerplate Custom Config Stuff (Tools)
-     */
-
-    private FileConfiguration toolsConfig = null;
-    private File toolsConfigFile = null;
-
-    /**
-     * Reload the Tools.yml file.
-     */
-    public void reloadToolsConfig() {
-        if (toolsConfigFile == null) {
-            toolsConfigFile = new File(modDirectory, "tools.yml");
-        }
-
-        toolsConfig = YamlConfiguration.loadConfiguration(toolsConfigFile);
-
-        if (isInJar("tools.yml")) {
-            InputStream defConfigStream = getResource("tools.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            toolsConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Tools config information.
-     *
-     * @return the configuration object for tools.yml
-     */
-    public FileConfiguration getToolsConfig() {
-        if (toolsConfig == null) {
-            reloadToolsConfig();
-        }
-
-        return toolsConfig;
-    }
-
-    /**
-     * Save the Tools config informtion.
-     */
-    public void saveToolsConfig() {
-        if (toolsConfig == null || toolsConfigFile == null) {
-            return;
-        }
-
-        try {
-            toolsConfig.save(toolsConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + toolsConfigFile + ex.toString());
-        }
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Armor)
-     */
-
-    private FileConfiguration armorConfig = null;
-    private File armorConfigFile = null;
-
-    /**
-     * Reload the Armor.yml file.
-     */
-    public void reloadArmorConfig() {
-        if (armorConfigFile == null) {
-            armorConfigFile = new File(modDirectory, "armor.yml");
-        }
-
-        armorConfig = YamlConfiguration.loadConfiguration(armorConfigFile);
-
-        if (isInJar("armor.yml")) {
-            InputStream defConfigStream = getResource("armor.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            armorConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Armor config information.
-     *
-     * @return the configuration object for armor.yml
-     */
-    public FileConfiguration getArmorConfig() {
-        if (armorConfig == null) {
-            reloadArmorConfig();
-        }
-
-        return armorConfig;
-    }
-
-    /**
-     * Save the Armor config informtion.
-     */
-    public void saveArmorConfig() {
-        if (armorConfig == null || armorConfigFile == null) {
-            return;
-        }
-
-        try {
-            armorConfig.save(armorConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + armorConfigFile + ex.toString());
-        }
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Blocks)
-     */
-
-    private FileConfiguration blocksConfig = null;
-    private File blocksConfigFile = null;
-
-    /**
-     * Reload the Blocks.yml file.
-     */
-    public void reloadBlocksConfig() {
-        if (blocksConfigFile == null) {
-            blocksConfigFile = new File(modDirectory, "blocks.yml");
-        }
-
-        blocksConfig = YamlConfiguration.loadConfiguration(blocksConfigFile);
-
-        if (isInJar("blocks.yml")) {
-            InputStream defConfigStream = getResource("blocks.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            blocksConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Blocks config information.
-     *
-     * @return the configuration object for blocks.yml
-     */
-    public FileConfiguration getBlocksConfig() {
-        if (blocksConfig == null) {
-            reloadBlocksConfig();
-        }
-
-        return blocksConfig;
-    }
-
-    /**
-     * Save the Blocks config informtion.
-     */
-    public void saveBlocksConfig() {
-        if (blocksConfig == null || blocksConfigFile == null) {
-            return;
-        }
-
-        try {
-            blocksConfig.save(blocksConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + blocksConfigFile + ex.toString());
-        }
-    }
-
-    public boolean isInJar(String resource) {
-        InputStream iStream = getResource(resource);
-        return iStream != null;
-    }
 }

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

@@ -1,31 +1,27 @@
 package com.gmail.nossr50.party;
 
-import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Map;
-
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
 
 public class Party {
-    public static String pluginPath;
-    public static String partyPlayersFile;
-    public static String partyLocksFile;
-    public static String partyPasswordsFile;
+    public static String partyPlayersFile = mcMMO.maindirectory + File.separator + "FlatFileStuff" + File.separator + "partyPlayers";
+    public static String partyLocksFile = mcMMO.maindirectory + File.separator + "FlatFileStuff" + File.separator + "partyLocks";
+    public static String partyPasswordsFile = mcMMO.maindirectory + File.separator + "FlatFileStuff" + File.separator + "partyPasswords";
 
     HashMap<String, HashMap<String, Boolean>> partyPlayers = new HashMap<String, HashMap<String, Boolean>>();
     HashMap<String, Boolean> partyLocks = new HashMap<String, Boolean>();
@@ -34,19 +30,14 @@ public class Party {
     private static mcMMO plugin;
     private static volatile Party instance;
 
-    private Party() {
-        plugin = mcMMO.p;
-        pluginPath = plugin.getDataFolder().getPath();
-        partyPlayersFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPlayers";
-        partyLocksFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyLocks";
-        partyPasswordsFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPasswords";
-        new File(pluginPath + File.separator + "FlatFileStuff").mkdir();
-        loadParties();
+    public Party(mcMMO instance) {
+        new File(mcMMO.maindirectory + File.separator + "FlatFileStuff").mkdir();
+        plugin = instance;
     }
 
     public static Party getInstance() {
         if (instance == null) {
-            instance = new Party();
+            instance = new Party(plugin);
         }
         return instance;
     }
@@ -78,127 +69,51 @@ public class Party {
      * @return the number of players in this player's party
      */
     public int partyCount(Player player) {
-        if (player != null) {
-            return getAllMembers(player).size();
-        }
-        else {
-            return 0;
+        PlayerProfile PP = Users.getProfile(player);
+        int partyMembers = 0;
+
+        for (Player p : Bukkit.getServer().getOnlinePlayers()) {
+            if (player != null && p != null) { //Is this even possible?
+                if (PP.getParty().equals(Users.getProfile(p).getParty())) {
+                    partyMembers++;
+                }
+            }
         }
+
+        return partyMembers;
     }
 
     private void informPartyMembers(Player player) {
         String playerName = player.getName();
 
-        if (player != null) {
-            for (Player p : getOnlineMembers(player)) {
-                if (p.getName() != playerName) {
-                    p.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", new Object[] {playerName}));
+        for (Player p : Bukkit.getServer().getOnlinePlayers()) {
+            if (player != null && p != null) {
+                if (inSameParty(player, p) && !p.getName().equals(playerName)) {
+                    p.sendMessage(mcLocale.getString("Party.InformedOnJoin", new Object[] {playerName}));
                 }
             }
         }
     }
 
-    /**
-     * Get a list of all online players in this player's party.
-     *
-     * @param player The player to check
-     * @return all online players in the player's party
-     */
-    public ArrayList<Player> getOnlineMembers(Player player) {
-        ArrayList<Player> players = new ArrayList<Player>();
-
-        if (player != null) {
-            for (Player p : plugin.getServer().getOnlinePlayers()) {
-                if (inSameParty(player, p)) {
-                    players.add(p);
-                }
-            }
-        }
-
-        return players;
-    }
-
-    /**
-     * Get a list of all online players in this party.
-     *
-     * @param partyName The party to check
-     * @return all online players in this party
-     */
-    public ArrayList<Player> getOnlineMembers(String partyName) {
-        ArrayList<Player> players = new ArrayList<Player>();
-
-        for (Player p : plugin.getServer().getOnlinePlayers()) {
-            PlayerProfile PP = Users.getProfile(p);
-
-            if (PP.inParty()) {
-                if (PP.getParty().equalsIgnoreCase(partyName)) {
-                    players.add(p);
-                }
-            }
-        }
-
-        return players;
-    }
-
     /**
      * Get a list of all players in this player's party.
      *
      * @param player The player to check
      * @return all the players in the player's party
      */
-    public ArrayList<Player> getAllMembers(Player player) {
+    public ArrayList<Player> getPartyMembers(Player player) {
         ArrayList<Player> players = new ArrayList<Player>();
-        HashMap<String, PlayerProfile> profiles = Users.getProfiles();
 
-        if (player != null) {
-            for (String name : profiles.keySet()) {
-                Player otherPlayer = profiles.get(name).getPlayer();
-
-                if (otherPlayer != null && inSameParty(otherPlayer, player)) {
-                    players.add(otherPlayer);
+        for (Player p : Bukkit.getServer().getOnlinePlayers()) {
+            if (p.isOnline() && player != null && p != null) {
+                if (inSameParty(player, p) && !p.getName().equals(player.getName())) {
+                    players.add(p);
                 }
             }
         }
-
         return players;
     }
 
-
-    /**
-     * Get a list of all current party names.
-     *
-     * @return the list of parties.
-     */
-    public ArrayList<String> getParties() {
-        String location = plugin.usersFile;
-        ArrayList<String> parties = new ArrayList<String>();
-
-        try {
-            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) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        return parties;
-    }
-
     /**
      * Notify party members when the party owner changes.
      *
@@ -207,9 +122,9 @@ public class Party {
     private void informPartyMembersOwnerChange(String newOwnerName) {
         Player newOwner = plugin.getServer().getPlayer(newOwnerName);
 
-        if (newOwner != null) {
-            for (Player p : getOnlineMembers(newOwner)) {
-                if (p.getName() != newOwnerName) {
+        for (Player p : Bukkit.getServer().getOnlinePlayers()){
+            if (newOwner != null && p != null) {
+                if (inSameParty(newOwner, p)) {
                     p.sendMessage(newOwnerName + " is the new party owner."); //TODO: Needs more locale
                 }
             }
@@ -224,10 +139,10 @@ public class Party {
     private void informPartyMembersQuit(Player player) {
         String playerName = player.getName();
 
-        if (player != null) {
-            for (Player p : getOnlineMembers(player)) {
-                if (p.getName() != playerName) {
-                    p.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", new Object[] {playerName}));
+        for (Player p : Bukkit.getServer().getOnlinePlayers()){
+            if (player != null && p != null){
+                if (inSameParty(player, p) && !p.getName().equals(playerName)) {
+                    p.sendMessage(mcLocale.getString("Party.InformedOnQuit", new Object[] {playerName}));
                 }
             }
         }
@@ -324,10 +239,10 @@ public class Party {
         informPartyMembers(player);
 
         if (!invite) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Join", new Object[]{ newParty }));
+            player.sendMessage(mcLocale.getString("mcPlayerListener.JoinedParty", new Object[]{ newParty }));
         }
         else {
-            player.sendMessage(LocaleLoader.getString("Commands.Invite.Accepted", new Object[]{ PP.getParty() }));
+            player.sendMessage(mcLocale.getString("mcPlayerListener.InviteAccepted", new Object[]{ PP.getParty() }));
         }
     }
 
@@ -389,25 +304,6 @@ public class Party {
         savePartyFile(partyPasswordsFile, partyPasswords);
     }
 
-    /**
-     * Get the leader of a party.
-     *
-     * @param partyName The party name
-     * @return the leader of the party
-     */
-    public Player getPartyLeader(String partyName) {
-        Player leader = null;
-
-        for (String name : partyPlayers.get(partyName).keySet()) {
-            if (partyPlayers.get(partyName).get(name)) {
-                leader = plugin.getServer().getPlayer(name);
-                break;
-            }
-        }
-
-        return leader;
-    }
-
     /**
      * Set the leader of a party.
      *
@@ -545,14 +441,7 @@ public class Party {
      * @return true if this player is in the right party, false otherwise
      */
     public boolean isInParty(Player player, PlayerProfile PP) {
-        Map<String, Boolean> party = partyPlayers.get(PP.getParty());
-
-        if (party != null && party.containsKey(player.getName())) {
-            return true;
-        }
-        else {
-            return false;
-        }
+        return partyPlayers.get(PP.getParty()).containsKey(player.getName());
     }
 
     /**
@@ -569,7 +458,7 @@ public class Party {
                 e.printStackTrace();
             }
             catch (EOFException e) {
-                plugin.getLogger().info("partyPlayersFile empty.");
+                Bukkit.getLogger().info("partyPlayersFile empty.");
             }
             catch (IOException e) {
                 e.printStackTrace();
@@ -588,7 +477,7 @@ public class Party {
                 e.printStackTrace();
             }
             catch (EOFException e) {
-                plugin.getLogger().info("partyLocksFile empty.");
+                Bukkit.getLogger().info("partyLocksFile empty.");
             }
             catch (IOException e) {
                 e.printStackTrace();
@@ -607,7 +496,7 @@ public class Party {
                 e.printStackTrace();
             }
             catch (EOFException e) {
-                plugin.getLogger().info("partyPasswordsFile empty.");
+                Bukkit.getLogger().info("partyPasswordsFile empty.");
             }
             catch (IOException e) {
                 e.printStackTrace();

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

@@ -1,178 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Combat;
-
-public class BleedTimer implements Runnable {
-    private final static int MAX_BLEED_TICKS = 10;
-
-    private static Map<LivingEntity, Integer> bleedList = new HashMap<LivingEntity, Integer>();
-    private static Map<LivingEntity, Integer> bleedAddList = new HashMap<LivingEntity, Integer>();
-    private static List<LivingEntity> bleedRemoveList = new ArrayList<LivingEntity>();
-
-    private static boolean lock = false;
-
-    @Override
-    public void run() {
-        updateBleedList();
-        bleedSimulate();
-    }
-
-    private void bleedSimulate() {
-        lock = true;
-
-        for (Entry<LivingEntity, Integer> entry : bleedList.entrySet()) {
-            LivingEntity entity = entry.getKey();
-
-            if (entry.getValue() <= 0 || entity.isDead() || entity == null) {
-                remove(entity);
-                break;
-            }
-
-            // Player bleed simulation
-            if (entity instanceof Player) {
-                Player player = (Player) entity;
-
-                if (!player.isOnline()) {
-                    continue;
-                }
-
-                //Never kill with Bleeding
-                if (player.getHealth() - 1 > 0) {
-                    Combat.dealDamage(player, 1);
-                }
-
-                entry.setValue(entry.getValue() - 1);
-
-                if (entry.getValue() <= 0) {
-                    player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding.Stopped"));
-                }
-            }
-            // Bleed monsters/animals
-            else {
-                Combat.dealDamage(entity, 2);
-                entry.setValue(entry.getValue() - 1);
-            }
-        }
-
-        // Unlock list now that we are done
-        lock = false;
-    }
-
-    private void updateBleedList() {
-        if (lock) {
-            mcMMO.p.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
-        }
-        else {
-            bleedList.keySet().removeAll(bleedRemoveList);
-            bleedRemoveList.clear();
-
-            bleedList.putAll(bleedAddList);
-            bleedAddList.clear();
-        }
-    }
-
-    /**
-     * Instantly Bleed out a LivingEntity
-     * 
-     * @param entity LivingEntity to bleed out
-     */
-    public static void bleedOut(LivingEntity entity) {
-        if (bleedList.containsKey(entity)) {
-            Combat.dealDamage(entity, bleedList.get(entity) * 2);
-            bleedList.remove(entity);
-       }
-    }
-
-    /**
-     * Remove a LivingEntity from the bleedList if it is in it
-     * 
-     * @param entity LivingEntity to remove
-     */
-    public static void remove(LivingEntity entity) {
-        if (lock) {
-            if (!bleedRemoveList.contains(entity)) {
-                bleedRemoveList.add(entity);
-            }
-        }
-        else {
-            if (bleedList.containsKey(entity)) {
-                bleedList.remove(entity);
-            }
-        }
-    }
-
-    /**
-     * Add a LivingEntity to the bleedList if it is not in it.
-     *
-     * @param entity LivingEntity to add
-     * @param ticks Number of bleeding ticks
-     */
-    public static void add(LivingEntity entity, int ticks) {
-        int newTicks = ticks;
-
-        if (lock) {
-            if (bleedAddList.containsKey(entity)) {
-                newTicks += bleedAddList.get(entity);
-
-                if (newTicks > MAX_BLEED_TICKS) {
-                    newTicks = MAX_BLEED_TICKS;
-                }
-
-                bleedAddList.put(entity, newTicks);
-            }
-            else {
-                if (newTicks > MAX_BLEED_TICKS) {
-                    newTicks = MAX_BLEED_TICKS;
-                }
-
-                bleedAddList.put(entity, newTicks);
-            }
-        }
-        else {
-            if (bleedList.containsKey(entity)) {
-                newTicks += bleedList.get(entity);
-
-                if (newTicks > MAX_BLEED_TICKS) {
-                    newTicks = MAX_BLEED_TICKS;
-                }
-
-                bleedList.put(entity, newTicks);
-
-                // Need to find a better way to ensure that the entity stays in bleedList
-                // when some ticks are added but already marked for removal.
-                // Suggestion: Why not use Iterator.remove() and drop the lock boolean?
-                if (bleedRemoveList.contains(entity)) {
-                    bleedRemoveList.remove(entity);
-                }
-            }
-            else {
-                if (newTicks > MAX_BLEED_TICKS) {
-                    newTicks = MAX_BLEED_TICKS;
-                }
-
-                bleedList.put(entity, newTicks);
-            }
-        }
-    }
-
-    /**
-     * Check to see if a LivingEntity is in the bleedList
-     * 
-     * @param entity LivingEntity to check if in the bleedList
-     * @return true if in the list, false if not
-     */
-    public static boolean contains(LivingEntity entity) {
-        return (bleedList.containsKey(entity) || bleedAddList.containsKey(entity));
-    }
-}

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

@@ -39,7 +39,7 @@ public class GainXp implements Runnable {
             damage += health;
         }
 
-        PP.addXP(player, skillType, (int) (damage * baseXp));
+        PP.addXP(skillType, (int) (damage * baseXp));
         Skills.XpCheckSkill(skillType, player);
     }
 }

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

@@ -1,20 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.util.Users;
-
-public class ProfileSaveTask implements Runnable {
-    Player player = null;
-
-    public ProfileSaveTask(Player player) {
-        this.player = player;
-    }
-
-    @Override
-    public void run() {
-        if (player != null) {
-            Users.getProfileByName(player.getName()).save();
-        }
-    }
-}

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

@@ -1,20 +1,23 @@
 package com.gmail.nossr50.runnables;
 
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.util.Users;
 
 public class RemoveProfileFromMemoryTask implements Runnable {
-    private String playerName = null;
+    private Player player;
 
-    public RemoveProfileFromMemoryTask(String playerName) {
-        this.playerName = playerName;
+    public RemoveProfileFromMemoryTask(Player player) {
+        this.player = player;
     }
 
     @Override
     public void run() {
+        String playerName = player.getName();
         //Check if the profile still exists (stuff like MySQL reconnection removes profiles)
         if (Users.players.containsKey(playerName.toLowerCase())) {
-            Users.getProfileByName(playerName.toLowerCase()).save(); //We save here so players don't quit/reconnect to cause lag
-            Users.removeUserByName(playerName.toLowerCase());
+            Users.getProfileByName(playerName).save(); //We save here so players don't quit/reconnect to cause lag
+            Users.removeUserByName(playerName);
         }
     }
 }

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

@@ -3,21 +3,17 @@ package com.gmail.nossr50.runnables;
 import java.io.BufferedReader;
 import java.io.FileReader;
 
+import org.bukkit.Bukkit;
+
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.util.m;
 
 public class SQLConversionTask implements Runnable {
-    private final mcMMO plugin;
-    private String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-
-    public SQLConversionTask(mcMMO plugin) {
-        this.plugin = plugin;
-    }
 
     @Override
     public void run() {
-        String location = plugin.usersFile;
+        String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
 
         try {
             FileReader file = new FileReader(location);
@@ -165,7 +161,7 @@ public class SQLConversionTask implements Runnable {
 
                 //Check to see if the user is in the DB
                 id = mcMMO.database.getInt("SELECT id FROM "
-                        + tablePrefix
+                        + LoadProperties.MySQLtablePrefix
                         + "users WHERE user = '" + playerName + "'");
 
                 if (id > 0) {
@@ -173,40 +169,40 @@ public class SQLConversionTask implements Runnable {
 
                     //Update the skill values
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "users SET lastlogin = " + 0
                             + " WHERE id = " + id);
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "skills SET "
-                            + "  taming = taming+" + Misc.getInt(taming)
-                            + ", mining = mining+" + Misc.getInt(mining)
-                            + ", repair = repair+" + Misc.getInt(repair)
-                            + ", woodcutting = woodcutting+" + Misc.getInt(woodcutting)
-                            + ", unarmed = unarmed+" + Misc.getInt(unarmed)
-                            + ", herbalism = herbalism+" + Misc.getInt(herbalism)
-                            + ", excavation = excavation+" + Misc.getInt(excavation)
-                            + ", archery = archery+" + Misc.getInt(archery)
-                            + ", swords = swords+" + Misc.getInt(swords)
-                            + ", axes = axes+" + Misc.getInt(axes)
-                            + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
-                            + ", fishing = fishing+" + Misc.getInt(fishing)
+                            + "  taming = taming+" + m.getInt(taming)
+                            + ", mining = mining+" + m.getInt(mining)
+                            + ", repair = repair+" + m.getInt(repair)
+                            + ", woodcutting = woodcutting+" + m.getInt(woodcutting)
+                            + ", unarmed = unarmed+" + m.getInt(unarmed)
+                            + ", herbalism = herbalism+" + m.getInt(herbalism)
+                            + ", excavation = excavation+" + m.getInt(excavation)
+                            + ", archery = archery+" + m.getInt(archery)
+                            + ", swords = swords+" + m.getInt(swords)
+                            + ", axes = axes+" + m.getInt(axes)
+                            + ", acrobatics = acrobatics+" + m.getInt(acrobatics)
+                            + ", fishing = fishing+" + m.getInt(fishing)
                             + " WHERE user_id = " + id);
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "experience SET "
-                            + "  taming = " + Misc.getInt(tamingXP)
-                            + ", mining = " + Misc.getInt(miningXP)
-                            + ", repair = " + Misc.getInt(repairXP)
-                            + ", woodcutting = " + Misc.getInt(woodCuttingXP)
-                            + ", unarmed = " + Misc.getInt(unarmedXP)
-                            + ", herbalism = " + Misc.getInt(herbalismXP)
-                            + ", excavation = " + Misc.getInt(excavationXP)
-                            + ", archery = " + Misc.getInt(archeryXP)
-                            + ", swords = " + Misc.getInt(swordsXP)
-                            + ", axes = " + Misc.getInt(axesXP)
-                            + ", acrobatics = " + Misc.getInt(acrobaticsXP)
-                            + ", fishing = " + Misc.getInt(fishingXP)
+                            + "  taming = " + m.getInt(tamingXP)
+                            + ", mining = " + m.getInt(miningXP)
+                            + ", repair = " + m.getInt(repairXP)
+                            + ", woodcutting = " + m.getInt(woodCuttingXP)
+                            + ", unarmed = " + m.getInt(unarmedXP)
+                            + ", herbalism = " + m.getInt(herbalismXP)
+                            + ", excavation = " + m.getInt(excavationXP)
+                            + ", archery = " + m.getInt(archeryXP)
+                            + ", swords = " + m.getInt(swordsXP)
+                            + ", axes = " + m.getInt(axesXP)
+                            + ", acrobatics = " + m.getInt(acrobaticsXP)
+                            + ", fishing = " + m.getInt(fishingXP)
                             + " WHERE user_id = " + id);
                 }
                 else {
@@ -214,61 +210,61 @@ public class SQLConversionTask implements Runnable {
 
                     //Create the user in the DB
                     mcMMO.database.write("INSERT INTO "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "users (user, lastlogin) VALUES ('"
                             + playerName + "',"
                             + System.currentTimeMillis() / 1000 + ")");
                     id = mcMMO.database.getInt("SELECT id FROM "
-                                    + tablePrefix
+                                    + LoadProperties.MySQLtablePrefix
                                     + "users WHERE user = '"
                                     + playerName + "'");
                     mcMMO.database.write("INSERT INTO "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "skills (user_id) VALUES (" + id + ")");
                     mcMMO.database.write("INSERT INTO "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "experience (user_id) VALUES (" + id
                             + ")");
                     //Update the skill values
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "users SET lastlogin = " + 0
                             + " WHERE id = " + id);
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "users SET party = '" + party
                             + "' WHERE id = " + id);
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "skills SET "
-                            + "  taming = taming+" + Misc.getInt(taming)
-                            + ", mining = mining+" + Misc.getInt(mining)
-                            + ", repair = repair+" + Misc.getInt(repair)
-                            + ", woodcutting = woodcutting+" + Misc.getInt(woodcutting)
-                            + ", unarmed = unarmed+" + Misc.getInt(unarmed)
-                            + ", herbalism = herbalism+" + Misc.getInt(herbalism)
-                            + ", excavation = excavation+" + Misc.getInt(excavation)
-                            + ", archery = archery+" + Misc.getInt(archery)
-                            + ", swords = swords+" + Misc.getInt(swords)
-                            + ", axes = axes+" + Misc.getInt(axes)
-                            + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
-                            + ", fishing = fishing+" + Misc.getInt(fishing)
+                            + "  taming = taming+" + m.getInt(taming)
+                            + ", mining = mining+" + m.getInt(mining)
+                            + ", repair = repair+" + m.getInt(repair)
+                            + ", woodcutting = woodcutting+" + m.getInt(woodcutting)
+                            + ", unarmed = unarmed+" + m.getInt(unarmed)
+                            + ", herbalism = herbalism+" + m.getInt(herbalism)
+                            + ", excavation = excavation+" + m.getInt(excavation)
+                            + ", archery = archery+" + m.getInt(archery)
+                            + ", swords = swords+" + m.getInt(swords)
+                            + ", axes = axes+" + m.getInt(axes)
+                            + ", acrobatics = acrobatics+" + m.getInt(acrobatics)
+                            + ", fishing = fishing+" + m.getInt(fishing)
                             + " WHERE user_id = " + id);
                     mcMMO.database.write("UPDATE "
-                            + tablePrefix
+                            + LoadProperties.MySQLtablePrefix
                             + "experience SET "
-                            + "  taming = " + Misc.getInt(tamingXP)
-                            + ", mining = " + Misc.getInt(miningXP)
-                            + ", repair = " + Misc.getInt(repairXP)
-                            + ", woodcutting = " + Misc.getInt(woodCuttingXP)
-                            + ", unarmed = " + Misc.getInt(unarmedXP)
-                            + ", herbalism = " + Misc.getInt(herbalismXP)
-                            + ", excavation = " + Misc.getInt(excavationXP)
-                            + ", archery = " + Misc.getInt(archeryXP)
-                            + ", swords = " + Misc.getInt(swordsXP)
-                            + ", axes = " + Misc.getInt(axesXP)
-                            + ", acrobatics = " + Misc.getInt(acrobaticsXP)
-                            + ", fishing = " + Misc.getInt(fishingXP)
+                            + "  taming = " + m.getInt(tamingXP)
+                            + ", mining = " + m.getInt(miningXP)
+                            + ", repair = " + m.getInt(repairXP)
+                            + ", woodcutting = " + m.getInt(woodCuttingXP)
+                            + ", unarmed = " + m.getInt(unarmedXP)
+                            + ", herbalism = " + m.getInt(herbalismXP)
+                            + ", excavation = " + m.getInt(excavationXP)
+                            + ", archery = " + m.getInt(archeryXP)
+                            + ", swords = " + m.getInt(swordsXP)
+                            + ", axes = " + m.getInt(axesXP)
+                            + ", acrobatics = " + m.getInt(acrobaticsXP)
+                            + ", fishing = " + m.getInt(fishingXP)
                             + " WHERE user_id = " + id);
                 }
             }
@@ -277,7 +273,7 @@ public class SQLConversionTask implements Runnable {
             in.close();
         }
         catch (Exception e) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
     }
 }

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

@@ -1,33 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.util.Database;
-import com.gmail.nossr50.util.Users;
-
-public class SQLReconnect implements Runnable {
-    private final mcMMO plugin;
-
-    public SQLReconnect(mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void run() {
-        if (!Database.isConnected()) {
-            Database.connect();
-            if (Database.isConnected()) {
-                for (PlayerProfile x : Users.players.values()) {
-                    x.save(); //Save all profiles
-                }
-
-                Users.players.clear(); //Clear the profiles
-                for (Player x : plugin.getServer().getOnlinePlayers()) {
-                    Users.addUser(x); //Add in new profiles, forcing them to 'load' again from MySQL
-                }
-            }
-        }
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-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.SkillType;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-public class SkillMonitor implements Runnable {
-    private final mcMMO plugin;
-
-    public SkillMonitor(final mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void run() {
-        long curTime = System.currentTimeMillis();
-
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-
-            PlayerProfile PP = Users.getProfile(player);
-
-            /*
-             * MONITOR SKILLS
-             */
-            for (SkillType skill : SkillType.values()) {
-                if (skill.getTool() != null && skill.getAbility() != null) {
-                    Skills.monitorSkill(player, PP, curTime, skill);
-                }
-            }
-
-            /*
-             * COOLDOWN MONITORING
-             */
-            for (AbilityType ability : AbilityType.values()) {
-                if (ability.getCooldown() > 0 ) {
-                    Skills.watchCooldown(player, PP, curTime, ability);
-                }
-            }
-        }
-    }
-}

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

@@ -1,30 +1,31 @@
 package com.gmail.nossr50.runnables;
 
+import org.bukkit.Bukkit;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.FileManager;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutStuff;
 
 public class SpoutStart implements Runnable{
     private final mcMMO plugin;
 
-    public SpoutStart(final mcMMO plugin) {
-        this.plugin = plugin;
+    public SpoutStart(mcMMO m) {
+        this.plugin = m;
     }
 
     @Override
     public void run() {
-        if (plugin.getServer().getPluginManager().getPlugin("Spout") != null) {
-            Config.getInstance().spoutEnabled = true;
+        if (Bukkit.getPluginManager().getPlugin("Spout") != null) {
+            LoadProperties.spoutEnabled = true;
         }
         else {
-            Config.getInstance().spoutEnabled = false;
+            LoadProperties.spoutEnabled = false;
         }
 
         //Spout Stuff
-        if (Config.getInstance().spoutEnabled) {
+        if (LoadProperties.spoutEnabled) {
             SpoutStuff.setupSpoutConfigs();
             SpoutStuff.registerCustomEvent();
             SpoutStuff.extractFiles(); //Extract source materials

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

@@ -0,0 +1,142 @@
+package com.gmail.nossr50.runnables;
+
+import java.util.HashSet;
+
+import org.bukkit.entity.LivingEntity;
+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.util.Combat;
+import com.gmail.nossr50.util.Users;
+
+public class mcBleedTimer implements Runnable {
+    private final mcMMO plugin;
+
+    private static HashSet<LivingEntity> bleedList = new HashSet<LivingEntity>();
+    private static HashSet<LivingEntity> bleedAddList = new HashSet<LivingEntity>();
+    private static HashSet<LivingEntity> bleedRemoveList = new HashSet<LivingEntity>();
+
+    private static boolean lock = false;
+
+    public mcBleedTimer(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void run() {
+        updateBleedList();
+
+        // Player bleed simulation
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (player == null) {
+                continue;
+            }
+
+            PlayerProfile PP = Users.getProfile(player);
+            if (PP == null) {
+                continue;
+            }
+
+            if (PP.getBleedTicks() >= 1) {
+
+                //Never kill with Bleeding
+                if (player.getHealth() - 2 < 0) {
+                    if (player.getHealth() - 1 > 0) {
+                        Combat.dealDamage(player, 1);
+                    }
+                }
+                else {
+                    Combat.dealDamage(player, 2);
+                }
+
+                PP.decreaseBleedTicks();
+
+                if (PP.getBleedTicks() == 0) {
+                    player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
+                }
+            }
+        }
+
+        // Non-player bleed simulation
+        bleedSimulate();
+    }
+
+    private void bleedSimulate() {
+        lock = true;
+
+        // Bleed monsters/animals
+        for (LivingEntity entity : bleedList) {
+            if ((entity == null || entity.isDead())) {
+                remove(entity);
+                continue;
+            }
+            else {
+                Combat.dealDamage(entity, 2);
+            }
+        }
+
+        // Unlock list now that we are done
+        lock = false;
+    }
+
+    private void updateBleedList() {
+        if (lock) {
+            plugin.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
+        }
+        else {
+            bleedList.removeAll(bleedRemoveList);
+            bleedRemoveList.clear();
+
+            bleedList.addAll(bleedAddList);
+            bleedAddList.clear();
+        }
+    }
+
+    /**
+     * Remove a LivingEntity from the bleedList if it is in it
+     * 
+     * @param entity LivingEntity to remove
+     */
+    public static void remove(LivingEntity entity) {
+        if (lock) {
+            if (!bleedRemoveList.contains(entity)) {
+                bleedRemoveList.add(entity);
+            }
+        }
+        else {
+            if (bleedList.contains(entity)) {
+                bleedList.remove(entity);
+            }
+        }
+    }
+
+    /**
+     * Add a LivingEntity to the bleedList if it is not in it.
+     *
+     * @param entity LivingEntity to add
+     */
+    public static void add(LivingEntity entity) {
+        if (lock) {
+            if (!bleedAddList.contains(entity)) {
+                bleedAddList.add(entity);
+            }
+        }
+        else {
+            if (!bleedList.contains(entity)){
+                bleedList.add(entity);
+            }
+        }
+    }
+
+    /**
+     * Check to see if a LivingEntity is in the bleedList
+     * 
+     * @param entity LivingEntity to check if in the bleedList
+     * @return true if in the list, false if not
+     */
+    public static boolean contains(LivingEntity entity) {
+        return (bleedList.contains(entity) || bleedAddList.contains(entity));
+    }
+}

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

@@ -3,22 +3,20 @@ package com.gmail.nossr50.runnables;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Users;
 
-public class SaveTimer implements Runnable {
+public class mcSaveTimer implements Runnable {
     private final mcMMO plugin;
 
-    public SaveTimer(final mcMMO plugin) {
+    public mcSaveTimer(final mcMMO plugin) {
         this.plugin = plugin;
     }
 
     @Override
     public void run() {
         //All player data will be saved periodically through this
-        int count = 1;
-
         for (Player player : plugin.getServer().getOnlinePlayers()) {
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new ProfileSaveTask(player), count);
-            count++;
+            Users.getProfile(player).save();
         }
     }
 }

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

@@ -0,0 +1,58 @@
+package com.gmail.nossr50.runnables;
+
+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.SkillType;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class mcTimer implements Runnable {
+    private final mcMMO plugin;
+
+    public mcTimer(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void run() {
+        long curTime = System.currentTimeMillis();
+
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (player == null) { //Is this even possible?
+                continue;
+            }
+
+            PlayerProfile PP = Users.getProfile(player);
+
+            if (PP == null) { //Is this even possible?
+                continue;
+            }
+
+            /*
+             * MONITOR SKILLS
+             */
+            Skills.monitorSkill(player, PP, curTime, SkillType.AXES);
+            Skills.monitorSkill(player, PP, curTime, SkillType.EXCAVATION);
+            Skills.monitorSkill(player, PP, curTime, SkillType.HERBALISM);
+            Skills.monitorSkill(player, PP, curTime, SkillType.MINING);
+            Skills.monitorSkill(player, PP, curTime, SkillType.SWORDS);
+            Skills.monitorSkill(player, PP, curTime, SkillType.UNARMED);
+            Skills.monitorSkill(player, PP, curTime, SkillType.WOODCUTTING);
+
+            /*
+             * COOLDOWN MONITORING
+             */
+            Skills.watchCooldown(player, PP, curTime, AbilityType.SKULL_SPLIITER);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.GIGA_DRILL_BREAKER);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.GREEN_TERRA);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.SUPER_BREAKER);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.SERRATED_STRIKES);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.BERSERK);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.TREE_FELLER);
+            Skills.watchCooldown(player, PP, curTime, AbilityType.BLAST_MINING);
+        }
+    }
+}

src/main/java/com/gmail/nossr50/skills/combat/Archery.java

@@ -1,49 +1,43 @@
 package com.gmail.nossr50.skills.combat;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Random;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Archery {
+
     private static Random random = new Random();
-    public static Map<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
 
     /**
      * Track arrows fired for later retrieval.
      *
+     * @param plugin mcMMO plugin instance
      * @param entity Entity damaged by the arrow
      * @param PPa PlayerProfile of the player firing the arrow
      */
-    public static void trackArrows(Entity entity, PlayerProfile PPa) {
+    public static void trackArrows(mcMMO plugin, Entity entity, PlayerProfile PPa) {
         final int MAX_BONUS_LEVEL = 1000;
-
         int skillLevel = PPa.getSkillLevel(SkillType.ARCHERY);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
-        if (random.nextInt(1000) <= skillCheck) {
-            for (Entry<Entity, Integer> entry : arrowTracker.entrySet()) {
-                if (entry.getKey() == entity) { //Shouldn't we be using .equals() here?
-                    entry.setValue(entry.getValue() + 1);
-                    return;
-                }
-            }
+        if (!plugin.arrowTracker.containsKey(entity)) {
+            plugin.arrowTracker.put(entity, 0);
+        }
 
-            arrowTracker.put(entity, 1);
+        if (skillLevel > MAX_BONUS_LEVEL || (random.nextInt(1000) <= skillLevel)) {
+            plugin.arrowTracker.put(entity, 1);
         }
     }
 
@@ -52,27 +46,26 @@ public class Archery {
      *
      * @param defender Defending player
      * @param attacker Attacking player
-     * @param event The event to modify
      */
-    public static void dazeCheck(Player defender, Player attacker, EntityDamageByEntityEvent event) {
+    public static void dazeCheck(Player defender, Player attacker) {
         final int MAX_BONUS_LEVEL = 1000;
 
         int skillLevel = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY);
-        Location location = defender.getLocation();
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        Location loc = defender.getLocation();
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
         if (random.nextInt(10) > 5) {
-            location.setPitch(90);
+            loc.setPitch(90);
         }
         else {
-            location.setPitch(-90);
+            loc.setPitch(-90);
         }
 
-        if (random.nextInt(2000) <= skillCheck) {
-            defender.teleport(location);
-            event.setDamage(event.getDamage() + 4);
-            defender.sendMessage(LocaleLoader.getString("Combat.TouchedFuzzy"));
-            attacker.sendMessage(LocaleLoader.getString("Combat.TargetDazed"));
+        if (random.nextInt(2000) <= skillCheck && mcPermissions.getInstance().daze(attacker)) {
+            defender.teleport(loc);
+            Combat.dealDamage(defender, 4);
+            defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy"));
+            attacker.sendMessage(mcLocale.getString("Combat.TargetDazed"));
         }
     }
 
@@ -80,16 +73,13 @@ public class Archery {
      * Check for arrow retrieval.
      *
      * @param entity The entity hit by the arrows
+     * @param plugin mcMMO plugin instance
      */
-    public static void arrowRetrievalCheck(Entity entity) {
-        for (Iterator<Map.Entry<Entity, Integer>> it = arrowTracker.entrySet().iterator() ; it.hasNext() ; ) { //This is a wee bit confusing...
-            Entry<Entity, Integer> entry = it.next();
-
-            if (entry.getKey() == entity) { //Shouldn't we be using .equals() here?
-                Misc.dropItems(entity.getLocation(), new ItemStack(Material.ARROW), entry.getValue());
-                it.remove();
-                return;
-            }
+    public static void arrowRetrievalCheck(Entity entity, mcMMO plugin) {
+        if (plugin.arrowTracker.containsKey(entity)) {
+            m.mcDropItems(entity.getLocation(), new ItemStack(Material.ARROW), plugin.arrowTracker.get(entity));
         }
+
+        plugin.arrowTracker.remove(entity);
     }
 }

src/main/java/com/gmail/nossr50/skills/combat/Axes.java

@@ -6,18 +6,17 @@ import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class Axes {
 
@@ -32,8 +31,10 @@ public class Axes {
     public static void axesBonus(Player attacker, EntityDamageByEntityEvent event) {
         final int MAX_BONUS = 4;
 
+        int bonus = 0;
+
         /* Add 1 DMG for every 50 skill levels */
-        int bonus = Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / 50;
+        bonus += Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / 50;
 
         if (bonus > MAX_BONUS) {
             bonus = MAX_BONUS;
@@ -51,11 +52,11 @@ public class Axes {
     public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
 
-        if (entity instanceof Tameable) {
-            Tameable pet = (Tameable) entity;
+        if (entity instanceof Wolf) {
+            Wolf wolf = (Wolf) entity;
 
-            if (pet.isTamed()) {
-                AnimalTamer tamer = pet.getOwner();
+            if (wolf.isTamed()) {
+                AnimalTamer tamer = wolf.getOwner();
 
                 if (tamer instanceof Player) {
                     Player owner = (Player) tamer;
@@ -73,19 +74,20 @@ public class Axes {
 
         PlayerProfile PPa = Users.getProfile(attacker);
         int skillLevel = PPa.getSkillLevel(SkillType.AXES);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
         if (random.nextInt(2000) <= skillCheck && !entity.isDead()){
             int damage = event.getDamage();
 
             if (entity instanceof Player){
                 event.setDamage((int) (damage * PVP_MODIFIER));
-                ((Player) entity).sendMessage(LocaleLoader.getString("Axes.Combat.CritStruck"));
+                Player player = (Player) entity;
+                player.sendMessage(mcLocale.getString("Axes.HitCritically"));
             }
             else {
                 event.setDamage(damage * PVE_MODIFIER);
             }
-            attacker.sendMessage(LocaleLoader.getString("Axes.Combat.CriticalHit"));
+            attacker.sendMessage(mcLocale.getString("Axes.CriticalHit"));
         }
     }
 
@@ -110,7 +112,7 @@ public class Axes {
             durabilityDamage += Users.getProfile(attacker).getSkillLevel(SkillType.AXES)/30;
 
             if (!hasArmor(targetPlayer)) {
-                applyGreaterImpact(attacker, target, event);
+                applyImpact(attacker, target, event);
             }
             else {
                 for (ItemStack armor : targetPlayer.getInventory().getArmorContents()) {
@@ -120,29 +122,25 @@ public class Axes {
             }
         }
         else {
-            applyGreaterImpact(attacker, target, event); //Since mobs are technically unarmored, this will always trigger
+            applyImpact(attacker, target, event); //Since mobs are technically unarmored, this will always trigger
         }
     }
 
     /**
-     * Apply Greater Impact ability.
+     * Apply impact ability.
      *
      * @param attacker The attacking player
      * @param target The defending entity
      * @param event The event to modify
      */
-    private static void applyGreaterImpact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event) {
+    private static void applyImpact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event) {
         final int GREATER_IMPACT_CHANCE = 25;
         final double GREATER_IMPACT_MULTIPLIER = 1.5;
 
-        if (!Permissions.getInstance().greaterImpact(attacker)) {
-            return;
-        }
-
         if (random.nextInt(100) <= GREATER_IMPACT_CHANCE) {
             event.setDamage(event.getDamage() + 2);
             target.setVelocity(attacker.getLocation().getDirection().normalize().multiply(GREATER_IMPACT_MULTIPLIER));
-            attacker.sendMessage(LocaleLoader.getString("Axes.Combat.GI.Proc"));
+            attacker.sendMessage(mcLocale.getString("Axes.GreaterImpactOnEnemy"));
         }
     }
 

src/main/java/com/gmail/nossr50/skills/combat/Staves.java

@@ -0,0 +1,372 @@
+package com.gmail.nossr50.skills.combat;
+
+import java.util.Collection;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Egg;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.SmallFireball;
+import org.bukkit.entity.Snowball;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.runnables.mcBleedTimer;
+
+public class Staves {
+
+    /**
+     * Handle the projectile effects from the staves.
+     *
+     * @param event The event to modify
+     */
+    public static void altFireCheck(EntityDamageByEntityEvent event) {
+        LivingEntity defender = (LivingEntity) event.getEntity();
+        Entity attacker = event.getDamager();
+
+        if (attacker.hasMetadata("mcmmoFiredFromStaff")) {
+            event.setDamage(0);
+
+            Projectile projectile = (Projectile) attacker;
+            Player shooter = (Player) projectile.getShooter();
+            EntityType type = attacker.getType();
+
+            projectileEffects(defender, shooter, type);
+        }
+    }
+
+    /**
+     * Fire a projectile on alt-fire from a staff.
+     *
+     * @param type The type of staff
+     * @param attacker The attacking player
+     * @param plugin mcMMO plugin instance
+     */
+    public static void altFire(Material type, Player attacker, mcMMO plugin) {
+        Projectile projectile;
+
+        if (attacker.getItemInHand().getAmount() > 1) {
+            return;
+        }
+
+        switch (type) {
+        case BLAZE_ROD:
+            projectile = attacker.launchProjectile(SmallFireball.class);
+            ((SmallFireball) projectile).setIsIncendiary(false);
+            ((SmallFireball) projectile).setYield(0f);
+            break;
+
+        case BONE:
+            projectile = attacker.launchProjectile(Snowball.class);
+            break;
+
+        case STICK:
+            projectile = attacker.launchProjectile(Egg.class);
+            break;
+
+        default:
+            return;
+        }
+
+        projectile.setMetadata("mcmmoFiredFromStaff", new FixedMetadataValue(plugin, true));
+    }
+
+    /**
+     * Handle the effects of the Bone's direct hit.
+     *
+     * @param defender The defending player
+     * @param attacker The attacking player
+     */
+    public static void boneEffect(Player defender, Player attacker) {
+        float xpLost = expLossCalculate();
+        float xpGained = expGainCalculate();
+
+        float attackerXP = attacker.getExp();
+        float defenderXP = defender.getExp();
+        int attackerLevel = attacker.getLevel();
+        int defenderLevel = defender.getLevel();
+
+        if (Party.getInstance().inSameParty(defender, attacker)) {
+
+            //Drain XP
+            if (attackerXP - xpLost < 0f) {
+                if (attackerLevel != 0) {
+                    attacker.setLevel(attackerLevel - 1);
+                    attacker.setExp(1f - xpLost);
+                    attacker.sendMessage("You transfered some XP to your ally!"); //TODO: Use mcLocale
+                }
+                else {
+                    attacker.sendMessage("You don't have enough XP to transfer!"); //TODO: Use mcLocale
+                    return;
+                }
+            }
+            else {
+                attacker.setExp(attackerXP - xpLost);
+                attacker.sendMessage("You transfered some XP to your ally!"); //TODO: Use mcLocale
+            }
+
+            //Reward XP
+            if (defenderXP + xpGained >= 1f) {
+                defender.setLevel(defenderLevel + 1);
+                defender.setExp(0f + xpGained);
+                defender.sendMessage("You were given XP from your ally!"); //TODO: Use mcLocale
+            }
+            else {
+                defender.setExp(defenderXP + xpGained);
+                defender.sendMessage("You were given XP from your ally!"); //TODO: Use mcLocale
+            }
+        }
+        else {
+
+            //Drain XP
+            if (defenderXP - xpLost < 0f) {
+                if (defenderLevel != 0) {
+                    defender.setLevel(defenderLevel - 1);
+                    defender.setExp(1f - xpLost);
+                    defender.sendMessage("You were drained of XP!"); //TODO: Use mcLocale
+                }
+                else {
+                    attacker.sendMessage("Your enemy doesn't have enough XP to drain!"); //TODO: Use mcLocale
+                    return;
+                }
+            }
+            else {
+                defender.setExp(defenderXP - xpLost);
+                defender.sendMessage("You were drained of XP!"); //TODO: Use mcLocale
+            }
+
+            //Reward XP
+            if (attackerXP + xpGained >= 1f) {
+                attacker.setLevel(attackerLevel + 1);
+                attacker.setExp(0f + xpGained);
+                attacker.sendMessage("You gained XP from your enemy!"); //TODO: Use mcLocale
+            }
+            else {
+                attacker.setExp(attackerXP + xpGained);
+                attacker.sendMessage("You gained XP from your enemy!"); //TODO: Use mcLocale
+            }
+        }
+    }
+
+    /**
+     * Handle the effects of the Blaze Rod's direct hit.
+     *
+     * @param target The defending entity
+     * @param attacker The attacking player
+     */
+    public static void blazeRodEffect(LivingEntity target, Player attacker) {
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, attacker)) {
+            target.setFireTicks(0);
+            mcBleedTimer.remove(target);
+
+            for (PotionEffect effect : target.getActivePotionEffects()) {
+                if (effect.getType().equals(PotionEffectType.POISON) || effect.getType().equals(PotionEffectType.WEAKNESS) || effect.getType().equals(PotionEffectType.SLOW)) {
+                    target.removePotionEffect(effect.getType());
+                }
+            }
+
+            attacker.sendMessage("Your ally was cured of all status effects!"); //TODO: Use locale
+            ((Player) target).sendMessage("You were cured of all status effects!"); //TODO: Use locale
+        }
+        else {
+            if (target.getFireTicks() + fireTicksCalculate() > target.getMaxFireTicks()) {
+                target.setFireTicks(target.getMaxFireTicks());
+            }
+            else {
+                target.setFireTicks(target.getFireTicks() + fireTicksCalculate());
+            }
+
+            attacker.sendMessage("You set your enemy on fire!"); //TODO: Use locale
+
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were set on fire!"); //TODO: Use locale
+            }
+        }
+    }
+
+    /**
+     * Handle the effects of the Stick's direct hit.
+     *
+     * @param target The defending entity
+     * @param attacker The attacking player
+     */
+    public static void stickEffect(LivingEntity target, Player attacker) {
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, attacker)) {
+            Player defender = (Player) target;
+            defender.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, amplifierCalulate()));
+
+            /* Do we WANT to heal food along with health? */
+            if (defender.getFoodLevel() + amplifierCalulate() > 20) {
+                defender.setFoodLevel(20);
+            }
+            else {
+                defender.setFoodLevel(defender.getFoodLevel() + amplifierCalulate());
+            }
+
+            attacker.sendMessage("Your ally was healed!"); //TODO: Use locale
+            defender.sendMessage("You were healed!"); //TODO: Use locale
+        }
+        else {
+            target.addPotionEffect(new PotionEffect(PotionEffectType.HARM, 1, amplifierCalulate()));
+
+            attacker.sendMessage("Your enemy was harmed!"); //TODO: Use locale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were harmed!"); //TODO: Use locale
+            }
+        }
+    }
+
+    /**
+     * Handle the special effects from the staff projectiles.
+     *
+     * @param defender The defending entity
+     * @param shooter The attacking player
+     * @param type The type of projectile
+     */
+    private static void projectileEffects(LivingEntity target, Player shooter, EntityType projectile) {
+        final int TICKS_PER_SECOND = 20;
+        final int MAX_SLOW_DURATION_SECONDS = 240;
+        final int MAX_SPEED_DURATION_SECONDS = 480;
+        final int MAX_WEAKNESS_DURATION_SECONDS = 240;
+        final int MAX_STRENGTH_DURATION_SECONDS = 480;
+        final int MAX_POISON_DURATION_SECONDS = 120;
+        final int MAX_REGEN_DURATION_SECONDS = 120;
+
+        Collection<PotionEffect> potionEffects = target.getActivePotionEffects();
+
+        int duration = durationCalulate();
+        int amplifier = amplifierCalulate();
+        PotionEffectType potionType = null;
+
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, shooter)) {
+            switch (projectile) {
+            case EGG:
+                potionType = PotionEffectType.REGENERATION;
+                break;
+
+            case SMALL_FIREBALL:
+                potionType = PotionEffectType.SPEED;
+                break;
+
+            case SNOWBALL:
+                potionType = PotionEffectType.INCREASE_DAMAGE;
+                break;
+
+            default:
+                break;
+            }
+        }
+        else {
+            switch (projectile) {
+            case EGG:
+                potionType = PotionEffectType.POISON;
+                break;
+
+            case SMALL_FIREBALL:
+                potionType = PotionEffectType.SLOW;
+                break;
+
+            case SNOWBALL:
+                potionType = PotionEffectType.WEAKNESS;
+                break;
+
+            default:
+                break;
+            }
+        }
+
+        for (PotionEffect effect : potionEffects) {
+            if (effect.getType().equals(potionType)) {
+                duration = duration + effect.getDuration();
+                break;
+            }
+        }
+
+        if (potionType.equals(PotionEffectType.SLOW) && duration > (TICKS_PER_SECOND * MAX_SLOW_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_SLOW_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.SPEED) && duration > (TICKS_PER_SECOND * MAX_SPEED_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_SPEED_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.WEAKNESS) && duration > (TICKS_PER_SECOND * MAX_WEAKNESS_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_WEAKNESS_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.INCREASE_DAMAGE) && duration > (TICKS_PER_SECOND * MAX_STRENGTH_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_STRENGTH_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.POISON) && duration > (TICKS_PER_SECOND * MAX_POISON_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_POISON_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.REGENERATION) && duration > (TICKS_PER_SECOND * MAX_REGEN_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_REGEN_DURATION_SECONDS);
+        }
+
+        target.addPotionEffect(new PotionEffect(potionType, duration, amplifier));
+
+        if (potionType.equals(PotionEffectType.SLOW)) {
+            shooter.sendMessage("Your enemy was slowed!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were slowed!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.SPEED)) {
+            shooter.sendMessage("Your ally's speed was boosted!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("Your speed was boosted!"); //TODO: Use mcLocale
+        }
+        else if (potionType.equals(PotionEffectType.WEAKNESS)) {
+            shooter.sendMessage("Your enemy was weakened!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were weakened!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.INCREASE_DAMAGE)) {
+            shooter.sendMessage("Your ally was strengthened!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("You were strengthened!"); //TODO: Use mcLocale
+        }
+        else if (potionType.equals(PotionEffectType.POISON)) {
+            shooter.sendMessage("Your enemy was poisoned!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were poisoned!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.REGENERATION)) {
+            shooter.sendMessage("Your ally's began regaining health!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("You began regaining health!"); //TODO: Use mcLocale
+        }
+    }
+
+    private static int durationCalulate() {
+        //TODO: Calculate duration based off time held
+        return 80;
+    }
+
+
+    private static int amplifierCalulate() {
+        //TODO: Calculate amplifier based off skill level
+        return 10;
+    }
+
+
+    private static float expLossCalculate() {
+        //TODO: Calculate exp lost based on skill level
+        return 0.25f;
+    }
+
+
+    private static float expGainCalculate() {
+        //TODO: Calculate exp gained based on skill level
+        return 0.10f;
+    }
+
+    private static int fireTicksCalculate() {
+        //TODO: Calculate based on skill level
+        return 2;
+    }
+}

src/main/java/com/gmail/nossr50/skills/combat/Swords.java

@@ -6,35 +6,39 @@ import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.runnables.BleedTimer;
+import com.gmail.nossr50.runnables.mcBleedTimer;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.ItemChecks;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Swords {
+
     private static Random random = new Random();
 
     /**
      * Check for Bleed effect.
      *
      * @param attacker The attacking player
-     * @param defender The defending entity
+     * @param entity The defending entity
+     * @param plugin mcMMO plugin instance
      */
-    public static void bleedCheck(Player attacker, LivingEntity defender) {
+    public static void bleedCheck(Player attacker, LivingEntity entity, mcMMO plugin) {
 
-        if (defender instanceof Tameable) {
-            Tameable pet = (Tameable) defender;
+        if (entity instanceof Wolf) {
+            Wolf wolf = (Wolf) entity;
 
-            if (pet.isTamed()) {
-                AnimalTamer tamer = pet.getOwner();
+            if (wolf.isTamed()) {
+                AnimalTamer tamer = wolf.getOwner();
 
                 if (tamer instanceof Player) {
                     Player owner = (Player) tamer;
@@ -50,50 +54,61 @@ public class Swords {
 
         PlayerProfile PPa = Users.getProfile(attacker);
         int skillLevel = PPa.getSkillLevel(SkillType.SWORDS);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
-        if (random.nextInt(1000) <= skillCheck && !defender.isDead()) {
-            int bleedTicks = 0;
+        if (random.nextInt(1000) <= skillCheck && !entity.isDead()) {
+            if (entity instanceof Player) {
+                Player target = (Player) entity;
+                int bleedTicks;
 
-            if (skillLevel >= 750) {
-                bleedTicks = 3;
+                if (skillLevel >= 750) {
+                    bleedTicks = 3;
+                }
+                else {
+                    bleedTicks = 2;
+                }
+
+                Users.getProfile(target).addBleedTicks(bleedTicks);
             }
             else {
-                bleedTicks = 2;
+                mcBleedTimer.add(entity);
             }
-            
-            BleedTimer.add(defender, bleedTicks);
-            attacker.sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding"));
+            attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
         }
     }
 
     /**
      * Counter-attack entities.
      *
-     * @param attacker The attacking entity
-     * @param defender The defending player
-     * @param damage The amount of damage being countered
+     * @param event The event to modify
      */
-    public static void counterAttackChecks(Entity attacker, Player defender, int damage) {
+    public static void counterAttackChecks(EntityDamageByEntityEvent event) {
+        Entity attacker = event.getDamager();
+
         if (!(attacker instanceof LivingEntity)) {
             return;
         }
 
-        PlayerProfile PPd = Users.getProfile(defender);
+        Entity target = event.getEntity();
 
-        if (ItemChecks.isSword(defender.getItemInHand()) && Permissions.getInstance().counterAttack(defender)) {
-            final int MAX_BONUS_LEVEL = 600;
-            final int COUNTER_ATTACK_MODIFIER = 2;
+        if (target instanceof Player) {
+            Player defender = (Player) target;
+            PlayerProfile PPd = Users.getProfile(defender);
 
-            int skillLevel = PPd.getSkillLevel(SkillType.SWORDS);
-            int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+            if (ItemChecks.isSword(defender.getItemInHand()) && mcPermissions.getInstance().counterAttack(defender)) {
+                final int MAX_BONUS_LEVEL = 600;
+                final int COUNTER_ATTACK_MODIFIER = 2;
 
-            if (random.nextInt(2000) <= skillCheck) {
-                Combat.dealDamage((LivingEntity) attacker, damage / COUNTER_ATTACK_MODIFIER);
-                defender.sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));
+                int skillLevel = PPd.getSkillLevel(SkillType.SWORDS);
+                int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
-                if (attacker instanceof Player) {
-                    ((Player) attacker).sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Hit"));
+                if (random.nextInt(2000) <= skillCheck) {
+                    Combat.dealDamage((LivingEntity) attacker, event.getDamage() / COUNTER_ATTACK_MODIFIER);
+                    defender.sendMessage(mcLocale.getString("Swords.CounterAttacked"));
+
+                    if (attacker instanceof Player) {
+                        ((Player) attacker).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
+                    }
                 }
             }
         }

src/main/java/com/gmail/nossr50/skills/combat/Taming.java

@@ -19,16 +19,17 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.runnables.mcBleedTimer;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Taming {
+
     private static Random random = new Random();
 
     /**
@@ -36,14 +37,15 @@ public class Taming {
      *
      * @param PPo The PlayerProfile of the wolf's owner
      * @param theWolf The wolf using the ability
-     * @param damage The damage being absorbed by the wolf  
+     * @param event The event to modify
      */
-    public static void fastFoodService (PlayerProfile PPo, Wolf theWolf, int damage) {
+    public static void fastFoodService (PlayerProfile PPo, Wolf theWolf, EntityDamageEvent event) {
         final int SKILL_ACTIVATION_LEVEL = 50;
         final int ACTIVATION_CHANCE = 50;
 
         int health = theWolf.getHealth();
         int maxHealth = theWolf.getMaxHealth();
+        int damage = event.getDamage();
 
         if (PPo.getSkillLevel(SkillType.TAMING) >= SKILL_ACTIVATION_LEVEL) {
             if (health < maxHealth) {
@@ -80,8 +82,9 @@ public class Taming {
      * @param PPo The PlayerProfile of the wolf's owner
      * @param event The event to modify
      * @param master The wolf's master
+     * @param plugin mcMMO plugin instance
      */
-    public static void gore(PlayerProfile PPo, EntityDamageEvent event, Player master) {
+    public static void gore(PlayerProfile PPo, EntityDamageEvent event, Player master, mcMMO plugin) {
         final int GORE_MULTIPLIER = 2;
 
         if (random.nextInt(1000) <= PPo.getSkillLevel(SkillType.TAMING)) {
@@ -89,12 +92,16 @@ public class Taming {
             event.setDamage(event.getDamage() * GORE_MULTIPLIER);
 
             if (entity instanceof Player) {
-                ((Player) entity).sendMessage(LocaleLoader.getString("Combat.StruckByGore"));
+                Player target = (Player) entity;
+
+                target.sendMessage(mcLocale.getString("Combat.StruckByGore"));
+                Users.getProfile(target).addBleedTicks(2);
+            }
+            else {
+                mcBleedTimer.add((LivingEntity) entity);
             }
 
-            BleedTimer.add((LivingEntity) entity, 2);
-
-            master.sendMessage(LocaleLoader.getString("Combat.Gore"));
+            master.sendMessage(mcLocale.getString("Combat.Gore"));
         }
     }
 
@@ -108,7 +115,8 @@ public class Taming {
         AnimalTamer tamer = beast.getOwner();
 
         if (tamer instanceof Player) {
-            return ((Player) tamer).getName();
+            Player owner = (Player) tamer;
+            return owner.getName();
         }
         else {
             return "Offline Master";
@@ -128,10 +136,6 @@ public class Taming {
         final int THICK_FUR_MODIFIER = 2;
         final int SHOCK_PROOF_MODIFIER = 6;
 
-        if (!(event.getEntity() instanceof Wolf)) {
-            return;
-        }
-
         DamageCause cause = event.getCause();
         Wolf wolf = (Wolf) event.getEntity();
         Player master = (Player) wolf.getOwner();
@@ -143,20 +147,20 @@ public class Taming {
         case CONTACT:
         case LAVA:
         case FIRE:
-            if (Permissions.getInstance().environmentallyAware(master)) {
+            if (mcPermissions.getInstance().environmentallyAware(master)) {
                 if (skillLevel >= ENVIRONMENTALLY_AWARE_LEVEL) {
                     if (event.getDamage() >= wolf.getHealth()) {
                         return;
                     }
 
                     wolf.teleport(master.getLocation());
-                    master.sendMessage(LocaleLoader.getString("Taming.Listener.Wolf"));
+                    master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack"));
                 }
             }
             break;
 
         case FALL:
-            if (Permissions.getInstance().environmentallyAware(master)) {
+            if (mcPermissions.getInstance().environmentallyAware(master)) {
                 if (skillLevel >= ENVIRONMENTALLY_AWARE_LEVEL) {
                     event.setCancelled(true);
                 }
@@ -165,7 +169,7 @@ public class Taming {
 
         /* Thick Fur */
         case FIRE_TICK:
-            if (Permissions.getInstance().thickFur(master)) {
+            if (mcPermissions.getInstance().thickFur(master)) {
                 if(skillLevel >= THICK_FUR_LEVEL) {
                     wolf.setFireTicks(0);
                 }
@@ -174,7 +178,7 @@ public class Taming {
 
         case ENTITY_ATTACK:
         case PROJECTILE:
-            if (Permissions.getInstance().thickFur(master)) {
+            if (mcPermissions.getInstance().thickFur(master)) {
                 if (skillLevel >= THICK_FUR_LEVEL) {
                     event.setDamage(event.getDamage() / THICK_FUR_MODIFIER);
                 }
@@ -184,7 +188,7 @@ public class Taming {
         /* Shock Proof */
         case ENTITY_EXPLOSION:
         case BLOCK_EXPLOSION:
-            if (Permissions.getInstance().shockProof(master)) {
+            if (mcPermissions.getInstance().shockProof(master)) {
                 if (skillLevel >= SHOCK_PROOF_LEVEL) {
                     event.setDamage(event.getDamage() / SHOCK_PROOF_MODIFIER);
                 }
@@ -210,12 +214,12 @@ public class Taming {
         switch (type) {
         case WOLF:
             summonItem = Material.BONE;
-            summonAmount = Config.getInstance().getTamingCOTWWolfCost();
+            summonAmount = LoadProperties.bonesConsumedByCOTW;
             break;
 
         case OCELOT:
             summonItem = Material.RAW_FISH;
-            summonAmount = Config.getInstance().getTamingCOTWOcelotCost();
+            summonAmount = LoadProperties.fishConsumedByCOTW;
             break;
 
         default:
@@ -228,11 +232,11 @@ public class Taming {
                     if (x.getType().equals(type)) {
                         switch (type) {
                         case WOLF:
-                            player.sendMessage(LocaleLoader.getString("Taming.Summon.Fail.Wolf"));
+                            player.sendMessage(mcLocale.getString("m.TamingSummonWolfFailed"));
                             return;
 
                         case OCELOT:
-                            player.sendMessage(LocaleLoader.getString("Taming.Summon.Fail.Ocelot"));
+                            player.sendMessage(mcLocale.getString("m.TamingSummonOcelotFailed"));
                             return;
 
                         default:
@@ -254,10 +258,10 @@ public class Taming {
                 }
 
                 player.setItemInHand(new ItemStack(summonItem, item.getAmount() - summonAmount));
-                player.sendMessage(LocaleLoader.getString("Taming.Summon.Complete"));
+                player.sendMessage(mcLocale.getString("m.TamingSummon"));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Skills.NeedMore") + " " + ChatColor.GRAY + Misc.prettyItemString(summonItem.getId()));
+                player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(summonItem.getId()));
             }
         }
     }
@@ -272,15 +276,15 @@ public class Taming {
     public static void beastLore(EntityDamageByEntityEvent event, LivingEntity target, Player inspector) {
         if (target instanceof Tameable) {
             Tameable beast = (Tameable) target;
-            String message = LocaleLoader.getString("Combat.BeastLore") + " ";
+            String message = mcLocale.getString("Combat.BeastLore") + " ";
             int health = target.getHealth();
             event.setCancelled(true);
 
             if (beast.isTamed()) {
-                message = message.concat(LocaleLoader.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(beast)}) + " ");
+                message = message.concat(mcLocale.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(beast)}) + " ");
             }
 
-            message = message.concat(LocaleLoader.getString("Combat.BeastLoreHealth", new Object[] {health, target.getMaxHealth()}));
+            message = message.concat(mcLocale.getString("Combat.BeastLoreHealth", new Object[] {health, target.getMaxHealth()}));
             inspector.sendMessage(message);
         }
     }

src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java

@@ -10,12 +10,13 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Unarmed {
+
     private static Random random = new Random();
 
     /**
@@ -48,15 +49,15 @@ public class Unarmed {
 
         PlayerProfile PPa = Users.getProfile(attacker);
         int skillLevel = PPa.getSkillLevel(SkillType.UNARMED);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
         ItemStack inHand = defender.getItemInHand();
 
         if (!inHand.getType().equals(Material.AIR)) {
-            if (random.nextInt(3000) <= skillCheck && !ironGrip(defender, attacker)) {
-                defender.sendMessage(LocaleLoader.getString("Skills.Disarmed"));
+            if (random.nextInt(3000) <= skillCheck && ironGrip(defender, attacker)) {
+                defender.sendMessage(mcLocale.getString("Skills.Disarmed"));
 
-                Misc.dropItem(defender.getLocation(), inHand);
+                m.mcDropItem(defender.getLocation(), inHand);
                 defender.setItemInHand(new ItemStack(Material.AIR));
             }
         }
@@ -72,27 +73,20 @@ public class Unarmed {
         final int MAX_BONUS_LEVEL = 1000;
 
         int skillLevel = Users.getProfile(defender).getSkillLevel(SkillType.UNARMED);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
-        if (random.nextInt(2000) <= skillCheck && Permissions.getInstance().deflect(defender)) {
+        if (random.nextInt(2000) <= skillCheck && mcPermissions.getInstance().deflect(defender)) {
             event.setCancelled(true);
-            defender.sendMessage(LocaleLoader.getString("Combat.ArrowDeflect"));
+            defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect"));
         }
     }
 
-    /**
-     * Check Iron Grip ability success
-     *
-     * @param defender The defending player
-     * @param attacker The attacking player
-     * @return true if the defender was not disarmed, false otherwise
-     */
-    private static boolean ironGrip(Player defender, Player attacker) {
+    public static boolean ironGrip(Player defender, Player attacker) {
         final int MAX_BONUS_LEVEL = 1000;
 
         PlayerProfile PPd = Users.getProfile(defender);
         int skillLevel = PPd.getSkillLevel(SkillType.UNARMED);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
         if (random.nextInt(1000) <= skillCheck) {
             defender.sendMessage(ChatColor.GREEN + "Your iron grip kept you from being disarmed!"); //TODO: Use locale

src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java

@@ -14,17 +14,16 @@ import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class BlastMining {
 
@@ -42,18 +41,22 @@ public class BlastMining {
      * @return A list of blocks dropped from the explosion
      */
     private static List<Block> explosionYields(List<Block> ores, List<Block> debris, float yield, float oreBonus, float debrisReduction, int extraDrops) {
-        Iterator<Block> oresIterator = ores.iterator();
+        Iterator<Block> iterator2 = ores.iterator();
         List<Block> blocksDropped = new ArrayList<Block>();
 
-        while (oresIterator.hasNext()) {
-            Block temp = oresIterator.next();
+        while (iterator2.hasNext()) {
+            Block temp = iterator2.next();
 
             if (random.nextFloat() < (yield + oreBonus)) {
                 blocksDropped.add(temp);
                 Mining.miningDrops(temp);
 
-                if (!mcMMO.placeStore.isTrue(temp)) {
-                    for (int i = 1 ; i < extraDrops ; i++) {
+                if (!temp.hasMetadata("mcmmoPlacedBlock")) {
+                    if (extraDrops == 2) {
+                        blocksDropped.add(temp);
+                        Mining.miningDrops(temp);
+                    }
+                    if (extraDrops == 3) {
                         blocksDropped.add(temp);
                         Mining.miningDrops(temp);
                     }
@@ -61,11 +64,11 @@ public class BlastMining {
             }
         }
 
-        if (yield - debrisReduction > 0) {
-            Iterator<Block> debrisIterator = debris.iterator();
+        if (yield - debrisReduction != 0) {
+            Iterator<Block> iterator3 = debris.iterator();
 
-            while (debrisIterator.hasNext()) {
-                Block temp = debrisIterator.next();
+            while (iterator3.hasNext()) {
+                Block temp = iterator3.next();
 
                 if (random.nextFloat() < (yield - debrisReduction))
                     Mining.miningDrops(temp);
@@ -103,7 +106,7 @@ public class BlastMining {
         while (iterator.hasNext()) {
             Block temp = iterator.next();
 
-            if (BlockChecks.isOre(temp)) {
+            if (BlockChecks.isOre(temp.getType())) {
                 ores.add(temp);
             }
             else {
@@ -159,7 +162,7 @@ public class BlastMining {
         }
 
         for (Block block : xp) {
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 Mining.miningXP(player, block);
             }
         }
@@ -235,74 +238,52 @@ public class BlastMining {
     }
 
     /**
-     * Detonate TNT for Blast Mining
+     * Remotely detonate TNT for Blast Mining.
      *
-     * @param event The PlayerInteractEvent
      * @param player Player detonating the TNT
      * @param plugin mcMMO plugin instance
      */
-    public static void detonate(PlayerInteractEvent event, Player player, mcMMO plugin) {
-        PlayerProfile PP = Users.getProfile(player);
-
-        if (PP.getSkillLevel(SkillType.MINING) < 125)
-            return;
-
-        Block block = event.getClickedBlock();
-
-        if (block == null || block.getType() != Material.TNT) {
-            final byte SNOW = 78;
-            final byte AIR = 0;
-            final int BLOCKS_AWAY = 100;
-
-            HashSet<Byte> transparent = new HashSet<Byte>();
-
-            transparent.add(SNOW);
-            transparent.add(AIR);
-
-            block = player.getTargetBlock(transparent, BLOCKS_AWAY);
-
-            if (block.getType() != Material.TNT) {
-                return;
-            }
-        }
-        else if (block.getType() == Material.TNT) {
-            event.setCancelled(true); // This is the only way I know to avoid the original TNT to be triggered (in case the player is close to it)
-        }
-
-        if (!Misc.blockBreakSimulate(block, player, true)) {
-            return;
-        }
-
-        final double MAX_DISTANCE_AWAY = 10.0;
+    public static void remoteDetonation(Player player, mcMMO plugin) {
+        final byte SNOW = 78;
+        final byte AIR = 0;
+        final int BLOCKS_AWAY = 100;
         final int TIME_CONVERSION_FACTOR = 1000;
 
-        AbilityType ability = AbilityType.BLAST_MINING;
+        PlayerProfile PP = Users.getProfile(player);
+        HashSet<Byte> transparent = new HashSet<Byte>();
 
-        /* Check Cooldown */
-        if(!Skills.cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
-            player.sendMessage(LocaleLoader.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + Skills.calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
+        transparent.add(SNOW);
+        transparent.add(AIR);
 
-            return;
-        }
+        Block block = player.getTargetBlock(transparent, BLOCKS_AWAY);
 
-        /* Send message to nearby players */
-        for (Player y : player.getWorld().getPlayers()) {
-            if (y != player && Misc.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
-                y.sendMessage(ability.getAbilityPlayer(player));
+        if (block.getType().equals(Material.TNT) && m.blockBreakSimulate(block, player, true) && PP.getSkillLevel(SkillType.MINING) >= 125) {
+            final double MAX_DISTANCE_AWAY = 10.0;
+            AbilityType ability = AbilityType.BLAST_MINING;
+
+            /* Check Cooldown */
+            if (!Skills.cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
+                player.sendMessage(mcLocale.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + Skills.calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
+                return;
             }
+
+            /* Send message to nearby players */
+            for (Player y : player.getWorld().getPlayers()) {
+                if (y != player && m.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
+                    y.sendMessage(ability.getAbilityPlayer(player));
+                }
+            }
+
+            player.sendMessage(mcLocale.getString("BlastMining.Boom"));
+
+            /* Create the TNT entity */
+            TNTPrimed tnt = player.getWorld().spawn(block.getLocation(), TNTPrimed.class);
+            plugin.tntTracker.put(tnt.getEntityId(), player);
+            block.setType(Material.AIR);
+            tnt.setFuseTicks(0);
+
+            PP.setSkillDATS(ability, System.currentTimeMillis()); //Save DATS for Blast Mining
+            PP.setAbilityInformed(ability, false);
         }
-
-        player.sendMessage(LocaleLoader.getString("Mining.Blast.Boom"));
-
-        /* Create the TNT entity */
-        TNTPrimed tnt = player.getWorld().spawn(block.getLocation(), TNTPrimed.class);
-        plugin.tntTracker.put(tnt.getEntityId(), player);
-        tnt.setFuseTicks(0);
-
-        /* Disable the original one */
-        block.setType(Material.AIR);
-
-        PP.setSkillDATS(ability, System.currentTimeMillis()); //Save DATS for Blast Mining
-        PP.setAbilityInformed(ability, false);
     }
 }

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -11,15 +12,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.spout.SpoutSounds;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.TreasuresConfig;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.config.LoadTreasures;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
@@ -31,6 +29,28 @@ public class Excavation {
 
     private static Random random = new Random();
 
+    /**
+     * Check to see if a block can be broken by Giga Drill Breaker.
+     *
+     * @param material The type of block to check
+     * @return
+     */
+    public static boolean canBeGigaDrillBroken(Material type) {
+        switch (type) {
+        case CLAY:
+        case DIRT:
+        case GRASS:
+        case GRAVEL:
+        case MYCEL:
+        case SAND:
+        case SOUL_SAND:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
     /**
      * Check to see if treasures were found.
      *
@@ -47,43 +67,36 @@ public class Excavation {
 
         List<ExcavationTreasure> treasures = new ArrayList<ExcavationTreasure>();
 
-        int xp;
+        int xp = LoadProperties.mbase;
 
-        if (Config.getInstance().getBlockModsEnabled() && CustomBlocksConfig.getInstance().customExcavationBlocks.contains(new ItemStack(block.getTypeId(), 1, (short) 0, block.getData()))) {
-            xp = ModChecks.getCustomBlock(block).getXpGain();
-        }
-        else {
-            xp = Config.getInstance().getExcavationBaseXP();
-        }
-
-        if (Permissions.getInstance().excavationTreasures(player)) {
+        if (mcPermissions.getInstance().excavationTreasures(player)) {
             switch (type) {
             case DIRT:
-                treasures = TreasuresConfig.getInstance().excavationFromDirt;
+                treasures = LoadTreasures.excavationFromDirt;
                 break;
 
             case GRASS:
-                treasures = TreasuresConfig.getInstance().excavationFromGrass;
+                treasures = LoadTreasures.excavationFromGrass;
                 break;
 
             case SAND:
-                treasures = TreasuresConfig.getInstance().excavationFromSand;
+                treasures = LoadTreasures.excavationFromSand;
                 break;
 
             case GRAVEL:
-                treasures = TreasuresConfig.getInstance().excavationFromGravel;
+                treasures = LoadTreasures.excavationFromGravel;
                 break;
 
             case CLAY:
-                treasures = TreasuresConfig.getInstance().excavationFromClay;
+                treasures = LoadTreasures.excavationFromClay;
                 break;
 
             case MYCEL:
-                treasures = TreasuresConfig.getInstance().excavationFromMycel;
+                treasures = LoadTreasures.excavationFromMycel;
                 break;
 
             case SOUL_SAND:
-                treasures = TreasuresConfig.getInstance().excavationFromSoulSand;
+                treasures = LoadTreasures.excavationFromSoulSand;
                 break;
 
             default:
@@ -102,13 +115,13 @@ public class Excavation {
             //Drop items
             for (ItemStack x : is) {
                 if (x != null) {
-                    Misc.dropItem(loc, x);
+                    m.mcDropItem(loc, x);
                 }
             }
         }
 
         //Handle XP related tasks
-        PP.addXP(player, SkillType.EXCAVATION, xp);
+        PP.addXP(SkillType.EXCAVATION, xp);
         Skills.XpCheckSkill(SkillType.EXCAVATION, player);
     }
 
@@ -119,17 +132,17 @@ public class Excavation {
      * @param block The block to check
      */
     public static void gigaDrillBreaker(Player player, Block block) {
-        Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
+        Skills.abilityDurabilityLoss(player.getItemInHand(), LoadProperties.abilityDurabilityLoss);
 
-        if (!mcMMO.placeStore.isTrue(block)) {
+        if (!block.hasMetadata("mcmmoPlacedBlock")) {
             FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
-            mcMMO.p.getServer().getPluginManager().callEvent(armswing);
+            Bukkit.getPluginManager().callEvent(armswing);
 
             Excavation.excavationProcCheck(block, player);
             Excavation.excavationProcCheck(block, player);
         }
 
-        if (Config.getInstance().spoutEnabled) {
+        if (LoadProperties.spoutEnabled) {
             SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
         }
     }

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

@@ -17,18 +17,17 @@ import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Wool;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.TreasuresConfig;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.config.LoadTreasures;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.ItemChecks;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class Fishing {
 
@@ -44,16 +43,16 @@ public class Fishing {
         int level = PP.getSkillLevel(SkillType.FISHING);
         int fishingTier;
 
-        if (level >= Config.getInstance().getFishingTierLevelsTier5()) {
+        if (level >= LoadProperties.fishingTier5) {
             fishingTier = 5;
         }
-        else if (level >= Config.getInstance().getFishingTierLevelsTier4()) {
+        else if (level >= LoadProperties.fishingTier4) {
             fishingTier = 4;
         }
-        else if (level >= Config.getInstance().getFishingTierLevelsTier3()) {
+        else if (level >= LoadProperties.fishingTier3) {
             fishingTier =  3;
         }
-        else if (level >= Config.getInstance().getFishingTierLevelsTier2()) {
+        else if (level >= LoadProperties.fishingTier2) {
             fishingTier =  2;
         }
         else {
@@ -76,35 +75,37 @@ public class Fishing {
 
         switch (getFishingLootTier(PP)) {
         case 1:
-            rewards = TreasuresConfig.getInstance().fishingRewardsTier1;
+            rewards = LoadTreasures.fishingRewardsTier1;
             break;
 
         case 2:
-            rewards = TreasuresConfig.getInstance().fishingRewardsTier2;
+            rewards = LoadTreasures.fishingRewardsTier2;
             break;
 
         case 3:
-            rewards = TreasuresConfig.getInstance().fishingRewardsTier3;
+            rewards = LoadTreasures.fishingRewardsTier3;
             break;
 
         case 4:
-            rewards = TreasuresConfig.getInstance().fishingRewardsTier4;
+            rewards = LoadTreasures.fishingRewardsTier4;
             break;
 
         case 5:
-            rewards = TreasuresConfig.getInstance().fishingRewardsTier5;
+            rewards = LoadTreasures.fishingRewardsTier5;
             break;
 
         default:
             break;
         }
 
-        if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0 && Permissions.getInstance().fishingTreasures(player)) {
-            FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
+        if (LoadProperties.fishingDrops) {
+            if (rewards.size() > 0) {
+                FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
 
-            if (random.nextDouble() * 100 <= treasure.getDropChance()) {
-                Users.getProfile(player).addXP(player, SkillType.FISHING, treasure.getXp());
-                theCatch.setItemStack(treasure.getDrop());
+                if (random.nextDouble() * 100 <= treasure.getDropChance()) {
+                    Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
+                    theCatch.setItemStack(treasure.getDrop());
+                }
             }
         }
         else {
@@ -117,7 +118,7 @@ public class Fishing {
             theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); //Change durability to random value
         }
 
-        PP.addXP(player, SkillType.FISHING, Config.getInstance().getFishingBaseXP());
+        PP.addXP(SkillType.FISHING, LoadProperties.mfishing);
         Skills.XpCheckSkill(SkillType.FISHING, player);
     }
 
@@ -131,16 +132,16 @@ public class Fishing {
         PlayerProfile PP = Users.getProfile(player);
 
         getFishingResults(player, event);
-        Item theCatch = (Item) event.getCaught();
+        Item theCatch = (Item)event.getCaught();
 
         if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
             final int ENCHANTMENT_CHANCE = 10;
             boolean enchanted = false;
             ItemStack fishingResults = theCatch.getItemStack();
 
-            player.sendMessage(LocaleLoader.getString("Fishing.ItemFound"));
+            player.sendMessage(mcLocale.getString("Fishing.ItemFound"));
             if (ItemChecks.isArmor(fishingResults) || ItemChecks.isTool(fishingResults)) {
-                if (random.nextInt(100) <= ENCHANTMENT_CHANCE && Permissions.getInstance().fishingMagic(player)) {
+                if (random.nextInt(100) <= ENCHANTMENT_CHANCE) {
                     for (Enchantment newEnchant : Enchantment.values()) {
                         if (newEnchant.canEnchantItem(fishingResults)) {
                             Map<Enchantment, Integer> resultEnchantments = fishingResults.getEnchantments();
@@ -168,7 +169,7 @@ public class Fishing {
             }
 
             if (enchanted) {
-                player.sendMessage(LocaleLoader.getString("Fishing.MagicFound"));
+                player.sendMessage(mcLocale.getString("Fishing.MagicFound"));
             }
         }
     }
@@ -187,91 +188,91 @@ public class Fishing {
 
         switch (type) {
         case BLAZE:
-            Misc.dropItem(loc, new ItemStack(Material.BLAZE_ROD));
+            m.mcDropItem(loc, new ItemStack(Material.BLAZE_ROD));
             break;
 
         case CAVE_SPIDER:
             if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.SPIDER_EYE));
+                m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE));
             }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.STRING));
+                m.mcDropItem(loc, new ItemStack(Material.STRING));
             }
             break;
 
         case CHICKEN:
             if (DROP_NUMBER > 66) {
-                Misc.dropItem(loc, new ItemStack(Material.FEATHER));
+                m.mcDropItem(loc, new ItemStack(Material.FEATHER));
             }
             else if (DROP_NUMBER > 33) {
-                Misc.dropItem(loc, new ItemStack(Material.RAW_CHICKEN));
+                m.mcDropItem(loc, new ItemStack(Material.RAW_CHICKEN));
                 }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.EGG));
+                m.mcDropItem(loc, new ItemStack(Material.EGG));
             }
             break;
 
         case COW:
             if (DROP_NUMBER > 99) {
-                Misc.dropItem(loc, new ItemStack(Material.MILK_BUCKET));
+                m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET));
             }
             else if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.LEATHER));
+                m.mcDropItem(loc, new ItemStack(Material.LEATHER));
             }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.RAW_BEEF));
+                m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF));
             }
             break;
 
         case CREEPER:
-            Misc.dropItem(loc, new ItemStack(Material.SULPHUR));
+            m.mcDropItem(loc, new ItemStack(Material.SULPHUR));
             break;
 
         case ENDERMAN:
-            Misc.dropItem(loc, new ItemStack(Material.ENDER_PEARL));
+            m.mcDropItem(loc, new ItemStack(Material.ENDER_PEARL));
             break;
 
         case GHAST:
             if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.SULPHUR));
+                m.mcDropItem(loc, new ItemStack(Material.SULPHUR));
             }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.GHAST_TEAR));
+                m.mcDropItem(loc, new ItemStack(Material.GHAST_TEAR));
             }
             break;
 
         case MAGMA_CUBE:
-            Misc.dropItem(loc, new ItemStack(Material.MAGMA_CREAM));
+            m.mcDropItem(loc, new ItemStack(Material.MAGMA_CREAM));
             break;
 
         case MUSHROOM_COW:
             if (DROP_NUMBER > 99) {
-                Misc.dropItem(loc, new ItemStack(Material.MILK_BUCKET));
+                m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET));
             }
             else if (DROP_NUMBER > 98) {
-                Misc.dropItem(loc, new ItemStack(Material.MUSHROOM_SOUP));
+                m.mcDropItem(loc, new ItemStack(Material.MUSHROOM_SOUP));
             }
             else if (DROP_NUMBER > 66) {
-                Misc.dropItem(loc, new ItemStack(Material.LEATHER));
+                m.mcDropItem(loc, new ItemStack(Material.LEATHER));
             }
             else if (DROP_NUMBER > 33) {
-                Misc.dropItem(loc, new ItemStack(Material.RAW_BEEF));
+                m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF));
             }
             else {
-                Misc.dropItems(loc, new ItemStack(Material.RED_MUSHROOM), 3);
+                m.mcDropItems(loc, new ItemStack(Material.RED_MUSHROOM), 3);
             }
             break;
 
         case PIG:
-            Misc.dropItem(loc, new ItemStack(Material.PORK));
+            m.mcDropItem(loc, new ItemStack(Material.PORK));
             break;
 
         case PIG_ZOMBIE:
             if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.ROTTEN_FLESH));
+                m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH));
             }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.GOLD_NUGGET));
+                m.mcDropItem(loc, new ItemStack(Material.GOLD_NUGGET));
             }
             break;
 
@@ -285,48 +286,48 @@ public class Fishing {
                 ItemStack theWool = wool.toItemStack();
                 theWool.setAmount(1 + random.nextInt(6));
 
-                Misc.dropItem(loc, theWool);
+                m.mcDropItem(loc, theWool);
                 sheep.setSheared(true);
             }
             break;
 
         case SKELETON:
             if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.BONE));
+                m.mcDropItem(loc, new ItemStack(Material.BONE));
             }
             else {
-                Misc.dropItems(loc, new ItemStack(Material.ARROW), 3);
+                m.mcDropItems(loc, new ItemStack(Material.ARROW), 3);
             }
             break;
 
         case SLIME:
-            Misc.dropItem(loc, new ItemStack(Material.SLIME_BALL));
+            m.mcDropItem(loc, new ItemStack(Material.SLIME_BALL));
             break;
 
         case SNOWMAN:
             if (DROP_NUMBER > 99) {
-                Misc.dropItem(loc, new ItemStack(Material.PUMPKIN));
+                m.mcDropItem(loc, new ItemStack(Material.PUMPKIN));
             }
             else {
-                Misc.dropItems(loc, new ItemStack(Material.SNOW_BALL), 5);
+                m.mcDropItems(loc, new ItemStack(Material.SNOW_BALL), 5);
             }
             break;
 
         case SPIDER:
             if (DROP_NUMBER > 50) {
-                Misc.dropItem(loc, new ItemStack(Material.SPIDER_EYE));
+                m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE));
             }
             else {
-                Misc.dropItem(loc, new ItemStack(Material.STRING));
+                m.mcDropItem(loc, new ItemStack(Material.STRING));
             }
             break;
 
         case SQUID:
-            Misc.dropItem(loc, new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x0));
+            m.mcDropItem(loc, new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x0));
             break;
 
         case ZOMBIE:
-            Misc.dropItem(loc, new ItemStack(Material.ROTTEN_FLESH));
+            m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH));
             break;
 
         default:

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
+import org.bukkit.Bukkit;
 import org.bukkit.CropState;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -12,18 +13,16 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.runnables.GreenThumbTimer;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
-import com.gmail.nossr50.util.Permissions;
 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 Herbalism {
 
@@ -38,30 +37,72 @@ public class Herbalism {
     public static void greenTerra(Player player, Block block) {
         PlayerInventory inventory = player.getInventory();
         boolean hasSeeds = inventory.contains(Material.SEEDS);
+        Material type = block.getType();
 
         if (!hasSeeds) {
             player.sendMessage("You need more seeds to spread Green Terra");  //TODO: Needs more locale.
         }
         else if (hasSeeds && !block.getType().equals(Material.WHEAT)) {
             inventory.removeItem(new ItemStack(Material.SEEDS));
-            player.updateInventory();   // Needed until replacement available
-            greenTerraConvert(player, block);
+            player.updateInventory();
+
+            if (m.blockBreakSimulate(block, player, false)) {
+                if (LoadProperties.enableSmoothToMossy && type.equals(Material.SMOOTH_BRICK)) {
+                    block.setData((byte) 0x1); //Set type of the brick to mossy
+                }
+                else if (LoadProperties.enableDirtToGrass && type.equals(Material.DIRT)) {
+                    block.setType(Material.GRASS);
+                }
+                else if (LoadProperties.enableCobbleToMossy && type.equals(Material.COBBLESTONE)) {
+                    block.setType(Material.MOSSY_COBBLESTONE);
+                }
+            }
         }
     }
-    
-    public static void greenTerraConvert(Player player, Block block) {
-        Material type = block.getType();
-        
-        if (Misc.blockBreakSimulate(block, player, false)) {
-            if (Config.getInstance().getHerbalismGreenThumbSmoothbrickToMossy() && type == Material.SMOOTH_BRICK && block.getData() == 0) {
-                block.setTypeIdAndData(block.getTypeId(), (byte) 1, false); //Set type of the brick to mossy, force the client update
-            }
-            else if (Config.getInstance().getHerbalismGreenThumbDirtToGrass() && type == Material.DIRT) {
-                block.setType(Material.GRASS);
-            }
-            else if (Config.getInstance().getHerbalismGreenThumbCobbleToMossy() && type == Material.COBBLESTONE) {
-                block.setType(Material.MOSSY_COBBLESTONE);
-            }
+
+    /**
+     * Check if a block can be made mossy.
+     *
+     * @param material The type of Block to check
+     * @return true if the block can be made mossy, false otherwise
+     */
+    public static Boolean makeMossy(Material type) {
+        switch (type) {
+        case COBBLESTONE:
+        case DIRT:
+        case SMOOTH_BRICK:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Check if a block is affected by Herbalism abilities.
+     *
+     * @param type The type of Block to check
+     * @return true if the block is affected, false otherwise
+     */
+    public static Boolean canBeGreenTerra(Material type){
+        switch (type) {
+        case BROWN_MUSHROOM:
+        case CACTUS:
+        case CROPS:
+        case JACK_O_LANTERN:
+        case MELON_BLOCK:
+        case NETHER_WARTS:
+        case PUMPKIN:
+        case RED_MUSHROOM:
+        case RED_ROSE:
+        case SUGAR_CANE_BLOCK:
+        case VINE:
+        case WATER_LILY:
+        case YELLOW_FLOWER:
+            return true;
+
+        default:
+            return false;
         }
     }
 
@@ -84,19 +125,16 @@ public class Herbalism {
         Byte data = block.getData();
         Location loc = block.getLocation();
         Material mat = null;
-
         int xp = 0;
         int catciDrops = 0;
         int caneDrops = 0;
 
-        boolean customPlant = false;
-
         switch (type) {
         case BROWN_MUSHROOM:
         case RED_MUSHROOM:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = Material.getMaterial(id);
-                xp = Config.getInstance().getHerbalismXPMushrooms();
+                xp = LoadProperties.mmushroom;
             }
             break;
 
@@ -105,11 +143,11 @@ public class Herbalism {
                 Block b = block.getRelative(0, y, 0);
                 if (b.getType().equals(Material.CACTUS)) {
                     mat = Material.CACTUS;
-                    if (!mcMMO.placeStore.isTrue(b)) {
+                    if (!b.hasMetadata("mcmmoPlacedBlock")) {
                         if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
                             catciDrops++;
                         }
-                        xp += Config.getInstance().getHerbalismXPCactus();
+                        xp += LoadProperties.mcactus;
                     }
                 }
             }
@@ -118,41 +156,41 @@ public class Herbalism {
         case CROPS:
             if (data == CropState.RIPE.getData()) {
                 mat = Material.WHEAT;
-                xp = Config.getInstance().getHerbalismXPWheat();
+                xp = LoadProperties.mwheat;
 
-                if (Permissions.getInstance().greenThumbWheat(player)) {
+                if (LoadProperties.wheatRegrowth && mcPermissions.getInstance().greenThumbWheat(player)) {
                     greenThumbWheat(block, player, event, plugin);
                 }
             }
             break;
 
         case MELON_BLOCK:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = Material.MELON;
-                xp = Config.getInstance().getHerbalismXPMelon();
+                xp = LoadProperties.mmelon;
             }
             break;
 
         case NETHER_WARTS:
             if (data == (byte) 0x3) {
                 mat = Material.NETHER_STALK;
-                xp = Config.getInstance().getHerbalismXPNetherWart();
+                xp = LoadProperties.mnetherwart;
             }
             break;
 
         case PUMPKIN:
         case JACK_O_LANTERN:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = Material.getMaterial(id);
-                xp = Config.getInstance().getHerbalismXPPumpkin();
+                xp = LoadProperties.mpumpkin;
             }
             break;
 
         case RED_ROSE:
         case YELLOW_FLOWER:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = Material.getMaterial(id);
-                xp = Config.getInstance().getHerbalismXPFlowers();
+                xp = LoadProperties.mflower;
             }
             break;
 
@@ -161,134 +199,61 @@ public class Herbalism {
                 Block b = block.getRelative(0, y, 0);
                 if (b.getType().equals(Material.SUGAR_CANE_BLOCK)) {
                     mat = Material.SUGAR_CANE;
-                    if (!mcMMO.placeStore.isTrue(b)) {
+                    if (!b.hasMetadata("mcmmoPlacedBlock")) {
                         if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
                             caneDrops++;
                         }
-                        xp += Config.getInstance().getHerbalismXPSugarCane();
+                        xp += LoadProperties.msugar;
                     }
                 }
             }
             break;
 
         case VINE:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = type;
-                xp = Config.getInstance().getHerbalismXPVines();
+                xp = LoadProperties.mvines;
             }
             break;
 
         case WATER_LILY:
-            if (!mcMMO.placeStore.isTrue(block)) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
                 mat = type;
-                xp = Config.getInstance().getHerbalismXPLilyPads();
+                xp = LoadProperties.mlilypad;
             }
             break;
 
         default:
-            if (Config.getInstance().getBlockModsEnabled() && CustomBlocksConfig.getInstance().customHerbalismBlocks.contains(new ItemStack(block.getTypeId(), 1, (short) 0, block.getData()))) {
-                customPlant = true;
-                xp = ModChecks.getCustomBlock(block).getXpGain();
-            }
             break;
         }
 
-        if (mat == null && !customPlant) {
+        if (mat == null) {
             return;
-        }
-
-        if (Permissions.getInstance().herbalismDoubleDrops(player)) {
-            ItemStack is = null;
-
-            if (customPlant) {
-                is = new ItemStack(ModChecks.getCustomBlock(block).getItemDrop());
-            }
-            else {
-                is = new ItemStack(mat);
-            }
+        } else if (mcPermissions.getInstance().herbalismDoubleDrops(player)) {
+            ItemStack is = new ItemStack(mat);
 
             if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
-                Config configInstance = Config.getInstance();
-
-                switch (type) {
-                case BROWN_MUSHROOM:
-                    if (configInstance.getBrownMushroomsDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case CACTUS:
-                    if (configInstance.getCactiDoubleDropsEnabled()) {
-                        Misc.dropItems(loc, is, catciDrops);
-                    }
-                    break;
-
-                case CROPS:
-                    if (configInstance.getWheatDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case MELON_BLOCK:
-                    if (configInstance.getMelonsDoubleDropsEnabled()) {
-                        Misc.dropItems(loc, is, 3);
-                        Misc.randomDropItems(loc, is, 50, 4);
-                    }
-                    break;
-
-                case NETHER_WARTS:
-                    if (configInstance.getNetherWartsDoubleDropsEnabled()) {
-                        Misc.dropItems(loc, is, 2);
-                        Misc.randomDropItems(loc, is, 50, 3);
-                    }
-                    break;
-
-                case PUMPKIN:
-                    if (configInstance.getPumpkinsDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case RED_MUSHROOM:
-                    if (configInstance.getRedMushroomsDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case SUGAR_CANE_BLOCK:
-                    if (configInstance.getSugarCaneDoubleDropsEnabled()) {
-                        Misc.dropItems(loc, is, caneDrops);
-                    }
-                    break;
-
-                case VINE:
-                    if (configInstance.getVinesDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case WATER_LILY:
-                    if (configInstance.getWaterLiliesDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                case YELLOW_FLOWER:
-                    if (configInstance.getYellowFlowersDoubleDropsEnabled()) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
-
-                default:
-                    if (customPlant) {
-                        Misc.dropItem(loc, is);
-                    }
-                    break;
+                if (type.equals(Material.CACTUS)) {
+                    m.mcDropItems(loc, is, catciDrops);
+                }
+                else if (type.equals(Material.MELON_BLOCK)) {
+                    m.mcDropItems(loc, is, 3);
+                    m.mcRandomDropItems(loc, is, 50, 4);
+                }
+                else if (type.equals(Material.NETHER_WARTS)) {
+                    m.mcDropItems(loc, is, 2);
+                    m.mcRandomDropItems(loc, is, 50, 3);
+                }
+                else if (type.equals(Material.SUGAR_CANE_BLOCK)) {
+                    m.mcDropItems(loc, is, caneDrops);
+                }
+                else {
+                    m.mcDropItem(loc, is);
                 }
             }
         }
-
-        PP.addXP(player, SkillType.HERBALISM, xp);
+        
+        PP.addXP(SkillType.HERBALISM, xp);
         Skills.XpCheckSkill(SkillType.HERBALISM, player);
     }
 
@@ -312,13 +277,13 @@ public class Herbalism {
         if (hasSeeds && PP.getAbilityMode(AbilityType.GREEN_TERRA) || hasSeeds && (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1500) <= herbLevel)) {
             event.setCancelled(true);
 
-            Misc.dropItem(loc, new ItemStack(Material.WHEAT));
-            Misc.randomDropItems(loc, new ItemStack(Material.SEEDS), 50, 3);
+            m.mcDropItem(loc, new ItemStack(Material.WHEAT));
+            m.mcRandomDropItems(loc, new ItemStack(Material.SEEDS), 50, 3);
 
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new GreenThumbTimer(block, PP), 1);
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new GreenThumbTimer(block, PP), 1);
 
             inventory.removeItem(new ItemStack(Material.SEEDS));
-            player.updateInventory();   // Needed until replacement available
+            player.updateInventory();
         }
     }
 
@@ -339,10 +304,10 @@ public class Herbalism {
         player.setItemInHand(new ItemStack(Material.SEEDS, seeds - 1));
 
         if (skillLevel > MAX_BONUS_LEVEL || random.nextInt(1500) <= skillLevel) {
-            greenTerraConvert(player, block);
+            greenTerra(player, block);
         }
         else {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail"));
+            player.sendMessage(mcLocale.getString("mcPlayerListener.GreenThumbFail"));
         }
     }
 }

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

@@ -2,98 +2,30 @@ package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
+import org.bukkit.Bukkit;
 import org.bukkit.CoalType;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.getspout.spoutapi.sound.SoundEffect;
+import org.bukkit.enchantments.Enchantment;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutSounds;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 
 public class Mining {
+
     private static Random random = new Random();
 
-    /**
-     * Handle double drops when using Silk Touch.
-     *
-     * @param block The block to process drops for
-     */
-    private static void silkTouchDrops(Block block) {
-        Location loc = block.getLocation();
-        Material type = block.getType();
-        ItemStack item = new ItemStack(type);
-        Config configInstance = Config.getInstance();
-
-        switch (type) {
-        case ENDER_STONE:
-        case GOLD_ORE:
-        case IRON_ORE:
-        case MOSSY_COBBLESTONE:
-        case NETHERRACK:
-        case OBSIDIAN:
-        case SANDSTONE:
-            miningDrops(block);
-            break;
-
-        case COAL_ORE:
-            if (configInstance.getCoalDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case DIAMOND_ORE:
-            if (configInstance.getDiamondDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case GLOWING_REDSTONE_ORE:
-        case REDSTONE_ORE:
-            if (configInstance.getRedstoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case GLOWSTONE:
-            if (configInstance.getGlowstoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case LAPIS_ORE:
-            if (configInstance.getLapisDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case STONE:
-            if (configInstance.getStoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        default:
-            if (ModChecks.isCustomMiningBlock(block)) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-        }
-
-    }
-
     /**
      * Drop items from Mining & Blast Mining skills.
      *
@@ -103,102 +35,44 @@ public class Mining {
         Location loc = block.getLocation();
         Material type = block.getType();
         ItemStack item = new ItemStack(type);
-        Config configInstance = Config.getInstance();
 
         switch (type) {
         case COAL_ORE:
-            if (configInstance.getCoalDoubleDropsEnabled()) {
-                item = new ItemStack(Material.COAL, 1, (short) 0, CoalType.COAL.getData());
-                Misc.dropItem(loc, item);
-            }
+            item = new ItemStack(Material.COAL, 1, (short) 0, CoalType.COAL.getData());
+            m.mcDropItem(loc, item);
             break;
 
         case DIAMOND_ORE:
-            if (configInstance.getDiamondDoubleDropsEnabled()) {
-                item = new ItemStack(Material.DIAMOND);
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case ENDER_STONE:
-            if (configInstance.getEndStoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
+            item = new ItemStack(Material.DIAMOND);
+            m.mcDropItem(loc, item);
             break;
 
         case GLOWING_REDSTONE_ORE:
         case REDSTONE_ORE:
-            if (configInstance.getRedstoneDoubleDropsEnabled()) {
-                item = new ItemStack(Material.REDSTONE);
-                Misc.dropItems(loc, item, 4);
-                Misc.randomDropItem(loc, item, 50);
-            }
+            item = new ItemStack(Material.REDSTONE);
+            m.mcDropItems(loc, item, 4);
+            m.mcRandomDropItem(loc, item, 50);
             break;
 
         case GLOWSTONE:
-            if (configInstance.getGlowstoneDoubleDropsEnabled()) {
-                item = new ItemStack(Material.GLOWSTONE_DUST);
-                Misc.dropItems(loc, item, 2);
-                Misc.randomDropItems(loc, item, 50, 2);
-            }
-            break;
-
-        case GOLD_ORE:
-            if (configInstance.getGoldDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case IRON_ORE:
-            if (configInstance.getIronDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
+            item = new ItemStack(Material.GLOWSTONE_DUST);
+            m.mcDropItems(loc, item, 2);
+            m.mcRandomDropItems(loc, item, 50, 2);
             break;
 
         case LAPIS_ORE:
-            if (configInstance.getLapisDoubleDropsEnabled()) {
-                item = new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x4);
-                Misc.dropItems(loc, item, 4);
-                Misc.randomDropItems(loc, item, 50, 4);
-            }
-            break;
-
-        case MOSSY_COBBLESTONE:
-            if (configInstance.getMossyCobblestoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case NETHERRACK:
-            if (configInstance.getNetherrackDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case OBSIDIAN:
-            if (configInstance.getObsidianDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
-            break;
-
-        case SANDSTONE:
-            if (configInstance.getSandstoneDoubleDropsEnabled()) {
-                Misc.dropItem(loc, item);
-            }
+            item = new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x4);
+            m.mcDropItems(loc, item, 4);
+            m.mcRandomDropItems(loc, item, 50, 4);
             break;
 
         case STONE:
-            if (configInstance.getStoneDoubleDropsEnabled()) {
-                item = new ItemStack(Material.COBBLESTONE);
-                Misc.dropItem(loc, item);
-            }
+            item = new ItemStack(Material.COBBLESTONE);
+            m.mcDropItem(loc, item);
             break;
 
         default:
-            if (ModChecks.isCustomMiningBlock(block)) {
-                item = ModChecks.getCustomBlock(block).getItemDrop();
-                Misc.dropItem(loc, item);
-            }
+            m.mcDropItem(loc, item);
             break;
         }
     }
@@ -216,66 +90,63 @@ public class Mining {
         
         switch (type) {
         case COAL_ORE:
-            xp += Config.getInstance().getMiningXPCoalOre();
+            xp += LoadProperties.mcoal;
             break;
 
         case DIAMOND_ORE:
-            xp += Config.getInstance().getMiningXPDiamondOre();
+            xp += LoadProperties.mdiamond;
             break;
 
         case ENDER_STONE:
-            xp += Config.getInstance().getMiningXPEndStone();
+            xp += LoadProperties.mendstone;
             break;
 
         case GLOWING_REDSTONE_ORE:
         case REDSTONE_ORE:
-            xp += Config.getInstance().getMiningXPRedstoneOre();
+            xp += LoadProperties.mredstone;
             break;
 
         case GLOWSTONE:
-            xp += Config.getInstance().getMiningXPGlowstone();
+            xp += LoadProperties.mglowstone;
             break;
 
         case GOLD_ORE:
-            xp += Config.getInstance().getMiningXPGoldOre();
+            xp += LoadProperties.mgold;
             break;
 
         case IRON_ORE:
-            xp += Config.getInstance().getMiningXPIronOre();
+            xp += LoadProperties.miron;
             break;
 
         case LAPIS_ORE:
-            xp += Config.getInstance().getMiningXPLapisOre();
+            xp += LoadProperties.mlapis;
             break;
 
         case MOSSY_COBBLESTONE:
-            xp += Config.getInstance().getMiningXPMossyStone();
+            xp += LoadProperties.mmossstone;
             break;
 
         case NETHERRACK:
-            xp += Config.getInstance().getMiningXPNetherrack();
+            xp += LoadProperties.mnetherrack;
             break;
 
         case OBSIDIAN:
-            xp += Config.getInstance().getMiningXPObsidian();
+            xp += LoadProperties.mobsidian;
             break;
 
         case SANDSTONE:
-            xp += Config.getInstance().getMiningXPSandstone();
+            xp += LoadProperties.msandstone;
             break;
 
         case STONE:
-            xp += Config.getInstance().getMiningXPStone();
+            xp += LoadProperties.mstone;
             break;
 
         default:
-            if (ModChecks.isCustomMiningBlock(block)) {
-                xp += ModChecks.getCustomBlock(block).getXpGain();
-            }
             break;
         }
 
-        PP.addXP(player, SkillType.MINING, xp);
+        PP.addXP(SkillType.MINING, xp);
         Skills.XpCheckSkill(SkillType.MINING, player);
     }
 
@@ -286,101 +157,112 @@ public class Mining {
      * @param block The block being broken
      */
     public static void miningBlockCheck(Player player, Block block) {
-        if (mcMMO.placeStore.isTrue(block)) {
+        if (block.hasMetadata("mcmmoPlacedBlock")) {
             return;
         }
 
         miningXP(player, block);
 
-        final int MAX_BONUS_LEVEL = 1000;
-        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
-        int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+        if (canBeSuperBroken(block.getType())) {
+            final int MAX_BONUS_LEVEL = 1000;
 
-        if (random.nextInt(1000) <= skillCheck && Permissions.getInstance().miningDoubleDrops(player)) {
-            if (player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
-                silkTouchDrops(block);
-            }
-            else {
-                miningDrops(block);
+            int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
+
+            if ((skillLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= skillLevel) && mcPermissions.getInstance().miningDoubleDrops(player)) {
+                if (player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
+                    m.mcDropItem(block.getLocation(), new ItemStack(block.getType()));
+                }
+                else {
+                    miningDrops(block);
+                }
             }
         }
     }
 
+    /**
+     * Check to see if a block is broken by Super Breaker.
+     *
+     * @param type The type of Block to check
+     * @return true if the block would be broken by Super Breaker, false otherwise
+     */
+    public static Boolean canBeSuperBroken(Material type) {
+        switch (type) {
+        case COAL_ORE:
+        case DIAMOND_ORE:
+        case ENDER_STONE:
+        case GLOWING_REDSTONE_ORE:
+        case GLOWSTONE:
+        case GOLD_ORE:
+        case IRON_ORE:
+        case LAPIS_ORE:
+        case MOSSY_COBBLESTONE:
+        case NETHERRACK:
+        case OBSIDIAN:
+        case REDSTONE_ORE:
+        case SANDSTONE:
+        case STONE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
     /**
      * Handle the Super Breaker ability.
      *
      * @param player The player using the ability
      * @param block The block being affected
      */
-    public static void superBreakerBlockCheck(Player player, Block block) {
+    public static void SuperBreakerBlockCheck(Player player, Block block) {
         Material type = block.getType();
-        int tier = Misc.getTier(player.getItemInHand());
-        int durabilityLoss = Config.getInstance().getAbilityToolDamage();
+        int tier = m.getTier(player.getItemInHand());
+        int durabilityLoss = LoadProperties.abilityDurabilityLoss;
         FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
 
-        if (ModChecks.isCustomMiningBlock(block)) {
-            if (ModChecks.getCustomBlock(block).getTier() < tier) {
+        switch (type) {
+        case OBSIDIAN:
+            if (tier < 4) {
+                return;
+            }
+            durabilityLoss = durabilityLoss * 5; //Obsidian needs to do more damage than normal
+            /* FALL THROUGH */
+
+        case DIAMOND_ORE:
+        case GLOWING_REDSTONE_ORE:
+        case GOLD_ORE:
+        case LAPIS_ORE:
+        case REDSTONE_ORE:
+            if (tier < 3) {
+                return;
+            }
+            /* FALL THROUGH */
+
+        case IRON_ORE:
+            if (tier < 2) {
+                return;
+            }
+            /* FALL THROUGH */
+
+        case COAL_ORE:
+        case ENDER_STONE:
+        case GLOWSTONE:
+        case MOSSY_COBBLESTONE:
+        case NETHERRACK:
+        case SANDSTONE:
+        case STONE:
+            if (block.hasMetadata("mcmmoPlacedBlock")) {
                 return;
             }
 
-            if (mcMMO.placeStore.isTrue(block)) {
-                return;
-            }
-
-            mcMMO.p.getServer().getPluginManager().callEvent(armswing);
+            Bukkit.getPluginManager().callEvent(armswing);
             Skills.abilityDurabilityLoss(player.getItemInHand(), durabilityLoss);
 
             miningBlockCheck(player, block);
 
-            if (Config.getInstance().spoutEnabled) {
+            if (LoadProperties.spoutEnabled) {
                 SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
             }
         }
-        else {
-            switch (type) {
-            case OBSIDIAN:
-                if (tier < 4) {
-                    return;
-                }
-                durabilityLoss = durabilityLoss * 5; //Obsidian needs to do more damage than normal
-                /* FALL THROUGH */
-
-            case DIAMOND_ORE:
-            case GLOWING_REDSTONE_ORE:
-            case GOLD_ORE:
-            case LAPIS_ORE:
-            case REDSTONE_ORE:
-                if (tier < 3) {
-                    return;
-                }
-                /* FALL THROUGH */
-
-            case IRON_ORE:
-                if (tier < 2) {
-                    return;
-                }
-                /* FALL THROUGH */
-
-            case COAL_ORE:
-            case ENDER_STONE:
-            case GLOWSTONE:
-            case MOSSY_COBBLESTONE:
-            case NETHERRACK:
-            case SANDSTONE:
-            case STONE:
-                if (mcMMO.placeStore.isTrue(block)) {
-                    return;
-                }
-
-                mcMMO.p.getServer().getPluginManager().callEvent(armswing);
-                Skills.abilityDurabilityLoss(player.getItemInHand(), durabilityLoss);
-
-                miningBlockCheck(player, block);
-
-                if (Config.getInstance().spoutEnabled) {
-                    SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
-                }
-            }
-        }
     }
 }

src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.gathering;
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.TreeSpecies;
 import org.bukkit.block.Block;
@@ -11,22 +10,19 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Tree;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.Bukkit;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.spout.SpoutSounds;
-import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Combat;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 import org.getspout.spoutapi.sound.SoundEffect;
 
@@ -58,8 +54,8 @@ public class WoodCutting {
      * @param PP The PlayerProfile of the player
      */
     private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP) {
-        if (toBeFelled.size() >= Config.getInstance().getTreeFellerThreshold()) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFellerThreshold"));
+        if (toBeFelled.size() >= LoadProperties.treeFellerThreshold) {
+            player.sendMessage(mcLocale.getString("Skills.Woodcutting.TreeFellerThreshold"));
             return;
         }
 
@@ -72,7 +68,7 @@ public class WoodCutting {
 
         /* This is to prevent using wood axes everytime you tree fell */
         if ((inHand.getDurability() + durabilityLoss >= inHand.getType().getMaxDurability()) || inHand.getType().equals(Material.AIR)) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFeller.Splinter"));
+            player.sendMessage(mcLocale.getString("TreeFeller.AxeSplinters"));
 
             int health = player.getHealth();
 
@@ -90,34 +86,8 @@ public class WoodCutting {
         ItemStack jungle = new ItemStack(Material.LOG, 1, (short) 0, TreeSpecies.JUNGLE.getData());
         
         for (Block x : toBeFelled) {
-            if (Misc.blockBreakSimulate(x, player, true)) {
-                if (Config.getInstance().getBlockModsEnabled()) {
-                    CustomBlock block = ModChecks.getCustomBlock(x);
-                    item = block.getItemDrop();
-
-                    if (ModChecks.isCustomLogBlock(x)) {
-                        if (!mcMMO.placeStore.isTrue(x)) {
-                            WoodCutting.woodCuttingProcCheck(player, x);
-                            xp = block.getXpGain();
-                        }
-
-                        /* Remove the block */
-                        x.setData((byte) 0x0);
-                        x.setType(Material.AIR);
-
-                        Misc.dropItem(x.getLocation(), item);
-                    }
-                    else if (ModChecks.isCustomLeafBlock(x)) {
-                        final int SAPLING_DROP_CHANCE = 10;
-
-                        /* Remove the block */
-                        x.setData((byte) 0x0);
-                        x.setType(Material.AIR);
-
-                        Misc.randomDropItem(x.getLocation(), item, SAPLING_DROP_CHANCE);
-                    }
-                }
-                else if (x.getType() == Material.LOG) {
+            if (m.blockBreakSimulate(x, player, true)) {
+                if (x.getType() == Material.LOG) {
                     Tree tree = (Tree) x.getState().getData();
                     TreeSpecies species = tree.getSpecies();
 
@@ -142,24 +112,24 @@ public class WoodCutting {
                         break;
                     }
 
-                    if (!mcMMO.placeStore.isTrue(x)) {
+                    if (!x.hasMetadata("mcmmoPlacedBlock")) {
                         WoodCutting.woodCuttingProcCheck(player, x);
 
                         switch (species) {
                             case GENERIC:
-                                xp += Config.getInstance().getWoodcuttingXPOak();
+                                xp += LoadProperties.moak;
                                 break;
 
                             case REDWOOD:
-                                xp += Config.getInstance().getWoodcuttingXPSpruce();
+                                xp += LoadProperties.mspruce;
                                 break;
 
                             case BIRCH:
-                                xp += Config.getInstance().getWoodcuttingXPBirch();
+                                xp += LoadProperties.mbirch;
                                 break;
 
                             case JUNGLE:
-                                xp += Config.getInstance().getWoodcuttingXPJungle() / 4; //Nerf XP from Jungle Trees when using Tree Feller
+                                xp += LoadProperties.mjungle / 4; //Nerf XP from Jungle Trees when using Tree Feller
                                 break;
 
                             default:
@@ -172,13 +142,13 @@ public class WoodCutting {
                     x.setType(Material.AIR);
 
                     /* Drop the block */
-                    Misc.dropItem(x.getLocation(), item);
+                    m.mcDropItem(x.getLocation(), item);
                 }
                 else if (x.getType() == Material.LEAVES) {
                     final int SAPLING_DROP_CHANCE = 10;
 
                     item = new ItemStack(Material.SAPLING, 1, (short) 0, (byte) (x.getData() & 3)); //Drop the right type of sapling
-                    Misc.randomDropItem(x.getLocation(), item, SAPLING_DROP_CHANCE);
+                    m.mcRandomDropItem(x.getLocation(), item, SAPLING_DROP_CHANCE);
 
                     //Remove the block
                     x.setData((byte) 0);
@@ -187,9 +157,25 @@ public class WoodCutting {
             }
         }
 
-        if (Permissions.getInstance().woodcutting(player)) {
-            PP.addXP(player, SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
-            Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
+        PP.addXP(SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
+        Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
+    }
+
+    /**
+     * Checks if the block is affected by Tree Feller.
+     *
+     * @param block Block to check
+     * @return true if the block is affected by Tree Feller, false otherwise
+     */
+    private static boolean treeFellerCompatible(Block block) {
+        switch (block.getType()) {
+        case LOG:
+        case LEAVES:
+        case AIR:
+            return true;
+
+        default:
+            return false;
         }
     }
 
@@ -202,16 +188,13 @@ public class WoodCutting {
     private static void processTreeFelling(Block currentBlock, ArrayList<Block> toBeFelled) {
         Material type = currentBlock.getType();
         
-        if (toBeFelled.size() >= Config.getInstance().getTreeFellerThreshold()) {
+        if(toBeFelled.size() >= LoadProperties.treeFellerThreshold) {
             return;
         }
 
         if (type.equals(Material.LOG) || type.equals(Material.LEAVES)) {
             toBeFelled.add(currentBlock);
         }
-        else if (Config.getInstance().getBlockModsEnabled() && (ModChecks.isCustomLogBlock(currentBlock) || ModChecks.isCustomLeafBlock(currentBlock))) {
-            toBeFelled.add(currentBlock);
-        }
 
         Block xPositive = currentBlock.getRelative(1, 0, 0);
         Block xNegative = currentBlock.getRelative(-1, 0, 0);
@@ -219,26 +202,26 @@ public class WoodCutting {
         Block zNegative = currentBlock.getRelative(0, 0, -1);
         Block yPositive = currentBlock.getRelative(0, 1, 0);
 
-        if (!mcMMO.placeStore.isTrue(currentBlock)) {
-            if (!isTooAggressive(currentBlock, xPositive) && BlockChecks.treeFellerCompatible(xPositive) && !toBeFelled.contains(xPositive)) {
+        if (!currentBlock.hasMetadata("mcmmoPlacedBlock")) {
+            if (!isTooAggressive(currentBlock, xPositive) && treeFellerCompatible(xPositive) && !toBeFelled.contains(xPositive)) {
                 processTreeFelling(xPositive, toBeFelled);
             }
 
-            if (!isTooAggressive(currentBlock, xNegative) && BlockChecks.treeFellerCompatible(xNegative) && !toBeFelled.contains(xNegative)) {
+            if (!isTooAggressive(currentBlock, xNegative) && treeFellerCompatible(xNegative) && !toBeFelled.contains(xNegative)) {
                 processTreeFelling(xNegative, toBeFelled);
             }
 
-            if (!isTooAggressive(currentBlock, zPositive) && BlockChecks.treeFellerCompatible(zPositive) && !toBeFelled.contains(zPositive)) {
+            if (!isTooAggressive(currentBlock, zPositive) && treeFellerCompatible(zPositive) && !toBeFelled.contains(zPositive)) {
                 processTreeFelling(zPositive, toBeFelled);
             }
 
-            if (!isTooAggressive(currentBlock, zNegative) && BlockChecks.treeFellerCompatible(zNegative) && !toBeFelled.contains(zNegative)) {
+            if (!isTooAggressive(currentBlock, zNegative) && treeFellerCompatible(zNegative) && !toBeFelled.contains(zNegative)) {
                 processTreeFelling(zNegative, toBeFelled);
             }
         }
 
-        if (BlockChecks.treeFellerCompatible(yPositive)) {
-            if(!mcMMO.placeStore.isTrue(currentBlock) && !toBeFelled.contains(yPositive)) {
+        if (treeFellerCompatible(yPositive)) {
+            if(!currentBlock.hasMetadata("mcmmoPlacedBlock") && !toBeFelled.contains(yPositive)) {
                 processTreeFelling(yPositive, toBeFelled);
             }
         }
@@ -253,9 +236,9 @@ public class WoodCutting {
      */
     private static boolean isTooAggressive(Block currentBlock, Block newBlock) {
         Material currentType = currentBlock.getType();
-        Material newType = newBlock.getType();
+        Material newType = currentBlock.getType();
 
-        if ((currentType.equals(Material.LEAVES) || currentType.equals(Material.AIR) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLeafBlock(currentBlock))) && (newType.equals(Material.LEAVES) || newType.equals(Material.AIR) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLeafBlock(currentBlock)))) {
+        if ((currentType.equals(Material.LEAVES) || currentType.equals(Material.AIR)) && (newType.equals(Material.LEAVES) || newType.equals(Material.AIR))) {
             return true;
         }
         else {
@@ -276,54 +259,9 @@ public class WoodCutting {
         byte type = block.getData();
         Material mat = Material.getMaterial(block.getTypeId());
 
-        Tree tree = (Tree) block.getState().getData();
-        TreeSpecies species = tree.getSpecies();
-
-        if ((skillLevel > MAX_SKILL_LEVEL || random.nextInt(1000) <= skillLevel) && Permissions.getInstance().woodcuttingDoubleDrops(player)) {
-            Config configInstance = Config.getInstance();
-            ItemStack item;
-            Location location;
-
-            if (configInstance.getBlockModsEnabled() && ModChecks.isCustomLogBlock(block)) {
-                item = ModChecks.getCustomBlock(block).getItemDrop();
-                location = block.getLocation();
-                Misc.dropItem(location, item);
-                return;
-            }
-            else {
-                item = new ItemStack(mat, 1, (short) 0, type);
-                location = block.getLocation();
-            }
-
-            /* Drop the block */
-            switch (species) {
-            case GENERIC:
-                if (configInstance.getOakDoubleDropsEnabled()) {
-                    Misc.dropItem(location, item);
-                }
-                break;
-
-            case REDWOOD:
-                if (configInstance.getSpruceDoubleDropsEnabled()) {
-                    Misc.dropItem(location, item);
-                }
-                break;
-
-            case BIRCH:
-                if (configInstance.getBirchDoubleDropsEnabled()) {
-                    Misc.dropItem(location, item);
-                }
-                break;
-
-            case JUNGLE:
-                if (configInstance.getJungleDoubleDropsEnabled()) {
-                    Misc.dropItem(location, item);
-                }
-                break;
-
-            default:
-                break;
-            }
+        if ((skillLevel > MAX_SKILL_LEVEL || random.nextInt(1000) <= skillLevel) && mcPermissions.getInstance().woodcuttingDoubleDrops(player)) {
+            ItemStack item = new ItemStack(mat, 1, (short) 0, type);
+            m.mcDropItem(block.getLocation(), item);
         }
     }
 
@@ -338,38 +276,33 @@ public class WoodCutting {
         int xp = 0;
         TreeSpecies species = TreeSpecies.getByData(block.getData());
 
-        if (mcMMO.placeStore.isTrue(block)) {
+        if (block.hasMetadata("mcmmoPlacedBlock")) {
             return;
         }
 
-        if (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(block)) {
-            xp = ModChecks.getCustomBlock(block).getXpGain();
-        }
-        else {
-            switch (species) {
-            case GENERIC:
-                xp += Config.getInstance().getWoodcuttingXPOak();
-                break;
+        switch (species) {
+        case GENERIC:
+            xp += LoadProperties.moak;
+            break;
 
-            case REDWOOD:
-                xp += Config.getInstance().getWoodcuttingXPSpruce();
-                break;
+        case REDWOOD:
+            xp += LoadProperties.mspruce;
+            break;
 
-            case BIRCH:
-                xp += Config.getInstance().getWoodcuttingXPBirch();
-                break;
+        case BIRCH:
+            xp += LoadProperties.mbirch;
+            break;
 
-            case JUNGLE:
-                xp += Config.getInstance().getWoodcuttingXPJungle();
-                break;
+        case JUNGLE:
+            xp += LoadProperties.mjungle;
+            break;
 
-            default:
-                break;
-            }
+        default:
+            break;
         }
 
         WoodCutting.woodCuttingProcCheck(player, block);
-        PP.addXP(player, SkillType.WOODCUTTING, xp);
+        PP.addXP(SkillType.WOODCUTTING, xp);
         Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
     }
 
@@ -381,13 +314,13 @@ public class WoodCutting {
      */
     public static void leafBlower(Player player, Block block) {
         FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
-        mcMMO.p.getServer().getPluginManager().callEvent(armswing);
+        Bukkit.getPluginManager().callEvent(armswing);
 
-        if (Config.getInstance().getWoodcuttingRequiresTool()) {
-            Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
+        if (LoadProperties.woodcuttingrequiresaxe) {
+            Skills.abilityDurabilityLoss(player.getItemInHand(), LoadProperties.abilityDurabilityLoss);
         }
 
-        if (Config.getInstance().spoutEnabled) {
+        if (LoadProperties.spoutEnabled) {
             SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
         }
     }
@@ -395,9 +328,9 @@ public class WoodCutting {
     private static int durabilityLossCalulate(ArrayList<Block> toBeFelled) {
         int durabilityLoss = 0;
         for (Block x : toBeFelled) {
-            if (x.getType().equals(Material.LOG) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(x))) {
+            if (x.getType().equals(Material.LOG)) {
                 durabilityLoss++;
-                durabilityLoss = durabilityLoss + Config.getInstance().getAbilityToolDamage();
+                durabilityLoss = durabilityLoss + LoadProperties.abilityDurabilityLoss;
             }
         }
 

src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java

@@ -8,14 +8,15 @@ import org.bukkit.event.entity.EntityDamageEvent;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 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 Acrobatics {
+
     private static Random random = new Random();
 
     /**
@@ -35,7 +36,7 @@ public class Acrobatics {
         int damage = event.getDamage();
         int health = player.getHealth();
 
-        if (!Permissions.getInstance().gracefulRoll(player)) {
+        if (!mcPermissions.getInstance().gracefulRoll(player)) {
             gracefulRoll = false;
         }
 
@@ -43,7 +44,7 @@ public class Acrobatics {
             acrovar = acrovar * 2;
         }
 
-        if ((acrovar > MAX_BONUS_LEVEL || random.nextInt(1000) <= acrovar) && Permissions.getInstance().roll(player)) {
+        if ((acrovar > MAX_BONUS_LEVEL || random.nextInt(1000) <= acrovar) && mcPermissions.getInstance().roll(player)) {
             int threshold = 7;
 
             if (gracefulRoll) {
@@ -58,7 +59,7 @@ public class Acrobatics {
 
             /* Check for death */
             if (health - damage >= 1) {
-                PP.addXP(player, SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
+                PP.addXP(SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
                 Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 
                 event.setDamage(newDamage);
@@ -68,15 +69,15 @@ public class Acrobatics {
                 }
 
                 if (gracefulRoll) {
-                    player.sendMessage(LocaleLoader.getString("Acrobatics.Ability.Proc"));
+                    player.sendMessage(mcLocale.getString("Acrobatics.GracefulRoll"));
                 }
                 else {
-                    player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text"));
+                    player.sendMessage(mcLocale.getString("Acrobatics.Roll"));
                 }
             }
         }
         else if (health - damage >= 1) {
-            PP.addXP(player, SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
+            PP.addXP(SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
             Skills.XpCheckSkill(SkillType.ACROBATICS, player);
         }
     }
@@ -103,15 +104,15 @@ public class Acrobatics {
             }
         }
 
-        if (Permissions.getInstance().acrobatics(defender)) {
+        if (mcPermissions.getInstance().acrobatics(defender)) {
             int skillLevel = PPd.getSkillLevel(SkillType.ACROBATICS);
-            int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+            int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
-            if (random.nextInt(4000) <= skillCheck && Permissions.getInstance().dodge(defender)) {
-                defender.sendMessage(LocaleLoader.getString("Acrobatics.Combat.Proc"));
+            if (random.nextInt(4000) <= skillCheck && mcPermissions.getInstance().dodge(defender)) {
+                defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
 
                 if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
-                    PPd.addXP(defender, SkillType.ACROBATICS, damage * DODGE_MODIFIER);
+                    PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER);
                     Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
                 }
 

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

@@ -0,0 +1,491 @@
+package com.gmail.nossr50.skills.misc;
+
+import java.util.Map;
+import java.util.Random;
+import java.util.Map.Entry;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import org.getspout.spoutapi.SpoutManager;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.spout.SpoutSounds;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
+import com.gmail.nossr50.locale.mcLocale;
+
+public class Repair {
+
+    private static Random random = new Random();
+
+    /**
+     * Handle all the item repair checks.
+     *
+     * @param player Player repairing the item
+     * @param is The item being repaired
+     */
+    public static void repairCheck(Player player, ItemStack is) {
+        PlayerProfile PP = Users.getProfile(player);
+        short durabilityBefore = is.getDurability();
+        PlayerInventory inventory = player.getInventory();
+        int skillLevel = PP.getSkillLevel(SkillType.REPAIR);
+
+        if (durabilityBefore > 0 && is.getAmount() == 1) {
+
+            /*
+             * REPAIR ARMOR
+             */
+            if (ItemChecks.isArmor(is) && LoadProperties.repairArmor && mcPermissions.getInstance().armorRepair(player)) {
+                if (ItemChecks.isDiamondArmor(is) && inventory.contains(LoadProperties.rDiamond) && skillLevel >= LoadProperties.repairdiamondlevel && mcPermissions.getInstance().diamondRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rDiamond));
+                    xpHandler(player, PP, is, durabilityBefore, 6, true);
+                }
+                else if (ItemChecks.isIronArmor(is) && inventory.contains(LoadProperties.rIron) && skillLevel >= LoadProperties.repairIronLevel && mcPermissions.getInstance().ironRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rIron));
+                    xpHandler(player, PP, is, durabilityBefore, 2, true);
+                }
+                else if (ItemChecks.isGoldArmor(is) && inventory.contains(LoadProperties.rGold) && skillLevel >= LoadProperties.repairGoldLevel && mcPermissions.getInstance().goldRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rGold));
+                    xpHandler(player, PP, is, durabilityBefore, 4, true);
+                }
+                else if (ItemChecks.isLeatherArmor(is) && inventory.contains(LoadProperties.rLeather) && mcPermissions.getInstance().leatherRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rLeather));
+                    xpHandler(player, PP, is, durabilityBefore, 1, true);
+                }
+                else {
+                    needMoreVespeneGas(is, player); //UNABLE TO REPAIR
+                }
+            }
+
+            /*
+             * REPAIR TOOLS
+             */
+            else if (ItemChecks.isTool(is) && LoadProperties.repairTools && mcPermissions.getInstance().toolRepair(player)) {
+                if (ItemChecks.isStoneTool(is) && inventory.contains(LoadProperties.rStone) && skillLevel >= LoadProperties.repairStoneLevel && mcPermissions.getInstance().stoneRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rStone));
+                    xpHandler(player, PP, is, durabilityBefore, 2, false);
+                }
+                else if (ItemChecks.isWoodTool(is) && inventory.contains(LoadProperties.rWood) && mcPermissions.getInstance().woodRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rWood));
+                    xpHandler(player, PP, is, durabilityBefore, 2, false);
+                }
+                else if (ItemChecks.isIronTool(is) && inventory.contains(LoadProperties.rIron) && skillLevel >= LoadProperties.repairIronLevel && mcPermissions.getInstance().ironRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rIron));
+                    xpHandler(player, PP, is, durabilityBefore, 1, true);
+                }
+                else if (ItemChecks.isDiamondTool(is) && inventory.contains(LoadProperties.rDiamond) && skillLevel >= LoadProperties.repairdiamondlevel && mcPermissions.getInstance().diamondRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rDiamond));
+                    xpHandler(player, PP, is, durabilityBefore, 1, true);
+                }
+                else if (ItemChecks.isGoldTool(is) && inventory.contains(LoadProperties.rGold) && skillLevel >= LoadProperties.repairGoldLevel && mcPermissions.getInstance().goldRepair(player)) {
+                    repairItem(player, is, new ItemStack(LoadProperties.rGold));
+                    xpHandler(player, PP, is, durabilityBefore, 8, true);
+                }
+                else if (is.getType().equals(Material.BOW) && inventory.contains(LoadProperties.rString) && skillLevel >= LoadProperties.repairBowLevel && mcPermissions.getInstance().bowRepair(player)){
+                    repairItem(player, is, new ItemStack(LoadProperties.rString));
+                    xpHandler(player, PP, is, durabilityBefore, 2, false);
+                }
+                else {
+                    needMoreVespeneGas(is, player); //UNABLE TO REPAIR
+                }
+            }
+        }
+        else {
+            player.sendMessage(mcLocale.getString("Skills.FullDurability"));
+        }
+    }
+
+    /**
+     * Handle the XP gain for repair events.
+     *
+     * @param player Player repairing the item
+     * @param PP PlayerProfile of the repairing player
+     * @param is Item being repaired
+     * @param durabilityBefore Durability of the item before repair
+     * @param modify Amount to modify the durability by
+     * @param boost True if the modifier is a boost, false if the modifier is a reduction
+     */
+    private static void xpHandler(Player player, PlayerProfile PP, ItemStack is, short durabilityBefore, int modify, boolean boost) {
+        short durabilityAfter = is.getDurability();
+        short dif = (short) (durabilityBefore - durabilityAfter);
+
+        if (boost) {
+            dif = (short) (dif * modify);
+        }
+        else{
+            dif = (short) (dif / modify);
+        }
+
+        if (ItemChecks.isShovel(is)) {
+            dif = (short) (dif / 3);
+        }
+        else if(ItemChecks.isSword(is)) {
+            dif = (short) (dif / 2);
+        }
+        else if(ItemChecks.isHoe(is)) {
+            dif = (short) (dif / 2);
+        }
+
+        PP.addXP(SkillType.REPAIR, dif * 10);
+        Skills.XpCheckSkill(SkillType.REPAIR, player);
+
+        //CLANG CLANG
+        if (LoadProperties.spoutEnabled) {
+            SpoutSounds.playRepairNoise(player);
+        }
+    }
+
+    /**
+     * Get current Arcane Forging rank.
+     * 
+     * @param skillLevel The skill level of the player whose rank is being checked
+     * @return The player's current Arcane Forging rank
+     */
+    public static int getArcaneForgingRank(int skillLevel) {
+        if (skillLevel >= LoadProperties.arcaneRank4) {
+            return 4;
+        }
+        else if (skillLevel >= LoadProperties.arcaneRank3) {
+            return 3;
+        }
+        else if (skillLevel >= LoadProperties.arcaneRank2) {
+            return 2;
+        }
+        else if (skillLevel >= LoadProperties.arcaneRank1) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+
+    /**
+     * Handles removing & downgrading enchants.
+     *
+     * @param player Player repairing the item
+     * @param is Item being repaired
+     */
+    private static void addEnchants(Player player, ItemStack is) {
+        Map<Enchantment, Integer> enchants = is.getEnchantments();
+
+        if (enchants.size() == 0) {
+            return;
+        }
+
+        int rank = getArcaneForgingRank(Users.getProfile(player).getSkillLevel(SkillType.REPAIR));
+
+        if (rank == 0 || !mcPermissions.getInstance().arcaneForging(player)) {
+            for (Enchantment x : enchants.keySet()) {
+                is.removeEnchantment(x);
+            }
+            player.sendMessage(mcLocale.getString("Repair.LostEnchants"));
+            return;
+        }
+
+        boolean downgraded = false;
+
+        for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
+            Enchantment enchantment = enchant.getKey();
+
+            if (random.nextInt(100) <= getEnchantChance(rank)) {
+                int enchantLevel = enchant.getValue();
+
+                if (LoadProperties.mayDowngradeEnchants && enchantLevel > 1) {
+                    if (random.nextInt(100) <= getDowngradeChance(rank)) {
+                        is.addEnchantment(enchantment, enchantLevel--);
+                        downgraded = true;
+                    }
+                }
+            }
+            else {
+                is.removeEnchantment(enchantment);
+            }
+        }
+
+        Map<Enchantment, Integer> newEnchants = is.getEnchantments();
+
+        if (newEnchants.isEmpty()) {
+            player.sendMessage(mcLocale.getString("Repair.ArcaneFailed"));
+        }
+        else if (downgraded || newEnchants.size() < enchants.size()) {
+            player.sendMessage(mcLocale.getString("Repair.Downgraded"));
+        }
+        else {
+            player.sendMessage(mcLocale.getString("Repair.ArcanePerfect"));
+        }
+    }
+
+    /**
+     * Gets chance of keeping enchantment during repair.
+     *
+     * @param rank Arcane Forging rank
+     * @return The chance of keeping the enchantment
+     */
+    public static int getEnchantChance(int rank) {
+        switch (rank) {
+        case 4:
+            return LoadProperties.keepEnchantsRank4;
+
+        case 3:
+            return LoadProperties.keepEnchantsRank3;
+
+        case 2:
+            return LoadProperties.keepEnchantsRank2;
+
+        case 1:
+            return LoadProperties.keepEnchantsRank1;
+
+        default:
+            return 0;
+        }
+    }
+
+    /**
+     * Gets chance of enchantment being downgraded during repair.
+     *
+     * @param rank Arcane Forging rank
+     * @return The chance of the enchantment being downgraded
+     */
+    public static int getDowngradeChance(int rank) {
+        switch (rank) {
+        case 4:
+            return LoadProperties.downgradeRank4;
+
+        case 3:
+            return LoadProperties.downgradeRank3;
+
+        case 2:
+            return LoadProperties.downgradeRank2;
+
+        case 1:
+            return LoadProperties.downgradeRank1;
+
+        default:
+            return 100;
+        }
+    }
+
+    /**
+     * Computes repair bonuses.
+     *
+     * @param player The player repairing an item
+     * @param durability The durability of the item being repaired
+     * @param ramt The base amount of durability repaired to the item 
+     * @return The final amount of durability repaired to the item
+     */
+    private static short repairCalculate(Player player, short durability, int ramt) {
+        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
+        float bonus = (float) skillLevel / 500;
+
+        bonus = (ramt * bonus);
+        ramt += bonus;
+
+        if (checkPlayerProcRepair(player)) {
+            ramt = (short) (ramt * 2);
+        }
+
+        durability -= ramt;
+
+        if (durability < 0) {
+            durability = 0;
+        }
+        return durability;
+    }
+
+    /**
+     * Gets the base durability amount to repair an item.
+     *
+     * @param is The item being repaired
+     * @param player The player repairing the item
+     * @return The final amount of durability repaired to the item
+     */
+    private static short getRepairAmount(ItemStack is, Player player){
+        short maxDurability = is.getType().getMaxDurability();
+        int ramt = 0;
+        
+        if (ItemChecks.isShovel(is)) {
+            ramt = maxDurability;
+        }
+        else if (ItemChecks.isHoe(is) || ItemChecks.isSword(is) || is.getType().equals(Material.SHEARS)) {
+            ramt = maxDurability / 2;
+        }
+        else if (ItemChecks.isAxe(is) || ItemChecks.isMiningPick(is) || is.getType().equals(Material.BOW)) {
+            ramt = maxDurability / 3;
+        }
+        else if (ItemChecks.isBoots(is)) {
+            ramt = maxDurability / 4;
+        }
+        else if (ItemChecks.isHelmet(is)) {
+            ramt = maxDurability / 5;
+        }
+        else if (ItemChecks.isPants(is)) {
+            ramt = maxDurability / 7;
+        }
+        else if (ItemChecks.isChestplate(is)) {
+            ramt = maxDurability / 8;
+        }
+
+        return repairCalculate(player, is.getDurability(), ramt);
+    }
+
+    /**
+     * Informs a player that the repair has failed.
+     *
+     * @param is The item being repaired
+     * @param player The player repairing the item
+     */
+    private static void needMoreVespeneGas(ItemStack is, Player player) {
+        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
+
+        if (is.getAmount() != 1) {
+            player.sendMessage(mcLocale.getString("Skills.StackedItems"));
+        }
+        else {
+            if (ItemChecks.isDiamondTool(is) || ItemChecks.isDiamondArmor(is)) {
+                if (skillLevel < LoadProperties.repairdiamondlevel) {
+                    player.sendMessage(mcLocale.getString("Skills.AdeptDiamond"));
+                }
+                else {
+                    player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.BLUE + m.prettyItemString(LoadProperties.rDiamond));
+                }
+            }
+            else if (ItemChecks.isIronTool(is) || ItemChecks.isIronArmor(is)) {
+                if (skillLevel < LoadProperties.repairIronLevel) {
+                    player.sendMessage(mcLocale.getString("Skills.AdeptIron"));
+                }
+                else {
+                    player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.rIron));
+                }
+            }
+            else if (ItemChecks.isGoldTool(is) || ItemChecks.isGoldArmor(is)) {
+                if (skillLevel < LoadProperties.repairGoldLevel) {
+                    player.sendMessage(mcLocale.getString("Skills.AdeptGold"));
+                }
+                else {
+                    player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GOLD + m.prettyItemString(LoadProperties.rGold));
+                }
+            }
+            else if (ItemChecks.isStoneTool(is)) {
+                if (skillLevel < LoadProperties.repairStoneLevel) {
+                    player.sendMessage(mcLocale.getString("Skills.AdeptStone"));
+                }
+                else {
+                    player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.rStone));
+                }
+            }
+            else if (ItemChecks.isWoodTool(is)) {
+                player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.DARK_GREEN + m.prettyItemString(LoadProperties.rWood));
+            }
+            else if (ItemChecks.isLeatherArmor(is)) {
+                player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(LoadProperties.rLeather));
+            }
+            else if (is.getType().equals(Material.BOW)) {
+                player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(LoadProperties.rString));
+            }
+        }
+    }
+
+    /**
+     * Checks for Super Repair bonus.
+     *
+     * @param player The player repairing an item
+     * @return true if bonus granted, false otherwise
+     */
+    public static boolean checkPlayerProcRepair(Player player) {
+        final int MAX_BONUS_LEVEL = 1000;
+
+        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
+
+        if ((skillLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= skillLevel) && mcPermissions.getInstance().repairBonus(player)) {
+            player.sendMessage(mcLocale.getString("Skills.FeltEasy"));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Repairs an item.
+     *
+     * @param player The player repairing an item
+     * @param item The item being repaired
+     * @param repairMaterial The repair reagent
+     */
+    public static void repairItem(Player player, ItemStack item, ItemStack repairMaterial) {
+        short initialDurability = item.getDurability();
+        short newDurability = getRepairAmount(item, player);
+        PlayerInventory inventory = player.getInventory();
+
+        McMMOPlayerRepairCheckEvent event = new McMMOPlayerRepairCheckEvent(player, (short) (initialDurability - newDurability), repairMaterial, item);
+        Bukkit.getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        if (repairMaterial.getType().equals(Material.WOOD)) {
+            removeWood(inventory);
+        }
+        else {
+            inventory.removeItem(repairMaterial);
+        }
+
+        /* Handle the enchants */
+        if (LoadProperties.mayLoseEnchants && !mcPermissions.getInstance().arcaneBypass(player)) {
+            addEnchants(player, item);
+        }
+
+        item.setDurability(newDurability);
+    }
+
+    /**
+     * Handles notifications for placing an anvil.
+     *
+     * @param player The player placing the anvil
+     * @param anvilID The item ID of the anvil block
+     */
+    public static void placedAnvilCheck(Player player, int anvilID) {
+        PlayerProfile PP = Users.getProfile(player);
+
+        if (!PP.getPlacedAnvil()) {
+            if (LoadProperties.spoutEnabled) {
+                SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+
+                if (sPlayer.isSpoutCraftEnabled()) {
+                    sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.getMaterial(anvilID)); //TODO: Use Locale
+                }
+            }
+            else {
+                player.sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil"));
+            }
+
+            PP.togglePlacedAnvil();
+        }
+    }
+
+    /**
+     * Removes wood from a player's inventory on repair. Needed due to wood having multiple possible data values.
+     *
+     * @param inventory The inventory to remove wood from
+     */
+    private static void removeWood(PlayerInventory inventory) {
+        //TODO: Make this less hackish once there's a better way to do it...
+        int slot = inventory.first(Material.WOOD);
+        ItemStack item = inventory.getItem(slot);
+        item.setAmount(item.getAmount() - 1);
+        inventory.setItem(slot, item);
+    }
+}