Think it's finally right...

Tier 1 - breaks with wood/gold
Tier 2 - breaks with stone
Tier 3 - breaks with iron
Tier 4 - breaks with diamond

Changelog.txt

@@ -6,8 +6,113 @@ Key:
   = Fix
   ! Change
   - Removal
-  
-Version 1.3.04-dev
+
+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
+ + 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 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 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
+
+Version 1.3.05
+ + Added Skill Shot to Archery which increases damage dealt by 10% every 50 skill levels (caps at 200%)
+ + Added ExperienceAPI and PartyAPI classes for developer use
+ + Added ability to cap overall power level
+ + Added showing powerlevel below a persons name if you run Spout (optional)
+ = Fixed errors when Spout would disable itself after start-up
+ = Fixed XP bar not updating when XP was gained
+ = Fixed bug with repairing wooden tools
+ = Fixed bug where spawned wolves only had 8 health.
+ = Fixed bug where rare Treasures from Excavation were dropping too often
+ = Fixed bug where Skull Splitter & Serrated Strikes could be used without permissions.
+ = Fixed bug where API functions were set to static
+ = Fixed bug where mmoedit threw errors when modifying an offline user
+ = Fixed dupe exploit with Blast Mining
+ ! Changed Tree Feller to account for ability durability loss but not leaves.
+ ! Changed bypass node for Arcane Forging to not default to true for OPs
+ - Removed Ignition from Archery
+ - Removed McMMOPlayerRepairEvent - was basically a duplicate of McMMOPlayerRepairCheck but couldn't be cancelled.
+
+Version 1.3.04
  + Added McMMOPlayerRepairEvent for API usage - fires after completion of a repair.
  + Added McMMOPlayerRepairCheckEvent for API usage - fires before repair process begins, can be cancelled.
  + Added ability to get skill level from McMMOPlayerExperience events
@@ -21,7 +126,7 @@ Version 1.3.04-dev
  = Fixed bug where /ptp worked on dead party members
  ! Changed MySQL to reload all player information on reconnection
  ! Changed event package structure - be sure to update these if you're using the API in your plugin
- 
+
 Version 1.3.03
  + Added Ocelots to Taming XP tables
  + Added ability to summon Ocelots with Call of the Wild

README.creole

@@ -1,6 +1,9 @@
 == 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.
 

pom.xml

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

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

@@ -1,119 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Material;
-
-import com.gmail.nossr50.config.LoadProperties;
-
-public class BlockChecks {
-
-    /**
-     * Checks to see if a block type awards XP.
-     *
-     * @param material The type of Block to check
-     * @return true if the block type awards XP, false otherwise
-     */
-    public static boolean shouldBeWatched(Material material) {
-        switch (material) {
-        case BROWN_MUSHROOM:
-        case CACTUS:
-        case CLAY:
-        case COAL_ORE:
-        case DIAMOND_ORE:
-        case DIRT:
-        case ENDER_STONE:
-        case GLOWING_REDSTONE_ORE:
-        case GLOWSTONE:
-        case GOLD_ORE:
-        case GRASS:
-        case GRAVEL:
-        case IRON_ORE:
-        case JACK_O_LANTERN:
-        case LAPIS_ORE:
-        case LOG:
-        case MELON_BLOCK:
-        case MOSSY_COBBLESTONE:
-        case MYCEL:
-        case NETHERRACK:
-        case OBSIDIAN:
-        case PUMPKIN:
-        case RED_MUSHROOM:
-        case RED_ROSE:
-        case REDSTONE_ORE:
-        case SAND:
-        case SANDSTONE:
-        case SOUL_SAND:
-        case STONE:
-        case SUGAR_CANE_BLOCK:
-        case VINE:
-        case WATER_LILY:
-        case YELLOW_FLOWER:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Check if a block should allow for the activation of abilities.
-     *
-     * @param material The type of Block to check
-     * @return true if the block should allow ability activation, false otherwise
-     */
-    public static boolean abilityBlockCheck(Material material) {
-        switch (material) {
-        case BED_BLOCK:
-        case BREWING_STAND:
-        case BOOKSHELF:
-        case BURNING_FURNACE:
-        case CAKE_BLOCK:
-        case CHEST:
-        case DISPENSER:
-        case ENCHANTMENT_TABLE:
-        case FENCE_GATE:
-        case FURNACE:
-        case IRON_DOOR_BLOCK:
-        case JUKEBOX:
-        case LEVER:
-        case NOTE_BLOCK:
-        case STONE_BUTTON:
-        case TRAP_DOOR:
-        case WALL_SIGN:
-        case WOODEN_DOOR:
-        case WORKBENCH:
-            return false;
-
-        default:
-            break;
-        }
-
-        if (Material.getMaterial(LoadProperties.anvilID).equals(material)) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-
-    /**
-     * Check if a block type is an ore.
-     *
-     * @param material The type of Block to check
-     * @return true if the Block is an ore, false otherwise
-     */
-    public static boolean isOre(Material material) {
-        switch (material) {
-        case COAL_ORE:
-        case DIAMOND_ORE:
-        case GLOWING_REDSTONE_ORE:
-        case GOLD_ORE:
-        case IRON_ORE:
-        case LAPIS_ORE:
-        case REDSTONE_ORE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,470 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.inventory.ItemStack;
-
-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.events.fake.FakeEntityDamageByEntityEvent;
-import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.runnables.GainXp;
-import com.gmail.nossr50.runnables.mcBleedTimer;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.Axes;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
-
-public class Combat {
-
-    /**
-     * Apply combat modifiers and process and XP gain.
-     *
-     * @param event The event to run the combat checks on.
-     * @param plugin mcMMO plugin instance
-     */
-    public static void combatChecks(EntityDamageByEntityEvent event, mcMMO plugin) {
-        if (event.getDamage() == 0 || event.getEntity().isDead()) {
-            return;
-        }
-
-        Entity damager = event.getDamager();
-        LivingEntity target = (LivingEntity) event.getEntity();
-        EntityType damagerType = damager.getType();
-        EntityType targetType = target.getType();
-
-        switch (damagerType) {
-        case PLAYER:
-            Player attacker = (Player) event.getDamager();
-            ItemStack itemInHand = attacker.getItemInHand();
-            PlayerProfile PPa = Users.getProfile(attacker);
-
-            combatAbilityChecks(attacker);
-
-            if (ItemChecks.isSword(itemInHand) && mcPermissions.getInstance().swords(attacker)) {
-                if (!mcBleedTimer.contains(target) && mcPermissions.getInstance().swordsBleed(attacker)) {
-                    Swords.bleedCheck(attacker, target, plugin);
-                }
-
-                if (PPa.getAbilityMode(AbilityType.SERRATED_STRIKES)) {
-                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.SWORDS, plugin);
-            }
-            else if (ItemChecks.isAxe(itemInHand) && mcPermissions.getInstance().axes(attacker)) {
-                if (mcPermissions.getInstance().axeBonus(attacker)) {
-                    Axes.axesBonus(attacker, event);
-                }
-
-                if (mcPermissions.getInstance().criticalHit(attacker)) {
-                    Axes.axeCriticalCheck(attacker, event);
-                }
-
-                if (mcPermissions.getInstance().impact(attacker)) {
-                    Axes.impact(attacker, target, event);
-                }
-
-                if (PPa.getAbilityMode(AbilityType.SKULL_SPLIITER)) {
-                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.AXES, plugin);
-            }
-            else if (itemInHand.getType().equals(Material.AIR) && mcPermissions.getInstance().unarmed(attacker)) {
-                if (mcPermissions.getInstance().unarmedBonus(attacker)) {
-                    Unarmed.unarmedBonus(PPa, event);
-                }
-
-                if (PPa.getAbilityMode(AbilityType.BERSERK) && mcPermissions.getInstance().berserk(attacker)) {
-                    event.setDamage((int) (event.getDamage() * 1.5));
-                }
-
-                if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {
-                    Unarmed.disarmProcCheck(PPa, (Player) target);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin);
-            }
-            else if (itemInHand.getType().equals(Material.BONE) && mcPermissions.getInstance().beastLore(attacker)) {
-                Taming.beastLore(event, target, attacker);
-            }
-            break;
-
-        case WOLF:
-            Wolf wolf = (Wolf) damager;
-
-            if (wolf.isTamed() && wolf.getOwner() instanceof Player) {
-                Player master = (Player) wolf.getOwner();
-                PlayerProfile PPo = Users.getProfile(master);
-
-                if (mcPermissions.getInstance().taming(master)) {
-                    if (mcPermissions.getInstance().fastFoodService(master)) {
-                        Taming.fastFoodService(PPo, wolf, event);
-                    }
-
-                    if (mcPermissions.getInstance().sharpenedclaws(master)) {
-                        Taming.sharpenedClaws(PPo, event);
-                    }
-
-                    if (mcPermissions.getInstance().gore(master)) {
-                        Taming.gore(PPo, event, master, plugin);
-                    }
-
-                    startGainXp(master, PPo, target, SkillType.TAMING, plugin);
-                }
-            }
-            break;
-
-        case ARROW:
-            archeryCheck((EntityDamageByEntityEvent) event, plugin);
-            break;
-
-        default:
-            break;
-        }
-
-        if (targetType.equals(EntityType.PLAYER)) {
-            Swords.counterAttackChecks(event);
-            Acrobatics.dodgeChecks(event);
-        }
-    }
-
-    /**
-     * Process combat abilities based on weapon preparation modes.
-     *
-     * @param attacker The player attacking
-     */
-    public static void combatAbilityChecks(Player attacker) {
-        PlayerProfile PPa = Users.getProfile(attacker);
-
-        if (PPa.getToolPreparationMode(ToolType.AXE)) {
-            Skills.abilityCheck(attacker, SkillType.AXES);
-        }
-        else if (PPa.getToolPreparationMode(ToolType.SWORD)) {
-            Skills.abilityCheck(attacker, SkillType.SWORDS);
-        }
-        else if (PPa.getToolPreparationMode(ToolType.FISTS)) {
-            Skills.abilityCheck(attacker, SkillType.UNARMED);
-        }
-    }
-
-    /**
-     * Process archery abilities.
-     *
-     * @param event The event to run the archery checks on.
-     * @param pluginx mcMMO plugin instance
-     */
-    public static void archeryCheck(EntityDamageByEntityEvent event, mcMMO pluginx) {
-        Arrow arrow = (Arrow) event.getDamager();
-        LivingEntity shooter = arrow.getShooter();
-        LivingEntity target = (LivingEntity) event.getEntity();
-
-        if (target instanceof Player) {
-            Player defender = (Player) target;
-
-            if (mcPermissions.getInstance().unarmed(defender) && defender.getItemInHand().getType().equals(Material.AIR)) {
-                Unarmed.deflectCheck(defender, event);
-            }
-        }
-
-        if (shooter instanceof Player) {
-            Player attacker = (Player) shooter;
-            PlayerProfile PPa = Users.getProfile(attacker);
-            int damage = event.getDamage();
-
-            if (mcPermissions.getInstance().archery(attacker) && damage > 0) {
-                if (mcPermissions.getInstance().trackArrows(attacker)) {
-                    Archery.trackArrows(pluginx, target, PPa);
-                }
-
-                if (mcPermissions.getInstance().ignition(attacker)) {
-                    Archery.ignitionCheck(target, attacker);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx);
-
-                if (target instanceof Player) {
-                    Player defender = (Player) target;
-                    PlayerProfile PPd = Users.getProfile(defender);
-
-                    if (PPa.inParty() && PPd.inParty() && Party.getInstance().inSameParty(defender, attacker)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-
-                    Archery.dazeCheck(defender, attacker);
-                }
-            }
-        }
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason CUSTOM
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     */
-    public static void dealDamage(LivingEntity target, int dmg) {
-        dealDamage(target, dmg, EntityDamageEvent.DamageCause.CUSTOM);
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason cause
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param cause DamageCause to pass to damage event
-     */
-    private static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
-        if (LoadProperties.eventCallback) {
-            EntityDamageEvent ede = (EntityDamageEvent) new FakeEntityDamageEvent(target, cause, dmg);
-            Bukkit.getPluginManager().callEvent(ede);
-
-            if (ede.isCancelled()) {
-                return;
-            }
-
-            target.damage(ede.getDamage());
-        }
-        else {
-            target.damage(dmg);
-        }
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param attacker Player to pass to event as damager
-     */
-    private static void dealDamage(LivingEntity target, int dmg, Player attacker) {
-        if (LoadProperties.eventCallback) {
-            EntityDamageEvent ede = (EntityDamageByEntityEvent) new FakeEntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
-            Bukkit.getPluginManager().callEvent(ede);
-
-            if (ede.isCancelled()) {
-                return;
-            }
-
-            target.damage(ede.getDamage());
-        }
-        else {
-            target.damage(dmg);
-        }
-    }
-
-    /**
-     * Apply Area-of-Effect ability actions.
-     *
-     * @param attacker The attacking player
-     * @param target The defending entity
-     * @param damage The initial damage amount
-     * @param plugin mcMMO plugin instance
-     * @param type The type of skill being used
-     */
-    private static void applyAbilityAoE(Player attacker, LivingEntity target, int damage, mcMMO plugin, SkillType type) {
-        int numberOfTargets = m.getTier(attacker.getItemInHand()); //The higher the weapon tier, the more targets you hit
-        int damageAmount = 0;
-
-        if (type.equals(SkillType.AXES)) {
-            damageAmount = damage / 2;
-        }
-        else if (type.equals(SkillType.SWORDS)) {
-            damageAmount = damage / 4;
-        }
-
-        if (damageAmount < 1) {
-            damageAmount = 1;
-        }
-
-        for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) {
-            EntityType entityType = entity.getType();
-
-            if (entityType.equals(EntityType.WOLF)) {
-                Wolf wolf = (Wolf) entity;
-                AnimalTamer tamer = wolf.getOwner();
-
-                if (tamer instanceof Player) {
-                    Player owner = (Player) tamer;
-
-                    if (owner.equals(attacker) || Party.getInstance().inSameParty(attacker, owner)) {
-                        continue;
-                    }
-                }
-            }
-
-            if (entity instanceof LivingEntity && numberOfTargets >= 1) {
-                if (entityType.equals(EntityType.PLAYER)) {
-                    Player defender = (Player) entity;
-                    PlayerProfile PP = Users.getProfile(defender);
-
-                    //Reasons why the target shouldn't be hit
-                    if (PP.getGodMode()) {
-                        continue;
-                    }
-
-                    if (defender.getName().equals(attacker.getName())) { //Is this even possible?
-                        continue;
-                    }
-
-                    if (Party.getInstance().inSameParty(attacker, defender)) {
-                        continue;
-                    }
-
-                    if (defender.isDead()) {
-                        continue;
-                    }
-
-                    //Apply effect to players only if PVP is enabled
-                    if (target.getWorld().getPVP()) {
-                        String message = "";
-
-                        if (type.equals(SkillType.AXES)) {
-                            message = mcLocale.getString("Axes.HitByCleave");
-                        }
-                        else if (type.equals(SkillType.SWORDS)) {
-                            message = mcLocale.getString("Swords.HitBySerratedStrikes");
-                        }
-
-                        dealDamage(defender, damageAmount, attacker);
-                        defender.sendMessage(message);
-
-                        if (type.equals(SkillType.SWORDS)) {
-                            PP.addBleedTicks(5);
-                        }
-
-                        numberOfTargets--;
-                    }
-                }
-                else {
-                    LivingEntity livingEntity = (LivingEntity) entity;
-
-                    if (type.equals(SkillType.SWORDS)) {
-                        mcBleedTimer.add(livingEntity);
-                    }
-
-                    dealDamage(livingEntity, damageAmount, attacker);
-                    numberOfTargets--;
-                }
-            }
-        }
-    }
-
-    /**
-     * Start the task that gives combat XP.
-     *
-     * @param attacker The attacking player
-     * @param PP The player's PlayerProfile
-     * @param target The defending entity
-     * @param skillType The skill being used
-     * @param plugin mcMMO plugin instance
-     */
-    public static void startGainXp(Player attacker, PlayerProfile PP, LivingEntity target, SkillType skillType, mcMMO pluginx) {
-        double baseXP = 0;
-
-        if (target instanceof Player) {
-            if (!LoadProperties.pvpxp) {
-                return;
-            }
-
-            Player defender = (Player) target;
-            PlayerProfile PPd = Users.getProfile(defender);
-
-            if (System.currentTimeMillis() >= (PPd.getRespawnATS() * 1000) + 5000 && ((PPd.getLastLogin() + 5) * 1000) < System.currentTimeMillis() && defender.getHealth() >= 1) {
-                baseXP = 20 * LoadProperties.pvpxprewardmodifier;
-            }
-        }
-        else if (!target.hasMetadata("mcmmoFromMobSpawner")) {
-            if (target instanceof Animals && !target.hasMetadata("mcmmoSummoned")) {
-                baseXP = LoadProperties.animalXP;
-            }
-            else {
-                EntityType type = target.getType();
-
-                switch (type) {
-                case BLAZE:
-                    baseXP = LoadProperties.blazeXP;
-                    break;
-
-                case CAVE_SPIDER:
-                    baseXP = LoadProperties.cavespiderXP;
-                    break;
-
-                case CREEPER:
-                    baseXP = LoadProperties.creeperXP;
-                    break;
-
-                case ENDER_DRAGON:
-                    baseXP = LoadProperties.enderdragonXP;
-                    break;
-
-                case ENDERMAN:
-                    baseXP = LoadProperties.endermanXP;
-                    break;
-
-                case GHAST:
-                    baseXP = LoadProperties.ghastXP;
-                    break;
-
-                case MAGMA_CUBE:
-                    baseXP = LoadProperties.magmacubeXP;
-                    break;
-
-                case PIG_ZOMBIE:
-                    baseXP = LoadProperties.pigzombieXP;
-                    break;
-
-                case SILVERFISH:
-                    baseXP = LoadProperties.silverfishXP;
-                    break;
-
-                case SKELETON:
-                    baseXP = LoadProperties.skeletonXP;
-                    break;
-
-                case SLIME:
-                    baseXP = LoadProperties.slimeXP;
-                    break;
-
-                case SPIDER:
-                    baseXP = LoadProperties.spiderXP;
-                    break;
-
-                case ZOMBIE:
-                    baseXP = LoadProperties.zombieXP;
-                    break;
-
-                default:
-                    break;
-                }
-            }
-
-            baseXP *= 10;
-        }
-
-        if (baseXP != 0) {
-            Bukkit.getScheduler().scheduleSyncDelayedTask(pluginx, new GainXp(attacker, PP, skillType, baseXP, target), 0);
-        }
-    }
-}

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

@@ -1,64 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Item {
-
-    /**
-     * Check for item usage.
-     *
-     * @param player Player whose item usage to check
-     */
-    public static void itemchecks(Player player) {
-        ItemStack inhand = player.getItemInHand();
-
-        if (LoadProperties.chimaeraWingEnable && inhand.getTypeId() == LoadProperties.chimaeraId) {
-            chimaerawing(player);
-        }
-    }
-
-    private static void chimaerawing(Player player) {
-        PlayerProfile PP = Users.getProfile(player);
-        ItemStack is = player.getItemInHand();
-        Block block = player.getLocation().getBlock();
-        int amount = is.getAmount();
-
-        if (mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == LoadProperties.chimaeraId) {
-            if (Skills.cooldownOver(PP.getRecentlyHurt(), 60) && amount >= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.setItemInHand(new ItemStack(LoadProperties.chimaeraId, amount - LoadProperties.feathersConsumedByChimaeraWing));
-
-                for (int y = 0; block.getY() + y < player.getWorld().getMaxHeight(); y++) {
-                    if (!block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
-                        player.sendMessage(mcLocale.getString("Item.ChimaeraWingFail"));
-                        player.teleport(block.getRelative(0, y - 1, 0).getLocation());
-                        return;
-                    }
-                }
-
-                if (player.getBedSpawnLocation() != null && player.getBedSpawnLocation().getBlock().getType().equals(Material.BED_BLOCK)) {
-                    player.teleport(player.getBedSpawnLocation());
-                }
-                else {
-                    player.teleport(player.getWorld().getSpawnLocation());
-                }
-
-                player.sendMessage(mcLocale.getString("Item.ChimaeraWingPass"));
-            }
-            else if (!Skills.cooldownOver(PP.getRecentlyHurt(), 60) && is.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.sendMessage(mcLocale.getString("Item.InjuredWait", new Object[] {Skills.calculateTimeLeft(PP.getRecentlyHurt(), 60)}));
-            }
-            else if (is.getAmount() <= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.chimaeraId));
-            }
-        }
-    }
-}

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

@@ -1,541 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-public class Metrics {
-
-    /**
-     * The current revision number
-     */
-    private final static int REVISION = 5;
-
-    /**
-     * The base url of the metrics domain
-     */
-    private static final String BASE_URL = "http://metrics.griefcraft.com";
-
-    /**
-     * The url used to report a server's status
-     */
-    private static final String REPORT_URL = "/report/%s";
-
-    /**
-     * The file where guid and opt out is stored in
-     */
-    private static final String CONFIG_FILE = "plugins/PluginMetrics/config.yml";
-
-    /**
-     * The separator to use for custom data. This MUST NOT change unless you are hosting your own
-     * version of metrics and want to change it.
-     */
-    private static final String CUSTOM_DATA_SEPARATOR = "~~";
-
-    /**
-     * Interval of time to ping (in minutes)
-     */
-    private final static int PING_INTERVAL = 10;
-
-    /**
-     * A map of all of the graphs for each plugin
-     */
-    private Map<Plugin, Set<Graph>> graphs = Collections.synchronizedMap(new HashMap<Plugin, Set<Graph>>());
-
-    /**
-     * A convenient map of the default Graph objects (used by addCustomData mainly)
-     */
-    private Map<Plugin, Graph> defaultGraphs = Collections.synchronizedMap(new HashMap<Plugin, Graph>());
-
-    /**
-     * The plugin configuration file
-     */
-    private final YamlConfiguration configuration;
-
-    /**
-     * Unique server id
-     */
-    private String guid;
-
-    public Metrics() throws IOException {
-        // load the config
-        File file = new File(CONFIG_FILE);
-        configuration = YamlConfiguration.loadConfiguration(file);
-
-        // add some defaults
-        configuration.addDefault("opt-out", false);
-        configuration.addDefault("guid", UUID.randomUUID().toString());
-
-        // Do we need to create the file?
-        if (configuration.get("guid", null) == null) {
-            configuration.options().header("http://metrics.griefcraft.com").copyDefaults(true);
-            configuration.save(file);
-        }
-
-        // Load the guid then
-        guid = configuration.getString("guid");
-    }
-
-    /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs
-     * on the metrics website. Plotters can be added to the graph object returned.
-     *
-     * @param plugin
-     * @param type
-     * @param name
-     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-     */
-    public Graph createGraph(Plugin plugin, Graph.Type type, String name) {
-        if (plugin == null || type == null || name == null) {
-            throw new IllegalArgumentException("All arguments must not be null");
-        }
-
-        // Construct the graph object
-        Graph graph = new Graph(type, name);
-
-        // Get the graphs for the plugin
-        Set<Graph> graphs = getOrCreateGraphs(plugin);
-
-        // Now we can add our graph
-        graphs.add(graph);
-
-        // and return back
-        return graph;
-    }
-
-    /**
-     * Adds a custom data plotter for a given plugin
-     *
-     * @param plugin
-     * @param plotter
-     */
-    public void addCustomData(Plugin plugin, Plotter plotter) {
-        // The default graph for the plugin
-        Graph graph = getOrCreateDefaultGraph(plugin);
-
-        // Add the plotter to the graph o/
-        graph.addPlotter(plotter);
-
-        // Ensure the default graph is included in the submitted graphs
-        getOrCreateGraphs(plugin).add(graph);
-    }
-
-    /**
-     * Begin measuring a plugin
-     *
-     * @param plugin
-     */
-    public void beginMeasuringPlugin(final Plugin plugin) {
-        // Did we opt out?
-        if (configuration.getBoolean("opt-out", false)) {
-            return;
-        }
-
-        // Begin hitting the server with glorious data
-        plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
-            private boolean firstPost = true;
-
-            public void run() {
-                try {
-                    // We use the inverse of firstPost because if it is the first time we are posting,
-                    // it is not a interval ping, so it evaluates to FALSE
-                    // Each time thereafter it will evaluate to TRUE, i.e PING!
-                    postPlugin(plugin, !firstPost);
-
-                    // After the first post we set firstPost to false
-                    // Each post thereafter will be a ping
-                    firstPost = false;
-                } catch (IOException e) {
-                    System.out.println("[Metrics] " + e.getMessage());
-                }
-            }
-        }, 0, PING_INTERVAL * 1200);
-    }
-
-    /**
-     * Generic method that posts a plugin to the metrics website
-     *
-     * @param plugin
-     */
-    private void postPlugin(Plugin plugin, boolean isPing) throws IOException {
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        PluginDescriptionFile description = plugin.getDescription();
-
-        // The author string, created with description.getAuthors()
-        // Authors are separated by a comma
-        String authors = "";
-
-        // Add each author to the string
-        for (String author : description.getAuthors()) {
-            authors += author + ", ";
-        }
-
-        // If there were any authors at all, we need to remove the last 2 characters
-        // the last 2 characters are the last comma and space
-        if (!authors.isEmpty()) {
-            authors = authors.substring(0, authors.length() - 2);
-        }
-
-        // Construct the post data
-        String data = encode("guid") + '=' + encode(guid)
-                + encodeDataPair("authors", authors)
-                + encodeDataPair("version", description.getVersion())
-                + encodeDataPair("server", Bukkit.getVersion())
-                + encodeDataPair("players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length))
-                + encodeDataPair("revision", String.valueOf(REVISION));
-
-        // If we're pinging, append it
-        if (isPing) {
-            data += encodeDataPair("ping", "true");
-        }
-
-        // Add any custom data available for the plugin
-        Set<Graph> graphs = getOrCreateGraphs(plugin);
-
-        // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
-        // inside of the graph (e.g plotters)
-        synchronized(graphs) {
-            Iterator<Graph> iter = graphs.iterator();
-
-            while (iter.hasNext()) {
-                Graph graph = iter.next();
-
-                // Because we have a lock on the graphs set already, it is reasonable to assume
-                // that our lock transcends down to the individual plotters in the graphs also.
-                // Because our methods are private, no one but us can reasonably access this list
-                // without reflection so this is a safe assumption without adding more code.
-                for (Plotter plotter : graph.getPlotters()) {
-                    // The key name to send to the metrics server
-                    // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
-                    // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
-                    String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
-
-                    // The value to send, which for the foreseeable future is just the string
-                    // value of plotter.getValue()
-                    String value = Integer.toString(plotter.getValue());
-
-                    // Add it to the http post data :)
-                    data += encodeDataPair(key, value);
-                }
-            }
-        }
-
-        // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, plugin.getDescription().getName()));
-
-        // Connect to the website
-        URLConnection connection;
-
-        // Mineshafter creates a socks proxy, so we can safely bypass it
-        // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
-            connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
-            connection = url.openConnection();
-        }
-
-        connection.setDoOutput(true);
-
-        // Write the data
-        OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
-        writer.write(data);
-        writer.flush();
-
-        // Now read the response
-        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
-
-        // close resources
-        writer.close();
-        reader.close();
-
-        if (response.startsWith("ERR")) {
-            throw new IOException(response); //Throw the exception
-        } else {
-            // Is this the first update this hour?
-            if (response.contains("OK This is your first update this hour")) {
-                synchronized (graphs) {
-                    Iterator<Graph> iter = graphs.iterator();
-
-                    while (iter.hasNext()) {
-                        Graph graph = iter.next();
-
-                        for (Plotter plotter : graph.getPlotters()) {
-                            plotter.reset();
-                        }
-                    }
-                }
-            }
-        }
-        //if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
-    }
-
-    /**
-     * Get or create the Set of graphs for a specific plugin
-     *
-     * @param plugin
-     * @return
-     */
-    private Set<Graph> getOrCreateGraphs(Plugin plugin) {
-        Set<Graph> theGraphs = graphs.get(plugin);
-
-        // Create the Set if it does not already exist
-        if (theGraphs == null) {
-            theGraphs = Collections.synchronizedSet(new HashSet<Graph>());
-            graphs.put(plugin, theGraphs);
-        }
-
-        return theGraphs;
-    }
-
-    /**
-     * Get the default graph for a plugin and if it does not exist, create one
-     *
-     * @param plugin
-     * @return
-     */
-    private Graph getOrCreateDefaultGraph(Plugin plugin) {
-        Graph graph = defaultGraphs.get(plugin);
-
-        // Not yet created :(
-        if (graph == null) {
-            graph = new Graph(Graph.Type.Line, "Default");
-            defaultGraphs.put(plugin, graph);
-        }
-
-        return graph;
-    }
-
-    /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-     *
-     * @return
-     */
-    private boolean isMineshafterPresent() {
-        try {
-            Class.forName("mineshafter.MineServer");
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
-     * key/value pair MUST be included manually, e.g:
-     * <p>
-     *     String httpData = encode("guid") + "=" + encode("1234") + encodeDataPair("authors") + "..";
-     * </p>
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    private static String encodeDataPair(String key, String value) throws UnsupportedEncodingException {
-        return "&" + encode(key) + "=" + encode(value);
-    }
-
-    /**
-     * Encode text as UTF-8
-     *
-     * @param text
-     * @return
-     */
-    private static String encode(String text) throws UnsupportedEncodingException {
-        return URLEncoder.encode(text, "UTF-8");
-    }
-
-    /**
-     * Represents a custom graph on the website
-     */
-    public static class Graph {
-
-        /**
-         * The graph's type that will be visible on the website
-         */
-        public static enum Type {
-
-            /**
-             * A simple line graph which also includes a scrollable timeline viewer to view
-             * as little or as much of the data as possible.
-             */
-            Line,
-
-            /**
-             * An area graph. This is the same as a line graph except the area under the curve is shaded
-             */
-            Area,
-
-            /**
-             * A column graph, which is a graph where the data is represented by columns on the vertical axis,
-             * i.e they go up and down.
-             */
-            Column,
-
-            /**
-             * A pie graph. The graph is generated by taking the data for the last hour and summing it
-             * together. Then the percentage for each plotter is calculated via round( (plot / total) * 100, 2 )
-             */
-            Pie
-
-        }
-
-        /**
-         * What the graph should be plotted as
-         */
-        private final Type type;
-
-        /**
-         * The graph's name, alphanumeric and spaces only :)
-         * If it does not comply to the above when submitted, it is rejected
-         */
-        private final String name;
-
-        /**
-         * The set of plotters that are contained within this graph
-         */
-        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-        private Graph(Type type, String name) {
-            this.type = type;
-            this.name = name;
-        }
-
-        /**
-         * Gets the graph's name
-         *
-         * @return
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Add a plotter to the graph, which will be used to plot entries
-         *
-         * @param plotter
-         */
-        public void addPlotter(Plotter plotter) {
-            plotters.add(plotter);
-        }
-
-        /**
-         * Remove a plotter from the graph
-         *
-         * @param plotter
-         */
-        public void removePlotter(Plotter plotter) {
-            plotters.remove(plotter);
-        }
-
-        /**
-         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
-         * @return
-         */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(plotters);
-        }
-
-        @Override
-        public int hashCode() {
-            return (type.hashCode() * 17) ^ name.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof Graph)) {
-                return false;
-            }
-
-            Graph graph = (Graph) object;
-            return graph.type == type && graph.name.equals(name);
-        }
-
-    }
-
-    /**
-     * Interface used to collect custom data for a plugin
-     */
-    public static abstract class Plotter {
-
-        /**
-         * The plot's name
-         */
-        private final String name;
-
-        /**
-         * Construct a plotter with the default plot name
-         */
-        public Plotter() {
-            this("Default");
-        }
-
-        /**
-         * Construct a plotter with a specific plot name
-         *
-         * @param name
-         */
-        public Plotter(String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the current value for the plotted point
-         *
-         * @return
-         */
-        public abstract int getValue();
-
-        /**
-         * Get the column name for the plotted point
-         *
-         * @return the plotted point's column name
-         */
-        public String getColumnName() {
-            return name;
-        }
-
-        /**
-         * Called after the website graphs have been updated
-         */
-        public void reset() {
-        }
-
-        @Override
-        public int hashCode() {
-            return getColumnName().hashCode() + getValue();
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof Plotter)) {
-                return false;
-            }
-
-            Plotter plotter = (Plotter) object;
-            return plotter.name.equals(name) && plotter.getValue() == getValue();
-        }
-
-    }
-
-}

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

@@ -0,0 +1,68 @@
+package com.gmail.nossr50.api;
+
+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;
+
+public class ChatAPI {
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    public void sendPartyChat(String sender, String party, String message) {
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
+
+        mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            if (Users.getProfile(player).inParty()) {
+                if (Users.getProfile(player).getParty().equalsIgnoreCase(chatEvent.getParty())) {
+                    player.sendMessage(pPrefix + chatEvent.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param message The message to send
+     */
+    public void sendAdminChat(String sender, String message) {
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
+
+        mcMMO.p.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            if (Permissions.getInstance().adminChat(player) || player.isOp())
+                player.sendMessage(aPrefix + chatEvent.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class ExperienceAPI {
+
+    /**
+     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     *
+     * @param player The player to check
+     * @param skillType The skill to check
+     */
+    private void checkXP(Player player, SkillType skillType) {
+        if (skillType.equals(SkillType.ALL)) {
+            Skills.XpCheckAll(player);
+        }
+        else {
+            Skills.XpCheckSkill(skillType, player);
+        }
+    }
+
+    /**
+     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public void addRawXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverride(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public void addXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXP(player, skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Get the amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     */
+    public int getXP(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillXpLevel(skillType);
+    }
+
+    /**
+     * Get the amount of XP left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP left before leveling up a specifc skill
+     */
+    public int getXPToNextLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getXpToLevel(skillType);
+    }
+
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     * @param notify True if this should fire a level up notification, false otherwise.
+     */
+    public void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+        Users.getProfile(player).addLevels(skillType, levels);
+
+        if (notify) {
+            checkXP(player, skillType);
+        }
+    }
+
+    /**
+     * Get the level a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     */
+    public int getLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillLevel(skillType);
+    }
+
+    /**
+     * Gets the power level of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the power level for
+     * @return the power level of the player
+     */
+    public int getPowerLevel(Player player) {
+        return Users.getProfile(player).getPowerLevel();
+    }
+}

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

@@ -0,0 +1,142 @@
+package com.gmail.nossr50.api;
+
+import java.util.ArrayList;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+
+public class PartyAPI {
+
+    /**
+     * Get the name of the party a player is in.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check the party name of
+     * @return the name of the player's party
+     */
+    public String getPartyName(Player player) {
+        return Users.getProfile(player).getParty();
+    }
+
+    /**
+     * Checks if a player is in a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return true if the player is in a party, false otherwise
+     */
+    public boolean inParty(Player player) {
+        return Users.getProfile(player).inParty();
+    }
+
+    /**
+     * Check if two players are in the same party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playera The first player to check
+     * @param playerb The second player to check
+     * @return true if the two players are in the same party, false otherwise
+     */
+    public boolean inSameParty(Player playera, Player playerb) {
+        return Party.getInstance().inSameParty(playera, playerb);
+    }
+
+    /**
+     * Get a list of all current party names.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the list of parties.
+     */
+    public ArrayList<String> getParties() {
+        return Party.getInstance().getParties();
+    }
+
+    /**
+     * Add a player to a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add to the party
+     * @param partyName The party to add the player to
+     */
+    public void addToParty(Player player, String partyName) {
+        Party.getInstance().addToParty(player, Users.getProfile(player), partyName, false, null);
+    }
+
+    /**
+     * Remove a player from a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to remove
+     */
+    public void removeFromParty(Player player) {
+        Party.getInstance().removeFromParty(player, Users.getProfile(player));
+    }
+
+    /**
+     * 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

@@ -0,0 +1,144 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class CommandHelper {
+
+    /**
+     * Checks for command permissions.
+     *
+     * @param sender The command sender
+     * @param permission The permission to check
+     * @return true if the sender is a player without permissions, false otherwise
+     */
+    public static boolean noCommandPermissions(CommandSender sender, String permission) {
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+
+            if (player != null && !Permissions.getInstance().permission(player, permission)) {
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static boolean noConsoleUsage(CommandSender sender) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Print out details on Gathering skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printGatheringSkills(Player inspect, CommandSender display) {
+        if (Skills.hasGatheringSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+
+            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 (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 (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 (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 (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) }));
+            }
+        }
+    }
+
+    public static void printGatheringSkills(Player player) {
+        printGatheringSkills(player, player);
+    }
+
+    /**
+     * Print out details on Combat skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printCombatSkills(Player inspect, CommandSender display) {
+        if (Skills.hasCombatSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
+
+            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 (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 (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 (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 (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) }));
+            }
+        }
+    }
+
+    public static void printCombatSkills(Player player) {
+        printCombatSkills(player, player);
+    }
+
+    /**
+     * Print out details on Misc skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printMiscSkills(Player inspect, CommandSender display) {
+        if (Skills.hasMiscSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
+
+            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 (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) }));
+            }
+        }
+    }
+
+    public static void printMiscSkills(Player player) {
+        printMiscSkills(player, player);
+    }
+}

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

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

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

@@ -6,78 +6,124 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+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;
 
+//TODO: Any way we can make this work for offline use?
 public class AddxpCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    private final mcMMO plugin;
 
-	public AddxpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
+    public AddxpCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Player modifiedPlayer;
+        int xp;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /addxp [playername] <skill> <xp>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
         }
-        
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions."); //TODO: Needs more locale.
-			return true;
-		}
 
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp");
-				return true;
-			} else if (args.length == 3) {
-				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getProfile(plugin.getServer().getPlayer(args[0])).addXPOverrideNoBonus(Skills.getSkillType(args[1]), newvalue);
-					plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); //TODO: Needs more locale.
-					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
-					Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-				}
-			} else {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp"); //TODO: Needs more locale.
-			}
-			return true;
-		}
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (!Skills.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
 
-		if (!mcPermissions.getInstance().mmoedit(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 2) {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); //TODO: Needs more locale.
-			return true;
-		}
-		if (args.length == 3) {
-			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-				int newvalue = Integer.valueOf(args[2]);
-				Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0]));
-				plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); //TODO: Needs more locale.
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified."); //TODO: Needs more locale.
-				Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-			}
-		} else if (args.length == 2 && m.isInt(args[1]) && Skills.isSkill(args[0])) {
-			int newvalue = Integer.valueOf(args[1]);
-			Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player);
-			player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
-		} else {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); //TODO: Needs more locale.
-		}
+                if (Misc.isInt(args[1])) {
+                    modifiedPlayer = (Player) sender;
+                    xp = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
 
-		return true;
-	}
+                    Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
+
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = Misc.getCapitalized(skill.toString());
+                    }
+
+                    modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
+
+                    if (skill.equals(SkillType.ALL)) {
+                        Skills.XpCheckAll(modifiedPlayer);
+                    }
+                    else {
+                        Skills.XpCheckSkill(skill, modifiedPlayer);
+                    }
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        case 3:
+            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])) {
+                xp = Integer.valueOf(args[2]);
+                skill = Skills.getSkillType(args[1]);
+                String message;
+
+                Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
+
+                if (skill.equals(SkillType.ALL)) {
+                    skillName = "all skills";
+                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                }
+                else {
+                    skillName = Misc.getCapitalized(skill.toString());
+                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                }
+
+                sender.sendMessage(message);
+                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
+
+                if (skill.equals(SkillType.ALL)) {
+                    Skills.XpCheckAll(modifiedPlayer);
+                }
+                else {
+                    Skills.XpCheckSkill(skill, modifiedPlayer);
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -1,126 +1,95 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class InspectCommand implements CommandExecutor {
     private final mcMMO plugin;
 
-    public InspectCommand(mcMMO instance) {
-        this.plugin = instance;
+    public InspectCommand (mcMMO plugin) {
+        this.plugin = plugin;
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer target;
+        PlayerProfile PP;
+        String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
 
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-        if (sender instanceof Player  && !mcPermissions.getInstance().inspect(player)) {
-            sender.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
             return true;
         }
-        
-        if (args.length < 1) {
-            sender.sendMessage(ChatColor.RED + "Proper usage is /inspect <playername>"); //TODO: Needs more locale.
+
+        switch (args.length) {
+        case 1:
+            target = plugin.getServer().getOfflinePlayer(args[0]);
+            PP = Users.getProfile(target);
+
+            if (target.isOnline()) {
+                Player player = (Player) target;
+
+                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
+                CommandHelper.printGatheringSkills(player, sender);
+                CommandHelper.printCombatSkills(player, sender);
+                CommandHelper.printMiscSkills(player, sender);
+                sender.sendMessage(LocaleLoader.getString("Commands.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"));
+                    return true;
+                }
+
+                if (!PP.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", new Object[] { args[0] }));
+
+                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), 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(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(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) }));
+
+                return true;
+            }
+
+        default:
+            sender.sendMessage(usage);
             return true;
         }
-        
-        // if split[1] is an online player
-        if (plugin.getServer().getPlayer(args[0]) != null) 
-        {
-            Player target = plugin.getServer().getPlayer(args[0]);
-            PlayerProfile PPt = Users.getProfile(target);
-            
-            //If they are not an Op they have to be close
-            if(sender instanceof Player && !player.isOp() && !m.isNear(player.getLocation(), target.getLocation(), 5))
-            {
-                sender.sendMessage("You are too far away to inspect that player!"); //TODO: Needs more locale.
-            }
-            
-            sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName()); //TODO: Needs more locale.
-
-            sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
-            if (mcPermissions.getInstance().excavation(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
-            if (mcPermissions.getInstance().fishing(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
-            if (mcPermissions.getInstance().herbalism(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
-            if (mcPermissions.getInstance().mining(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
-            if (mcPermissions.getInstance().woodcutting(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
-
-            sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
-            if (mcPermissions.getInstance().axes(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
-            if (mcPermissions.getInstance().archery(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
-            if (mcPermissions.getInstance().swords(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
-            if (mcPermissions.getInstance().taming(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
-            if (mcPermissions.getInstance().unarmed(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
-
-            sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); //TODO: Needs more locale.
-            if (mcPermissions.getInstance().acrobatics(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
-            if (mcPermissions.getInstance().repair(target))
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
-
-            sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(target, PPt)));
-        } else {
-            if(sender instanceof Player && !player.isOp())
-            {
-                sender.sendMessage("That player is offline, inspecting offline players is limited to Ops!"); //TODO: Needs more locale.
-                return true;
-            }
-            
-            PlayerProfile PPt = Users.getOfflineProfile(args[0]);
-            
-            if(!PPt.isLoaded())
-            {
-                sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-                return true;
-            }
-            
-            sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for Offline Player " + ChatColor.YELLOW + args[0]); //TODO: Needs more locale.
-
-            sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
-
-            sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
-
-            sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); //TODO: Needs more locale.
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
-                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
-        }
-
-        return true;
     }
 }

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

@@ -1,78 +1,35 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McstatsCommand implements CommandExecutor {
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-        if (!(sender instanceof Player)) {
-            sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
             return true;
         }
 
-		PlayerProfile PP = Users.getProfile(player);
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
+        player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+        player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
 
-		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()) }));
 
-		ChatColor header = ChatColor.GOLD;
-
-		if (Skills.hasGatheringSkills(player)) {
-			player.sendMessage(header + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().excavation(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
-		}
-		if (Skills.hasCombatSkills(player)) {
-			player.sendMessage(header + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().axes(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
-			if (mcPermissions.getInstance().swords(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED)));
-		}
-
-		if (Skills.hasMiscSkills(player)) {
-			player.sendMessage(header + "-=MISC SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().acrobatics(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS)));
-			if (mcPermissions.getInstance().repair(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)));
-		}
-		player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(player, PP)));
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -1,118 +1,121 @@
 package com.gmail.nossr50.commands.general;
 
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class MmoeditCommand implements CommandExecutor {
+    private final mcMMO plugin;
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) 
-        {
-            player = (Player) sender;
+    public MmoeditCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer modifiedPlayer;
+        PlayerProfile PP;
+        int newValue;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /mmoedit [player] <skill> <level>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
         }
-		
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions."); //TODO: Needs more locale.
-			return true;
-		}
 
-		if (!(sender instanceof Player)) 
-		{
-			if (args.length < 2) 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-				return true;
-			} else if (args.length == 3)
-			{
-			    PlayerProfile PPt = null;
-			    
-			    if(Users.players.containsKey(args[0].toLowerCase())) {
-			        PPt = Users.players.get(args[0].toLowerCase());
-			    }
-			    
-			    if(PPt == null)
-			        Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
-			        
-			    if(!PPt.isLoaded())
-		        {
-		            sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-		            return true;
-		        }
-			    
-				if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-				{
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue);
-					System.out.println(args[1] + " has been modified for " + args[0] + "."); //TODO: Needs more locale.
-				}
-			} else 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			}
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
 
-			return true;
-		}
+                if (Misc.isInt(args[1])) {
+                    modifiedPlayer = (Player) sender;
+                    newValue = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
+                    PP = Users.getProfile(modifiedPlayer);
 
-		if (!mcPermissions.getInstance().mmoedit(player)) 
-		{
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		
-		if (args.length < 2) 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			return true;
-		}
-		if (args.length == 3) 
-		{
-		    PlayerProfile PPt = null;
-            
-            if(Users.players.containsKey(args[0].toLowerCase())) {
-                PPt = Users.players.get(args[0].toLowerCase());
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = Misc.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);
             }
-            
-            if(PPt == null)
-                Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
-            
-		    if(!PPt.isLoaded())
-	        {
-	            sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-	            return true;
-	        }
-		    
-			if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-			{
-				int newvalue = Integer.valueOf(args[2]);
-				PPt.modifyskill(Skills.getSkillType(args[1]), newvalue);
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]); //TODO: Needs more locale.
-			}
-		} else if (args.length == 2) 
-		{
-			if (m.isInt(args[1]) && Skills.isSkill(args[0])) 
-			{
-			    PlayerProfile PP = Users.getProfile(player);
-				int newvalue = Integer.valueOf(args[1]);
-				PP.modifyskill(Skills.getSkillType(args[0]), newvalue);
-				player.sendMessage(ChatColor.RED + args[0] + " has been modified."); //TODO: Needs more locale.
-			}
-		} else 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-		}
 
-		return true;
-	}
+            return true;
+
+        case 3:
+            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
+            String playerName = modifiedPlayer.getName();
+            PP = Users.getProfile(modifiedPlayer);
+
+            if (!PP.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])) {
+                newValue = Integer.valueOf(args[2]);
+                skill = Skills.getSkillType(args[1]);
+                String message;
+
+                Users.getProfile(modifiedPlayer).modifySkill(skill, newValue);
+
+                if (skill.equals(SkillType.ALL)) {
+                    skillName = "all skills";
+                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                }
+                else {
+                    skillName = Misc.getCapitalized(skill.toString());
+                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                }
+
+                sender.sendMessage(message);
+
+                if (modifiedPlayer.isOnline()) {
+                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -1,51 +1,51 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.runnables.SQLConversionTask;
+import com.gmail.nossr50.util.Users;
 
 public class MmoupdateCommand implements CommandExecutor {
-	@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;
-		}
+    private final mcMMO plugin;
 
-		Player player = (Player) sender;
+    public MmoupdateCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		if (!mcPermissions.getInstance().admin(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		player.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
-		Users.clearUsers();
-		convertToMySQL();
-		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-			Users.addUser(x);
-		}
-		player.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
+            return true;
+        }
 
-		return true;
-	}
-	
-	/**
+        sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
+        Users.clearUsers();
+        convertToMySQL();
+
+        for (Player x : plugin.getServer().getOnlinePlayers()) {
+            Users.addUser(x);
+        }
+
+        sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
+
+        return true;
+    }
+
+    /**
      * Convert FlatFile data to MySQL data.
      */
     private void convertToMySQL() {
-        if (!LoadProperties.useMySQL) {
+        if (!Config.getInstance().getUseMySQL()) {
             return;
         }
 
-        Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1);
+        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, new SQLConversionTask(plugin), 1);
     }
-}
+}

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

@@ -1,124 +1,93 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 
 public class XprateCommand implements CommandExecutor {
-	private static int oldrate = LoadProperties.xpGainMultiplier;
-	
-	public static boolean xpevent = false;
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private final mcMMO plugin;
+    private static int oldrate = Config.getInstance().xpGainMultiplier;
+    public static boolean xpevent = false;
 
-		if (!(sender instanceof Player)) {
-			if(args.length <= 0)
-			{
-				System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-				System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-			}
-			
-			if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-			{
-				if(xpevent)
-				{
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-						x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-					xpevent = !xpevent;
-					LoadProperties.xpGainMultiplier = oldrate;
-				} else
-				{
-					LoadProperties.xpGainMultiplier = oldrate;
-				}
-			}
-			
-			if(args.length >= 1 && m.isInt(args[0]))
-			{
-				oldrate = LoadProperties.xpGainMultiplier;
-				
-				if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-				{
-					if(args[1].equalsIgnoreCase("true"))
-						xpevent = true;
-					else
-						xpevent = false;
-				} else
-				{
-					System.out.println(mcLocale.getString("Commands.xprate.proper3"));
-					return true;
-				}
-				LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-				if(xpevent = true)
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-					{
-						x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!"); //TODO: Needs more locale.
-						x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!"); //TODO: Needs more locale.
-					}
-				
-				System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier); //TODO: Needs more locale.
-			}
-			
-			return true;
-		}
-		
-		Player player = (Player) sender;
-		
-		if(!mcPermissions.getInstance().admin(player))
-		{
-			player.sendMessage(ChatColor.YELLOW+"[mcMMO] "+ChatColor.DARK_RED +mcLocale.getString("mcPlayerListener.NoPermission"));  
-			return true;
-		}
-		if(args.length <= 0)
-		{
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-		}
-		if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-		{
-			if(xpevent)
-			{
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-					x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-				xpevent = !xpevent;
-				LoadProperties.xpGainMultiplier = oldrate;
-			} else
-			{
-				LoadProperties.xpGainMultiplier = oldrate;
-			}
-		}
-		if(args.length >= 1 && m.isInt(args[0]))
-		{
-			oldrate = LoadProperties.xpGainMultiplier;
-			
-			if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-			{
-				if(args[1].equalsIgnoreCase("true"))
-					xpevent = true;
-				else
-					xpevent = false;
-			} else
-			{
-				player.sendMessage(mcLocale.getString("Commands.xprate.proper3"));
-				return true;
-			}
-			LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-			if(xpevent = true)
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-				{
-					x.sendMessage(mcLocale.getString("Commands.xprate.started"));
-					x.sendMessage(mcLocale.getString("Commands.xprate.started2", new Object[] {LoadProperties.xpGainMultiplier}));
-				}
-		}
-		
-		return true;
-	}
+    public XprateCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage1 = LocaleLoader.getString("Commands.xprate.proper.0");
+        String usage2 = LocaleLoader.getString("Commands.xprate.proper.1");
+        String usage3 = LocaleLoader.getString("Commands.xprate.proper.2");
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            if (args[0].equalsIgnoreCase("reset")) {
+                if (xpevent) {
+                    for (Player x : plugin.getServer().getOnlinePlayers()) {
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    }
+
+                    xpevent = !xpevent;
+                    Config.getInstance().xpGainMultiplier = oldrate;
+                }
+                else {
+                    Config.getInstance().xpGainMultiplier = oldrate;
+                }
+            }
+            else if (Misc.isInt(args[0])) {
+                sender.sendMessage(usage3);
+            }
+            else {
+                sender.sendMessage(usage2);
+            }
+
+            return true;
+
+        case 2:
+            if (Misc.isInt(args[0])) {
+                oldrate = Config.getInstance().xpGainMultiplier;
+
+                if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
+                    xpevent = Boolean.valueOf(args[1]);
+                }
+                else {
+                    sender.sendMessage(usage3);
+                }
+
+                Config.getInstance().xpGainMultiplier = Misc.getInt(args[0]);
+
+                if (xpevent) {
+                    for (Player x : plugin.getServer().getOnlinePlayers()) {
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {Config.getInstance().xpGainMultiplier}));
+                    }
+                }
+                else {
+                    sender.sendMessage("The XP RATE was modified to " + Config.getInstance().xpGainMultiplier); //TODO: Locale
+                }
+            }
+            else {
+                sender.sendMessage(usage1);
+                sender.sendMessage(usage2);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage1);
+            sender.sendMessage(usage2);
+            return true;
+        }
+    }
 }

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

@@ -1,44 +1,38 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
         }
 
-		if (player != null && !mcPermissions.getInstance().mcAbility(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ability")) {
+            return true;
+        }
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        PlayerProfile PP = Users.getProfile((Player) sender);
 
-		PlayerProfile PP = Users.getProfile(player);
+        if (PP.getAbilityUse()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+        }
 
-		if (PP.getAbilityUse()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-			PP.toggleAbilityUse();
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-			PP.toggleAbilityUse();
-		}
+        PP.toggleAbilityUse();
 
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -6,58 +6,67 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
 
+//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
 public class MccCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
+        Player player = (Player) sender;
 
-		player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
+        player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
 
-		if (mcPermissions.getInstance().party(player)) {
-			player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
-			player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
-			player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
+        if (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().partyChat(player))
-				player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
+            if (Permissions.getInstance().partyChat(player)) {
+                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
+            }
 
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
+            player.sendMessage("/invite " + LocaleLoader.getString("Commands.Party.Invite"));
+            player.sendMessage("/accept " + LocaleLoader.getString("Commands.Party.Accept"));
 
-			if (mcPermissions.getInstance().partyTeleport(player))
-				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
-		}
-		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/mcstats " + ChatColor.RED + mcLocale.getString("m.mccStats"));
-		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
+            if (Permissions.getInstance().partyTeleport(player)) {
+                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
+            }
+        }
 
-		if (mcPermissions.getInstance().mcAbility(player))
-			player.sendMessage("/mcability " + ChatColor.RED + mcLocale.getString("m.mccToggleAbility"));
+        player.sendMessage(LocaleLoader.getString("Commands.Other"));
+        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
+        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
-		if (mcPermissions.getInstance().adminChat(player))
-			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
+        if (Permissions.getInstance().mcAbility(player)) {
+            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
 
-		if (mcPermissions.getInstance().inspect(player))
-			player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
+        if (Permissions.getInstance().adminChat(player)) {
+            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
 
-		if (mcPermissions.getInstance().mmoedit(player))
-			player.sendMessage("/mmoedit " + mcLocale.getString("m.mccMmoedit"));
+        if (Permissions.getInstance().inspect(player)) {
+            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
 
-		if (mcPermissions.getInstance().mcgod(player))
-			player.sendMessage("/mcgod " + ChatColor.RED + mcLocale.getString("m.mccMcGod"));
+        if (Permissions.getInstance().mmoedit(player)) {
+            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
 
-		player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
-		player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
+        if (Permissions.getInstance().mcgod(player)) {
+            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
 
-		return true;
-	}
+        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
+        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
+
+        return true;
+    }
 }

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

@@ -1,43 +1,38 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McgodCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-		if (!(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.tools.mcgod")) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().mcgod(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        PlayerProfile PP = Users.getProfile((Player) sender);
 
-        if (mcPermissions.getInstance().mcgod(player)) {
-			if (PP.getGodMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
-				PP.toggleGodMode();
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
-				PP.toggleGodMode();
-			}
-		}
+        if (PP.getGodMode()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+        }
 
-		return true;
-	}
+        PP.toggleGodMode();
+
+        return true;
+    }
 }

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

@@ -1,43 +1,34 @@
 package com.gmail.nossr50.commands.mc;
 
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McmmoCommand implements CommandExecutor {
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String description = LocaleLoader.getString("mcMMO.Description");
+        String[] mcSplit = description.split(",");
+        sender.sendMessage(mcSplit);
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        if (Config.getInstance().getDonateMessageEnabled()) {
+            if (Config.getInstance().spoutEnabled && sender instanceof SpoutPlayer) {
+                SpoutPlayer sPlayer = (SpoutPlayer) sender;
 
-		Player player = (Player) sender;
+                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
+            }
 
-		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-		String[] mcSplit = description.split(",");
+            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
+            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "mcmmodev@gmail.com" + ChatColor.GOLD + " Paypal");
+        }
 
-		for (String x : mcSplit) {
-			player.sendMessage(x);
-		}
-
-		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
-			SpoutPlayer sPlayer = (SpoutPlayer) player;
-			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com"); //Where'd our notification go?
-		} else {
-			if (LoadProperties.donateMessage)
-			    player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com");
-		}
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -1,68 +1,75 @@
 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.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.AbilityType;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 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) {
+    @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
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                player = (Player) sender;
+                PP = Users.getProfile(player);
+            }
+            else {
+                sender.sendMessage(usage);
+                return true;
+            }
+            break;
 
-		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]);
-		}
+        case 1:
+            player = plugin.getServer().getOfflinePlayer(args[0]);
+            PP = Users.getProfile(player);
+            String playerName = player.getName();
 
-		/*
-		 * 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);
+            if (!PP.isLoaded()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
 
-		//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);
+            sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale
 
-		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
+            break;
 
-		return true;
-	}
+        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;
+    }
 }

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

@@ -1,109 +1,143 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.Bukkit;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.FileWriter;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McremoveCommand implements CommandExecutor {
+    private final String location;
+    private final mcMMO plugin;
+
+    public McremoveCommand (mcMMO plugin) {
+        this.plugin = plugin;
+        this.location = plugin.usersFile;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
+        String playerName;
+        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+        String databaseName = Config.getInstance().getMySQLDatabaseName();
+        String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
+        String success;
 
-        if (player != null && !mcPermissions.getInstance().mcremove(player)) {
-            player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
             return true;
         }
-        
-        if(args.length == 0)
-        {
-            sender.sendMessage("Correct usage is /mcremove [Player Name]"); //TODO: Needs more locale.
+
+        switch (args.length) {
+        case 1:
+            playerName = args[0];
+            success = ChatColor.GREEN + playerName + "was successfully removed from the database!"; //TODO: Locale
+            break;
+
+        default:
+            sender.sendMessage(usage);
             return true;
         }
-        
-        String playerName = args[0]; //Player that we are going to remove
-        
-        //If the server is using MySQL
-        if(LoadProperties.useMySQL)
-        {
-            int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
-            
-            //Remove user from tables
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"users WHERE "
-                    +LoadProperties.MySQLtablePrefix+"users.id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"cooldowns WHERE "
-                    +LoadProperties.MySQLtablePrefix+"cooldowns.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"huds WHERE "
-                    +LoadProperties.MySQLtablePrefix+"huds.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"skills WHERE "
-                    +LoadProperties.MySQLtablePrefix+"skills.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-            +LoadProperties.MySQLdbName+"."
-            +LoadProperties.MySQLtablePrefix+"experience WHERE "
-            +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
 
-            sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
-        } else {
-            //FlatFile removal
-            //TODO: Properly remove users from FlatFile, it's going to be a huge bitch with how our FlatFile system works. Let's adopt SQLite support.
-            if(Bukkit.getServer().getPlayer(playerName) != null)
-            {
-                Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
-                if(targetPlayer.isOnline()) 
-                {
-                    Users.getProfile(targetPlayer).resetAllData();
-                    sender.sendMessage("User "+playerName+" removed from FlatFile DB!"); //TODO: Needs more locale.
-                } else {
-                    sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                    return true;
-                }
-            } else {
-                sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                return true;
+        /* 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"));
             }
         }
-        
+        else {
+            if (removeFlatFileUser(playerName)) {
+                sender.sendMessage(success);
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            }
+        }
+
         //Force PlayerProfile stuff to update
-        if(Bukkit.getServer().getPlayer(playerName) != null)
-        {
-            Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
-            if(targetPlayer.isOnline())
-            {
-                targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!"); //TODO: Needs more locale.
-                Users.removeUserByName(playerName);
-            } else {
-                Users.removeUser(targetPlayer);
-            }
-        } else {
-            Users.removeUserByName(playerName);
+        Player player = plugin.getServer().getPlayer(playerName);
+
+        if (player != null && Users.players.containsKey(playerName.toLowerCase())) {
+            Users.removeUser(player);
+            Users.addUser(player);
         }
-        
-        sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale.
-        
+
         return true;
     }
-}
+
+    private boolean removeFlatFileUser(String playerName) {
+        boolean worked = false;
+
+        try {
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            StringBuilder writer = new StringBuilder();
+            String line = "";
+
+            while ((line = in.readLine()) != null) {
+
+                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
+                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                    writer.append(line).append("\r\n");
+                }
+                else {
+                    System.out.println("User found, removing...");
+                    worked = true;
+                    continue; //Skip the player
+                }
+            }
+
+            in.close();
+            FileWriter out = new FileWriter(location); //Write out the new file
+            out.write(writer.toString());
+            out.close();
+
+            return worked;
+        }
+        catch (Exception e) {
+            plugin.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

@@ -7,180 +7,148 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import com.gmail.nossr50.Leaderboard;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 
 public class MctopCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-		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();
+    @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()) {
 
-				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();
+            switch (args.length) {
+            case 0:
+                flatfileDisplay(1, "ALL", sender);
+                return true;
 
-				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 ");
+            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"));
+                }
 
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				// If no page number is specified
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-				for (int i = 1; i <= 10; i++) { // i<=userslist.size()
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-				}
-				return true;
-			}
-			if (args.length >= 0) {
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				if (args.length >= 1 && m.isInt(args[0])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[0]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-				for (int i = 1; i <= 10; i++) {
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					// System.out.println(username.get(1).get(0));
-					// System.out.println("Mining : " + userslist.get(i).get(0) + ", User id : " + userslist.get(i).get(1));
-				}
-			}
-		}
+                return true;
 
-		return true;
-	}
+            case 2:
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (Misc.isInt(args[1])) {
+                    flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(usage);
+                return true;
+            }
+        }
+        else {
+            String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
+
+            switch (args.length) {
+            case 0:
+                sqlDisplay(1, powerlevel, sender);
+                return true;
+
+            case 1:
+                if (Misc.isInt(args[0])) {
+                    sqlDisplay(Integer.valueOf(args[0]), powerlevel, sender);
+                }
+                else if (Skills.isSkill(args[0])) {
+                    sqlDisplay(1, args[0].toLowerCase(), sender);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            case 2:
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (Misc.isInt(args[1])) {
+                    sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(usage);
+                return true;
+            }
+        }
+    }
+
+    private void flatfileDisplay(int page, String skill, CommandSender sender) {
+        String[] info = Leaderboard.retrieveInfo(skill, page);
+
+        if (skill == "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));
+        }
+    }
 }

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

@@ -1,86 +1,100 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class ACommand implements CommandExecutor {
+    private final mcMMO plugin;
 
-	public ACommand() {}
+    public ACommand (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 /a <message>"; //TODO: Needs more locale.
 
-		// Console message?
-		if (!(sender instanceof Player) && args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
-
-			Bukkit.getLogger().info("[A]<*Console*> " + aMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.chat.adminchat")) {
+            return true;
         }
 
-		if (player != null && !mcPermissions.getInstance().adminChat(player) && !player.isOp()) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                PP = Users.getProfile((Player) sender);
 
-		// Not a toggle, a message
+                if (PP.getPartyChatMode()) {
+                    PP.togglePartyChat();
+                }
 
-		if (args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
+                PP.toggleAdminChat();
 
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			Bukkit.getLogger().info("[A]<" + name + "> " + aMessage);
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
+                if (PP.getAdminChatMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.On"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.Off"));
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
 
-		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;
-	}
+            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;
+        }
+    }
 }

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

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

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

@@ -6,61 +6,71 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
 
+//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) {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /invite <player>"; //TODO: Needs more locale.
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        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;
-		}
+        switch (args.length) {
+        case 1:
+            Player player = (Player) sender;
+            PlayerProfile PP = Users.getProfile(player);
 
-		Party Pinstance = Party.getInstance();
+            Party partyInstance = Party.getInstance();
 
-		if (!PP.inParty()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NotInParty"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /invite <playername>"); //TODO: Needs more locale.
-			return true;
-		}
-		if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			if (Pinstance.canInvite(player, PP)) {
-				Player target = plugin.getServer().getPlayer(args[0]);
-				PlayerProfile PPt = Users.getProfile(target);
-				PPt.modifyInvite(PP.getParty());
+            if (!PP.inParty()) {
+                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return true;
+            }
 
-				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;
-			}
-		}
+            Player target = plugin.getServer().getPlayer(args[0]);
 
-		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;
+        }
+    }
 }

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

@@ -1,94 +1,120 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
 
 public class PCommand implements CommandExecutor {
-	public PCommand() {}
+    private final mcMMO plugin;
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public PCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		// 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];
-			}
+    @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.
 
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-			Bukkit.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + pMessage);
 
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Users.getProfile(herp).getParty().equalsIgnoreCase(args[0])) {
-						herp.sendMessage(pPrefix + pMessage);
-					}
-				}
-			}
-			return true;
-		}
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                PP = Users.getProfile((Player) sender);
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+                if (PP.getAdminChatMode()) {
+                    PP.toggleAdminChat();
+                }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+                PP.togglePartyChat();
 
-		// Not a toggle, a message
+                if (PP.getPartyChatMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.On"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Off"));
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
 
-		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];
-			}
+            return true;
 
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") ";
-			Bukkit.getLogger().info("[P](" + PP.getParty() + ")<" + name + "> " + pMessage);
+        default:
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                PP = Users.getProfile(player);
 
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Party.getInstance().inSameParty(herp, player))
-						herp.sendMessage(pPrefix + pMessage);
-				}
-			}
+                if (!PP.inParty()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                    return true;
+                }
 
-			return true;
-		}
+                String message = args[0];
 
-		if (PP.getAdminChatMode())
-			PP.toggleAdminChat();
+                for (int i = 1; i < args.length; i++) {
+                    message = message + " " + args [i];
+                }
 
-		PP.togglePartyChat();
+                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.getPartyChatMode()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOn"));
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOff"));
-		}
+                if (!Party.getInstance().isParty(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                    return true;
+                }
 
-		return true;
-	}
+                String message = args[1];
+
+                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;
+        }
+    }
 }

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

@@ -1,269 +1,267 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.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.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
 
 public class PartyCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private final mcMMO plugin;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    public PartyCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-		Party Pinstance = Party.getInstance();
+        Player player = (Player) sender;
+        String playerName = player.getName();
+        PlayerProfile PP = Users.getProfile(player);
 
-		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
-			Pinstance.addToParty(player, PP, PP.getParty(), false);
-		}
+        Party partyInstance = Party.getInstance();
+        boolean inParty = PP.inParty();
+        String partyName = PP.getParty();
+        boolean isLeader = partyInstance.isPartyLeader(playerName, partyName);
 
-		if (args.length == 0 && !PP.inParty()) {
-			player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "party "}));
-			player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "party "}));
-			player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "party " }));
-			return true;
-		} else if (args.length == 0 && PP.inParty()) {
-			String tempList = "";
-			int x = 0;
-			for (Player p : Bukkit.getServer().getOnlinePlayers()) {
-				if (PP.getParty().equals(Users.getProfile(p).getParty())) {
-					if (p != null && x + 1 >= Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName();
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName();
-							x++;
-						}
-					}
-					if (p != null && x < Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName() + ", ";
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName() + ", ";
-							x++;
-						}
-					}
-				}
-			}
-			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
-			
-			//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()) {
+        if (PP.inParty() && (!partyInstance.isParty(PP.getParty()) || !partyInstance.isInParty(player, PP))) {
+            partyInstance.addToParty(player, PP, PP.getParty(), false, null);
+        }
 
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), null, EventReason.LEFT_PARTY);
-                Bukkit.getPluginManager().callEvent(event);
+        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 = "";
 
-                if (event.isCancelled()) {
-                    return true;
+                for (Player p : partyInstance.getAllMembers(player)) {
+                    if (p.equals(partyInstance.getPartyLeader(partyName))) {
+                        tempList += ChatColor.GOLD;
+                    }
+                    else {
+                        tempList += ChatColor.WHITE;
+                    }
+
+                    tempList += p.getName() + " ";
                 }
 
-				Pinstance.removeFromParty(player, PP);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-				return true;
+                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] { partyName }));
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] { tempList }));
+            }
 
-			} 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);
+            return true;
 
-				    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);
+        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;
                     }
-				}
-				Pinstance.addToParty(player, PP, args[0], false);
-				return true;
-			}
-		} else if (args.length == 2 && PP.inParty()) {
-			if (args[0].equalsIgnoreCase("password")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Pinstance.setPartyPassword(PP.getParty(), args[1]);
-						player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("kick")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Player tPlayer = null;
-						if (Bukkit.getServer().getPlayer(args[1]) != null)
-							tPlayer = Bukkit.getServer().getPlayer(args[1]);
-						if (tPlayer == null) {
-							player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { args[1] }));
-						}
-						if (!Pinstance.inSameParty(player, tPlayer)) {
-							player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { tPlayer.getName() }));
-						} else {
-							// Not an admin
-							if (!mcPermissions.getInstance().admin(player)) {
-								// Can't kick an admin
-								if (mcPermissions.getInstance().admin(tPlayer)) {
-									player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { tPlayer.getName() }));
-								}
-							}
-							PlayerProfile tPP = Users.getProfile(tPlayer);
 
-			                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, tPP.getParty(), null, EventReason.KICKED_FROM_PARTY);
-			                Bukkit.getPluginManager().callEvent(event);
+                    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;
-			                }
+                    if (event.isCancelled()) {
+                        return true;
+                    }
 
-							Pinstance.removeFromParty(tPlayer, tPP);
+                    partyInstance.removeFromParty(player, PP);
+                }
+                else {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+                    plugin.getServer().getPluginManager().callEvent(event);
 
-							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;
+                    }
+                }
+
+                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);
 
                 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;
+                partyInstance.addToParty(player, PP, args[0], false, args[1]);
             }
-			Pinstance.addToParty(player, PP, args[0], false, args[1]);
-		}
 
-		return true;
-	}
+            return true;
+
+        default:
+            player.sendMessage(LocaleLoader.getString("Party.Help.0"));
+            player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+            player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+            return true;
+        }
+    }
 }

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

@@ -1,88 +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.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
 
 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) {
+    @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.
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
+            return true;
+        }
 
-		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.
-		}
+        switch (args.length) {
+        case 1:
+            Player player = (Player) sender;
+            PlayerProfile PP = Users.getProfile(player);
 
-		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 (!Party.getInstance().isInParty(player, PP)) {
+                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                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.
-			}
-		}
+            if (PP.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
+                return true;
+            }
 
-		return true;
-	}
-}
+            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;
+        }
+   }
+}

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

@@ -1,56 +1,118 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class AcrobaticsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player))
-		{
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String dodgeChance;
+    private String rollChance;
+    private String gracefulRollChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canDodge;
+    private boolean canRoll;
+    private boolean canGracefulRoll;
 
-		String dodgepercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String gracepercentage = String.valueOf(((skillvalue / 1000) * 100) * 2);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		if (PP.getSkillLevel(SkillType.ACROBATICS) <= 800)
-			dodgepercentage = String.valueOf((skillvalue / 4000 * 100));
-		else
-			dodgepercentage = "20";
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
+            return true;
+        }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAcrobatics") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAcrobatics") }));
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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) }));
+        skillValue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
+        dataCalculations(skillValue);
+        permissionsCheck(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;
-	}
+        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) }));
+
+        if (canDodge || canGracefulRoll || canRoll) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
+
+        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);
+    }
 }

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

@@ -1,66 +1,108 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class ArcheryCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String skillShotBonus;
+    private String dazeChance;
+    private String retrieveChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSkillShot;
+    private boolean canDaze;
+    private boolean canRetrieve;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ARCHERY);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		int ignition = 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 200)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 400)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 600)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 800)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 1000)
-			ignition += 20;
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.archery")) {
+            return true;
+        }
 
-		String percentagedaze;
-		if (PP.getSkillLevel(SkillType.ARCHERY) < 1000)
-			percentagedaze = String.valueOf((skillvalue / 2000) * 100);
-		else
-			percentagedaze = "50";
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillArchery") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainArchery") }));
+        skillValue = (float) PP.getSkillLevel(SkillType.ARCHERY);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		if (mcPermissions.getInstance().archery(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+        player.sendMessage(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.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery1_0"), mcLocale.getString("m.EffectsArchery1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery2_0"), mcLocale.getString("m.EffectsArchery2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery4_0"), mcLocale.getString("m.EffectsArchery4_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
-		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.ArcheryIgnitionLength", new Object[] { (ignition / 20) }));
-		
-		Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
+        if (canSkillShot || canDaze || canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
 
-		return true;
-	}
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
+        }
+
+        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);
+    }
 }

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

@@ -1,68 +1,133 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class AxesCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String critChance;
+    private String bonusDamage;
+    private String impactDamage;
+    private String greaterImpactDamage;
+    private String skullSplitterLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSkullSplitter;
+    private boolean canCritical;
+    private boolean canBonusDamage;
+    private boolean canImpact;
+    private boolean canGreaterImpact;
 
-		String percentage;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		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;
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.axes")) {
+            return true;
+        }
 
-		int ticks = 2;
-		short durDmg = 5;
-		durDmg+=Users.getProfile(player).getSkillLevel(SkillType.AXES)/30;
-		int x = PP.getSkillLevel(SkillType.AXES);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAxes") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAxes") }));
+        skillValue = (float) PP.getSkillLevel(SkillType.AXES);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		if (mcPermissions.getInstance().axes(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+        player.sendMessage(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) }));
 
-		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 (canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
 
-		return true;
-	}
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
+        }
+
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3") }));
+        }
+
+        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);
+    }
 }

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

@@ -5,46 +5,72 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class ExcavationCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String gigaDrillBreakerLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canGigaDrill;
+    private boolean canTreasureHunt;
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.EXCAVATION);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		player.sendMessage("");
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.excavation")) {
+            return true;
+        }
 
-		if (mcPermissions.getInstance().excavation(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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 }));
+        skillValue = (float) PP.getSkillLevel(SkillType.EXCAVATION);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
-		
-		return true;
-	}
+        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 (canGigaDrill || canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
+
+        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);
+    }
 }

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

@@ -1,50 +1,104 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.locale.LocaleLoader;
+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;
 
 public class FishingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private int lootTier;
+    private String magicChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canTreasureHunt;
+    private boolean canMagicHunt;
+    private boolean canShake;
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillFishing") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainFishing") }));
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		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 (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.fishing")) {
+            return true;
+        }
 
-		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"));
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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);
+        lootTier = Fishing.getFishingLootTier(PP);
+        dataCalculations(lootTier);
+        permissionsCheck(player);
 
-		return true;
-	}
+        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 (canTreasureHunt || canMagicHunt || canShake) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
+
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
+        }
+
+        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);
+    }
 }

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

@@ -1,72 +1,168 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+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.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class HerbalismCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String greenTerraLength;
+    private String greenThumbChance;
+    private String greenThumbStage;
+    private String farmersDietRank;
+    private String doubleDropChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canGreenTerra;
+    private boolean canGreenThumbWheat;
+    private boolean canGreenThumbBlocks;
+    private boolean canFarmersDiet;
+    private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;
 
-		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++;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.HERBALISM);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.herbalism")) {
+            return true;
+        }
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.HERBALISM);
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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") }));
+        skillValue = (float) PP.getSkillLevel(SkillType.HERBALISM);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		if (mcPermissions.getInstance().herbalism(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+        player.sendMessage(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) }));
 
-		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 (canGreenTerra || (canDoubleDrop && !doubleDropsDisabled )|| canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
 
-		return true;
-	}
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
+        }
+
+        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();
+    }
 }

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

@@ -1,132 +1,196 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+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.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class MiningCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String doubleDropChance;
+    private String superBreakerLength;
+    private String blastMiningRank;
+    private String blastRadiusIncrease;
+    private String blastDamageDecrease;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSuperBreaker;
+    private boolean canDoubleDrop;
+    private boolean canBlast;
+    private boolean canBiggerBombs;
+    private boolean canDemoExpert;
+    private boolean doubleDropsDisabled;
 
-		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") }));
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		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) }));
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.mining")) {
+            return true;
+        }
 
-		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;
-	}
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
+
+        skillValue = (float) PP.getSkillLevel(SkillType.MINING);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
+
+        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();
+    }
 }

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

@@ -1,54 +1,162 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+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.mcLocale;
-import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.locale.LocaleLoader;
+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;
 
 public class RepairCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String repairMasteryBonus;
+    private String superRepairChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    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;
 
-		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") }));
+    private int diamondLevel;
+    private int goldLevel;
+    private int ironLevel;
+    private int stoneLevel;
 
-		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) }));
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		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;
-	}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.repair")) {
+            return true;
+        }
+
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
+
+        skillValue = (float) PP.getSkillLevel(SkillType.REPAIR);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
+
+        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%");
+        Config configInstance = Config.getInstance();
+
+        diamondLevel = configInstance.getRepairDiamondLevelRequirement();
+        goldLevel = configInstance.getRepairGoldLevelRequirement();
+        ironLevel = configInstance.getRepairIronLevelRequirement();
+        stoneLevel = configInstance.getRepairStoneLevelRequirement();
+
+        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);
+    }
 }

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

@@ -1,72 +1,119 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class SwordsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String counterAttackChance;
+    private String bleedLength;
+    private String bleedChance;
+    private String serratedStrikesLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canCounter;
+    private boolean canSerratedStrike;
+    private boolean canBleed;
 
-		int bleedrank = 2;
-		String percentage, counterattackpercentage;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.SWORDS);
-		if (PP.getSkillLevel(SkillType.SWORDS) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
-		else
-			percentage = "75";
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.swords")) {
+            return true;
+        }
 
-		if (skillvalue >= 750)
-			bleedrank += 1;
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		if (PP.getSkillLevel(SkillType.SWORDS) <= 600)
-			counterattackpercentage = String.valueOf((skillvalue / 2000) * 100);
-		else
-			counterattackpercentage = "30";
+        skillValue = (float) PP.getSkillLevel(SkillType.SWORDS);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.SWORDS);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+        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) }));
 
-		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 || canCounter || canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
 
-		return true;
-	}
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
+        }
+
+        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") }));
+        }
+
+        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);
+    }
 }

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

@@ -1,78 +1,172 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+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.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class TamingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String goreChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canBeastLore;
+    private boolean canGore;
+    private boolean canSharpenedClaws;
+    private boolean canEnvironmentallyAware;
+    private boolean canThickFur;
+    private boolean canShockProof;
+    private boolean canCallWild;
+    private boolean canFastFood;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.TAMING);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillTaming") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainTaming") }));
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.taming")) {
+            return true;
+        }
 
-		if (mcPermissions.getInstance().taming(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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") }));
+        skillValue = (float) PP.getSkillLevel(SkillType.TAMING);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		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") }));
+        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 (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 (canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
 
-		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 (canBeastLore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
+        }
 
-		if (PP.getSkillLevel(SkillType.TAMING) < 750)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming4") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming4_0"), mcLocale.getString("m.AbilBonusTaming4_1") }));
-		if (PP.getSkillLevel(SkillType.TAMING) < 50)
-            player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming5") }));
-		else
-	          player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming5_0"), mcLocale.getString("m.AbilBonusTaming5_1") }));
-		
-		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
-		
-		Page.grabGuidePageForSkill(SkillType.TAMING, player, args);
+        if (canGore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3") }));
+        }
 
-		return true;
-	}
+        if (canSharpenedClaws) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5") }));
+        }
+
+        if (canEnvironmentallyAware) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7") }));
+        }
+
+        if (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);
+    }
 }

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

@@ -1,74 +1,126 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class UnarmedCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String berserkLength;
+    private String deflectChance;
+    private String disarmChance;
+    private String ironArmBonus;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canBerserk;
+    private boolean canDisarm;
+    private boolean canBonusDamage;
+    private boolean canDeflect;
 
-		String percentage, arrowpercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.UNARMED);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			percentage = String.valueOf((skillvalue / 3000) * 100);
-		else
-			percentage = "33.3";
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.unarmed")) {
+            return true;
+        }
 
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			arrowpercentage = String.valueOf(((skillvalue / 1000) * 100) / 2);
-		else
-			arrowpercentage = "50";
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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;
+        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
+        dataCalculations(skillValue);
+        permissionsCheck(player);
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillUnarmed") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainUnarmed") }));
+        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 (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 (canBerserk || canBonusDamage || canDeflect || canDisarm) {
+            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.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 (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) }));
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
-		
-		Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
+        }
 
-		return true;
-	}
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
+        }
+
+        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
+            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("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);
+    }
 }

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

@@ -1,59 +1,115 @@
 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.Users;
-import com.gmail.nossr50.mcPermissions;
+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.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class WoodcuttingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    private float skillValue;
+    private String treeFellerLength;
+    private String doubleDropChance;
 
-		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;
-	}
+    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;
+        }
+
+        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();
+    }
 }

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

@@ -1,50 +1,77 @@
 package com.gmail.nossr50.commands.spout;
 
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 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 {
-	@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;
-		}
+    private final mcMMO plugin;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+    public MchudCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		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;
-	}
+    @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;
+        }
+    }
 }

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

@@ -6,57 +6,74 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 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;
 
 public class XplockCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.spoutEnabled || !LoadProperties.xpbar || !LoadProperties.xplockEnable) {
-			sender.sendMessage("This command is not enabled."); //TODO: Needs more locale.
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (!Config.getInstance().spoutEnabled || !Config.getInstance().getSpoutXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
 
-		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;
-		}
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		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;
+        }
+    }
 }

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

@@ -0,0 +1,478 @@
+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); }
+
+    /* 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); }
+
+    public int getRepairGoldMaterial() { return config.getInt("Skills.Repair.Gold.ID", 266); }
+    public int getRepairStoneMaterial() { return config.getInt("Skills.Repair.Stone.ID", 4); }
+    public int getRepairWoodMaterial() { return config.getInt("Skills.Repair.Wood.ID", 5); }
+    public int getRepairDiamondMaterial() { return config.getInt("Skills.Repair.Diamond.ID", 264); }
+    public int getRepairIronMaterial() { return config.getInt("Skills.Repair.Iron.ID", 265); }
+    public int getRepairStringMaterial() { return config.getInt("Skills.Repair.String.ID", 287); }
+    public int getRepairLeatherMaterial() { return config.getInt("Skills.Repair.Leather.ID", 334); }
+
+    public int getRepairDiamondLevelRequirement() { return config.getInt("Skills.Repair.Diamond.Level_Required", 50); }
+    public int getRepairIronLevelRequirement() { return config.getInt("Skills.Repair.Iron.Level_Required", 0); }
+    public int getRepairGoldLevelRequirement() { return config.getInt("Skills.Repair.Gold.Level_Required", 0); }
+    public int getRepairStoneLevelRequirement() { return config.getInt("Skills.Repair.Stone.Level_Required", 0); }
+
+    /* 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 static File configFile;
-    protected static File dataFolder;
+    protected File configFile;
+    protected File dataFolder;
     protected final mcMMO plugin;
-    protected static FileConfiguration config;
+    protected FileConfiguration config;
 
     public ConfigLoader(mcMMO plugin, String fileName){
         this.plugin = plugin;
@@ -28,7 +28,7 @@ public abstract class ConfigLoader {
     /**
      * Save this config file.
      */
-    private static void saveConfig() {
+    private void saveConfig() {
         try {
             config.save(configFile);
         }
@@ -41,7 +41,6 @@ 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/LoadProperties.java

@@ -1,479 +0,0 @@
-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 Boolean aDisplayNames, pDisplayNames;
-    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;
-
-    /* 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;
-
-    /*
-     * 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;
-
-    /* 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);
-
-        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);
-
-        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);
-
-        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);
-
-        aDisplayNames = config.getBoolean("Commands.a.Display_Names", true);
-        pDisplayNames = config.getBoolean("Commands.p.Display_Names", 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/TreasuresConfig.java

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

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

@@ -0,0 +1,99 @@
+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.CustomItem;
+
+public class CustomArmorConfig extends ModConfigLoader{
+    private static CustomArmorConfig instance;
+
+    public static CustomArmorConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomArmorConfig(mcMMO.p);
+        }
+
+        return instance;
+    }
+
+    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> customItems = new ArrayList<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...");
+
+        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) {
+                ItemStack repairMaterial = new ItemStack(repairID, 1, (short) 0, repairData);
+                armor = new CustomItem(durability, repairMaterial, repairQuantity, repairable, id);
+            }
+            else {
+                armor = new CustomItem(durability, null, 0, repairable, id);
+            }
+
+            idList.add(id);
+            customIDs.add(id);
+            customItems.add(armor);
+        }
+    }
+}

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

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

@@ -0,0 +1,107 @@
+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.CustomItem;
+import com.gmail.nossr50.datatypes.mods.CustomTool;
+
+public class CustomToolsConfig extends ModConfigLoader {
+    private static CustomToolsConfig instance;
+
+    public static CustomToolsConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomToolsConfig(mcMMO.p);
+        }
+
+        return instance;
+    }
+
+    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<CustomItem> customItems = new ArrayList<CustomItem>();
+
+    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...");
+
+        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) {
+                ItemStack repairMaterial = new ItemStack(repairID, 1, (short) 0, repairData);
+                tool = new CustomTool(durability, repairMaterial, repairQuantity, repairable, tier, abilityEnabled, multiplier, id);
+            }
+            else {
+                tool = new CustomTool(durability, null, 0, repairable, tier, abilityEnabled, multiplier, id);
+            }
+
+            idList.add(id);
+            customIDs.add(id);
+            customItems.add(tool);
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+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,134 +1,197 @@
-package com.gmail.nossr50.datatypes;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Mining;
-
-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;
-        }
-    }
-}
+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(),
+            "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(),
+            "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(),
+            "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(),
+            "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(),
+            "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(),
+            "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(),
+            "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(),
+            null,
+            null,
+            "Mining.Blast.Other.On",
+            "Mining.Blast.Refresh",
+            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 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);
+    }
+
+    /**
+     * 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;
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 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 +9,17 @@ import org.getspout.spoutapi.gui.RenderPriority;
 import org.getspout.spoutapi.gui.Widget;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Users;
 
 public class HUDmmo {
-    private int center_x = 427/2;
+    private int center_x = 427 / 2;
 
-    private String playerName = null;
+    private String playerName;
+    private final mcMMO plugin;
 
     private Widget xpbar = null;
     private GenericGradient xpfill = null;
@@ -28,10 +28,9 @@ public class HUDmmo {
     private GenericGradient xpicon_border = null;
     private GenericTexture xpicon = null;
 
-    private mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
-
-    public HUDmmo(Player player) {
-        playerName = player.getName();
+    public HUDmmo(Player player, mcMMO plugin) {
+        this.playerName = player.getName();
+        this.plugin = plugin;
         initializeHUD(player);
     }
 
@@ -120,9 +119,9 @@ public class HUDmmo {
      * @param sPlayer Player to initialize XP bar for
      */
     private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) {
-        Color border = new Color((float) LoadProperties.xpborder_r, (float) LoadProperties.xpborder_g, (float) LoadProperties.xpborder_b, 1f);
+        Color border = new Color((float) Config.getInstance().getSpoutRetroHUDXPBorderRed(), (float) Config.getInstance().getSpoutRetroHUDXPBorderGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBorderBlue(), 1f);
         Color green = new Color(0f, 1f, 0f, 1f);
-        Color background = new Color((float) LoadProperties.xpbackground_r, (float) LoadProperties.xpbackground_g, (float) LoadProperties.xpbackground_b, 1f);
+        Color background = new Color((float) Config.getInstance().getSpoutRetroHUDXPBackgroundRed(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundBlue(), 1f);
         Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
 
         xpicon = new GenericTexture();
@@ -186,12 +185,12 @@ public class HUDmmo {
         xpbg.setPriority(RenderPriority.Low);
         xpbg.setDirty(true);
 
-        if (LoadProperties.xpbar) {
+        if (Config.getInstance().getSpoutXPBarEnabled()) {
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
             sPlayer.getMainScreen().attachWidget(plugin, xpfill);
             sPlayer.getMainScreen().attachWidget(plugin, xpbg);
 
-            if (LoadProperties.xpicon) {
+            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon_bg);
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon_border);
@@ -206,27 +205,27 @@ public class HUDmmo {
      *
      * @param sPlayer Player to initialize XP bar for
      */
-    private void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
-        if (LoadProperties.xpbar) {
+    public void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
+        if (Config.getInstance().getSpoutXPBarEnabled()) {
             xpbar = new GenericTexture();
 
             ((GenericTexture) xpbar).setUrl("xpbar_inc000.png");
 
-            xpbar.setX(LoadProperties.xpbar_x);
-            xpbar.setY(LoadProperties.xpbar_y);
+            xpbar.setX(Config.getInstance().getSpoutXPBarXPosition());
+            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
             xpbar.setHeight(8);
             xpbar.setWidth(256);
 
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
 
-            if (LoadProperties.xpicon) {
+            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
                 xpicon = new GenericTexture();
 
                 xpicon.setUrl("Icon.png");
                 xpicon.setHeight(16);
                 xpicon.setWidth(32);
-                xpicon.setX(LoadProperties.xpicon_x);
-                xpicon.setY(LoadProperties.xpicon_y);
+                xpicon.setX(Config.getInstance().getSpoutXPIconXPosition());
+                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition());
                 xpicon.setDirty(true);
 
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
@@ -242,25 +241,25 @@ public class HUDmmo {
      * @param sPlayer Player to initialize XP bar for
      */
     private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) {
-        if (LoadProperties.xpbar) {
+        if (Config.getInstance().getSpoutXPBarEnabled()) {
             xpbar = new GenericTexture();
 
             ((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
             xpbar.setX(center_x - 64);
-            xpbar.setY(LoadProperties.xpbar_y);
+            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
             xpbar.setHeight(4);
             xpbar.setWidth(128);
 
             sPlayer.getMainScreen().attachWidget(plugin, xpbar);
 
-            if (LoadProperties.xpicon) {
+            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
                 xpicon = new GenericTexture();
 
                 xpicon.setUrl("Icon.png");
                 xpicon.setHeight(8);
                 xpicon.setWidth(16);
                 xpicon.setX(center_x - (8 + 64));
-                xpicon.setY(LoadProperties.xpicon_y + 2);
+                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition() + 2);
                 xpicon.setDirty(true);
 
                 sPlayer.getMainScreen().attachWidget(plugin, xpicon);
@@ -277,7 +276,7 @@ public class HUDmmo {
      * @param PP Profile of the given player
      */
     private void updateXpBarStandard(Player player, PlayerProfile PP) {
-        if (!LoadProperties.xpbar) {
+        if (!Config.getInstance().getSpoutXPBarEnabled()) {
             return;
         }
 
@@ -287,7 +286,7 @@ public class HUDmmo {
             return;
         }
 
-        ((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString()) + ".png");
+        ((GenericTexture) xpicon).setUrl(Misc.getCapitalized(theType.toString()) + ".png");
         xpicon.setDirty(true);
 
         ((GenericTexture) xpbar).setUrl(getUrlBar(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
@@ -303,7 +302,7 @@ public class HUDmmo {
      * @param PP Profile of the given player
      */
     private void updateXpBarRetro(Player player, PlayerProfile PP) {
-        if (!LoadProperties.xpbar) {
+        if (!Config.getInstance().getSpoutXPBarEnabled()) {
             return;
         }
 
@@ -315,7 +314,7 @@ public class HUDmmo {
 
         Color color = getRetroColor(theType);
 
-        xpicon.setUrl(m.getCapitalized(theType.toString()) + "_r.png");
+        xpicon.setUrl(Misc.getCapitalized(theType.toString()) + "_r.png");
 
         xpfill.setBottomColor(color);
         xpfill.setTopColor(color);
@@ -328,40 +327,40 @@ public class HUDmmo {
     private static Color getRetroColor(SkillType type) {
         switch (type) {
             case ACROBATICS:
-                return new Color((float) LoadProperties.acrobatics_r, (float) LoadProperties.acrobatics_g, (float) LoadProperties.acrobatics_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDAcrobaticsRed(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsGreen(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsBlue(), 1f);
 
             case ARCHERY:
-                return new Color((float) LoadProperties.archery_r, (float) LoadProperties.archery_g, (float) LoadProperties.archery_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDArcheryRed(), (float) Config.getInstance().getSpoutRetroHUDArcheryGreen(), (float) Config.getInstance().getSpoutRetroHUDArcheryBlue(), 1f);
 
             case AXES:
-                return new Color((float) LoadProperties.axes_r, (float) LoadProperties.axes_g, (float) LoadProperties.axes_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDAxesRed(), (float) Config.getInstance().getSpoutRetroHUDAxesGreen(), (float) Config.getInstance().getSpoutRetroHUDAxesBlue(), 1f);
 
             case EXCAVATION:
-                return new Color((float) LoadProperties.excavation_r, (float) LoadProperties.excavation_g, (float) LoadProperties.excavation_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDExcavationRed(), (float) Config.getInstance().getSpoutRetroHUDExcavationGreen(), (float) Config.getInstance().getSpoutRetroHUDExcavationBlue(), 1f);
 
             case HERBALISM:
-                return new Color((float) LoadProperties.herbalism_r, (float) LoadProperties.herbalism_g, (float) LoadProperties.herbalism_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDHerbalismRed(), (float) Config.getInstance().getSpoutRetroHUDHerbalismGreen(), (float) Config.getInstance().getSpoutRetroHUDHerbalismBlue(), 1f);
 
             case MINING:
-                return new Color((float) LoadProperties.mining_r, (float) LoadProperties.mining_g, (float) LoadProperties.mining_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDMiningRed(), (float) Config.getInstance().getSpoutRetroHUDMiningGreen(), (float) Config.getInstance().getSpoutRetroHUDMiningBlue(), 1f);
 
             case REPAIR:
-                return new Color((float) LoadProperties.repair_r, (float) LoadProperties.repair_g, (float) LoadProperties.repair_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDRepairRed(), (float) Config.getInstance().getSpoutRetroHUDRepairGreen(), (float) Config.getInstance().getSpoutRetroHUDRepairBlue(), 1f);
 
             case SWORDS:
-                return new Color((float) LoadProperties.swords_r, (float) LoadProperties.swords_g, (float) LoadProperties.swords_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDSwordsRed(), (float) Config.getInstance().getSpoutRetroHUDSwordsGreen(), (float) Config.getInstance().getSpoutRetroHUDSwordsBlue(), 1f);
 
             case TAMING:
-                return new Color((float) LoadProperties.taming_r, (float) LoadProperties.taming_g, (float) LoadProperties.taming_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDTamingRed(), (float) Config.getInstance().getSpoutRetroHUDTamingGreen(), (float) Config.getInstance().getSpoutRetroHUDTamingBlue(), 1f);
 
             case UNARMED:
-                return new Color((float) LoadProperties.unarmed_r, (float) LoadProperties.unarmed_g, (float) LoadProperties.unarmed_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDUnarmedRed(), (float) Config.getInstance().getSpoutRetroHUDUnarmedGreen(), (float) Config.getInstance().getSpoutRetroHUDUnarmedBlue(), 1f);
 
             case WOODCUTTING:
-                return new Color((float) LoadProperties.woodcutting_r, (float) LoadProperties.woodcutting_g, (float) LoadProperties.woodcutting_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDWoodcuttingRed(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingGreen(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingBlue(), 1f);
 
             case FISHING:
-                return new Color((float) LoadProperties.fishing_r, (float) LoadProperties.fishing_g, (float) LoadProperties.fishing_b, 1f);
+                return new Color((float) Config.getInstance().getSpoutRetroHUDFishingRed(), (float) Config.getInstance().getSpoutRetroHUDFishingGreen(), (float) Config.getInstance().getSpoutRetroHUDFishingBlue(), 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.LoadProperties;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.ModChecks;
+import com.gmail.nossr50.util.Users;
 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, partyChatOnly = false, adminChatMode = false;
+    private boolean partyChatMode = 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,7 +53,6 @@ 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
@@ -61,42 +60,10 @@ public class PlayerProfile {
     HashMap<ToolType, Integer> toolATS = new HashMap<ToolType, Integer>();
 
     private String playerName;
-    private String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
+    private final String location = mcMMO.p.usersFile;
 
-    public PlayerProfile(String name) {
-        hud = LoadProperties.defaulthud;
-        playerName = name;
-
-        for (AbilityType abilityType : AbilityType.values()) {
-            skillsDATS.put(abilityType, 0);
-        }
-
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType != SkillType.ALL) {
-                skills.put(skillType, 0);
-                skillsXp.put(skillType, 0);
-            }
-        }
-
-        if (LoadProperties.useMySQL) {
-            if (!loadMySQL()) {
-                addMySQLPlayer();
-                loadMySQL(); //This is probably not needed anymore, could just delete. // So can we remove this whole function, or just this line?
-            }
-        }
-        else if (!load()) {
-            addPlayer();
-        }
-
-        lastlogin = ((Long) (System.currentTimeMillis() / 1000)).intValue();
-    }
-
-    /*
-     * Why do we even have this? The only time it's called, it's false.
-     * Why not combine the two?
-     */
     public PlayerProfile(String name, boolean addNew) {
-        hud = LoadProperties.defaulthud;
+        hud = Config.getInstance().defaulthud;
         playerName = name;
 
         for (AbilityType abilityType : AbilityType.values()) {
@@ -110,10 +77,9 @@ public class PlayerProfile {
             }
         }
 
-        if (LoadProperties.useMySQL) {
+        if (Config.getInstance().getUseMySQL()) {
             if (!loadMySQL() && addNew) {
                 addMySQLPlayer();
-                loadMySQL(); //This is probably not needed anymore, could just delete. // So can we remove this whole function, or just this line?
             }
         }
         else if (!load() && addNew) {
@@ -124,17 +90,25 @@ 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() {
-        Integer id = 0;
-        id = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
-        if(id == 0)
-            return false;
+        int id = 0;
+        id = mcMMO.database.getInt("SELECT id FROM "+Config.getInstance().getMySQLTablePrefix()+"users WHERE user = '" + playerName + "'");
+        
         this.userid = id;
+        
         if (id > 0) {
-            HashMap<Integer, ArrayList<String>> huds = mcMMO.database.read("SELECT hudtype FROM "+LoadProperties.MySQLtablePrefix+"huds WHERE user_id = " + id);
+            HashMap<Integer, ArrayList<String>> huds = mcMMO.database.read("SELECT hudtype FROM "+Config.getInstance().getMySQLTablePrefix()+"huds WHERE user_id = " + id);
             if(huds.get(1) == null)
             {
-                mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"huds (user_id) VALUES ("+id+")");
+                mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"huds (user_id) VALUES ("+id+")");
             } else {
                 if(huds.get(1).get(0) != null)
                 {
@@ -146,20 +120,20 @@ public class PlayerProfile {
                     }
                 }
                 } else {
-                    hud = LoadProperties.defaulthud;
+                    hud = Config.getInstance().defaulthud;
                 }
             }
-            HashMap<Integer, ArrayList<String>> users = mcMMO.database.read("SELECT lastlogin, party FROM "+LoadProperties.MySQLtablePrefix+"users WHERE id = " + id);
+            HashMap<Integer, ArrayList<String>> users = mcMMO.database.read("SELECT lastlogin, party FROM "+Config.getInstance().getMySQLTablePrefix()+"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 "+LoadProperties.MySQLtablePrefix+"cooldowns WHERE user_id = " + id);
+                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);
             /*
              * 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 "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
+                mcMMO.database.write("INSERT INTO "+Config.getInstance().getMySQLTablePrefix()+"cooldowns (user_id) VALUES ("+id+")");
             }
             else
             {
@@ -172,7 +146,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 "+LoadProperties.MySQLtablePrefix+"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 "+Config.getInstance().getMySQLTablePrefix()+"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)));
@@ -185,7 +159,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 "+LoadProperties.MySQLtablePrefix+"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 "+Config.getInstance().getMySQLTablePrefix()+"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)));
@@ -207,12 +181,12 @@ public class PlayerProfile {
     }
 
     public void addMySQLPlayer() {
-        Integer id = 0;
-        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+")");
+        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+")");
         this.userid = id;
     }
 
@@ -231,53 +205,53 @@ public class PlayerProfile {
                 if(!character[0].equals(playerName)){continue;}
                 
                 //Get Mining
-                if(character.length > 1 && m.isInt(character[1]))
+                if(character.length > 1 && Misc.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 && m.isInt(character[4]))
+                if(character.length > 4 && Misc.isInt(character[4]))
                     skillsXp.put(SkillType.MINING, Integer.valueOf(character[4]));
-                if(character.length > 5 && m.isInt(character[5]))
+                if(character.length > 5 && Misc.isInt(character[5]))
                     skills.put(SkillType.WOODCUTTING, Integer.valueOf(character[5]));
-                if(character.length > 6 && m.isInt(character[6]))
+                if(character.length > 6 && Misc.isInt(character[6]))
                     skillsXp.put(SkillType.WOODCUTTING, Integer.valueOf(character[6]));
-                if(character.length > 7 && m.isInt(character[7]))
+                if(character.length > 7 && Misc.isInt(character[7]))
                     skills.put(SkillType.REPAIR, Integer.valueOf(character[7]));
-                if(character.length > 8 && m.isInt(character[8]))
+                if(character.length > 8 && Misc.isInt(character[8]))
                     skills.put(SkillType.UNARMED,  Integer.valueOf(character[8]));
-                if(character.length > 9 && m.isInt(character[9]))
+                if(character.length > 9 && Misc.isInt(character[9]))
                     skills.put(SkillType.HERBALISM, Integer.valueOf(character[9]));
-                if(character.length > 10 && m.isInt(character[10]))
+                if(character.length > 10 && Misc.isInt(character[10]))
                     skills.put(SkillType.EXCAVATION, Integer.valueOf(character[10]));
-                if(character.length > 11 && m.isInt(character[11]))
+                if(character.length > 11 && Misc.isInt(character[11]))
                     skills.put(SkillType.ARCHERY, Integer.valueOf(character[11]));
-                if(character.length > 12 && m.isInt(character[12]))
+                if(character.length > 12 && Misc.isInt(character[12]))
                     skills.put(SkillType.SWORDS, Integer.valueOf(character[12]));
-                if(character.length > 13 && m.isInt(character[13]))
+                if(character.length > 13 && Misc.isInt(character[13]))
                     skills.put(SkillType.AXES, Integer.valueOf(character[13]));
-                if(character.length > 14 && m.isInt(character[14]))
+                if(character.length > 14 && Misc.isInt(character[14]))
                     skills.put(SkillType.ACROBATICS, Integer.valueOf(character[14]));
-                if(character.length > 15 && m.isInt(character[15]))
+                if(character.length > 15 && Misc.isInt(character[15]))
                     skillsXp.put(SkillType.REPAIR, Integer.valueOf(character[15]));
-                if(character.length > 16 && m.isInt(character[16]))
+                if(character.length > 16 && Misc.isInt(character[16]))
                     skillsXp.put(SkillType.UNARMED, Integer.valueOf(character[16]));
-                if(character.length > 17 && m.isInt(character[17]))
+                if(character.length > 17 && Misc.isInt(character[17]))
                     skillsXp.put(SkillType.HERBALISM, Integer.valueOf(character[17]));
-                if(character.length > 18 && m.isInt(character[18]))
+                if(character.length > 18 && Misc.isInt(character[18]))
                     skillsXp.put(SkillType.EXCAVATION, Integer.valueOf(character[18]));
-                if(character.length > 19 && m.isInt(character[19]))
+                if(character.length > 19 && Misc.isInt(character[19]))
                     skillsXp.put(SkillType.ARCHERY, Integer.valueOf(character[19]));
-                if(character.length > 20 && m.isInt(character[20]))
+                if(character.length > 20 && Misc.isInt(character[20]))
                     skillsXp.put(SkillType.SWORDS, Integer.valueOf(character[20]));
-                if(character.length > 21 && m.isInt(character[21]))
+                if(character.length > 21 && Misc.isInt(character[21]))
                     skillsXp.put(SkillType.AXES, Integer.valueOf(character[21]));
-                if(character.length > 22 && m.isInt(character[22]))
+                if(character.length > 22 && Misc.isInt(character[22]))
                     skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(character[22]));
-                if(character.length > 24 && m.isInt(character[24]))
+                if(character.length > 24 && Misc.isInt(character[24]))
                     skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
-                if(character.length > 25 && m.isInt(character[25]))
+                if(character.length > 25 && Misc.isInt(character[25]))
                     skillsXp.put(SkillType.TAMING, Integer.valueOf(character[25]));
                 if(character.length > 26)
                     skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(character[26]));
@@ -315,22 +289,20 @@ public class PlayerProfile {
             }
             in.close();
         } catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            mcMMO.p.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 (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 "
+    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 "
                     +" mining = " + skillsDATS.get(AbilityType.SUPER_BREAKER)
                     +", woodcutting = " + skillsDATS.get(AbilityType.TREE_FELLER)
                     +", unarmed = " + skillsDATS.get(AbilityType.BERSERK)
@@ -340,7 +312,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 "+LoadProperties.MySQLtablePrefix+"skills SET "
+            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"skills SET "
                     +"  taming = "+skills.get(SkillType.TAMING)
                     +", mining = "+skills.get(SkillType.MINING)
                     +", repair = "+skills.get(SkillType.REPAIR)
@@ -354,7 +326,7 @@ public class PlayerProfile {
                     +", acrobatics = "+skills.get(SkillType.ACROBATICS)
                     +", fishing = "+skills.get(SkillType.FISHING)
                     +" WHERE user_id = "+this.userid);
-            mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"experience SET "
+            mcMMO.database.write("UPDATE "+Config.getInstance().getMySQLTablePrefix()+"experience SET "
                     +"  taming = "+skillsXp.get(SkillType.TAMING)
                     +", mining = "+skillsXp.get(SkillType.MINING)
                     +", repair = "+skillsXp.get(SkillType.REPAIR)
@@ -368,8 +340,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
@@ -377,18 +349,16 @@ 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");
-                        
-                    //Otherwise write the new player information
-                    } else {
+                    }
+                    else {
+                      //Otherwise write the new player information
                         writer.append(playerName + ":");
                         writer.append(skills.get(SkillType.MINING) + ":");
                         writer.append("" + ":");
@@ -428,16 +398,18 @@ 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) {
-                Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            catch (Exception e) {
+                mcMMO.p.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
             }
         }
     }
@@ -502,7 +474,7 @@ public class PlayerProfile {
             out.append(0+":"); //DATS
             out.append(0+":"); //DATS
             out.append(0+":"); //DATS
-            out.append(LoadProperties.defaulthud.toString()+":");//HUD
+            out.append(Config.getInstance().defaulthud.toString()+":");//HUD
             out.append(0+":"); //Fishing
             out.append(0+":"); //FishingXP
             out.append(0+":"); //Blast Mining
@@ -512,7 +484,7 @@ public class PlayerProfile {
             out.newLine();
             out.close();
         } catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            mcMMO.p.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
     }
 
@@ -581,6 +553,10 @@ public class PlayerProfile {
         save();
     }
 
+    public void setXpBarLocked(boolean locked) {
+        xpbarlocked = locked;
+    }
+
     public boolean getXpBarLocked() {
         return xpbarlocked;
     }
@@ -633,38 +609,6 @@ 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
      */
@@ -681,6 +625,15 @@ 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.
      *
@@ -774,6 +727,15 @@ 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.
      *
@@ -989,22 +951,26 @@ public class PlayerProfile {
      * XP Functions
      */
 
-    public Integer getSkillLevel(SkillType skillType) {
+    public int getSkillLevel(SkillType skillType) {
         return skills.get(skillType);
     }
 
-    public Integer getSkillXpLevel(SkillType skillType) {
+    public int getSkillXpLevel(SkillType skillType) {
         return skillsXp.get(skillType);
     }
 
+    public void skillUp(SkillType skillType, int newValue) {
+        skills.put(skillType, skills.get(skillType) + newValue);
+    }
+
     /**
      * Adds XP to the player, doesn't calculate for XP Rate
      *
      * @param skillType The skill to add XP to
      * @param newValue The amount of XP to add
      */
-    public void addXPOverrideNoBonus(SkillType skillType, int newValue) {
-        Player player = Bukkit.getPlayer(playerName);
+    public void addXPOverride(SkillType skillType, int newValue) {
+        Player player = mcMMO.p.getServer().getPlayer(playerName);
 
         if (skillType.equals(SkillType.ALL)) {
             for (SkillType x : SkillType.values()) {
@@ -1012,12 +978,12 @@ public class PlayerProfile {
                     continue;
                 }
 
-                Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
+                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
                 skillsXp.put(x, skillsXp.get(x) + newValue);
             }
         }
         else {
-            Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
             skillsXp.put(skillType, skillsXp.get(skillType) + newValue);
             lastgained = skillType;
         }
@@ -1029,36 +995,19 @@ public class PlayerProfile {
      * @param skillType The skill to add XP to
      * @param newValue The amount of XP to add
      */
-    public void addXPOverride(SkillType skillType, int newValue) {
-        Player player = Bukkit.getPlayer(playerName);
-
-        if (skillType.equals(SkillType.ALL)) {
-            for (SkillType x : SkillType.values()) {
-                if (x.equals(SkillType.ALL)) {
-                    continue;
-                }
-
-                Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
-                skillsXp.put(x, skillsXp.get(x) + newValue);
-            }
-        }
-        else {
-            int xp = newValue * LoadProperties.xpGainMultiplier;
-
-            Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
-            skillsXp.put(skillType, skillsXp.get(skillType) + xp);
-            lastgained = skillType;
-        }
+    public void addXPOverrideBonus(SkillType skillType, int newValue) {
+        int xp = newValue * Config.getInstance().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(SkillType skillType, int newValue, Player player) {
+    public void addXP(Player player, SkillType skillType, int newValue) {
         if (System.currentTimeMillis() < ((xpGainATS * 1000) + 250) || player.getGameMode().equals(GameMode.CREATIVE)) {
             return;
         }
@@ -1067,23 +1016,10 @@ public class PlayerProfile {
         double bonusModifier = 0;
 
         if (inParty()) {
-            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)) {
-                        PlayerProfile PartyLeader = Users.getProfile(x);
-
-                        if (PartyLeader.getSkillLevel(skillType) >= this.getSkillLevel(skillType)) {
-             
-                            int leaderLevel = PartyLeader.getSkillLevel(skillType);
-                            int difference = leaderLevel - this.getSkillLevel(skillType);
-                            bonusModifier = (difference * 0.75D) / 100D;
-                        }
-                    }
-                }
-            }
+            bonusModifier = partyModifier(skillType);
         }
 
-        int xp = (int) (newValue / skillType.getXpModifier()) * LoadProperties.xpGainMultiplier;
+        int xp = (int) (newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier;
 
         if (bonusModifier > 0) {
             if (bonusModifier >= 2) {
@@ -1094,18 +1030,47 @@ public class PlayerProfile {
             xp += trueBonus;
         }
 
-        Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
+        if (Config.getInstance().getToolModsEnabled()) {
+            ItemStack item = player.getItemInHand();
+
+            if (ItemChecks.isCustomTool(item)) {
+                xp = (int) (xp * ModChecks.getToolFromItemStack(item).getXpMultiplier());
+            }
+        }
+
+        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
         skillsXp.put(skillType, skillsXp.get(skillType) + xp);
         lastgained = skillType;
     }
 
+    /**
+     * Remove XP from a skill.
+     *
+     * @param skillType Type of skill to modify
+     * @param xp Amount of xp to remove
+     */
+    public void removeXP(SkillType skillType, int xp) {
+        if (skillType.equals(SkillType.ALL)) {
+            for (SkillType skill : SkillType.values()) {
+                if (skill.equals(SkillType.ALL)) {
+                    continue;
+                }
+
+                skillsXp.put(skill, skillsXp.get(skill) - xp);
+            }
+        }
+        else {
+            skillsXp.put(skillType, skillsXp.get(skillType) - xp);
+        }
+    }
+
     /**
      * Modify a skill level.
      *
      * @param skillType Type of skill to modify
      * @param newValue New level value for the skill
      */
-    public void modifyskill(SkillType skillType, int newValue) {
+    public void modifySkill(SkillType skillType, int newValue) {
         if (skillType.equals(SkillType.ALL)) {
             for (SkillType skill : SkillType.values()) {
                 if (skill.equals(SkillType.ALL)) {
@@ -1155,8 +1120,56 @@ public class PlayerProfile {
      * @param skillType Type of skill to check
      * @return the XP remaining until next level
      */
-    public Integer getXpToLevel(SkillType skillType) {
-        return (int) (1020 + (skills.get(skillType) *  20)); //Do we REALLY need to cast to int here?
+    public int getXpToLevel(SkillType skillType) {
+        return 1020 + (skills.get(skillType) *  Config.getInstance().getFormulaMultiplierCurve()); //Do we REALLY need to cast to int here?
+    }
+
+    /**
+     * Gets the power level of a player.
+     *
+     * @return the power level of the player
+     */
+    public int getPowerLevel() {
+        Player player = mcMMO.p.getServer().getPlayer(playerName);
+        int powerLevel = 0;
+
+        for (SkillType type : SkillType.values()) {
+            if (type.getPermissions(player)) {
+                powerLevel += getSkillLevel(type);
+            }
+        }
+
+        return powerLevel;
+    }
+
+    /**
+     * Calculate the party XP modifier.
+     *
+     * @param skillType Type of skill to check
+     * @return the party bonus multiplier
+     */
+    private double partyModifier(SkillType skillType) {
+        Player player = getPlayer();
+        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)) {
+                    PlayerProfile PartyLeader = Users.getProfile(x);
+                    int leaderSkill = PartyLeader.getSkillLevel(skillType);
+                    int playerSkill = getSkillLevel(skillType);
+
+                    if (leaderSkill >= playerSkill) {
+                        int difference = leaderSkill - playerSkill;
+                        bonusModifier = (difference * 0.75) / 100.0;
+                    }
+                }
+            }
+        }
+
+        return bonusModifier;
     }
 
     /*

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

@@ -2,105 +2,129 @@ package com.gmail.nossr50.datatypes;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
-public enum SkillType 
-{
-	ACROBATICS(LoadProperties.levelCapAcrobatics, LoadProperties.acrobaticsxpmodifier),
-	ALL, //This one is just for convenience
-	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;
-	private ToolType tool;
-	private double xpModifier;
-	
-	private SkillType()
-	{
-		this.ability = null;
-		this.maxLevel = 0;
-		this.tool = null;
-		this.xpModifier = 0;
-	}
-	
-	private SkillType(AbilityType ability, int maxLevel, ToolType tool, double xpModifier)
-	{
-		this.ability = ability;
-		this.maxLevel = maxLevel;
-		this.tool = tool;
-		this.xpModifier = xpModifier;
-	}
-	
-	private SkillType(int maxLevel, double xpModifier)
-	{
-		this(null, maxLevel, null, xpModifier);
-	}
-	
-	public AbilityType getAbility()
-	{
-		return this.ability;
-	}
-	
-	public int getMaxLevel()
-	{
-		if(maxLevel > 0)
-			return maxLevel;
-		else
-			return Integer.MAX_VALUE;
-	}
-	
-	public ToolType getTool() {
-		return tool;
-	}
-	
-	public boolean getPermissions(Player player)
-	{
-		switch(this)
-		{
-		case ACROBATICS:
-			return mcPermissions.getInstance().acrobatics(player);
-		case ARCHERY:
-			return mcPermissions.getInstance().archery(player);
-		case AXES:
-			return mcPermissions.getInstance().axes(player);
-		case EXCAVATION:
-			return mcPermissions.getInstance().excavation(player);
-		case FISHING:
-			return mcPermissions.getInstance().fishing(player);
-		case HERBALISM:
-			return mcPermissions.getInstance().herbalism(player);
-		case MINING:
-			return mcPermissions.getInstance().mining(player);
-		case REPAIR:
-			return mcPermissions.getInstance().repair(player);
-		case SWORDS:
-			return mcPermissions.getInstance().swords(player);
-		case TAMING:
-			return mcPermissions.getInstance().taming(player);
-		case UNARMED:
-			return mcPermissions.getInstance().unarmed(player);
-		case WOODCUTTING:
-			return mcPermissions.getInstance().woodcutting(player);
-		}
-		return false;
-	}
+public enum SkillType {
+    ACROBATICS(Config.getInstance().getLevelCapAcrobatics(), Config.getInstance().getFormulaMultiplierAcrobatics()),
+    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());
+
+    private AbilityType ability;
+    private int maxLevel;
+    private ToolType tool;
+    private double xpModifier;
+
+    private SkillType() {
+        this.ability = null;
+        this.maxLevel = 0;
+        this.tool = null;
+        this.xpModifier = 0;
+    }
+
+    private SkillType(AbilityType ability, int maxLevel, ToolType tool, double xpModifier) {
+        this.ability = ability;
+        this.maxLevel = maxLevel;
+        this.tool = tool;
+        this.xpModifier = xpModifier;
+    }
+
+    private SkillType(int maxLevel, double xpModifier) {
+        this(null, maxLevel, null, xpModifier);
+    }
+
+    public AbilityType getAbility() {
+        return ability;
+    }
+
+    /**
+     * Get the max level of this skill.
+     *
+     * @return the max level of this skill
+     */
+    public int getMaxLevel() {
+        if (maxLevel > 0) {
+            return maxLevel;
+        }
+        else {
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    public ToolType getTool() {
+        return tool;
+    }
+
+    /**
+     * Get the base permissions associated with this skill.
+     *
+     * @param player The player to check the permissions for
+     * @return true if the player has permissions, false otherwise
+     */
+    public boolean getPermissions(Player player) {
+        switch (this) {
+        case ACROBATICS:
+            return Permissions.getInstance().acrobatics(player);
+
+        case ARCHERY:
+            return Permissions.getInstance().archery(player);
+
+        case AXES:
+            return Permissions.getInstance().axes(player);
+
+        case EXCAVATION:
+            return Permissions.getInstance().excavation(player);
+
+        case FISHING:
+            return Permissions.getInstance().fishing(player);
+
+        case HERBALISM:
+            return Permissions.getInstance().herbalism(player);
+
+        case MINING:
+            return Permissions.getInstance().mining(player);
+
+        case REPAIR:
+            return Permissions.getInstance().repair(player);
+
+        case SWORDS:
+            return Permissions.getInstance().swords(player);
+
+        case TAMING:
+            return Permissions.getInstance().taming(player);
+
+        case UNARMED:
+            return Permissions.getInstance().unarmed(player);
+
+        case WOODCUTTING:
+            return Permissions.getInstance().woodcutting(player);
+
+        default:
+            return false;
+        }
+    }
 
     public double getXpModifier() {
         return xpModifier;
     }
 
+    /**
+     * Get the skill level for this skill.
+     *
+     * @param player The player to check
+     * @return
+     */
     public int getSkillLevel(Player player) {
         return Users.getProfile(player).getSkillLevel(this);
     }

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

@@ -3,55 +3,61 @@ package com.gmail.nossr50.datatypes;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.ItemChecks;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.ItemChecks;
 
-public enum ToolType
-{
-	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;
-	
-	private ToolType(String lowerTool, String raiseTool)
-	{
-		this.lowerTool = lowerTool;
-		this.raiseTool = raiseTool;
-	}
-	
-	public String getLowerTool()
-	{
-		return this.lowerTool;
-	}
-	
-	public String getRaiseTool()
-	{
-		return this.raiseTool;
-	}
-	
-	public boolean inHand(ItemStack is)
-	{
-		switch(this)
-		{
-		case AXE:
-			return ItemChecks.isAxe(is);
-		case FISTS:
-			return is.getType().equals(Material.AIR);
-		case HOE:
-			return ItemChecks.isHoe(is);
-		case PICKAXE:
-			return ItemChecks.isMiningPick(is);
-		case SHOVEL:
-			return ItemChecks.isShovel(is);
-		case SWORD:
-			return ItemChecks.isSword(is);
-		}
-		return false;
-	}
-	
+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"));
+
+    private String lowerTool;
+    private String raiseTool;
+
+    private ToolType(String lowerTool, String raiseTool) {
+        this.lowerTool = lowerTool;
+        this.raiseTool = raiseTool;
+    }
+
+    public String getLowerTool() {
+        return lowerTool;
+    }
+
+    public String getRaiseTool() {
+        return raiseTool;
+    }
+
+    /**
+     * Check to see if the item is of the appropriate type.
+     *
+     * @param is The item to check
+     * @return true if the item is the right type, false otherwise
+     */
+    public boolean inHand(ItemStack is) {
+        switch (this) {
+        case AXE:
+            return ItemChecks.isAxe(is);
+
+        case FISTS:
+            return is.getType().equals(Material.AIR);
+
+        case HOE:
+            return ItemChecks.isHoe(is);
+
+        case PICKAXE:
+            return ItemChecks.isPickaxe(is);
+
+        case SHOVEL:
+            return ItemChecks.isShovel(is);
+
+        case SWORD:
+            return ItemChecks.isSword(is);
+
+        default:
+            return false;
+        }
+    }
 }

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

@@ -8,8 +8,6 @@ public class Tree {
 
     private TreeNode root = null;
 
-    public Tree(){}
-
     /**
      * Add a node to this tree.
      *
@@ -33,12 +31,12 @@ public class Tree {
     public PlayerStat[] inOrder() {
         if (root != null) {
             ArrayList<PlayerStat> order = root.inOrder(new ArrayList<PlayerStat>());
-
             return order.toArray(new PlayerStat[order.size()]);
         }
         else {
 
-            /* Throw some dummy info in case the users file is empty.
+            /*
+             * Throw some dummy info in case the users file is empty.
              * It's not a good fix but its better than rewriting the whole system.
              */
             ArrayList<PlayerStat> x = new ArrayList<PlayerStat>();

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

@@ -4,46 +4,49 @@ import java.util.ArrayList;
 
 import com.gmail.nossr50.datatypes.PlayerStat;
 
-public class TreeNode 
-{
-	TreeNode left = null
-	, right = null;
-	PlayerStat ps = new PlayerStat();
+public class TreeNode {
+    TreeNode left = null;
+    TreeNode right = null;
+    PlayerStat ps = new PlayerStat();
 
-	public TreeNode(String p, int in) {ps.statVal = in; ps.name = p;}
+    public TreeNode(String p, int in) {
+        ps.statVal = in;
+        ps.name = p;
+    }
 
-	public void add (String p, int in) 
-	{
-		if (in >= ps.statVal)
-		{
-			if (left == null)
-				left = new TreeNode(p,in);
-			else
-				left.add(p, in);
-		}
-		else if(in < ps.statVal)
-		{
-		if (right == null)
-			right = new TreeNode(p,in);
-		else
-			right.add(p, in);
-		}
-	}
-	
-	public ArrayList<PlayerStat> inOrder(ArrayList<PlayerStat> a)
-	{
-		//if left node is not null than assign arrayList(a) to left.inOrder()
-		
-		//GOES THROUGH THE ENTIRE LEFT BRANCH AND GRABS THE GREATEST NUMBER
-		
-		if(left != null)
-			a = left.inOrder(a);
-	
-		a.add(ps);
-	
-		if(right != null)
-			a = right.inOrder(a);
-	
-		return a;
-	}
+    public void add (String p, int in) {
+        if (in >= ps.statVal) {
+            if (left == null) {
+                left = new TreeNode(p, in);
+            }
+            else {
+                left.add(p, in);
+            }
+        }
+        else if(in < ps.statVal) {
+            if (right == null) {
+                right = new TreeNode(p, in);
+            }
+            else {
+                right.add(p, in);
+            }
+        }
+    }
+
+    public ArrayList<PlayerStat> inOrder(ArrayList<PlayerStat> a) {
+        //if left node is not null than assign arrayList(a) to left.inOrder()
+        //GOES THROUGH THE ENTIRE LEFT BRANCH AND GRABS THE GREATEST NUMBER
+
+        if (left != null) {
+            a = left.inOrder(a);
+        }
+
+        a.add(ps);
+
+        if (right != null) {
+            a = right.inOrder(a);
+        }
+
+        return a;
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java

@@ -2,12 +2,12 @@ package com.gmail.nossr50.datatypes.buttons;
 
 import org.getspout.spoutapi.gui.GenericButton;
 
-public class ButtonEscape extends GenericButton
-{
-	public ButtonEscape()
-	{
-		this.setText("EXIT");
-		this.setWidth(60).setHeight(20);
-		this.setDirty(true);
-	}
-}
+public class ButtonEscape extends GenericButton {
+
+    public ButtonEscape() {
+        this.setText("EXIT");
+        this.setWidth(60);
+        this.setHeight(20);
+        this.setDirty(true);
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java

@@ -1,21 +1,14 @@
 package com.gmail.nossr50.datatypes.buttons;
 
-import org.getspout.spoutapi.gui.GenericButton;
-
 import com.gmail.nossr50.datatypes.PlayerProfile;
 
-public class ButtonHUDStyle extends GenericButton
-{
-	public ButtonHUDStyle(PlayerProfile PP)
-	{
-		this.setText("HUD Type: "+PP.getHUDType().toString());
-		this.setTooltip("Change your HUD style!");
-		this.setWidth(120).setHeight(20);
-		this.setDirty(true);
-	}
-	public void updateText(PlayerProfile PP)
-	{
-		this.setText("HUD Type: "+PP.getHUDType().toString());
-		this.setDirty(true);
-	}
-}
+public class ButtonHUDStyle extends ButtonToggle {
+
+    public ButtonHUDStyle(PlayerProfile PP) {
+        super("HUD Type: ", PP.getHUDType().toString(), "Change your HUD style!"); //TODO: Needs more locale
+    }
+
+    public void updateText(PlayerProfile PP) {
+        super.updateText("HUD Type: ", PP.getHUDType().toString()); //TODO: Needs more locale
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonPartyToggle.java

@@ -1,21 +1,14 @@
 package com.gmail.nossr50.datatypes.buttons;
 
-import org.getspout.spoutapi.gui.GenericButton;
-
 import com.gmail.nossr50.datatypes.PlayerProfile;
 
-public class ButtonPartyToggle extends GenericButton
-{
-	public ButtonPartyToggle(PlayerProfile PP)
-	{
-		this.setText("Party HUD: "+PP.getPartyHUD());
-		this.setTooltip("Toggle the Party HUD!");
-		this.setWidth(120).setHeight(20);
-		this.setDirty(true);
-	}
-	public void updateText(PlayerProfile PP)
-	{
-		this.setText("Party HUD: "+PP.getPartyHUD());
-		this.setDirty(true);
-	}
-}
+public class ButtonPartyToggle extends ButtonToggle {
+
+    public ButtonPartyToggle(PlayerProfile PP) {
+        super("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString(), "Toggle the Party HUD!"); //TODO: Needs more locale
+    }
+
+    public void updateText(PlayerProfile PP) {
+        super.updateText("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString()); //TODO: Needs more locale
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonToggle.java

@@ -0,0 +1,19 @@
+package com.gmail.nossr50.datatypes.buttons;
+
+import org.getspout.spoutapi.gui.GenericButton;
+
+public class ButtonToggle extends GenericButton{
+
+    public ButtonToggle(String text1, String text2, String tooltip) {
+        this.setText(text1 + text2);
+        this.setTooltip(tooltip);
+        this.setWidth(120);
+        this.setHeight(20);
+        this.setDirty(true);
+    }
+
+    public void updateText(String text1, String text2) {
+        this.setText(text1 + text2);
+        this.setDirty(true);
+    }
+}

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

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

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.datatypes.mods;
+
+import org.bukkit.inventory.ItemStack;
+
+public class CustomItem {
+    protected int itemID;
+    protected boolean repairable;
+    protected ItemStack repairMaterial;
+    protected int repairQuantity;
+    protected short durability;
+
+    public CustomItem(short durability, ItemStack repairMaterial, int repairQuantity, boolean repairable, int itemID) {
+        this.itemID = itemID;
+        this.repairable = repairable;
+        this.repairMaterial = repairMaterial;
+        this.repairQuantity = repairQuantity;
+        this.durability = durability;
+    }
+
+    public int getItemID() {
+        return itemID;
+    }
+
+    public void setItemID(int itemID) {
+        this.itemID = itemID;
+    }
+
+
+    public boolean isRepairable() {
+        return repairable;
+    }
+
+    public void setRepairable(boolean repairable) {
+        this.repairable = repairable;
+    }
+
+    public ItemStack getRepairMaterial() {
+        return repairMaterial;
+    }
+
+    public void setRepairMaterial(ItemStack repairMaterial) {
+        this.repairMaterial = repairMaterial;
+    }
+
+    public int getRepairQuantity() {
+        return repairQuantity;
+    }
+
+    public void setRepairQuantity(int repairQuantity) {
+        this.repairQuantity = repairQuantity;
+    }
+
+    public short getDurability() {
+        return durability;
+    }
+
+    public void setDurability(short durability) {
+        this.durability = durability;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.gmail.nossr50.datatypes.mods;
+
+import org.bukkit.inventory.ItemStack;
+
+public class CustomTool extends CustomItem {
+    private double xpMultiplier;
+    private boolean abilityEnabled;
+    private int tier;
+
+    public CustomTool(short durability, ItemStack repairMaterial, int repairQuantity, boolean repairable, int tier, boolean abilityEnabled, double xpMultiplier, int itemID) {
+        super(durability, repairMaterial, repairQuantity, repairable, 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,55 +5,53 @@ 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
-{
-	ButtonHUDStyle HUDButton = null;
-	ButtonPartyToggle PartyButton = null;
-	ButtonEscape EscapeButton = null;
-	GenericLabel mcMMO_label = new GenericLabel();
-	GenericLabel tip_escape = new GenericLabel();
-	int center_x = 427/2;
-	int center_y = 240/2;
-	
-	public PopupMMO(Player player, PlayerProfile PP, mcMMO plugin)
-	{
-		//240, 427 are the bottom right
-		mcMMO_label.setText(ChatColor.GOLD+"~mcMMO Menu~");
-		mcMMO_label.setX(center_x-35).setY((center_y/2)-20).setDirty(true);
-		
-		tip_escape.setText(ChatColor.GRAY+"Press ESCAPE to exit!");
-		tip_escape.setX(mcMMO_label.getX()-15).setY(mcMMO_label.getY()+10).setDirty(true);
-		
-		HUDButton = new ButtonHUDStyle(PP);
-		HUDButton.setX(center_x-(HUDButton.getWidth()/2)).setY(center_y/2).setDirty(true);
-		
-		if(LoadProperties.partybar)
-		{
-			PartyButton = new ButtonPartyToggle(PP);
-			PartyButton.setX(center_x-(PartyButton.getWidth()/2)).setY(center_y/2+PartyButton.getHeight()).setDirty(true);
-			this.attachWidget(plugin, PartyButton);
-		}
-		
-		EscapeButton = new ButtonEscape();
-		EscapeButton.setX(center_x-(EscapeButton.getWidth()/2)).setY((center_y/2)+(HUDButton.getHeight()*2)+5).setDirty(true);
-		
-		this.attachWidget(plugin, HUDButton);
-		this.attachWidget(plugin, mcMMO_label);
-		this.attachWidget(plugin, tip_escape);
-		this.attachWidget(plugin, EscapeButton);
-		
-		this.setDirty(true);
-	}
-	
-	public void updateButtons(PlayerProfile PP)
-	{
-		HUDButton.updateText(PP);
-		this.setDirty(true);
-	}
+public class PopupMMO extends GenericPopup {
+
+    private ButtonHUDStyle HUDButton = null;
+    private ButtonEscape EscapeButton = null;
+    private GenericLabel mcMMO_label = new GenericLabel();
+    private GenericLabel tip_escape = new GenericLabel();
+    private int center_x = 427 / 2;
+    private int center_y = 240 / 2;
+
+    public PopupMMO(Player player, PlayerProfile PP, mcMMO plugin) {
+
+        //240, 427 are the bottom right
+        mcMMO_label.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
+        mcMMO_label.setX(center_x - 35);
+        mcMMO_label.setY((center_y / 2) - 20);
+        mcMMO_label.setDirty(true);
+
+        tip_escape.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
+        tip_escape.setX(mcMMO_label.getX() - 15);
+        tip_escape.setY(mcMMO_label.getY() + 10);
+        tip_escape.setDirty(true);
+
+        HUDButton = new ButtonHUDStyle(PP);
+        HUDButton.setX(center_x - (HUDButton.getWidth() / 2));
+        HUDButton.setY(center_y / 2);
+        HUDButton.setDirty(true);
+
+        EscapeButton = new ButtonEscape();
+        EscapeButton.setX(center_x - (EscapeButton.getWidth() / 2));
+        EscapeButton.setY((center_y / 2) + (HUDButton.getHeight() * 2) + 5);
+        EscapeButton.setDirty(true);
+
+        this.attachWidget(plugin, HUDButton);
+        this.attachWidget(plugin, mcMMO_label);
+        this.attachWidget(plugin, tip_escape);
+        this.attachWidget(plugin, EscapeButton);
+
+        this.setDirty(true);
+    }
+
+    public void updateButtons(PlayerProfile PP) {
+        HUDButton.updateText(PP);
+        //PartyButton.updateText(PP);
+        this.setDirty(true);
+    }
 }

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

@@ -3,125 +3,126 @@ package com.gmail.nossr50.datatypes.treasure;
 import org.bukkit.inventory.ItemStack;
 
 public class ExcavationTreasure extends Treasure {
-	// dirt grass sand gravel clay mycel soulsand
-	// 00000001 - dirt		1
-	// 00000010 - grass		2
-	// 00000100 - sand		4
-	// 00001000 - gravel	8
-	// 00010000 - clay		16
-	// 00100000 - mycel		32
-	// 01000000 - soulsand	64
-	private byte dropsFrom = 0x0;
 
-	public ExcavationTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
-		super(drop, xp, dropChance, dropLevel);
-	}
+    // dirt | grass | sand | gravel | clay | mycel | soulsand
+    // 00000001 - dirt      1
+    // 00000010 - grass     2
+    // 00000100 - sand      4
+    // 00001000 - gravel    8
+    // 00010000 - clay      16
+    // 00100000 - mycel     32
+    // 01000000 - soulsand  64
+    private byte dropsFrom = 0x0;
 
-	// Raw getters and setters
-	public byte getDropsFrom() {
-		return dropsFrom;
-	}
+    public ExcavationTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
+        super(drop, xp, dropChance, dropLevel);
+    }
 
-	public void setDropsFrom(byte dropsFrom) {
-		this.dropsFrom = dropsFrom;
-	}
+    // Raw getters and setters
+    public byte getDropsFrom() {
+        return dropsFrom;
+    }
 
-	// Getters
-	public boolean getDropsFromDirt() {
-		return getDropFromMask(1);
-	}
+    public void setDropsFrom(byte dropsFrom) {
+        this.dropsFrom = dropsFrom;
+    }
 
-	public boolean getDropsFromGrass() {
-		return getDropFromMask(2);
-	}
+    // Getters
+    public boolean getDropsFromDirt() {
+        return getDropFromMask(1);
+    }
 
-	public boolean getDropsFromSand() {
-		return getDropFromMask(4);
-	}
+    public boolean getDropsFromGrass() {
+        return getDropFromMask(2);
+    }
 
-	public boolean getDropsFromGravel() {
-		return getDropFromMask(8);
-	}
+    public boolean getDropsFromSand() {
+        return getDropFromMask(4);
+    }
 
-	public boolean getDropsFromClay() {
-		return getDropFromMask(16);
-	}
+    public boolean getDropsFromGravel() {
+        return getDropFromMask(8);
+    }
 
-	public boolean getDropsFromMycel() {
-		return getDropFromMask(32);
-	}
+    public boolean getDropsFromClay() {
+        return getDropFromMask(16);
+    }
 
-	public boolean getDropsFromSoulSand() {
-		return getDropFromMask(64);
-	}
+    public boolean getDropsFromMycel() {
+        return getDropFromMask(32);
+    }
 
-	private boolean getDropFromMask(int mask) {
-		return ((dropsFrom & mask) > 0) ? true : false;
-	}
+    public boolean getDropsFromSoulSand() {
+        return getDropFromMask(64);
+    }
 
-	// Setters
-	public void setDropsFromDirt() {
-		setDropFromMask(1);
-	}
+    private boolean getDropFromMask(int mask) {
+        return ((dropsFrom & mask) > 0) ? true : false;
+    }
 
-	public void setDropsFromGrass() {
-		setDropFromMask(2);
-	}
+    // Setters
+    public void setDropsFromDirt() {
+        setDropFromMask(1);
+    }
 
-	public void setDropsFromSand() {
-		setDropFromMask(4);
-	}
+    public void setDropsFromGrass() {
+        setDropFromMask(2);
+    }
 
-	public void setDropsFromGravel() {
-		setDropFromMask(8);
-	}
+    public void setDropsFromSand() {
+        setDropFromMask(4);
+    }
 
-	public void setDropsFromClay() {
-		setDropFromMask(16);
-	}
+    public void setDropsFromGravel() {
+        setDropFromMask(8);
+    }
 
-	public void setDropsFromMycel() {
-		setDropFromMask(32);
-	}
+    public void setDropsFromClay() {
+        setDropFromMask(16);
+    }
 
-	public void setDropsFromSoulSand() {
-		setDropFromMask(64);
-	}
+    public void setDropsFromMycel() {
+        setDropFromMask(32);
+    }
 
-	private void setDropFromMask(int mask) {
-		dropsFrom |= mask;
-	}
+    public void setDropsFromSoulSand() {
+        setDropFromMask(64);
+    }
 
-	// Un-setters
-	public void unsetDropsFromDirt() {
-		unsetDropFromMask(1);
-	}
+    private void setDropFromMask(int mask) {
+        dropsFrom |= mask;
+    }
 
-	public void unsetDropsFromGrass() {
-		unsetDropFromMask(2);
-	}
+    // Un-setters
+    public void unsetDropsFromDirt() {
+        unsetDropFromMask(1);
+    }
 
-	public void unsetDropsFromSand() {
-		unsetDropFromMask(4);
-	}
+    public void unsetDropsFromGrass() {
+        unsetDropFromMask(2);
+    }
 
-	public void unsetDropsFromGravel() {
-		unsetDropFromMask(8);
-	}
+    public void unsetDropsFromSand() {
+        unsetDropFromMask(4);
+    }
 
-	public void unsetDropsFromClay() {
-		unsetDropFromMask(16);
-	}
+    public void unsetDropsFromGravel() {
+        unsetDropFromMask(8);
+    }
 
-	public void unsetDropsFromMycel() {
-		unsetDropFromMask(32);
-	}
+    public void unsetDropsFromClay() {
+        unsetDropFromMask(16);
+    }
 
-	public void unsetDropsFromSoulSand() {
-		unsetDropFromMask(64);
-	}
+    public void unsetDropsFromMycel() {
+        unsetDropFromMask(32);
+    }
 
-	private void unsetDropFromMask(int mask) {
-		dropsFrom &= ~mask;
-	}
+    public void unsetDropsFromSoulSand() {
+        unsetDropFromMask(64);
+    }
+
+    private void unsetDropFromMask(int mask) {
+        dropsFrom &= ~mask;
+    }
 }

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

@@ -3,18 +3,18 @@ package com.gmail.nossr50.datatypes.treasure;
 import org.bukkit.inventory.ItemStack;
 
 public class FishingTreasure extends Treasure {
-	private int maxLevel;
+    private int maxLevel;
 
-	public FishingTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel, int maxLevel) {
-		super(drop, xp, dropChance, dropLevel);
-		this.setMaxLevel(maxLevel);
-	}
+    public FishingTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel, int maxLevel) {
+        super(drop, xp, dropChance, dropLevel);
+        this.setMaxLevel(maxLevel);
+    }
 
-	public int getMaxLevel() {
-		return maxLevel;
-	}
+    public int getMaxLevel() {
+        return maxLevel;
+    }
 
-	public void setMaxLevel(int maxLevel) {
-		this.maxLevel = maxLevel;
-	}
+    public void setMaxLevel(int maxLevel) {
+        this.maxLevel = maxLevel;
+    }
 }

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

@@ -3,48 +3,47 @@ package com.gmail.nossr50.datatypes.treasure;
 import org.bukkit.inventory.ItemStack;
 
 public abstract class Treasure {
-	private int xp;
-	private Double dropChance;
-	private int dropLevel;
+    private int xp;
+    private double dropChance;
+    private int dropLevel;
+    private ItemStack drop;
 
-	private ItemStack drop;
+    public Treasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
+        this.drop = drop;
+        this.xp = xp;
+        this.dropChance = dropChance;
+        this.dropLevel = dropLevel;
+    }
 
-	public Treasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
-		this.drop = drop;
-		this.xp = xp;
-		this.dropChance = dropChance;
-		this.dropLevel = dropLevel;
-	}
+    public ItemStack getDrop() {
+        return drop;
+    }
 
-	public ItemStack getDrop() {
-		return drop;
-	}
+    public void setDrop(ItemStack drop) {
+        this.drop = drop;
+    }
 
-	public void setDrop(ItemStack drop) {
-		this.drop = drop;
-	}
+    public int getXp() {
+        return xp;
+    }
 
-	public int getXp() {
-		return xp;
-	}
+    public void setXp(int xp) {
+        this.xp = xp;
+    }
 
-	public void setXp(int xp) {
-		this.xp = xp;
-	}
+    public double getDropChance() {
+        return dropChance;
+    }
 
-	public Double getDropChance() {
-		return dropChance;
-	}
+    public void setDropChance(Double dropChance) {
+        this.dropChance = dropChance;
+    }
 
-	public void setDropChance(Double dropChance) {
-		this.dropChance = dropChance;
-	}
+    public int getDropLevel() {
+        return dropLevel;
+    }
 
-	public int getDropLevel() {
-		return dropLevel;
-	}
-
-	public void setDropLevel(int dropLevel) {
-		this.dropLevel = dropLevel;
-	}
+    public void setDropLevel(int dropLevel) {
+        this.dropLevel = dropLevel;
+    }
 }

src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java

@@ -0,0 +1,11 @@
+package com.gmail.nossr50.events.chat;
+
+/**
+ * Called when a chat is sent to the admin chat channel
+ */
+public class McMMOAdminChatEvent extends McMMOChatEvent{
+
+    public McMMOAdminChatEvent(String sender, String message) {
+        super(sender, message);
+    }
+}

src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.events.chat;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class McMMOChatEvent extends Event implements Cancellable{
+    private boolean cancelled;
+    private String sender;
+    private String message;
+
+    public McMMOChatEvent(String sender, String message) {
+        this.sender = sender;
+        this.message = message;
+    }
+
+    /**
+     * @return String name of the player who sent the chat, or "Console"
+     */
+    public String getSender() {
+        return sender;
+    }
+
+    /**
+     * @return String message that will be sent
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * @param message String message to be sent in chat
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /** Rest of file is required boilerplate for custom events **/
+    private static final HandlerList handlers = new HandlerList();
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java

@@ -0,0 +1,20 @@
+package com.gmail.nossr50.events.chat;
+
+/**
+ * Called when a chat is sent to a party channel
+ */
+public class McMMOPartyChatEvent extends McMMOChatEvent{
+    private String party;
+
+    public McMMOPartyChatEvent(String sender, String party, String message) {
+        super(sender, message);
+        this.party = party;
+    }
+
+    /**
+     * @return String name of the party the message will be sent to
+     */
+    public String getParty() {
+        return party;
+    }
+}

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java

@@ -6,8 +6,10 @@ import org.bukkit.event.player.PlayerEvent;
 
 import com.gmail.nossr50.datatypes.SkillType;
 
+/**
+ * Generic event for mcMMO experience events.
+ */
 public class McMMOPlayerExperienceEvent extends PlayerEvent {
-
     protected SkillType skill;
     protected int skillLevel;
 
@@ -17,22 +19,28 @@ public class McMMOPlayerExperienceEvent extends PlayerEvent {
         this.skillLevel = skill.getSkillLevel(player);
     }
 
+    /**
+     * @return The skill involved in this event
+     */
     public SkillType getSkill() {
         return skill;
     }
 
+    /**
+     * @return The skill level of the skill involved in this event
+     */
     public int getSkillLevel() {
         return skillLevel;
     }
 
     /** Rest of file is required boilerplate for custom events **/
     private static final HandlerList handlers = new HandlerList();
-    
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-    
+
     public static HandlerList getHandlerList() {
         return handlers;
     }

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java

@@ -8,17 +8,17 @@ import com.gmail.nossr50.datatypes.SkillType;
  * Called when a user levels up in a skill
  */
 public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
-	private int levelsGained;
-	
-	public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
-	    super(player, skill);
-		this.levelsGained = 1;	// Always 1 for now as we call in the loop where the levelups are calculated, could change later!
-	}
-	
-	/**
-	 * @return The number of levels gained in this event
-	 */
-	public int getLevelsGained() {
-		return levelsGained;
-	}
+    private int levelsGained;
+
+    public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
+        super(player, skill);
+        this.levelsGained = 1;    // Always 1 for now as we call in the loop where the levelups are calculated, could change later!
+    }
+
+    /**
+     * @return The number of levels gained in this event
+     */
+    public int getLevelsGained() {
+        return levelsGained;
+    }
 }

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java

@@ -4,18 +4,21 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.SkillType;
 
+/**
+ * Called when a player gains XP in a skill
+ */
 public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
-	private int xpGained;
-	
-	public McMMOPlayerXpGainEvent(Player player, SkillType skill, int xpGained) {
-	    super(player, skill);
-		this.xpGained = xpGained;
-	}
-	
-	/**
-	 * @return The number experience gained in this event
-	 */
-	public int getXpGained() {
-		return xpGained;
-	}
+    private int xpGained;
+
+    public McMMOPlayerXpGainEvent(Player player, SkillType skill, int xpGained) {
+        super(player, skill);
+        this.xpGained = xpGained;
+    }
+
+    /**
+     * @return The amount of experience gained in this event
+     */
+    public int getXpGained() {
+        return xpGained;
+    }
 }

src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java

@@ -1,19 +1,15 @@
 package com.gmail.nossr50.events.fake;
 
-//import java.util.ArrayList;
-
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockBreakEvent;
-//import org.bukkit.inventory.ItemStack;
 
+/**
+ * Called when mcMMO breaks a block due to a special ability.
+ */
 public class FakeBlockBreakEvent extends BlockBreakEvent {
 
-	public FakeBlockBreakEvent(Block theBlock, Player player) {
-		super(theBlock, player);
-	}
-
-//	   public FakeBlockBreakEvent(Block theBlock, Player player) {
-//	        super(theBlock, player, new ArrayList<ItemStack>(theBlock.getDrops()));
-//	    }
-}
+    public FakeBlockBreakEvent(Block theBlock, Player player) {
+        super(theBlock, player);
+    }
+}

src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java

@@ -3,9 +3,12 @@ package com.gmail.nossr50.events.fake;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
+/**
+ * Called when mcMMO applies damage from an entity due to special abilities.
+ */
 public class FakeEntityDamageByEntityEvent extends EntityDamageByEntityEvent {
-    
-	public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) {
-		super(damager, damagee, cause, damage);
-	}
+
+    public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) {
+        super(damager, damagee, cause, damage);
+    }
 }

src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java

@@ -3,8 +3,12 @@ package com.gmail.nossr50.events.fake;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityDamageEvent;
 
-public class FakeEntityDamageEvent extends EntityDamageEvent{
+/**
+ * Called when mcMMO applies damage due to special abilities.
+ */
+public class FakeEntityDamageEvent extends EntityDamageEvent {
+
     public FakeEntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
         super(damagee, cause, damage);
     }
-}
+}

src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java

@@ -3,10 +3,12 @@ package com.gmail.nossr50.events.fake;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerAnimationEvent;
 
-public class FakePlayerAnimationEvent extends PlayerAnimationEvent{
+/**
+ * Called when handling extra drops to avoid issues with NoCheat.
+ */
+public class FakePlayerAnimationEvent extends PlayerAnimationEvent {
 
     public FakePlayerAnimationEvent(Player player) {
         super(player);
     }
-
 }

src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java

@@ -7,66 +7,66 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 
 /**
- * Called when mcMMO is preparing to drop an item
+ * Called when mcMMO is preparing to drop an item.
  */
 public class McMMOItemSpawnEvent extends Event implements Cancellable {
-	private Location location;
-	private ItemStack itemStack;
-	private boolean cancelled;
-	
-	public McMMOItemSpawnEvent(Location location, ItemStack itemStack) {
-		this.location = location;
-		this.itemStack = itemStack;
-		this.cancelled = false;
-	}
-	
-	/**
-	 * @return Location where the item will be dropped
-	 */
-	public Location getLocation() {
-		return location;
-	}
-	
-	/**
-	 * @param location Location where to drop the item
-	 */
-	public void setLocation(Location location) {
-		this.location = location;
-	}
-	
-	/**
-	 * @return ItemStack that will be dropped
-	 */
-	public ItemStack getItemStack() {
-		return itemStack;
-	}
-	
-	/**
-	 * @param itemStack ItemStack to drop
-	 */
-	public void setItemStack(ItemStack itemStack) {
-		this.itemStack = itemStack;
-	}
-	
-	/** Following are required for Cancellable **/
-	@Override
-	public boolean isCancelled() {
-		return cancelled;
-	}
+    private Location location;
+    private ItemStack itemStack;
+    private boolean cancelled;
 
-	@Override
-	public void setCancelled(boolean cancelled) {
-		this.cancelled = cancelled;
-	}
-	
-	/** Rest of file is required boilerplate for custom events **/
-	private static final HandlerList handlers = new HandlerList();
-	
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-	
-	public static HandlerList getHandlerList() {
-		return handlers;
-	}
+    public McMMOItemSpawnEvent(Location location, ItemStack itemStack) {
+        this.location = location;
+        this.itemStack = itemStack;
+        this.cancelled = false;
+    }
+
+    /**
+     * @return Location where the item will be dropped
+     */
+    public Location getLocation() {
+        return location;
+    }
+
+    /**
+     * @param location Location where to drop the item
+     */
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    /**
+     * @return ItemStack that will be dropped
+     */
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
+
+    /**
+     * @param itemStack ItemStack to drop
+     */
+    public void setItemStack(ItemStack itemStack) {
+        this.itemStack = itemStack;
+    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+    
+    /** Rest of file is required boilerplate for custom events **/
+    private static final HandlerList handlers = new HandlerList();
+
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 }

src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java

@@ -5,6 +5,9 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
+/**
+ * Called when a player attempts to join, leave, or change parties.
+ */
 public class McMMOPartyChangeEvent extends PlayerEvent implements Cancellable{
 
     protected String oldParty;
@@ -25,18 +28,57 @@ public class McMMOPartyChangeEvent extends PlayerEvent implements Cancellable{
         this.cancelled = false;
     }
 
+    /**
+     * @return The party being left, or null if the player was not in a party
+     */
     public String getOldParty() {
         return oldParty;
     }
 
+    /**
+     * @return The party being joined, or null if the player is not joining a new party
+     */
     public String getNewParty() {
         return newParty;
     }
 
+    /**
+     * @return The reason for the event being fired
+     */
     public EventReason getReason() {
         return reason;
     }
 
+    /**
+     * A list of reasons why the event may have been fired
+     */
+    public enum EventReason{
+        /**
+         * Joined a party for the first time.
+         */
+        JOINED_PARTY,
+
+        /**
+         * Left a party and did not join a new one.
+         */
+        LEFT_PARTY,
+
+        /**
+         * Was kicked from a party.
+         */
+        KICKED_FROM_PARTY,
+
+        /**
+         * Left one party to join another.
+         */
+        CHANGED_PARTIES,
+
+        /**
+         * Any reason that doesn't fit elsewhere.
+         */
+        CUSTOM;
+    }
+
     /** Rest of file is required boilerplate for custom events **/
     private static final HandlerList handlers = new HandlerList();
 
@@ -59,11 +101,4 @@ public class McMMOPartyChangeEvent extends PlayerEvent implements Cancellable{
     public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
-
-    public enum EventReason{
-        JOINED_PARTY,
-        LEFT_PARTY,
-        KICKED_FROM_PARTY,
-        CHANGED_PARTIES;
-    }
 }

src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java

@@ -4,8 +4,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
+/**
+ * Called just before a player teleports using the /ptp command.
+ */
 public class McMMOPartyTeleportEvent extends PlayerTeleportEvent{
-
     private String party;
     private Player target;
 
@@ -15,10 +17,16 @@ public class McMMOPartyTeleportEvent extends PlayerTeleportEvent{
         this.target = target;
     }
 
+    /**
+     * @return The party the teleporting player is in
+     */
     public String getParty() {
         return party;
     }
 
+    /**
+     * @return The player being teleported to
+     */
     public Player getTarget() {
         return target;
     }

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java

@@ -6,14 +6,16 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.datatypes.SkillType;
 
+/**
+ * Called just before a player repairs an object with mcMMO.
+ */
 public class McMMOPlayerRepairCheckEvent extends McMMOPlayerSkillEvent implements Cancellable{
-
-    private int repairAmount;
+    private short repairAmount;
     private ItemStack repairMaterial;
     private ItemStack repairedObject;
     private boolean cancelled;
 
-    public McMMOPlayerRepairCheckEvent(Player player, int repairAmount, ItemStack repairMaterial, ItemStack repairedObject) {
+    public McMMOPlayerRepairCheckEvent(Player player, short repairAmount, ItemStack repairMaterial, ItemStack repairedObject) {
         super(player, SkillType.REPAIR);
         this.repairAmount = repairAmount;
         this.repairMaterial = repairMaterial;
@@ -21,14 +23,23 @@ public class McMMOPlayerRepairCheckEvent extends McMMOPlayerSkillEvent implement
         this.cancelled = false;
     }
 
-    public int getRepairAmount() {
+    /**
+     * @return The amount this item will be repaired.
+     */
+    public short getRepairAmount() {
         return repairAmount;
     }
 
+    /**
+     * @return The material used to repair this item
+     */
     public ItemStack getRepairMaterial() {
         return repairMaterial;
     }
 
+    /**
+     * @return The item that was repaired
+     */
     public ItemStack getRepairedObject() {
         return repairedObject;
     }

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairEvent.java

@@ -1,26 +0,0 @@
-package com.gmail.nossr50.events.skills;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.datatypes.SkillType;
-
-public class McMMOPlayerRepairEvent extends McMMOPlayerSkillEvent{
-
-    private ItemStack item;
-    private short repairAmount;
-
-    public McMMOPlayerRepairEvent(Player player, ItemStack item, short repairAmount) {
-        super(player, SkillType.REPAIR);
-        this.item = item;
-        this.repairAmount = repairAmount;
-    }
-
-    public ItemStack getItem() {
-        return item;
-    }
-
-    public int getRepairAmount() {
-        return repairAmount;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java

@@ -6,8 +6,10 @@ import org.bukkit.event.player.PlayerEvent;
 
 import com.gmail.nossr50.datatypes.SkillType;
 
-public class McMMOPlayerSkillEvent extends PlayerEvent{
-
+/**
+ * Generic event for mcMMO skill handling.
+ */
+public class McMMOPlayerSkillEvent extends PlayerEvent {
     protected SkillType skill;
     protected int skillLevel;
 
@@ -17,10 +19,16 @@ public class McMMOPlayerSkillEvent extends PlayerEvent{
         this.skillLevel = skill.getSkillLevel(player);
     }
 
+    /**
+     * @return The skill involved in this event
+     */
     public SkillType getSkill() {
         return skill;
     }
 
+    /**
+     * @return The level of the skill involved in this event
+     */
     public int getSkillLevel() {
         return skillLevel;
     }
@@ -37,4 +45,3 @@ public class McMMOPlayerSkillEvent extends PlayerEvent{
         return handlers;
     }
 }
-

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

@@ -1,305 +1,337 @@
-package com.gmail.nossr50.listeners;
-
-import java.util.List;
-
-import com.gmail.nossr50.BlockChecks;
-import com.gmail.nossr50.ItemChecks;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.Users;
-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.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Mining;
-import com.gmail.nossr50.skills.Repair;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.WoodCutting;
-import com.gmail.nossr50.spout.SpoutSounds;
-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 mcBlockListener implements Listener {
-    private final mcMMO plugin;
-
-    public mcBlockListener(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().herbalismDoubleDrops(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);
-                }
-            }
-        }
-    }
-}
+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.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.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.CropState;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.enchantments.Enchantment;
+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 (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) {
+        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 == Config.getInstance().getRepairAnvilId() && Config.getInstance().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();
+        Material mat = block.getType();
+        ItemStack inhand = player.getItemInHand();
+
+        if (event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
+        /*
+         * HERBALISM
+         */
+
+        /* Green Terra */
+        if (PP.getToolPreparationMode(ToolType.HOE) && Permissions.getInstance().greenTerra(player) && ((mat.equals(Material.CROPS) && block.getData() == CropState.RIPE.getData()) || BlockChecks.canBeGreenTerra(block))) {
+            Skills.abilityCheck(player, SkillType.HERBALISM);
+        }
+
+        /* Triple drops */
+        if (PP.getAbilityMode(AbilityType.GREEN_TERRA) && BlockChecks.canBeGreenTerra(block)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+        }
+
+        if (Permissions.getInstance().herbalism(player) && BlockChecks.canBeGreenTerra(block)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+        }
+
+        /*
+         * MINING
+         */
+
+        if (Permissions.getInstance().mining(player) && BlockChecks.canBeSuperBroken(block)) {
+            if (Config.getInstance().getMiningRequiresTool() && ItemChecks.isPickaxe(inhand)) {
+                Mining.miningBlockCheck(player, block);
+            }
+            else if (!Config.getInstance().getMiningRequiresTool()) {
+                Mining.miningBlockCheck(player, block);
+            }
+        }
+
+        /*
+         * WOOD CUTTING
+         */
+
+        if (Permissions.getInstance().woodcutting(player) && mat.equals(Material.LOG)) {
+            if (Config.getInstance().getWoodcuttingRequiresTool() && ItemChecks.isAxe(inhand)) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+            else if (!Config.getInstance().getWoodcuttingRequiresTool()) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+        }
+
+        if (PP.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.getInstance().treeFeller(player) && ItemChecks.isAxe(inhand)) {
+            if (Config.getInstance().getToolModsEnabled()) {
+                if ((ItemChecks.isCustomTool(inhand) && ModChecks.getToolFromItemStack(inhand).isAbilityEnabled()) || !ItemChecks.isCustomTool(inhand)) {
+                    WoodCutting.treeFeller(event);
+                }
+            }
+            else {
+                WoodCutting.treeFeller(event);
+            }
+        }
+
+        /*
+         * EXCAVATION
+         */
+
+        if (BlockChecks.canBeGigaDrillBroken(block) && Permissions.getInstance().excavation(player) && !mcMMO.placeStore.isTrue(block)) {
+            if (Config.getInstance().getExcavationRequiresTool() && ItemChecks.isShovel(inhand)) {
+                Excavation.excavationProcCheck(block, player);
+            }
+            else if (!Config.getInstance().getExcavationRequiresTool()) {
+                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 mat = block.getType();
+
+        /*
+         * 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) && mat.equals(Material.LOG) && Permissions.getInstance().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) || mat.equals(Material.SNOW))) {
+                Skills.abilityCheck(player, SkillType.UNARMED);
+            }
+        }
+
+        /* TREE FELLER SOUNDS */
+        if (Config.getInstance().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) && Permissions.getInstance().greenTerra(player) && BlockChecks.makeMossy(block)) {
+            if (Config.getInstance().getToolModsEnabled()) {
+                if ((ItemChecks.isCustomTool(inhand) && ModChecks.getToolFromItemStack(inhand).isAbilityEnabled()) || !ItemChecks.isCustomTool(inhand)) {
+                    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 (Config.getInstance().getExcavationRequiresTool() && ItemChecks.isShovel(inhand)) {
+                if (Config.getInstance().getToolModsEnabled()) {
+                    if ((ItemChecks.isCustomTool(inhand) && ModChecks.getToolFromItemStack(inhand).isAbilityEnabled()) || !ItemChecks.isCustomTool(inhand)) {
+                        event.setInstaBreak(true);
+                        Excavation.gigaDrillBreaker(player, block);
+                    }
+                }
+                else {
+                    event.setInstaBreak(true);
+                    Excavation.gigaDrillBreaker(player, block);
+                }
+            }
+            else if (!Config.getInstance().getExcavationRequiresTool()) {
+                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 (Config.getInstance().spoutEnabled) {
+                SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+            }
+        }
+        else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
+            if (!player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) { //TODO: Why are we checking this?
+                if (Config.getInstance().getMiningRequiresTool() && ItemChecks.isPickaxe(inhand)) {
+                    if (Config.getInstance().getToolModsEnabled()) {
+                        if ((ItemChecks.isCustomTool(inhand) && ModChecks.getToolFromItemStack(inhand).isAbilityEnabled()) || !ItemChecks.isCustomTool(inhand)) {
+                            event.setInstaBreak(true);
+                            Mining.SuperBreakerBlockCheck(player, block);
+                        }
+                    }
+                    else {
+                        event.setInstaBreak(true);
+                        Mining.SuperBreakerBlockCheck(player, block);
+                    }
+                }
+                else if (!Config.getInstance().getMiningRequiresTool()) {
+                    event.setInstaBreak(true);
+                    Mining.SuperBreakerBlockCheck(player, block);
+                }
+            }
+        }
+        else if (PP.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && (mat.equals(Material.LEAVES) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLeafBlock(block)))) {
+            if (Config.getInstance().getWoodcuttingRequiresTool() && ItemChecks.isAxe(inhand)) {
+                if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+                    event.setInstaBreak(true);
+                    WoodCutting.leafBlower(player, block);
+                }
+            }
+            else if (!Config.getInstance().getWoodcuttingRequiresTool() && !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,314 +1,324 @@
-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.Combat;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.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.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.BlastMining;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Taming;
-
-public class mcEntityListener implements Listener {
-    private final mcMMO plugin;
-
-    public mcEntityListener(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);
-            }
-        }
-    }
-
-    /**
-     * 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) {
-        if (event.getSpawnReason().equals(SpawnReason.SPAWNER) && !LoadProperties.xpGainsMobSpawners) {
-            event.getEntity().setMetadata("mcmmoFromMobSpawner", new FixedMetadataValue(plugin, true));
-        }
-    }
-
-    /**
-     * Monitor ExplosionPrime events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler (priority = EventPriority.LOW)
-    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.LOW)
-    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, player);
-            Skills.XpCheckSkill(SkillType.TAMING, player);
-        }
-    }
-}
+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.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.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();
+        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 (!Misc.isInvincible(player, event)) {
+                if (cause == DamageCause.FALL && Permissions.getInstance().acrobatics(player) && !player.isInsideVehicle()) {
+                    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());
+                }
+            }
+            break;
+
+        case WOLF:
+            Wolf wolf = (Wolf) entity;
+
+            if ((!Misc.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 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);
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+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,367 +1,378 @@
-package com.gmail.nossr50.listeners;
-
-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.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.BlockChecks;
-import com.gmail.nossr50.Combat;
-import com.gmail.nossr50.Item;
-import com.gmail.nossr50.ItemChecks;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-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.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.BlastMining;
-import com.gmail.nossr50.skills.Fishing;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Repair;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Taming;
-
-public class mcPlayerListener implements Listener {
-    private mcMMO plugin;
-
-    public mcPlayerListener(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);
-            }
-
-            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);
-            }
-
-            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();
-
-        if (partyChat || adminChat) {
-            event.setCancelled(true);
-
-            String name = "";
-            boolean displayNames = false;
-            ChatColor color = ChatColor.WHITE;
-            String logHeader = "";
-
-            /* Set the pChat & aChat specific stuff */
-            if (partyChat) {
-                if (!PP.inParty()) {
-                    player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
-                    return;
-                }
-
-                displayNames = LoadProperties.pDisplayNames;
-                color = ChatColor.GREEN;
-                logHeader = "[P](" + PP.getParty() + ")<";
-            }
-            else if (adminChat) {
-                displayNames = LoadProperties.aDisplayNames;
-                color = ChatColor.AQUA;
-                logHeader = "[A]<";
-            }
-
-            /* Format & display */
-            if (displayNames) {
-                name = player.getDisplayName();
-            }
-            else {
-                name = player.getName();
-            }
-
-            String format = color + "(" + ChatColor.WHITE + name + color + ") " + event.getMessage();
-
-            for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-                if (partyChat && Party.getInstance().inSameParty(player, x))
-                    x.sendMessage(format);
-                else if (adminChat && (x.isOp() || mcPermissions.getInstance().adminChat(x))) {
-                    x.sendMessage(format);
-                }
-            }
-
-            Bukkit.getLogger().info(logHeader + name + ">" + event.getMessage());
-        }
-    }
-
-    // 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)));
-        }
-    }
+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.skills.misc.Repair;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.Item;
+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;
+
+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 (Permissions.getInstance().motd(player) && Config.getInstance().getMOTDEnabled()) {
+            player.sendMessage(ChatColor.GOLD+"Server is running "+ChatColor.GREEN+plugin.getName()+" "+plugin.getDescription().getVersion());
+            player.sendMessage(ChatColor.GOLD+"http://www.mcmmo.info"+ChatColor.DARK_AQUA+" - mcMMO Website");
+            //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 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 (Permissions.getInstance().repair(player) && block.getTypeId() == Config.getInstance().getRepairAnvilId()) {
+                if (ItemChecks.isTool(is) || ItemChecks.isArmor(is)) {
+                    Repair.repairCheck(player, is);
+                    event.setCancelled(true);
+                    player.updateInventory();
+                }
+                else if (Config.getInstance().getToolModsEnabled() && ItemChecks.isCustomTool(is) && ModChecks.getToolFromItemStack(is).isRepairable()) {
+                    Repair.repairCheck(player, is);
+                    event.setCancelled(true);
+                    player.updateInventory();
+                }
+                else if (Config.getInstance().getArmorModsEnabled() && ItemChecks.isCustomArmor(is) && ModChecks.getArmorFromItemStack(is).isRepairable()) {
+                    Repair.repairCheck(player, is);
+                    event.setCancelled(true);
+                    player.updateInventory();
+                }
+            }
+
+            /* ACTIVATION CHECKS */
+            if (Config.getInstance().getAbilitiesEnabled() && BlockChecks.abilityBlockCheck(block)) {
+                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 (Permissions.getInstance().greenThumbBlocks(player) && BlockChecks.makeMossy(block) && is.getType().equals(Material.SEEDS)) {
+                Herbalism.greenThumbBlocks(is, player, block);
+            }
+
+            /* ITEM CHECKS */
+            if (BlockChecks.abilityBlockCheck(block)) {
+                Item.itemChecks(player);
+            }
+
+            /* BLAST MINING CHECK */
+            if (player.isSneaking() && Permissions.getInstance().blastMining(player) && is.getTypeId() == Config.getInstance().getDetonatorItemID()) {
+                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() && Permissions.getInstance().blastMining(player) && is.getTypeId() == Config.getInstance().getDetonatorItemID()) {
+                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 (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.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];
+
+        if (plugin.aliasMap.containsKey(command.toLowerCase())) {
+            //We should find a better way to avoid string replacement where the alias is equals to the command
+            if (command.equals(plugin.aliasMap.get(command.toLowerCase()))) {
+                return;
+            }
+
+            event.setMessage(message.replace(command, plugin.aliasMap.get(command.toLowerCase())));
+        }
+    }
 }

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

@@ -8,7 +8,7 @@ import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 /**
  * Listener for listening to our own events, only really useful for catching errors
  */
-public class mcSelfListener implements Listener {
+public class SelfListener implements Listener {
 
     /**
      * Monitor internal XP gain events.

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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.popups.PopupMMO;
-import com.gmail.nossr50.spout.SpoutStuff;
-
-public class mcSpoutInputListener implements Listener {
-    private mcMMO plugin;
-
-    public mcSpoutInputListener(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,37 +1,46 @@
-package com.gmail.nossr50.listeners;
-
-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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.HUDmmo;
-import com.gmail.nossr50.spout.SpoutStuff;
-
-public class mcSpoutListener implements Listener {
-    //Why do we have this here? We never use it...
-    mcMMO plugin = null;
-    
-    public mcSpoutListener(mcMMO pluginx) {
-        plugin = pluginx;
-    }
-    
-    /**
-     * Monitor SpoutCraftEnable events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-
-        if (sPlayer.isSpoutCraftEnabled()) {
-            SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff
-            Users.getProfile(sPlayer).toggleSpoutEnabled();
-            sPlayer.setTitle(String.valueOf(m.getPowerLevel(sPlayer, Users.getProfile(sPlayer))));
-        }
-    }
+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();
+        }
+    }
 }

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.Users;
-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;
-
-public class mcSpoutScreenListener implements Listener {
-    //Why do we have this here? We never use it...
-    mcMMO plugin = null;
-
-    public mcSpoutScreenListener(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());
-        }
-    }
-}
+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());
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+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/LocaleLoader.java

@@ -0,0 +1,81 @@
+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;
+    }
+}

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

@@ -1,75 +0,0 @@
-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"; //$NON-NLS-1$
-
-	private static ResourceBundle RESOURCE_BUNDLE = null;
-
-	public static String getString(String key) 
-	{
-		return getString(key, null);
-	}
-
-	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) {
-					//System.out.println("Failed to load locale specified by mcmmo.properties '"+myLocale+"', defaulting to en_us");
-					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

@@ -1,130 +1,112 @@
 package com.gmail.nossr50;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.commands.skills.*;
 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.*;
+import com.gmail.nossr50.config.Config;
+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.runnables.*;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.listeners.mcBlockListener;
-import com.gmail.nossr50.listeners.mcEntityListener;
-import com.gmail.nossr50.listeners.mcPlayerListener;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Metrics;
+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 java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.OfflinePlayer;
 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;
-import org.getspout.spoutapi.SpoutManager;
-import org.getspout.spoutapi.player.FileManager;
 
 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();
 
-    private final mcPlayerListener playerListener = new mcPlayerListener(this);
-    private final mcBlockListener blockListener = new mcBlockListener(this);
-    private final mcEntityListener entityListener = new mcEntityListener(this);
-
-    //Alias - Command
-    public HashMap<String, String> aliasMap = new HashMap<String, String>();
-    public HashMap<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
+    public HashMap<String, String> aliasMap = new HashMap<String, String>(); //Alias - Command
     public HashMap<Integer, Player> tntTracker = new HashMap<Integer, Player>();
 
-    public static Database database = null;
+    public static File versionFile;
+    public static Database database;
+    public static mcMMO p;
 
-    //Config file stuff
-    LoadProperties config;
-    LoadTreasures config2;
+    public static ChunkletManager placeStore;
 
-    //Jar stuff
-    public static File mcmmo;
+    /* Jar Stuff */
+    public File mcmmo;
+
+    //File Paths
+    public String mainDirectory, flatFileDirectory, usersFile, leaderboardDirectory, modDirectory;
 
     /**
      * Things to be run when the plugin is enabled.
      */
     public void onEnable() {
-        final Plugin thisPlugin = this;
-        mcmmo = this.getFile();
-        new File(maindirectory).mkdir();
+        p = this;
+        setupFilePaths();
 
-        if (!versionFile.exists()) {
-            updateVersion();
-        }
-        else {
-            String vnum = readVersion();
+        //Force the loading of config files
+        Config configInstance = Config.getInstance();
+        TreasuresConfig.getInstance();
 
-            //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);
-            }
-
-            //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.getToolModsEnabled()) {
+            CustomToolsConfig.getInstance().load();
         }
 
-        this.config = new LoadProperties(this);
-        this.config.load();
+        if (configInstance.getArmorModsEnabled()) {
+            CustomArmorConfig.getInstance().load();
+        }
 
-        this.config2 = new LoadTreasures(this);
-        this.config2.load();
+        if (configInstance.getBlockModsEnabled()) {
+            CustomBlocksConfig.getInstance().load();
+        }
 
-        Party.getInstance().loadParties();
-        new Party(this);
-
-        if (!LoadProperties.useMySQL) {
-            Users.getInstance().loadUsers();
+        if (!configInstance.getUseMySQL()) {
+            Users.loadUsers();
         }
 
         PluginManager pm = getServer().getPluginManager();
 
-        if (pm.getPlugin("Spout") != null) {
-            LoadProperties.spoutEnabled = true;
-        }
-        else {
-            LoadProperties.spoutEnabled = false;
-        }
-
         //Register events
         pm.registerEvents(playerListener, this);
         pm.registerEvents(blockListener, this);
         pm.registerEvents(entityListener, this);
+        pm.registerEvents(worldListener, this);
 
-        PluginDescriptionFile pdfFile = this.getDescription();
+        if (configInstance.getHardcoreEnabled()) {
+            pm.registerEvents(hardcoreListener, this);
+        }
+
+        PluginDescriptionFile pdfFile = getDescription();
 
         //Setup the leaderboards
-        if (LoadProperties.useMySQL) {
+        if (configInstance.getUseMySQL()) {
             database = new Database(this);
             database.createStructure();
         }
@@ -140,42 +122,38 @@ 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 mcSaveTimer(this), 0, LoadProperties.saveInterval * 1200);
+        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(this), 0, configInstance.getSaveInterval() * 1200);
         //Regen & Cooldown timer (Runs every second)
-        scheduler.scheduleSyncRepeatingTask(this, new mcTimer(this), 0, 20);
+        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(this), 0, 20);
         //Bleed timer (Runs every two seconds)
-        scheduler.scheduleSyncRepeatingTask(this, new mcBleedTimer(this), 0, 40);
+        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
 
         registerCommands();
 
-        //Spout Stuff
-        if (LoadProperties.spoutEnabled) {
-            SpoutStuff.setupSpoutConfigs();
-            SpoutStuff.registerCustomEvent();
-            SpoutStuff.extractFiles(); //Extract source materials
-
-            FileManager FM = SpoutManager.getFileManager();
-            FM.addToPreLoginCache(this, SpoutStuff.getFiles());
+        if (configInstance.getStatsTrackingEnabled()) {
+            try {
+                Metrics metrics = new Metrics(this);
+                metrics.start();
+            }
+            catch (IOException e) {
+                System.out.println("Failed to submit stats.");
+            }
         }
 
-        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();
-
-                        // 'this' in this context is the Plugin object
-                        metrics.beginMeasuringPlugin(thisPlugin);
-                    }
-                    catch (IOException e) {
-                        System.out.println("Failed to submit stats.");
-                    }
-                }
-            }).start();
-        }
+        // Get our ChunkletManager
+        placeStore = ChunkletManagerFactory.getChunkletManager();
+    }
+    
+    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;
     }
 
     /**
@@ -186,126 +164,59 @@ public class mcMMO extends JavaPlugin {
      * @param player Player whose profile to get
      * @return the PlayerProfile object
      */
-    public static PlayerProfile getPlayerProfile(Player player) {
+    public PlayerProfile getPlayerProfile(Player player) {
         return Users.getProfile(player);
     }
 
     /**
-     * Check the XP of a player.
+     * Get profile of the player by name.
      * </br>
      * This function is designed for API usage.
      *
-     * @param player
-     * @param skillType
+     * @param playerName Name of player whose profile to get
+     * @return the PlayerProfile object
      */
-    public static void checkXp(Player player, SkillType skillType) {
-        if (skillType == SkillType.ALL) {
-            Skills.XpCheckAll(player);
-        }
-        else {
-            Skills.XpCheckSkill(skillType, player);
-        }
+    public PlayerProfile getPlayerProfileByName(String playerName) {
+        return Users.getProfileByName(playerName);
     }
 
     /**
-     * Check if two players are in the same party.
+     * Get profile of the offline player.
      * </br>
      * This function is designed for API usage.
      *
-     * @param playera The first player to check
-     * @param playerb The second player to check
-     * @return true if the two players are in the same party, false otherwise
+     * @param player Offline player whose profile to get
+     * @return the PlayerProfile object
      */
-    public static boolean inSameParty(Player playera, Player playerb) {
-        if (Users.getProfile(playera).inParty() && Users.getProfile(playerb).inParty()) {
-            if (Users.getProfile(playera).getParty().equals(Users.getProfile(playerb).getParty())) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-     * Get a list of all current party names.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @return the list of parties.
-     */
-    public static ArrayList<String> getParties() {
-        String location = "plugins/mcMMO/mcmmo.users";
-        ArrayList<String> parties = new ArrayList<String>();
-
-        try {
-
-            //Open the users file
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            String line = "";
-
-            while((line = in.readLine()) != null) {
-                String[] character = line.split(":");
-                String theparty = null;
-
-                //Party
-                if (character.length > 3) {
-                    theparty = character[3];
-                }
-
-                if (!parties.contains(theparty)) {
-                    parties.add(theparty);
-                }
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        return parties;
-    }
-
-    /**
-     * Get the name of the party a player is in.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to check the party name of
-     * @return the name of the player's party
-     */
-    public static String getPartyName(Player player) {
-        PlayerProfile PP = Users.getProfile(player);
-        return PP.getParty();
-    }
-
-    /**
-     * Checks if a player is in a party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to check
-     * @return true if the player is in a party, false otherwise
-     */
-    public static boolean inParty(Player player) {
-        PlayerProfile PP = Users.getProfile(player);
-        return PP.inParty();
+    public PlayerProfile getOfflinePlayerProfile(OfflinePlayer player) {
+        return Users.getProfile(player);
     }
 
     /**
      * 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();
         }
 
-        Bukkit.getServer().getScheduler().cancelTasks(this); //This removes our tasks
+        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());
+        }
+
         System.out.println("mcMMO was disabled."); //How informative!
     }
 
@@ -313,21 +224,20 @@ 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(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");
+        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");
 
         //Register commands
         //Skills commands
@@ -344,175 +254,99 @@ public class mcMMO extends JavaPlugin {
         getCommand("unarmed").setExecutor(new UnarmedCommand());
         getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
 
+        Config configInstance = Config.getInstance();
+
         //mc* commands
-        if (LoadProperties.mcremoveEnable) {
-            getCommand("mcremove").setExecutor(new McremoveCommand());
+        if (configInstance.getCommandMCRemoveEnabled()) {
+            getCommand("mcremove").setExecutor(new McremoveCommand(this));
         }
 
-        if (LoadProperties.mcabilityEnable) {
+        if (configInstance.getCommandMCAbilityEnabled()) {
             getCommand("mcability").setExecutor(new McabilityCommand());
         }
 
-        if (LoadProperties.mccEnable) {
+        if (configInstance.getCommandMCCEnabled()) {
             getCommand("mcc").setExecutor(new MccCommand());
         }
 
-        if (LoadProperties.mcgodEnable) {
+        if (configInstance.getCommandMCGodEnabled()) {
             getCommand("mcgod").setExecutor(new McgodCommand());
         }
 
-        if (LoadProperties.mcmmoEnable) {
+        if (configInstance.getCommandmcMMOEnabled()) {
             getCommand("mcmmo").setExecutor(new McmmoCommand());
         }
 
-        if (LoadProperties.mcrefreshEnable) {
+        if (configInstance.getCommandMCRefreshEnabled()) {
             getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
         }
 
-        if (LoadProperties.mctopEnable) {
+        if (configInstance.getCommandMCTopEnabled()) {
             getCommand("mctop").setExecutor(new MctopCommand());
         }
 
-        if (LoadProperties.mcstatsEnable) {
+        if (configInstance.getCommandMCStatsEnabled()) {
             getCommand("mcstats").setExecutor(new McstatsCommand());
         }
 
         //Party commands
-        if (LoadProperties.acceptEnable) {
-            getCommand("accept").setExecutor(new AcceptCommand());
+        if (configInstance.getCommandAcceptEnabled()) {
+            getCommand("accept").setExecutor(new AcceptCommand(this));
         }
 
-        if (LoadProperties.aEnable) {
-            getCommand("a").setExecutor(new ACommand());
+        if (configInstance.getCommandAdminChatAEnabled()) {
+            getCommand("a").setExecutor(new ACommand(this));
         }
 
-        if (LoadProperties.inviteEnable) {
+        if (configInstance.getCommandInviteEnabled()) {
             getCommand("invite").setExecutor(new InviteCommand(this));
         }
 
-        if (LoadProperties.partyEnable) {
-            getCommand("party").setExecutor(new PartyCommand());
+        if (configInstance.getCommandPartyEnabled()) {
+            getCommand("party").setExecutor(new PartyCommand(this));
         }
 
-        if (LoadProperties.pEnable) {
-            getCommand("p").setExecutor(new PCommand());
+        if (configInstance.getCommandPartyChatPEnabled()) {
+            getCommand("p").setExecutor(new PCommand(this));
         }
 
-        if (LoadProperties.ptpEnable) {
+        if (configInstance.getCommandPTPEnabled()) {
             getCommand("ptp").setExecutor(new PtpCommand(this));
         }
 
         //Other commands
-        if (LoadProperties.addxpEnable) {
+        if (configInstance.getCommandAddXPEnabled()) {
             getCommand("addxp").setExecutor(new AddxpCommand(this));
         }
 
-        if (LoadProperties.addlevelsEnable) {
+        if (configInstance.getCommandAddLevelsEnabled()) {
             getCommand("addlevels").setExecutor(new AddlevelsCommand(this));
         }
 
-        if (LoadProperties.mmoeditEnable) {
-            getCommand("mmoedit").setExecutor(new MmoeditCommand());
+        if (configInstance.getCommandMmoeditEnabled()) {
+            getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
         }
 
-        if (LoadProperties.inspectEnable) {
+        if (configInstance.getCommandInspectEnabled()) {
             getCommand("inspect").setExecutor(new InspectCommand(this));
         }
 
-        if (LoadProperties.xprateEnable) {
-            getCommand("xprate").setExecutor(new XprateCommand());
+        if (configInstance.getCommandXPRateEnabled()) {
+            getCommand("xprate").setExecutor(new XprateCommand(this));
         }
 
-        getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
+        getCommand("mmoupdate").setExecutor(new MmoupdateCommand(this));
 
         //Spout commands
-        if (LoadProperties.xplockEnable) {
+        if (configInstance.getCommandXPLockEnabled()) {
             getCommand("xplock").setExecutor(new XplockCommand());
         }
 
-        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);
+        getCommand("mchud").setExecutor(new MchudCommand(this));
     }
 
     /*
-     * Boilerplate Custom Config Stuff
+     * Boilerplate Custom Config Stuff (Treasures)
      */
 
     private FileConfiguration treasuresConfig = null;
@@ -527,9 +361,9 @@ public class mcMMO extends JavaPlugin {
         }
 
         treasuresConfig = YamlConfiguration.loadConfiguration(treasuresConfigFile);
-        InputStream defConfigStream = getResource("treasures.yml"); // Look for defaults in the jar
 
-        if (defConfigStream != null) {
+        if (isInJar("treasures.yml")) {
+            InputStream defConfigStream = getResource("treasures.yml");
             YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
             treasuresConfig.setDefaults(defConfig);
         }
@@ -560,7 +394,171 @@ public class mcMMO extends JavaPlugin {
             treasuresConfig.save(treasuresConfigFile);
         }
         catch (IOException ex) {
-            Bukkit.getLogger().severe("Could not save config to " + treasuresConfigFile + ex.toString());
+            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;
+    }
 }