1.3.13 Release

Removing detritus left over from recent commits.

.gitignore

@@ -24,7 +24,7 @@
 /world
 
 # Mac filesystem dust
-/.DS_Store
+*.DS_Store
 
 # intellij
 *.iml
@@ -39,4 +39,4 @@
 *.jar
 
 # Atlassian Stuff
-/atlassian-ide-plugin.xml
+/atlassian-ide-plugin.xml

Changelog.txt

@@ -7,11 +7,119 @@ Key:
   ! Change
   - Removal
 
+Version 1.3.13-dev
+ ! Indexed most used mySQL columns for faster queries
+ + Added task & command to prune old and powerless users from the SQL database.
+ + Added Craftbukkit 1.4.6 / 1.4.7 compatibility
+ + Added new /mcrank command for showing a players leader board ranking for all skills in one place
+ + Added a configurable durability cap for ArmorImpact to advanced.yml
+ + Added the version number to /mcmmo
+ + Added bats, giants, witches, withers, and wither skeletons to the mcMMO combat experience list, and makes their experience drops configurable
+ + Added the ability to track mobs spawned by mob spawners or the Taming ability when the chunks they are in unload and reload
+ + Added wooden button to the list of items that shouldn't trigger abilities
+ + Added a new feature to fishing. Players will have +10% chance of finding enchanted items when fishing while it's raining
+ + Added displaying bonus perks on skill commands
+ + Added config option to disable gaining Acrobatics XP from dodging lightning
+ + Added missing skill guides. They're finally here!
+ + Added more localization 
+ + Added a very secret easter egg
+ = Fix issue with Sand/Gravel tracking
+ = Fix possible NPE when using the PartyAPI to add a player to a party that doesn't exist.
+ = Fix mcremove command for mySQL
+ = Fix a java.io.FileNotFoundException when using SQL
+ = Impact now works with mobs wearing armor
+ = Fixed issue with Tree Feller dropping player-placed blocks
+ = Fixed issue with missing default cases from several switch/case statements
+ = Fixed issue with Mining using actual skill level rather than max skill level
+ = Fixed some issues with static access
+ = Fixed ItemStack deprecation issues
+ = Fixed Async deprecation issues
+ = Fixed a bug with MySQL databases (non-alphanumeric characters preventing MySQL access)
+ = Fixed a bug where the /skillreset command was broken
+ = Fixed a bug where skill commands displaying .x% instead of 0.x%
+ = Fixed a bug Unbreaking enchantments being ignored when using Treefelling and when hit by Armor Impact
+ = Fixed a bug where only 1 diamond was needed to fully repair a broken item: Repaired the Repair skill!
+ = Fixed a bug where a infinite loop of errors caused by mySQL database could cause the server to crash
+ = Fixed a bug where PartyChangeEvent was fired even when a player isn't able to change parties
+ = Fixed a bug which caused advanced.yml not to work for Swords
+ = Fixed a bug which caused advanced.yml not to respect every MaxChance node
+ = Fixed a bug where GreenThumb_StageChange wasn't read from advanced.yml
+ = Fixed a bug where Repair would remove enchantments but the glow effect remained
+ = Fixed a bug where dropped items did not retain custom NBT data
+ = Fixed a bug which caused a potentially infinite recursion in a btree structure
+ = Fixed a NPE with custom blocks
+ = Fixed a bug with Blast Mining never dropping debris blocks
+ = Fixed a bug with Blast Mining incorrectly handling reduced TNT damage
+ = Fixed a bug with conflicting fishing enchantments
+ = Fixed a bug where triple drops wouldn't happen
+ = Fixed a bug which caused fishing to ignore max/min levels in treasures.yml
+ = Fixed a bug where treefeller affected player-placed blocks
+ = Fixed bug where Skull Splitter would be applied twice.
+ ! GJ stopped being a lazy slacker and got stuff done
+ ! Nossr50 actually committed something
+ ! Changed code that uses SpoutPlugin to make it compatible with the latest version
+ ! Reimplemented skill level and power level caps.
+ ! Moved Arcane Forging and Fishing setting from config.yml to advanced.yml
+ ! Overall SQL query improvements
+ ! Reduced number of SQL queries for mcTop command from 11 to 1, speeding it up immensely
+ ! Changed FFS Leaderboards to hold information in memory rather than doing IO work (optimizations)
+ ! Improved chunk conversion (less errors)
+ ! Changed Fishing Treasure Hunter, chance has increased and now actually is level dependent
+ - Removed dead code relating to null profiles
+ - Removed unused imports
+ - Removed ChunkletUnloader and dependents, since they are no longer necessary.
+
+Version 1.3.12
+ + Added Craftbukkit 1.4.5 compatibility
+ + Added the new 1.3.2 items, xp and double drops for Cocoa beans & Emeralds, EnderChest to the list of blocks that shouldn't trigger abilities
+ + Added new items from Minecraft 1.4 to Herbalism (potatoes & carrots)
+ + Added new configuration file for advanced users.
+ + Added new permission nodes to greenthumb for the 1.4 items
+ + Added new mobs from Minecraft 1.4 checks for every ability
+ + Added new active ability for Repair: Salvage
+ + Added options to 'config.yml' configure shake chance
+ + Added the option to negate experience earned for Herbalism while in a minecart to prevent afk leveling
+ + Added Green thumb now converts cobble walls to mossy cobble walls
+ + Added beacons and anvils to list of blocks that don't trigger abilities
+ + Added a configuration option to disable experience gains when in a minecraft for Acrobatics and Herbalism, to prevent AFK leveling
+ + Added a new passive ability for Fishing, Fishermans diet. Increases hunger restored from fish
+ + Added a feature to display all active perks on login
+ ! Changed Fishing, Shake drops changed from guaranteed to based upon fishing level and perks
+ ! Changed Woodcutting, the amount of experience earned when using Tree Feller on jungle trees has increased
+ ! Changed Herbalism double drop rates for melons and netherwart
+ ! Changed filesystem usage, it's reduced a lot. Should help reduce lag on larger servers
+ ! Changed database connection handling. Support for aggressive connection timeouts, with exponential backoff for multiple failures
+ ! Changed Cobblestone walls are now mossy-able with Greenthumb
+ ! Changed the skull drop rates of the shake ability to 3%
+ = Fixed a NPE when Citizens perform certain tasks
+ = Fixed a NPE with Woodcutting, excessive null chunk before earning Woodcutting experience
+ = Fixed a NPE related to skill cooldowns
+ = Fixed a NPE when a players profile was null
+ = Fixed a NPE involving certain explosions
+ = Fixed a dupe bug when for players who were using a 'nuker' client
+ = Fixed a dupe bug where pistons were used to dupe ores
+ = Fixed a dupe bug with Salvage when players were in Creative mode
+ = Fixed a bug where the player was displayed an incorrect cooldown time
+ = Fixed a bug where players could earn experience when they were dealing 0 damage
+ = Fixed a bug where players could get double drops from mossified Cobblestone
+ = Fixed a bug where Herablism magically converted potatoes to carrots
+ = Fixed a bug where you couldn't modify the stats of offline players
+ = Fixed a bug where treefeller didn't work properly on tree's with side-way logs
+ = Fixed a bug where the Arcane forging downgrade chance should've been 0, but actually wasn't
+ = Fixed a bug where Fishing would sometimes give items with empty enchantments
+ = Fixed a bug where the lucky perk for Fishing was actually an unlucky perk
+ - Removed nothing
+
 Version 1.3.11
- = Fixed bug where mcMMO would ignore other block-protection plugins for various abilities
- 
+ ! Changed axes to start with 1 durability damage instead of 5, gain 1 durability damage every 50 levels instead of 30, and only have a 25% chance on hit to damage armor (per armor piece)
+ + Added compatibility with bow-wielding NPCs from Citizens/NPC mods
+ + Added compatibility for pvp-prevention plugins for Serrated Strikes
+ = Fixed bug where mcMMO could throw NPE errors if trees cut down were from a custom mod and had an id of 17
+ = Fixed dupe bug where mcMMO would ignore other block-protection plugins for various abilities
+ = Fixed NPE with hardcore mode's vampirism
+ 
 Version 1.3.10
- + Added 1.3.1 compatibility
+ + Added 1.3.1 compatibility
  + Added permission node for Iron Grip ability (mcmmo.ability.unarmed.irongrip)
  + Added ability for custom blocks to drop a range of items.
  + Added Ability API functions
@@ -24,7 +132,7 @@ Version 1.3.10
  = Fixed menu exit button not working
  = Fixed Repair enchant downgrade not working
  = Fixed NPE caused by Spout players after a /reload
- = Fixed ConcurrentModificationException on world unload
+ = Fixed ConcurrentModificationException on world unload
  = Fixed players never being removed from memory (memory leak)
  = Fixed admin chat being seen by everyone
  = Fixed issue with UTFDataFormatException occurring on occasion when trying to load Chunklets
@@ -35,7 +143,7 @@ Version 1.3.10
  = Fixed custom woodcutting blocks throwing errors.
  = Fixed possible ClassCastException from catching something other than a mob when using the Shake Mob skill
  ! Changed the format by which Chunklets are stored to be much smaller, and much faster to load
- ! Optimized how player placed blocks are tracked
+ ! Optimized how player placed blocks are tracked
 
 Version 1.3.09
  + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating)
@@ -151,7 +259,7 @@ Version 1.3.06
  = Fixed NPE error with Metrics on startup
  = Fixed bug where Herbalism required double drops permission to give XP
  = Fixed bug where {0} would be displayed in front of your power level in mcstats
- = Fixed mmoupdate not being useable from console
+ = Fixed mmoupdate not being useable from console
  = Fixed bug with repairing wooden tools
  = Fixed bug with Nether Wart not awarding XP
  = Fixed bug with fishing treasures when treasures list is empty
@@ -164,19 +272,19 @@ Version 1.3.06
  ! 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 how the tree feller threshold worked for the better
  ! Changed /mcremove to no longer kick players when they are removed from database
- ! Changed /mcremove to work on offline users for FlatFile
+ ! Changed /mcremove to 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 party & admin chat handling to be nicer to developers
  ! Changed /mcrefresh to work from console
- ! Changed /mcrefresh to work for offline players
+ ! Changed /mcrefresh to work for offline players
  ! Changed UpdateXPBar function to hopefully avoid errors
  ! Changed /party to show offline party members
- ! Changed Blast Mining requirements, now asks for the player to be crouching
+ ! Changed 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%)
@@ -225,7 +333,7 @@ Version 1.3.03
  + Added console functionality to mctop
  = Fixed Green Terra not awarding Triple Drops
  = Fixed ClassCastException from Taming preventDamage checks
- = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
+ = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
  = Fixed issue with block interaction returning NPEs
  = Fixed issue where every block broken had a mining check applied
  = Fixed issue where every block broken had a herbalism check applied
@@ -241,7 +349,7 @@ Version 1.3.03
  ! Changed mcMMO to be better about saving player information on server shutdown
  ! Changed PTP to prevent teleporting if you've been hurt in the last 30 seconds (configurable)
  ! Changed Chimera Wing failure check to use the maxWorldHeight.
- ! Changed inspect failed message to say inspect rather than whois
+ ! Changed inspect failed message to say inspect rather than whois
  ! Changed Call of the Wild to activate on left-click rather than right-click
  ! Changed Blast Mining to track based on Entity ID vs. Location
  ! Changed mmoedit to save a profile when used (this will make mctop update)

README.creole

@@ -1,8 +1,8 @@
 == mcMMO
 **The RPG lovers mod**
 
-=== Forums
-http://forums.mcmmo.info Talk with developers and the community about mcMMO here
+=== Dev builds
+http://nuclearw.com:8080/job/mcMMO/ Download the latest dev build of 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.
@@ -20,6 +20,7 @@ Hearing that people enjoy mcMMO and seeing the daily youtube videos about my mod
 
 Required Libraries:
 * Spout API
+* JUnit
 
 Required to Run:
 * Bukkit

pom.xml

@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.3.11</version>
+    <version>1.3.13</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
-        <url>http://issues.mcmmo.org</url>
-        <system>JIRA</system>
+        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
+        <system>GitHub</system>
     </issueManagement>
     <build>
         <finalName>mcMMO</finalName>
@@ -92,6 +92,13 @@
                 </executions>
             </plugin>
         </plugins>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-file</artifactId>
+                <version>2.2</version>
+            </extension>
+        </extensions>
     </build>
     <repositories>
         <repository>
@@ -123,8 +130,8 @@
         </dependency>
         <dependency>
             <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
+            <artifactId>spoutplugin</artifactId>
+            <version>LATEST</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
@@ -135,6 +142,12 @@
 			<scope>test</scope>
 		</dependency>
     </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>mcmmo-repo</id>
+            <url>file:///var/lib/jenkins/repo</url>
+        </repository>
+    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

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

@@ -1,11 +1,11 @@
 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.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
@@ -30,14 +30,12 @@ public final class ChatAPI {
             return;
         }
 
-        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
-
         mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
         for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
             if (Users.getProfile(player).inParty()) {
                 if (Users.getProfile(player).getParty().getName().equalsIgnoreCase(chatEvent.getParty())) {
-                    player.sendMessage(pPrefix + chatEvent.getMessage());
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {chatEvent.getSender()} ) + chatEvent.getMessage());
                 }
             }
         }
@@ -59,13 +57,11 @@ public final class ChatAPI {
             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());
+            if (Permissions.adminChat(player) || player.isOp())
+                player.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {chatEvent.getSender()} ) + chatEvent.getMessage());
         }
     }
 }

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

@@ -69,7 +69,16 @@ public final class PartyAPI {
      * @param partyName The party to add the player to
      */
     public static void addToParty(Player player, String partyName) {
-        PartyManager.getInstance().addToParty(player.getName(), Users.getProfile(player), PartyManager.getInstance().getParty(partyName)); //TODO this will throw a NPE if the party doesn't exist
+        Party party = PartyManager.getInstance().getParty(partyName);
+        String playerName = player.getName();
+
+        if (party == null) {
+            party = new Party();
+            party.setName(partyName);
+            party.setLeader(playerName);
+        }
+
+        PartyManager.getInstance().addToParty(playerName, Users.getProfile(player), party);
     }
 
     /**

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

@@ -23,7 +23,7 @@ public class CommandHelper {
         if (sender instanceof Player) {
             Player player = (Player) sender;
 
-            if (!Permissions.getInstance().permission(player, permission)) {
+            if (!Permissions.hasPermission(player, permission)) {
                 player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
                 return true;
             }
@@ -51,25 +51,30 @@ public class CommandHelper {
         if (Skills.hasGatheringSkills(inspect)) {
             PlayerProfile profile = Users.getProfile(inspect);
 
+            if (profile == null) {
+                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return;
+            }
+
             display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
 
-            if (Permissions.getInstance().excavation(inspect)) {
+            if (Permissions.excavation(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
             }
 
-            if (Permissions.getInstance().fishing(inspect)) {
+            if (Permissions.fishing(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
             }
 
-            if (Permissions.getInstance().herbalism(inspect)) {
+            if (Permissions.herbalism(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
             }
 
-            if (Permissions.getInstance().mining(inspect)) {
+            if (Permissions.mining(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
             }
 
-            if (Permissions.getInstance().woodcutting(inspect)) {
+            if (Permissions.woodcutting(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
             }
         }
@@ -89,25 +94,30 @@ public class CommandHelper {
         if (Skills.hasCombatSkills(inspect)) {
             PlayerProfile profile = Users.getProfile(inspect);
 
+            if (profile == null) {
+                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return;
+            }
+
             display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
 
-            if (Permissions.getInstance().axes(inspect)) {
+            if (Permissions.axes(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
             }
 
-            if (Permissions.getInstance().archery(inspect)) {
+            if (Permissions.archery(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
             }
 
-            if (Permissions.getInstance().swords(inspect)) {
+            if (Permissions.swords(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
             }
 
-            if (Permissions.getInstance().taming(inspect)) {
+            if (Permissions.taming(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
             }
 
-            if (Permissions.getInstance().unarmed(inspect)) {
+            if (Permissions.unarmed(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
             }
         }
@@ -126,13 +136,19 @@ public class CommandHelper {
     public static void printMiscSkills(Player inspect, CommandSender display) {
         if (Skills.hasMiscSkills(inspect)) {
             PlayerProfile profile = Users.getProfile(inspect);
+
+            if (profile == null) {
+                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return;
+            }
+
             display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
 
-            if (Permissions.getInstance().acrobatics(inspect)) {
+            if (Permissions.acrobatics(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
             }
 
-            if (Permissions.getInstance().repair(inspect)) {
+            if (Permissions.repair(inspect)) {
                 display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
             }
         }

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

@@ -12,7 +12,6 @@ import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public abstract class SkillCommand implements CommandExecutor {
@@ -25,7 +24,6 @@ public abstract class SkillCommand implements CommandExecutor {
     protected float skillValue;
 
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected Permissions permInstance = Permissions.getInstance();
 
     public SkillCommand(SkillType skill) {
         this.skill = skill;
@@ -46,6 +44,11 @@ public abstract class SkillCommand implements CommandExecutor {
         player = (Player) sender;
         profile = Users.getProfile(player);
 
+        if (profile == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            return true;
+        }
+
         skillValue = profile.getSkillLevel(skill);
         dataCalculations();
         permissionsCheck();

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -29,8 +28,7 @@ public class AddlevelsCommand implements CommandExecutor{
         PlayerProfile profile;
         int levels;
         SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels [player] <skill> <level>"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"addlevels", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">" });
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -51,14 +49,13 @@ public class AddlevelsCommand implements CommandExecutor{
                     profile = Users.getProfile(modifiedPlayer);
 
                     if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
+                        sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
                     }
                     else {
-                        skillName = Misc.getCapitalized(skill.toString());
+                        sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
                     }
 
                     profile.addLevels(skill, levels);
-                    sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
                 }
             }
             else {
@@ -72,6 +69,11 @@ public class AddlevelsCommand implements CommandExecutor{
             String playerName = modifiedPlayer.getName();
             profile = Users.getProfile(modifiedPlayer);
 
+            if (profile == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
             if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
@@ -85,23 +87,23 @@ public class AddlevelsCommand implements CommandExecutor{
             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
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] {playerName}));
                 }
                 else {
-                    skillName = Misc.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] {Misc.getCapitalized(skill.toString()), playerName}));
                 }
 
-                sender.sendMessage(message);
-
                 if (modifiedPlayer.isOnline()) {
-                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
+                    if (skill.equals(SkillType.ALL)) {
+                        ((Player) modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
+                    }
+                    else {
+                        ((Player) modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
+                    }
                 }
             }
             else {

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

@@ -1,6 +1,5 @@
 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;
@@ -29,8 +28,7 @@ public class AddxpCommand implements CommandExecutor {
         Player modifiedPlayer;
         int xp;
         SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addxp [playername] <skill> <xp>"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"addxp", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.XP") + ">" });
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -54,14 +52,12 @@ public class AddxpCommand implements CommandExecutor {
                     mcMMOPlayer.addXPOverride(skill, xp);
 
                     if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
+                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] {xp}));
                     }
                     else {
-                        skillName = Misc.getCapitalized(skill.toString());
+                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] {xp, Misc.getCapitalized(skill.toString())}));
                     }
 
-                    modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
                     if (skill.equals(SkillType.ALL)) {
                         Skills.xpCheckAll(modifiedPlayer, profile);
                     }
@@ -85,6 +81,11 @@ public class AddxpCommand implements CommandExecutor {
             McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
             PlayerProfile profile = Users.getProfile(modifiedPlayer);
 
+            if (profile == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
             if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
@@ -98,26 +99,22 @@ public class AddxpCommand implements CommandExecutor {
             if (Misc.isInt(args[2])) {
                 xp = Integer.valueOf(args[2]);
                 skill = Skills.getSkillType(args[1]);
-                String message;
 
                 mcMMOPlayer.addXPOverride(skill, xp);
 
                 if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] {playerName}));
                 }
                 else {
-                    skillName = Misc.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] {Misc.getCapitalized(skill.toString()), playerName}));
                 }
 
-                sender.sendMessage(message);
-                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
                 if (skill.equals(SkillType.ALL)) {
+                    modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] {xp}));
                     Skills.xpCheckAll(modifiedPlayer, profile);
                 }
                 else {
+                    modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] {xp, Misc.getCapitalized(skill.toString())}));
                     Skills.xpCheckSkill(skill, modifiedPlayer, profile);
                 }
             }

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

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

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

@@ -28,11 +28,11 @@ public class McstatsCommand implements CommandExecutor {
         CommandHelper.printMiscSkills(player);
 
         int powerLevelCap = Config.getInstance().getPowerLevelCap();
-        
+
         if (powerLevelCap > 0)
-        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()), String.valueOf(powerLevelCap) }));
+            player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()), String.valueOf(powerLevelCap) }));
         else
-        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()) }));        	
+            player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()) }));
 
         return true;
     }

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

@@ -1,6 +1,5 @@
 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;
@@ -22,7 +21,7 @@ public class MmoeditCommand implements CommandExecutor {
         int newValue;
         SkillType skill;
         String skillName;
-        String usage = ChatColor.RED + "Proper usage is /mmoedit [player] <skill> <level>"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"mmoedit", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">" });
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -50,7 +49,7 @@ public class MmoeditCommand implements CommandExecutor {
                     }
 
                     profile.modifySkill(skill, newValue);
-                    sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", new Object[] {skillName, newValue}));
                 }
                 else {
                     sender.sendMessage(usage);
@@ -88,9 +87,14 @@ public class MmoeditCommand implements CommandExecutor {
             if (mcmmoPlayer != null) {
                 profile = mcmmoPlayer.getProfile();
 
+                if (profile == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
                 profile.modifySkill(skill, newValue);
-                mcmmoPlayer.getPlayer().sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                sender.sendMessage(ChatColor.RED + skillName + " has been modified for " + args[0] + "."); //TODO: Use locale
+                mcmmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", new Object[] {skillName, newValue}));
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", new Object[] {skillName, args[0]}));
             }
             else {
                 profile = new PlayerProfile(args[0], false); //Temporary Profile

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

@@ -1,6 +1,5 @@
 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;
@@ -9,6 +8,7 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.SQLConversionTask;
 import com.gmail.nossr50.util.Users;
 
@@ -25,7 +25,7 @@ public class MmoupdateCommand implements CommandExecutor {
             return true;
         }
 
-        sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
+        sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
         Users.clearAll();
         convertToMySQL();
 
@@ -33,7 +33,7 @@ public class MmoupdateCommand implements CommandExecutor {
             Users.addUser(x);
         }
 
-        sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
+        sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
 
         return true;
     }
@@ -46,6 +46,6 @@ public class MmoupdateCommand implements CommandExecutor {
             return;
         }
 
-        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, new SQLConversionTask(plugin), 1);
+        plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new SQLConversionTask(plugin), 1);
     }
 }

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

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

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

@@ -74,7 +74,7 @@ public class XprateCommand implements CommandExecutor {
                     }
                 }
                 else {
-                    sender.sendMessage("The XP RATE was modified to " + Config.getInstance().xpGainMultiplier); //TODO: Locale
+                    sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", new Object[] {Config.getInstance().xpGainMultiplier}));
                 }
             }
             else {

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

@@ -24,6 +24,11 @@ public class McabilityCommand implements CommandExecutor {
 
         PlayerProfile profile = Users.getProfile((Player) sender);
 
+        if (profile == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            return true;
+        }
+
         if (profile.getAbilityUse()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
         }

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

@@ -1,6 +1,5 @@
 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;
@@ -22,21 +21,21 @@ public class MccCommand implements CommandExecutor {
 
         Player player = (Player) sender;
 
-        player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
+        player.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
 
-        if (Permissions.getInstance().party(player)) {
+        if (Permissions.party(player)) {
             player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
             player.sendMessage("/party " + LocaleLoader.getString("Commands.Party"));
             player.sendMessage("/party q " + LocaleLoader.getString("Commands.Party.Quit"));
 
-            if (Permissions.getInstance().partyChat(player)) {
+            if (Permissions.partyChat(player)) {
                 player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
             }
 
             player.sendMessage("/invite " + LocaleLoader.getString("Commands.Party.Invite"));
             player.sendMessage("/accept " + LocaleLoader.getString("Commands.Party.Accept"));
 
-            if (Permissions.getInstance().partyTeleport(player)) {
+            if (Permissions.partyTeleport(player)) {
                 player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
             }
         }
@@ -45,27 +44,27 @@ public class MccCommand implements CommandExecutor {
         player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
         player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
-        if (Config.getInstance().getCommandSkillResetEnabled() && Permissions.getInstance().skillReset(player)) {
+        if (Config.getInstance().getCommandSkillResetEnabled() && Permissions.skillReset(player)) {
             player.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
         }
-        
-        if (Permissions.getInstance().mcAbility(player)) {
+
+        if (Permissions.mcAbility(player)) {
             player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
         }
 
-        if (Permissions.getInstance().adminChat(player)) {
+        if (Permissions.adminChat(player)) {
             player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
         }
 
-        if (Permissions.getInstance().inspect(player)) {
+        if (Permissions.inspect(player)) {
             player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
         }
 
-        if (Permissions.getInstance().mmoedit(player)) {
+        if (Permissions.mmoedit(player)) {
             player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
         }
 
-        if (Permissions.getInstance().mcgod(player)) {
+        if (Permissions.mcgod(player)) {
             player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
         }
 

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

@@ -24,6 +24,11 @@ public class McgodCommand implements CommandExecutor {
 
         PlayerProfile profile = Users.getProfile((Player) sender);
 
+        if (profile == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            return true;
+        }
+
         if (profile.getGodMode()) {
             sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
         }

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

@@ -10,6 +10,7 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Anniversary;
 
 public class McmmoCommand implements CommandExecutor {
     @Override
@@ -22,13 +23,16 @@ public class McmmoCommand implements CommandExecutor {
             if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
                 SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
 
-                spoutPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
+                spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
             }
 
-            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
-            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "mcmmodev@gmail.com" + ChatColor.GOLD + " Paypal");
+            sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
         }
+        sender.sendMessage(LocaleLoader.getString("MOTD.Version", new Object[] {mcMMO.p.getDescription().getVersion()}));
 
+        Anniversary anniversary = new Anniversary();
+        anniversary.anniversaryCheck(sender);
         return true;
     }
 }

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

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands.mc;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+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.Database;
+
+public class McpurgeCommand implements CommandExecutor{
+    private Database database = mcMMO.getPlayerDatabase();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
+            return true;
+        }
+
+        if (Config.getInstance().getUseMySQL()) {
+            database.purgePowerlessSQL();
+
+            if (Config.getInstance().getOldUsersCutoff() != -1) {
+                database.purgeOldSQL();
+            }
+        }
+        else {
+            //TODO: Make this work for Flatfile data.
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+        return true;
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.gmail.nossr50.commands.mc;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.McRankAsync;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Skills;
+
+public class McrankCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        //TODO: Better input handling, add usage string
+
+        if (!Config.getInstance().getUseMySQL()) {
+            Leaderboard.updateLeaderboards(); //Make sure the information is up to date
+        }
+
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        Player player = (Player) sender;
+        String playerName;
+        switch (args.length) {
+            case 0:
+                playerName = player.getName();
+                break;
+
+            case 1:
+                playerName = args[0];
+                break;
+
+            default:
+                return false;
+        }
+
+        if (Config.getInstance().getUseMySQL()) {
+            sqlDisplay(sender, playerName);
+        }
+        else {
+            flatfileDisplay(sender, playerName);
+        }
+
+        return true;
+    }
+
+    public void flatfileDisplay(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName}));
+        for (SkillType skillType : SkillType.values()) {
+            int[] rankInts = Leaderboard.getPlayerRank(playerName, skillType);
+
+            if (skillType.equals(SkillType.ALL)) {
+                continue; // We want the overall ranking to be at the bottom
+            }
+
+            if (rankInts[1] == 0) {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), String.valueOf(rankInts[0])} ));
+            }
+        }
+
+        //Show the powerlevel ranking
+        int[] rankInts = Leaderboard.getPlayerRank(playerName, SkillType.ALL);
+        
+        if (rankInts[1] == 0) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {String.valueOf(rankInts[0])} ));
+        }
+    }
+
+    private void sqlDisplay(CommandSender sender, String playerName) {
+        Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getPluginManager().getPlugin("mcMMO"), new McRankAsync(playerName, sender));
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -24,7 +23,7 @@ public class McrefreshCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         OfflinePlayer player;
         PlayerProfile profile;
-        String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mcrefresh", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"});
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
             return true;
@@ -47,12 +46,17 @@ public class McrefreshCommand implements CommandExecutor {
             profile = Users.getProfile(player);
             String playerName = player.getName();
 
+            if (profile == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
             if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
             }
 
-            sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", new Object[] {playerName}));
 
             break;
 

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

@@ -5,21 +5,15 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Database;
-import com.gmail.nossr50.util.Users;
 
 public class McremoveCommand implements CommandExecutor {
     private final String location;
@@ -34,8 +28,8 @@ public class McremoveCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String playerName;
         String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        String databaseName = Config.getInstance().getMySQLDatabaseName();
-        String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
+        //String databaseName = Config.getInstance().getMySQLDatabaseName();
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mcremove", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
         String success;
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
@@ -45,7 +39,7 @@ public class McremoveCommand implements CommandExecutor {
         switch (args.length) {
         case 1:
             playerName = args[0];
-            success = ChatColor.GREEN + playerName + " was successfully removed from the database!"; //TODO: Locale
+            success = LocaleLoader.getString("Commands.mcremove.Success", new Object[] {playerName});
             break;
 
         default:
@@ -56,39 +50,12 @@ public class McremoveCommand implements CommandExecutor {
         /* MySQL */
         if (Config.getInstance().getUseMySQL()) {
             Database database = mcMMO.getPlayerDatabase();
-            int userId = 0;
-            userId = database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
-
-            if (userId > 0) {
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "users WHERE "
-                        + tablePrefix + "users.id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "cooldowns WHERE "
-                        + tablePrefix + "cooldowns.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "huds WHERE "
-                        + tablePrefix + "huds.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "skills WHERE "
-                        + tablePrefix + "skills.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "experience WHERE "
-                        + tablePrefix + "experience.user_id=" + userId);
+            int affected = 0;
+            affected = database.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + playerName + "'");
 
+            if (affected > 0) {
                 sender.sendMessage(success);
-
-            }
-            else {
+            } else {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
             }
         }
@@ -101,27 +68,7 @@ public class McremoveCommand implements CommandExecutor {
             }
         }
 
-        //Force PlayerProfile stuff to update
-        McMMOPlayer mcmmoPlayer = Users.getPlayer(playerName);
-
-        if (mcmmoPlayer != null) {
-            Player player = mcmmoPlayer.getPlayer();
-            SpoutHud spoutHud = mcmmoPlayer.getProfile().getSpoutHud();
-
-            if (spoutHud != null) {
-                spoutHud.removeWidgets();
-            }
-
-            Users.remove(playerName);
-
-            if (player.isOnline()) {
-                Users.addUser(player);
-
-                if (mcMMO.spoutEnabled) {
-                    SpoutStuff.reloadSpoutPlayer(player);
-                }
-            }
-        }
+        Database.profileCleanup(playerName);
 
         return true;
     }

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

@@ -10,6 +10,7 @@ import org.bukkit.command.CommandSender;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
@@ -20,7 +21,7 @@ public class MctopCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /mctop [skill] [page]"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.2", new Object[] {"mctop", "[" + LocaleLoader.getString("Commands.Usage.Skill") + "]", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"});
 
         if (!Config.getInstance().getUseMySQL()) {
 
@@ -36,6 +37,9 @@ public class MctopCommand implements CommandExecutor {
                 else if (Skills.isSkill(args[0])) {
                     flatfileDisplay(1, args[0].toUpperCase(), sender);
                 }
+                else if (Skills.isLocalizedSkill(args[0])) {
+                    flatfileDisplay(1, Skills.translateLocalizedSkill(args[0]).toUpperCase(), sender);
+                }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 }
@@ -43,13 +47,16 @@ public class MctopCommand implements CommandExecutor {
                 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);
+                    if (Skills.isSkill(args[0])) {
+                        flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
+                    }
+                    else if (Skills.isLocalizedSkill(args[0])) {
+                        flatfileDisplay(Integer.valueOf(args[1]), Skills.translateLocalizedSkill(args[0]).toUpperCase(), sender);
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    }
                 }
                 else {
                     sender.sendMessage(usage);
@@ -62,53 +69,60 @@ public class MctopCommand implements CommandExecutor {
                 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;
+        String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
 
-            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"));
-                }
+        switch (args.length) {
+        case 0:
+            sqlDisplay(1, powerlevel, sender);
+            return true;
 
-                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 if (Skills.isLocalizedSkill(args[0])) {
+                sqlDisplay(1, Skills.translateLocalizedSkill(args[0]).toLowerCase(), sender);
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+            }
 
-            case 2:
-                if (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
+            return true;
 
-                if (Misc.isInt(args[1])) {
+        case 2:
+            if (Misc.isInt(args[1])) {
+                if (Skills.isSkill(args[0])) {
                     sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
                 }
-                else {
-                    sender.sendMessage(usage);
+                else if (Skills.isLocalizedSkill(args[0])) {
+                    sqlDisplay(Integer.valueOf(args[1]), Skills.translateLocalizedSkill(args[0]).toLowerCase(), sender);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 }
-
-                return true;
-
-            default:
-                sender.sendMessage(usage);
-                return true;
             }
+            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);
+    	Leaderboard.updateLeaderboards(); //Make sure we have the latest information
+    	SkillType skillType = SkillType.getSkill(skill);
+        String[] info = Leaderboard.retrieveInfo(skillType, page);
 
-        if (skill.equals("ALL")) {
+        if (skill.equalsIgnoreCase("ALL")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
@@ -131,13 +145,15 @@ public class MctopCommand implements CommandExecutor {
                 n++;
             }
         }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
     }
 
     private void sqlDisplay(int page, String query, CommandSender sender) {
         String tablePrefix = Config.getInstance().getMySQLTablePrefix();
         Database database = mcMMO.getPlayerDatabase();
 
-        HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT " + query + ", user_id FROM " + tablePrefix + "skills WHERE " + query + " > 0 ORDER BY " + query + " DESC ");
+        HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT "+((page * 10) - 10)+",10");
 
         if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
@@ -145,14 +161,15 @@ public class MctopCommand implements CommandExecutor {
         else {
             sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(query) }));
         }
-
-        for (int i = (page * 10) - 9; i <= (page * 10); i++) {
-            if (i > userslist.size() || database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null) {
+        int place = (page * 10) - 9;
+        for (int i = 1; i <= 10; i++) {
+            if(userslist.get(i) == null) {
                 break;
             }
-
-            HashMap<Integer, ArrayList<String>> username = database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-            sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
+            sender.sendMessage(String.valueOf(place) + ". " + ChatColor.GREEN + userslist.get(i).get(1) + " - " + ChatColor.WHITE + userslist.get(i).get(0));
+            place++;
         }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
     }
 }

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -24,7 +23,7 @@ public class ACommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PlayerProfile profile;
-        String usage = ChatColor.RED + "Proper usage is /a <message>"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"a", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"});
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.chat.adminchat")) {
             return true;
@@ -76,12 +75,12 @@ public class ACommand implements CommandExecutor {
                 }
 
                 message = chatEvent.getMessage();
-                String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getName() + ChatColor.AQUA + "} ";
+                String prefix = LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {player.getName()} );
 
                 plugin.getLogger().info("[A]<" + player.getName() + "> " + message);
 
                 for (Player otherPlayer : plugin.getServer().getOnlinePlayers()) {
-                    if (Permissions.getInstance().adminChat(otherPlayer) || otherPlayer.isOp()) {
+                    if (Permissions.adminChat(otherPlayer) || otherPlayer.isOp()) {
                         otherPlayer.sendMessage(prefix + message);
                     }
                 }
@@ -95,12 +94,12 @@ public class ACommand implements CommandExecutor {
                 }
 
                 message = chatEvent.getMessage();
-                String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
+                String prefix = LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {LocaleLoader.getString("Commands.Chat.Console")} );
 
                 plugin.getLogger().info("[A]<*Console*> " + message);
 
                 for (Player player : plugin.getServer().getOnlinePlayers()) {
-                    if (Permissions.getInstance().adminChat(player) || player.isOp()) {
+                    if (Permissions.adminChat(player) || player.isOp()) {
                         player.sendMessage(prefix + message);
                     }
                 }

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -24,7 +23,7 @@ public class InviteCommand implements CommandExecutor {
 
     @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.
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
 
         if (CommandHelper.noConsoleUsage(sender)) {
             return true;
@@ -49,23 +48,21 @@ public class InviteCommand implements CommandExecutor {
             if (target != null) {
                 if (PartyManager.getInstance().canInvite(player, playerProfile)) {
                     Party party = playerProfile.getParty();
-                    
+
                     Users.getProfile(target).setInvite(party);
                     player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
                     target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] {party.getName(), player.getName()}));
                     target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                     return true;
                 }
-                else {
-                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                    return true;
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+
+                player.sendMessage(LocaleLoader.getString("Party.Locked"));
                 return true;
             }
 
+            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,6 +1,5 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -25,7 +24,7 @@ public class PCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PlayerProfile profile;
-        String usage = ChatColor.RED + "Proper usage is /p <party-name> <message>"; //TODO: Needs more locale.
+        String usage = LocaleLoader.getString("Commands.Usage.2", new Object[] {"p", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"});
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
             return true;
@@ -83,7 +82,7 @@ public class PCommand implements CommandExecutor {
                 }
 
                 message = chatEvent.getMessage();
-                String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + player.getName() + ChatColor.GREEN + ") ";
+                String prefix = LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {player.getName()} );
 
                 plugin.getLogger().info("[P](" + party.getName() + ")" + "<" + player.getName() + "> " + message);
 
@@ -120,7 +119,7 @@ public class PCommand implements CommandExecutor {
                 }
 
                 message = chatEvent.getMessage();
-                String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
+                String prefix = LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {LocaleLoader.getString("Commands.Chat.Console")} );
 
                 plugin.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + message);
 

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

@@ -87,7 +87,7 @@ public class PartyCommand implements CommandExecutor {
                     player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
                 }
                 else {
-                    player.sendMessage("Commands.Party.None");
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                 }
             }
             else if (args[0].equals("?")) {
@@ -137,6 +137,13 @@ public class PartyCommand implements CommandExecutor {
                 }
             }
             else {
+                Party newParty = partyManagerInstance.getParty(args[0]);
+
+                // Check to see if the party exists, and if it does, can the player join it?
+                if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, null)) {
+                    return true; // End before any event is fired.
+                }
+
                 if (party != null) {
                     McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
                     plugin.getServer().getPluginManager().callEvent(event);
@@ -179,18 +186,17 @@ public class PartyCommand implements CommandExecutor {
                             player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
                             return true;
                         }
-                        else {
-                            String partyName = party.getName();
-                            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
 
-                            plugin.getServer().getPluginManager().callEvent(event);
+                        String partyName = party.getName();
+                        McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
 
-                            if (event.isCancelled()) {
-                                return true;
-                            }
+                        plugin.getServer().getPluginManager().callEvent(event);
 
-                            partyManagerInstance.removeFromParty(args[1], party);
+                        if (event.isCancelled()) {
+                            return true;
                         }
+
+                        partyManagerInstance.removeFromParty(args[1], party);
                     }
                     else {
                         player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
@@ -202,12 +208,18 @@ public class PartyCommand implements CommandExecutor {
                             player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
                             return true;
                         }
-                        else {
-                            partyManagerInstance.setPartyLeader(args[1], party);
-                        }
+
+                        partyManagerInstance.setPartyLeader(args[1], party);
                     }
                 }
                 else {
+                    Party newParty = partyManagerInstance.getParty(args[0]);
+
+                    // Check to see if the party exists, and if it does, can the player join it?
+                    if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, args[1])) {
+                        return true; // End before any event is fired.
+                    }
+
                     McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
                     plugin.getServer().getPluginManager().callEvent(event);
 
@@ -220,6 +232,13 @@ public class PartyCommand implements CommandExecutor {
                 }
             }
             else {
+                Party newParty = partyManagerInstance.getParty(args[0]);
+
+                // Check to see if the party exists, and if it does, can the player join it?
+                if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, args[1])) {
+                    return true; // End before any event is fired.
+                }
+
                 McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
                 plugin.getServer().getPluginManager().callEvent(event);
 

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -13,6 +12,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Users;
 
 public class PtpCommand implements CommandExecutor {
@@ -24,7 +24,7 @@ public class PtpCommand implements CommandExecutor {
 
     @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.
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
 
         if (CommandHelper.noConsoleUsage(sender)) {
             return true;
@@ -39,7 +39,7 @@ public class PtpCommand implements CommandExecutor {
             Player player = (Player) sender;
             PlayerProfile profile = Users.getProfile(player);
 
-            if (profile.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
+            if (profile.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
                 player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
                 return true;
             }
@@ -47,7 +47,7 @@ public class PtpCommand implements CommandExecutor {
             Player target = plugin.getServer().getPlayer(args[0]);
 
             if (player.equals(target)) {
-                player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
                 return true;
             }
 
@@ -72,6 +72,7 @@ public class PtpCommand implements CommandExecutor {
                 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() }));
+                profile.setRecentlyHurt(System.currentTimeMillis());
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
@@ -84,5 +85,5 @@ public class PtpCommand implements CommandExecutor {
             sender.sendMessage(usage);
             return true;
         }
-   }
+    }
 }

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

@@ -3,15 +3,22 @@ package com.gmail.nossr50.commands.skills;
 import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.acrobatics.Acrobatics;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class AcrobaticsCommand extends SkillCommand {
     private String dodgeChance;
+    private String dodgeChanceLucky;
     private String rollChance;
+    private String rollChanceLucky;
     private String gracefulRollChance;
+    private String gracefulRollChanceLucky;
 
     private boolean canDodge;
     private boolean canRoll;
     private boolean canGracefulRoll;
+    private boolean lucky;
 
     public AcrobaticsCommand() {
         super(SkillType.ACROBATICS);
@@ -19,33 +26,38 @@ public class AcrobaticsCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        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);
-        }
+        float dodgeChanceF;
+        float rollChanceF;
+        float gracefulRollChanceF;
+
+        // DODGE
+        if (skillValue >= Acrobatics.dodgeMaxBonusLevel) dodgeChanceF = (float) Acrobatics.dodgeMaxChance;
+        else dodgeChanceF = (float) ((Acrobatics.dodgeMaxChance / Acrobatics.dodgeMaxBonusLevel) * skillValue);
+        dodgeChance = percent.format(dodgeChanceF / 100D);
+        if (dodgeChanceF * 1.3333D >= 100D) dodgeChanceLucky = percent.format(1D);
+        else dodgeChanceLucky = percent.format(dodgeChanceF * 1.3333D / 100D);
+
+        // ROLL
+        if (skillValue >= Acrobatics.rollMaxBonusLevel) rollChanceF = (float) Acrobatics.rollMaxChance;
+        else rollChanceF = (float) ((Acrobatics.rollMaxChance / Acrobatics.rollMaxBonusLevel) * skillValue);
+        rollChance = percent.format(rollChanceF / 100D);
+        if (rollChanceF * 1.3333D >= 100D) rollChanceLucky = percent.format(1D);
+        else rollChanceLucky = percent.format(rollChanceF * 1.3333D / 100D);
+
+        // GRACEFULROLL
+        if (skillValue >= Acrobatics.gracefulRollMaxBonusLevel) gracefulRollChanceF = (float) Acrobatics.gracefulRollMaxChance;
+        else gracefulRollChanceF = (float) ((Acrobatics.gracefulRollMaxChance / Acrobatics.gracefulRollMaxBonusLevel) * skillValue);
+        gracefulRollChance = percent.format(gracefulRollChanceF / 100D);
+        if (gracefulRollChanceF * 1.3333D >= 100D) gracefulRollChanceLucky = percent.format(1D);
+        else gracefulRollChanceLucky = percent.format(gracefulRollChanceF * 1.3333D / 100D);
     }
 
     @Override
     protected void permissionsCheck() {
-        canDodge = permInstance.dodge(player);
-        canRoll = permInstance.roll(player);
-        canGracefulRoll = permInstance.gracefulRoll(player);
+        canDodge = Permissions.dodge(player);
+        canRoll = Permissions.roll(player);
+        canGracefulRoll = Permissions.gracefulRoll(player);
+        lucky = Permissions.luckyAcrobatics(player);
     }
 
     @Override
@@ -55,6 +67,11 @@ public class AcrobaticsCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.ACROBATICS) }) }));
+        }
+
         if (canRoll) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
         }
@@ -76,15 +93,24 @@ public class AcrobaticsCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { rollChanceLucky }));
+        	else
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
         }
 
         if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { gracefulRollChanceLucky }));
+        	else
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
         }
 
         if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dodgeChanceLucky }));
+        	else
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
         }
     }
 }

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

@@ -3,15 +3,21 @@ package com.gmail.nossr50.commands.skills;
 import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.archery.Archery;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class ArcheryCommand extends SkillCommand {
     private String skillShotBonus;
     private String dazeChance;
+    private String dazeChanceLucky;
     private String retrieveChance;
+    private String retrieveChanceLucky;
 
     private boolean canSkillShot;
     private boolean canDaze;
     private boolean canRetrieve;
+    private boolean lucky;
 
     public ArcheryCommand() {
         super(SkillType.ARCHERY);
@@ -19,23 +25,35 @@ public class ArcheryCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        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);
-        }
+        float dazeChanceF;
+        float retrieveChanceF;
+
+        // SkillShot
+        double bonus = (int)((double) skillValue / (double) Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
+        if (bonus > Archery.skillShotMaxBonusPercentage) skillShotBonus = percent.format(Archery.skillShotMaxBonusPercentage);
+        else skillShotBonus = percent.format(bonus);
+
+        // Daze
+        if (skillValue >= Archery.dazeMaxBonusLevel) dazeChanceF = (float) Archery.dazeMaxBonus;
+        else dazeChanceF = (float) (( Archery.dazeMaxBonus / Archery.dazeMaxBonusLevel) * skillValue);
+        dazeChance = percent.format(dazeChanceF / 100D);
+        if (dazeChanceF * 1.3333D >= 100D) dazeChanceLucky = percent.format(1D);
+        else dazeChanceLucky = percent.format(dazeChanceF * 1.3333D / 100D);
+
+        // Retrieve
+        if (skillValue >= Archery.retrieveMaxBonusLevel) retrieveChanceF = (float) Archery.retrieveMaxChance;
+        else retrieveChanceF = (float) ((Archery.retrieveMaxChance / Archery.retrieveMaxBonusLevel) * skillValue);
+        retrieveChance = percent.format(retrieveChanceF / 100D);
+        if (retrieveChanceF * 1.3333D >= 100D) retrieveChanceLucky = percent.format(1D);
+        else retrieveChanceLucky = percent.format(retrieveChanceF * 1.3333D / 100D);
     }
 
     @Override
     protected void permissionsCheck() {
-        canSkillShot = permInstance.archeryBonus(player);
-        canDaze = permInstance.daze(player);
-        canRetrieve = permInstance.trackArrows(player);
+        canSkillShot = Permissions.archeryBonus(player);
+        canDaze = Permissions.daze(player);
+        canRetrieve = Permissions.trackArrows(player);
+        lucky = Permissions.luckyArchery(player);
     }
 
     @Override
@@ -45,6 +63,11 @@ public class ArcheryCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.ARCHERY) }) }));
+        }
+
         if (canSkillShot) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
         }
@@ -66,15 +89,21 @@ public class ArcheryCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
+        	player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
         }
 
         if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
+            if (lucky)
+        		player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dazeChanceLucky }));
+        	else
+        		player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
         }
 
         if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
+            if (lucky)
+        		player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { retrieveChanceLucky }));
+        	else
+        		player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
         }
     }
 }

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

@@ -3,19 +3,27 @@ package com.gmail.nossr50.commands.skills;
 import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.axes.Axes;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class AxesCommand extends SkillCommand {
     private String critChance;
+    private String critChanceLucky;
     private String bonusDamage;
     private String impactDamage;
     private String greaterImpactDamage;
     private String skullSplitterLength;
+    private String skullSplitterLengthEndurance;
 
     private boolean canSkullSplitter;
     private boolean canCritical;
     private boolean canBonusDamage;
     private boolean canImpact;
     private boolean canGreaterImpact;
+    private boolean lucky;
+    private boolean endurance;
 
     public AxesCommand() {
         super(SkillType.AXES);
@@ -23,31 +31,52 @@ public class AxesCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        impactDamage = String.valueOf(5 + ((int) skillValue / 30));
-        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
-        greaterImpactDamage = "2";
+        float critChanceF;
+        int skillCheck = Misc.skillCheck((int) skillValue, Axes.criticalHitMaxBonusLevel);
 
-        if (skillValue >= 750) {
-            critChance = "37.50";
-            bonusDamage = "4";
+        //Armor Impact
+        impactDamage = String.valueOf(1 + ((double) skillValue / (double) Axes.impactIncreaseLevel));
+        //Skull Splitter
+        int length = 2 + (int) ((double) skillValue / (double) Misc.abilityLengthIncreaseLevel);
+        skullSplitterLength = String.valueOf(length);
+
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
         }
-        else if (skillValue >= 200) {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = "4";
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
         }
-        else {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = String.valueOf((int) skillValue / 50);
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
         }
+        int maxLength = SkillType.AXES.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        skullSplitterLengthEndurance = String.valueOf(length);
+
+        //Greater Impact
+        greaterImpactDamage = String.valueOf(Axes.greaterImpactBonusDamage);
+        //Critical Strikes
+        if (skillValue >= Axes.criticalHitMaxBonusLevel) critChanceF = (float) Axes.criticalHitMaxChance;
+        else critChanceF = (float) ((Axes.criticalHitMaxChance / Axes.criticalHitMaxBonusLevel) * skillCheck);
+        critChance = percent.format(critChanceF / 100D);
+        if (critChanceF * 1.3333D >= 100D) critChanceLucky = percent.format(1D);
+        else critChanceLucky = percent.format(critChanceF * 1.3333D / 100D);
+        //Axe Mastery
+        if (skillValue >= Axes.bonusDamageMaxBonusLevel) bonusDamage = String.valueOf(Axes.bonusDamageMaxBonus);
+        else bonusDamage = String.valueOf(skillValue / ((double) Axes.bonusDamageMaxBonusLevel / (double) Axes.bonusDamageMaxBonus));
     }
 
     @Override
     protected void permissionsCheck() {
-        canSkullSplitter = permInstance.skullSplitter(player);
-        canCritical = permInstance.criticalHit(player);
-        canBonusDamage = permInstance.axeBonus(player);
-        canImpact = permInstance.impact(player);
-        canGreaterImpact = permInstance.greaterImpact(player);
+        canSkullSplitter = Permissions.skullSplitter(player);
+        canCritical = Permissions.criticalHit(player);
+        canBonusDamage = Permissions.axeBonus(player);
+        canImpact = Permissions.impact(player);
+        canGreaterImpact = Permissions.greaterImpact(player);
+        lucky = Permissions.luckyAxes(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -57,6 +86,11 @@ public class AxesCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.AXES) }) }));
+        }
+
         if (canSkullSplitter) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
         }
@@ -98,11 +132,17 @@ public class AxesCommand extends SkillCommand {
         }
 
         if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { critChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
         }
 
         if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { skullSplitterLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
         }
     }
 }

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

@@ -1,14 +1,23 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class ExcavationCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private String gigaDrillBreakerLength;
+    private String gigaDrillBreakerLengthEndurance;
+
+    private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
 
     private boolean canGigaDrill;
     private boolean canTreasureHunt;
+    private boolean lucky;
+    private boolean endurance;
 
     public ExcavationCommand() {
         super(SkillType.EXCAVATION);
@@ -16,13 +25,31 @@ public class ExcavationCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        gigaDrillBreakerLength = String.valueOf(length);
+
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
+        }
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
+        }
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
+        }
+        int maxLength = SkillType.EXCAVATION.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        gigaDrillBreakerLengthEndurance = String.valueOf(length);
     }
 
     @Override
     protected void permissionsCheck() {
-        canGigaDrill = permInstance.gigaDrillBreaker(player);
-        canTreasureHunt = permInstance.excavationTreasures(player);
+        canGigaDrill = Permissions.gigaDrillBreaker(player);
+        canTreasureHunt = Permissions.excavationTreasures(player);
+        lucky = Permissions.luckyExcavation(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -32,6 +59,11 @@ public class ExcavationCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.EXCAVATION) }) }));
+        }
+
         if (canGigaDrill) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
         }
@@ -49,7 +81,10 @@ public class ExcavationCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { gigaDrillBreakerLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
         }
     }
 }

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

@@ -1,17 +1,36 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class FishingCommand extends SkillCommand {
+
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
+
     private int lootTier;
     private String magicChance;
+    private String magicChanceLucky;
+    private String chanceRaining;
+    private int shakeUnlockLevel;
+    private String shakeChance;
+    private String shakeChanceLucky;
+    private String fishermansDietRank;
+
+    private int magicHunterMultiplier = advancedConfig.getFishingMagicMultiplier();
+    private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange();
+    private int fishermansDietRankMaxLevel = fishermansDietRankChange * 5;
 
     private boolean canTreasureHunt;
     private boolean canMagicHunt;
     private boolean canShake;
+    private boolean canFishermansDiet;
+    private boolean lucky;
+    private boolean raining;
 
     public FishingCommand() {
         super(SkillType.FISHING);
@@ -19,15 +38,38 @@ public class FishingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
+        raining = player.getWorld().hasStorm();
+        chanceRaining = "";
+        //Treasure Hunter
         lootTier = Fishing.getFishingLootTier(profile);
-        magicChance = percent.format((float) lootTier / 15);
+        double magicChanceD = lootTier * magicHunterMultiplier;
+        if (raining) {
+            chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
+            magicChanceD = magicChanceD * 1.1D;
+        }
+        magicChance = percent.format(magicChanceD / 100D);
+        if (magicChanceD * 1.3333D >= 100D) magicChanceLucky = percent.format(1D);
+        else magicChanceLucky = percent.format(magicChanceD * 1.3333D / 100D);
+
+        //Shake
+        int dropChance = Fishing.getShakeChance(lootTier);
+        shakeChance = percent.format(dropChance / 100D);
+        if (dropChance * 1.3333D >= 100D) shakeChanceLucky = percent.format(1D);
+        else shakeChanceLucky = percent.format(dropChance * 1.3333D / 100D);
+        shakeUnlockLevel = advancedConfig.getShakeUnlockLevel();
+
+        //Fishermans Diet
+        if (skillValue >= fishermansDietRankMaxLevel) fishermansDietRank = "5";
+        else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange));
     }
 
     @Override
     protected void permissionsCheck() {
-        canTreasureHunt = permInstance.fishingTreasures(player);
-        canMagicHunt = permInstance.fishingMagic(player);
-        canShake = permInstance.shakeMob(player);
+        canTreasureHunt = Permissions.fishingTreasures(player);
+        canMagicHunt = Permissions.fishingMagic(player);
+        canShake = Permissions.shakeMob(player);
+        canFishermansDiet = Permissions.fishermansDiet(player);
+        lucky = Permissions.luckyFishing(player);
     }
 
     @Override
@@ -37,6 +79,11 @@ public class FishingCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.FISHING) }) }));
+        }
+
         if (canTreasureHunt) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
         }
@@ -48,6 +95,10 @@ public class FishingCommand extends SkillCommand {
         if (canShake) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
         }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7") }));
+        }
     }
 
     @Override
@@ -62,17 +113,26 @@ public class FishingCommand extends SkillCommand {
         }
 
         if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance}) + chanceRaining +  LocaleLoader.getString("Perks.lucky.bonus", new Object[] { magicChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance}) + chanceRaining);
         }
 
         if (canShake) {
-            //TODO: Do we really need to display this twice? Not like there are any associated stats.
-            if (skillValue < 150) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
+            if (skillValue < advancedConfig.getShakeUnlockLevel()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0", new Object[] { shakeUnlockLevel }) }));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake"));
+                if (lucky)
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { shakeChanceLucky }));
+                else
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
             }
         }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", new Object[] { fishermansDietRank }));
+        }
     }
 }

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

@@ -1,16 +1,34 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class HerbalismCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
+
     private String greenTerraLength;
+    private String greenTerraLengthEndurance;
     private String greenThumbChance;
+    private String greenThumbChanceLucky;
     private String greenThumbStage;
     private String farmersDietRank;
     private String doubleDropChance;
+    private String doubleDropChanceLucky;
+
+    private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
+    private int farmersDietRankChange = advancedConfig.getFarmerDietRankChange();
+    private int farmersDietMaxLevel = farmersDietRankChange * 5;
+    private int greenThumbStageChange = advancedConfig.getGreenThumbStageChange();
+    private int greenThumbStageMaxLevel = greenThumbStageChange * 4;
+    private double greenThumbMaxBonus = advancedConfig.getGreenThumbChanceMax();
+    private int greenThumbMaxLevel = advancedConfig.getGreenThumbMaxLevel();
+    private double doubleDropsMaxBonus = advancedConfig.getHerbalismDoubleDropsChanceMax();
+    private int doubleDropsMaxLevel = advancedConfig.getHerbalismDoubleDropsMaxLevel();
 
     private boolean canGreenTerra;
     private boolean canGreenThumbWheat;
@@ -18,6 +36,8 @@ public class HerbalismCommand extends SkillCommand {
     private boolean canFarmersDiet;
     private boolean canDoubleDrop;
     private boolean doubleDropsDisabled;
+    private boolean lucky;
+    private boolean endurance;
 
     public HerbalismCommand() {
         super(SkillType.HERBALISM);
@@ -25,62 +45,58 @@ public class HerbalismCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        greenTerraLength = String.valueOf(2 + ((int) skillValue / 50));
+        float greenThumbChanceF;
+        float doubleDropChanceF;
 
-        if (skillValue >= 1500) {
-            greenThumbChance = "100.00%";
-            greenThumbStage = "4";
-            farmersDietRank = "5";
-            doubleDropChance = "100.00%";
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        greenTerraLength = String.valueOf(length);
+
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
         }
-        else if (skillValue >= 1000) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "4";
-            farmersDietRank = "5";
-            doubleDropChance = "100.00%";
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
         }
-        else if (skillValue >= 800) {
-            greenThumbChance = percent.format(skillValue / 1500);
-            greenThumbStage = "4";
-            farmersDietRank = "4";
-            doubleDropChance = percent.format(skillValue / 1000);
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
         }
-        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);
+        int maxLength = SkillType.HERBALISM.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
         }
+        greenTerraLengthEndurance = String.valueOf(length);
+        //FARMERS DIET
+        if (skillValue >= farmersDietMaxLevel) farmersDietRank = "5";
+        else farmersDietRank = String.valueOf((int) ((double) skillValue / (double) farmersDietRankChange));
+        //GREEN THUMB
+        if (skillValue >= greenThumbStageMaxLevel) greenThumbStage = "4";
+        else greenThumbStage = String.valueOf((int) ((double) skillValue / (double) greenThumbStageChange));
+
+        if (skillValue >= greenThumbMaxLevel) greenThumbChanceF = (float) (greenThumbMaxBonus);
+        else greenThumbChanceF = (float) ((greenThumbMaxBonus / greenThumbMaxLevel) * skillValue);
+        greenThumbChance = percent.format(greenThumbChanceF / 100D);
+        if (greenThumbChanceF * 1.3333D >= 100D) greenThumbChanceLucky = percent.format(1D);
+        else greenThumbChanceLucky = percent.format(greenThumbChanceF * 1.3333D / 100D);
+        //DOUBLE DROPS
+        if (skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus);
+        else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue);
+        doubleDropChance = percent.format(doubleDropChanceF / 100D);
+        if (doubleDropChanceF * 1.3333D >= 100D) doubleDropChanceLucky = percent.format(1D);
+        else doubleDropChanceLucky = percent.format(doubleDropChanceF * 1.3333D / 100D);
     }
 
     @Override
     protected void permissionsCheck() {
         Config configInstance = Config.getInstance();
 
-        canGreenTerra = permInstance.greenTerra(player);
-        canGreenThumbWheat = permInstance.greenThumbWheat(player);
-        canGreenThumbBlocks = permInstance.greenThumbBlocks(player);
-        canFarmersDiet = permInstance.farmersDiet(player);
-        canDoubleDrop = permInstance.herbalismDoubleDrops(player);
+        canGreenTerra = Permissions.greenTerra(player);
+        canGreenThumbWheat = Permissions.greenThumbWheat(player);
+        canGreenThumbBlocks = Permissions.greenThumbBlocks(player);
+        canFarmersDiet = Permissions.farmersDiet(player);
+        canDoubleDrop = Permissions.herbalismDoubleDrops(player);
         doubleDropsDisabled = configInstance.herbalismDoubleDropsDisabled();
+        lucky = Permissions.luckyHerbalism(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -90,6 +106,11 @@ public class HerbalismCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.HERBALISM) }) }));
+        }
+
         if (canGreenTerra) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
         }
@@ -119,11 +140,17 @@ public class HerbalismCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { greenTerraLengthEndurance }));
+            else
+                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 (lucky)
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { greenThumbChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
         }
 
         if (canGreenThumbWheat) {
@@ -135,7 +162,10 @@ public class HerbalismCommand extends SkillCommand {
         }
 
         if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
         }
     }
 }

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

@@ -1,24 +1,45 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class MiningCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private String doubleDropChance;
+    private String doubleDropChanceLucky;
     private String superBreakerLength;
+    private String superBreakerLengthEndurance;
     private String blastMiningRank;
     private String blastRadiusIncrease;
     private String blastDamageDecrease;
 
+    private int blastMiningRank1 = advancedConfig.getBlastMiningRank1();
+    private int blastMiningRank2 = advancedConfig.getBlastMiningRank2();
+    private int blastMiningRank3 = advancedConfig.getBlastMiningRank3();
+    private int blastMiningRank4 = advancedConfig.getBlastMiningRank4();
+    private int blastMiningRank5 = advancedConfig.getBlastMiningRank5();
+    private int blastMiningRank6 = advancedConfig.getBlastMiningRank6();
+    private int blastMiningRank7 = advancedConfig.getBlastMiningRank7();
+    private int blastMiningRank8 = advancedConfig.getBlastMiningRank8();
+
+    private double doubleDropsMaxBonus = advancedConfig.getMiningDoubleDropChance();
+    private int doubleDropsMaxLevel = advancedConfig.getMiningDoubleDropMaxLevel();
+    public int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
+
     private boolean canSuperBreaker;
     private boolean canDoubleDrop;
     private boolean canBlast;
     private boolean canBiggerBombs;
     private boolean canDemoExpert;
     private boolean doubleDropsDisabled;
+    private boolean lucky;
+    private boolean endurance;
 
     public MiningCommand() {
         super(SkillType.MINING);
@@ -26,61 +47,77 @@ public class MiningCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        superBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+        float doubleDropChanceF;
+        //Super Breaker
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        superBreakerLength = String.valueOf(length);
 
-        if (skillValue >= 1000) {
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
+        }
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
+        }
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
+        }
+        int maxLength = SkillType.MINING.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        superBreakerLengthEndurance = String.valueOf(length);
+        //Double Drops
+        if (skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus);
+        else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue);
+        doubleDropChance = percent.format(doubleDropChanceF / 100D);
+        if (doubleDropChanceF * 1.3333D >= 100D) doubleDropChanceLucky = percent.format(1D);
+        else doubleDropChanceLucky = percent.format(doubleDropChanceF * 1.3333D / 100D);
+
+        //Blast Mining
+        if (skillValue >= blastMiningRank8) {
             blastMiningRank = "8";
             blastDamageDecrease = "100.00%";
             blastRadiusIncrease = "4";
-            doubleDropChance = "100.00%";
         }
-        else if (skillValue >= 875) {
+        else if (skillValue >= blastMiningRank7) {
             blastMiningRank = "7";
             blastDamageDecrease = "50.00%";
             blastRadiusIncrease = "3";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 750) {
+        else if (skillValue >= blastMiningRank6) {
             blastMiningRank = "6";
             blastDamageDecrease = "50.00%";
             blastRadiusIncrease = "3";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 625) {
+        else if (skillValue >= blastMiningRank5) {
             blastMiningRank = "5";
             blastDamageDecrease = "25.00%";
             blastRadiusIncrease = "2";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 500) {
+        else if (skillValue >= blastMiningRank4) {
             blastMiningRank = "4";
             blastDamageDecrease = "25.00%";
             blastRadiusIncrease = "2";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 375) {
+        else if (skillValue >= blastMiningRank3) {
             blastMiningRank = "3";
             blastDamageDecrease = "0.00%";
             blastRadiusIncrease = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 250) {
+        else if (skillValue >= blastMiningRank2) {
             blastMiningRank = "2";
             blastDamageDecrease = "0.00%";
             blastRadiusIncrease = "1";
-            doubleDropChance = percent.format(skillValue / 1000);
         }
-        else if (skillValue >= 125) {
+        else if (skillValue >= blastMiningRank1) {
             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);
         }
     }
 
@@ -88,12 +125,14 @@ public class MiningCommand extends SkillCommand {
     protected void permissionsCheck() {
         Config configInstance = Config.getInstance();
 
-        canBiggerBombs = permInstance.biggerBombs(player);
-        canBlast = permInstance.blastMining(player);
-        canDemoExpert = permInstance.demolitionsExpertise(player);
-        canDoubleDrop = permInstance.miningDoubleDrops(player);
-        canSuperBreaker = permInstance.superBreaker(player);
+        canBiggerBombs = Permissions.biggerBombs(player);
+        canBlast = Permissions.blastMining(player);
+        canDemoExpert = Permissions.demolitionsExpertise(player);
+        canDoubleDrop = Permissions.miningDoubleDrops(player);
+        canSuperBreaker = Permissions.superBreaker(player);
         doubleDropsDisabled = configInstance.miningDoubleDropsDisabled();
+        lucky = Permissions.luckyMining(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -103,6 +142,11 @@ public class MiningCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.MINING) }) }));
+        }
+
         if (canSuperBreaker) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
         }
@@ -132,16 +176,22 @@ public class MiningCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
         }
 
         if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { superBreakerLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
         }
 
         if (canBlast) {
-            if (skillValue < 125) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
+            if (skillValue < blastMiningRank1) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0", new Object[] { blastMiningRank1 })  }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
@@ -149,8 +199,8 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canBiggerBombs) {
-            if (skillValue < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
+            if (skillValue < blastMiningRank2) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1", new Object[] { blastMiningRank2 }) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
@@ -158,8 +208,8 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canDemoExpert) {
-            if (skillValue < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
+            if (skillValue < blastMiningRank4) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2", new Object[] { blastMiningRank4 }) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));

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

@@ -2,20 +2,31 @@ package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class RepairCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private int arcaneForgingRank;
     private String repairMasteryBonus;
     private String superRepairChance;
+    private String superRepairChanceLucky;
+
+    private float repairMasteryMaxBonus = advancedConfig.getRepairMasteryMaxBonus();
+    private float repairMasteryMaxBonusLevel = advancedConfig.getRepairMasteryMaxLevel();
+    private float superRepairChanceMax = advancedConfig.getSuperRepairChanceMax();
+    private float superRepairMaxBonusLevel = advancedConfig.getSuperRepairMaxLevel();
 
     private boolean canSuperRepair;
     private boolean canMasterRepair;
     private boolean canArcaneForge;
+    private boolean canSalvage;
     private boolean canRepairStone;
     private boolean canRepairIron;
     private boolean canRepairGold;
@@ -23,7 +34,10 @@ public class RepairCommand extends SkillCommand {
     private boolean canRepairString;
     private boolean canRepairLeather;
     private boolean canRepairWood;
+    private boolean arcaneBypass;
+    private boolean lucky;
 
+    private int salvageLevel;
     private int diamondLevel;
     private int goldLevel;
     private int ironLevel;
@@ -35,6 +49,7 @@ public class RepairCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
+        float superRepairChanceF;
         // We're using pickaxes here, not the best but it works
         Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
         Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
@@ -46,39 +61,49 @@ public class RepairCommand extends SkillCommand {
         ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
         stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
 
-        repairMasteryBonus = percent.format(skillValue / 500);
+        salvageLevel = Config.getInstance().getSalvageUnlockLevel();
 
-        if (skillValue >= 1000) {
-            superRepairChance = "100.00%";
-        }
-        else {
-            superRepairChance = percent.format(skillValue / 1000);
-        }
+        if (skillValue >= repairMasteryMaxBonusLevel) repairMasteryBonus = percent.format(repairMasteryMaxBonus / 100D);
+        else repairMasteryBonus = percent.format((((double) repairMasteryMaxBonus / (double) repairMasteryMaxBonusLevel) * skillValue) / 100D);
+
+        if (skillValue >= superRepairMaxBonusLevel) superRepairChanceF = superRepairChanceMax;
+        else superRepairChanceF = (float) (((double) superRepairChanceMax / (double) superRepairMaxBonusLevel) * skillValue);
+        superRepairChance = percent.format(superRepairChanceF / 100D);
+        if (superRepairChanceF * 1.3333D >= 100D) superRepairChanceLucky = percent.format(1D);
+        else superRepairChanceLucky = percent.format((superRepairChanceF * 1.3333D) / 100D);
 
         arcaneForgingRank = Repair.getArcaneForgingRank(profile);
     }
 
     @Override
     protected void permissionsCheck() {
-        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);
+        canSuperRepair = Permissions.repairBonus(player);
+        canMasterRepair = Permissions.repairMastery(player);
+        canArcaneForge = Permissions.arcaneForging(player);
+        canSalvage = Permissions.salvage(player);
+        canRepairDiamond = Permissions.diamondRepair(player);
+        canRepairGold = Permissions.goldRepair(player);
+        canRepairIron = Permissions.ironRepair(player);
+        canRepairStone = Permissions.stoneRepair(player);
+        canRepairString = Permissions.stringRepair(player);
+        canRepairLeather = Permissions.leatherRepair(player);
+        canRepairWood = Permissions.woodRepair(player);
+        arcaneBypass = Permissions.arcaneBypass(player);
+        lucky = Permissions.luckyRepair(player);
     }
 
     @Override
     protected boolean effectsHeaderPermissions() {
-        return canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+        return canArcaneForge || canSalvage || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
     }
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.REPAIR) }) }));
+        }
+
         player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
 
         if (canMasterRepair) {
@@ -107,6 +132,10 @@ public class RepairCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.6", new Object[] { diamondLevel }), LocaleLoader.getString("Repair.Effect.7") }));
         }
 
+        if (canSalvage && salvageLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.16", new Object[] { salvageLevel }), LocaleLoader.getString("Repair.Effect.17") }));
+        }
+
         if (canArcaneForge) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
         }
@@ -124,18 +153,21 @@ public class RepairCommand extends SkillCommand {
         }
 
         if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { superRepairChanceLucky }));
+            else
+                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 (advancedConfig.getArcaneForgingEnchantLossEnabled()) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", new Object[] { (arcaneBypass ? 100 : Repair.getEnchantChance(arcaneForgingRank)) }));
             }
 
-            if (Config.getInstance().getArcaneForgingDowngradeEnabled()) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { Repair.getDowngradeChance(arcaneForgingRank) }));
+            if (advancedConfig.getArcaneForgingDowngradeEnabled()) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { (arcaneBypass ? 0 : Repair.getDowngradeChance(arcaneForgingRank)) }));
             }
         }
     }

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

@@ -1,18 +1,36 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class SwordsCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
+
     private String counterAttackChance;
+    private String counterAttackChanceLucky;
     private String bleedLength;
     private String bleedChance;
+    private String bleedChanceLucky;
     private String serratedStrikesLength;
+    private String serratedStrikesLengthEndurance;
+
+    private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
+    private float bleedChanceMax = advancedConfig.getBleedChanceMax();
+    private float bleedMaxLevel = advancedConfig.getBleedMaxBonusLevel();
+    private int bleedMaxTicks = advancedConfig.getBleedMaxTicks();
+    private int bleedBaseTicks = advancedConfig.getBleedBaseTicks();
+    private float counterChanceMax = advancedConfig.getCounterChanceMax();
+    private float counterMaxLevel = advancedConfig.getCounterMaxBonusLevel();
 
     private boolean canCounter;
     private boolean canSerratedStrike;
     private boolean canBleed;
+    private boolean lucky;
+    private boolean endurance;
 
     public SwordsCommand() {
         super(SkillType.SWORDS);
@@ -20,30 +38,52 @@ public class SwordsCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        serratedStrikesLength = String.valueOf(2 + ((int) skillValue / 50));
+        float bleedChanceF;
+        float counterAttackChanceF;
+        //Serrated Strikes
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        serratedStrikesLength = String.valueOf(length);
 
-        if (skillValue >= 750) {
-            bleedLength = "3";
-            bleedChance = "75.00%";
-            counterAttackChance = "30.00%";
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
         }
-        else if (skillValue >= 600) {
-            bleedLength = "2";
-            bleedChance = percent.format(skillValue / 1000);
-            counterAttackChance = "30.00%";
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
         }
-        else {
-            bleedLength = "2";
-            bleedChance = percent.format(skillValue / 1000);
-            counterAttackChance = percent.format(skillValue / 2000);
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
         }
+        int maxLength = SkillType.SWORDS.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        serratedStrikesLengthEndurance = String.valueOf(length);
+
+        //Bleed
+        if (skillValue >= bleedMaxLevel) bleedLength = String.valueOf(bleedMaxTicks);
+        else bleedLength = String.valueOf(bleedBaseTicks);
+
+        if (skillValue >= bleedMaxLevel) bleedChanceF = bleedChanceMax;
+        else bleedChanceF = (float) (((double) bleedChanceMax / (double) bleedMaxLevel) * skillValue);
+        bleedChance = percent.format(bleedChanceF / 100D);
+        if (bleedChanceF * 1.3333D >= 100D) bleedChanceLucky = percent.format(1D);
+        else bleedChanceLucky = percent.format(bleedChanceF * 1.3333D / 100D);
+
+        //Counter Attack
+        if (skillValue >= counterMaxLevel) counterAttackChanceF = counterChanceMax;
+        else counterAttackChanceF = (float) (((double) counterChanceMax / (double) counterMaxLevel) * skillValue);
+        counterAttackChance = percent.format(counterAttackChanceF / 100D);
+        if (counterAttackChanceF * 1.3333D >= 100D) counterAttackChanceLucky = percent.format(1D);
+        else counterAttackChanceLucky = percent.format(counterAttackChanceF * 1.3333D / 100D);
     }
 
     @Override
     protected void permissionsCheck() {
-        canBleed = permInstance.swordsBleed(player);
-        canCounter = permInstance.counterAttack(player);
-        canSerratedStrike = permInstance.serratedStrikes(player);
+        canBleed = Permissions.swordsBleed(player);
+        canCounter = Permissions.counterAttack(player);
+        canSerratedStrike = Permissions.serratedStrikes(player);
+        lucky = Permissions.luckySwords(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -53,6 +93,11 @@ public class SwordsCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.SWORDS) }) }));
+        }
+
         if (canCounter) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
         }
@@ -75,17 +120,26 @@ public class SwordsCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { counterAttackChanceLucky }));
+            else
+                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 (lucky)
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { bleedChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
         }
 
         if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { serratedStrikesLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
         }
     }
 }

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

@@ -1,12 +1,26 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class TamingCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private String goreChance;
+    private String goreChanceLucky;
+
+    private float goreChanceMax = advancedConfig.getGoreChanceMax();
+    private float goreMaxLevel = advancedConfig.getGoreMaxBonusLevel();
+    private int fastFoodUnlock = advancedConfig.getFastFoodUnlock();
+    private float fastFoodChance = advancedConfig.getFastFoodChance();
+    private int enviromentallyAwareUnlock = advancedConfig.getEnviromentallyAwareUnlock();
+    private int thickFurUnlock = advancedConfig.getThickFurUnlock();
+    private int shockProofUnlock = advancedConfig.getShockProofUnlock();
+    private int sharpenedClawUnlock = advancedConfig.getSharpenedClawsUnlock();
 
     private boolean canBeastLore;
     private boolean canGore;
@@ -16,6 +30,7 @@ public class TamingCommand extends SkillCommand {
     private boolean canShockProof;
     private boolean canCallWild;
     private boolean canFastFood;
+    private boolean lucky;
 
     public TamingCommand() {
         super(SkillType.TAMING);
@@ -23,23 +38,25 @@ public class TamingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        if (skillValue >= 1000) {
-            goreChance = "100.00%";
-        }
-        else {
-            goreChance = percent.format(skillValue / 1000);
-        }    }
+        float goreChanceF;
+        if (skillValue >= goreMaxLevel) goreChanceF = (goreChanceMax);
+        else goreChanceF = (float) (((double) goreChanceMax / (double) goreMaxLevel) * skillValue);
+        goreChance = percent.format(goreChanceF / 100D);
+        if (goreChanceF * 1.3333D >= 100D) goreChanceLucky = percent.format(1D);
+        else goreChanceLucky = percent.format(goreChanceF * 1.3333D / 100D);
+    }
 
     @Override
     protected void permissionsCheck() {
-        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);
+        canBeastLore = Permissions.beastLore(player);
+        canCallWild = Permissions.callOfTheWild(player);
+        canEnvironmentallyAware = Permissions.environmentallyAware(player);
+        canFastFood = Permissions.fastFoodService(player);
+        canGore = Permissions.gore(player);
+        canSharpenedClaws = Permissions.sharpenedClaws(player);
+        canShockProof = Permissions.shockProof(player);
+        canThickFur = Permissions.thickFur(player);
+        lucky = Permissions.luckyTaming(player);
     }
 
     @Override
@@ -49,6 +66,11 @@ public class TamingCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.TAMING) }) }));
+        }
+
         Config configInstance = Config.getInstance();
 
         if (canBeastLore) {
@@ -94,17 +116,17 @@ public class TamingCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canFastFood) {
-            if (skillValue < 50) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4") }));
+            if (skillValue < fastFoodUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4", new Object[] { fastFoodUnlock } ) }));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", new Object[] { fastFoodChance } ) }));
             }
         }
 
         if (canEnvironmentallyAware) {
-            if (skillValue < 100) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0") }));
+            if (skillValue < enviromentallyAwareUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0", new Object[] { enviromentallyAwareUnlock } ) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1") }));
@@ -112,8 +134,8 @@ public class TamingCommand extends SkillCommand {
         }
 
         if (canThickFur) {
-            if (skillValue < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1") }));
+            if (skillValue < thickFurUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1", new Object[] { thickFurUnlock } ) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3") }));
@@ -121,8 +143,8 @@ public class TamingCommand extends SkillCommand {
         }
 
         if (canShockProof) {
-            if (skillValue < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2") }));
+            if (skillValue < shockProofUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2", new Object[] { shockProofUnlock } ) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5") }));
@@ -130,8 +152,8 @@ public class TamingCommand extends SkillCommand {
         }
 
         if (canSharpenedClaws) {
-            if (skillValue < 750) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3") }));
+            if (skillValue < sharpenedClawUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3", new Object[] { sharpenedClawUnlock } ) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7") }));
@@ -139,7 +161,10 @@ public class TamingCommand extends SkillCommand {
         }
 
         if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { goreChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
         }
     }
 }

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

@@ -1,19 +1,36 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class UnarmedCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private String berserkLength;
+    private String berserkLengthEndurance;
     private String deflectChance;
+    private String deflectChanceLucky;
     private String disarmChance;
+    private String disarmChanceLucky;
     private String ironArmBonus;
 
+    private float disarmChanceMax = advancedConfig.getDisarmChanceMax();
+    private float disarmMaxLevel = advancedConfig.getDisarmMaxBonusLevel();
+    private float deflectChanceMax = advancedConfig.getDeflectChanceMax();
+    private float deflectMaxLevel = advancedConfig.getDeflectMaxBonusLevel();
+    private float ironArmMaxBonus = advancedConfig.getIronArmBonus();
+    private int ironArmIncreaseLevel = advancedConfig.getIronArmIncreaseLevel();
+    private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
+
     private boolean canBerserk;
     private boolean canDisarm;
     private boolean canBonusDamage;
     private boolean canDeflect;
+    private boolean lucky;
+    private boolean endurance;
 
     public UnarmedCommand() {
         super(SkillType.UNARMED);
@@ -21,30 +38,54 @@ public class UnarmedCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
+        float disarmChanceF;
+        float deflectChanceF;
+        //Berserk
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        berserkLength = String.valueOf(length);
 
-        if (skillValue >= 1000) {
-            disarmChance = "33.33%";
-            deflectChance = "50.00%";
-            ironArmBonus = "8";
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
         }
-        else if (skillValue >= 250) {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = "8";
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
         }
-        else {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
-        }    }
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
+        }
+        int maxLength = SkillType.UNARMED.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        berserkLengthEndurance = String.valueOf(length);
+
+        //Disarm
+        if (skillValue >= disarmMaxLevel) disarmChanceF = disarmChanceMax;
+        else disarmChanceF = (float) (((double) disarmChanceMax / (double) disarmMaxLevel) * skillValue);
+        disarmChance = percent.format(disarmChanceF / 100D);
+        if (disarmChanceF * 1.3333D >= 100D) disarmChanceLucky = percent.format(1D);
+        else disarmChanceLucky = percent.format(disarmChanceF * 1.3333D / 100D);
+
+        //Deflect
+        if (skillValue >= deflectMaxLevel) deflectChanceF = deflectChanceMax;
+        else deflectChanceF = (float) (((double) deflectChanceMax / (double) deflectMaxLevel) * skillValue);
+        deflectChance = percent.format(deflectChanceF / 100D);
+        if (deflectChanceF * 1.3333D >= 100D) deflectChanceLucky = percent.format(1D);
+        else deflectChanceLucky = percent.format(deflectChanceF * 1.3333D / 100D);
+
+        //Iron Arm
+        if (skillValue >= 250) ironArmBonus = String.valueOf(ironArmMaxBonus);
+        else ironArmBonus = String.valueOf(3 + ((double) skillValue / (double) ironArmIncreaseLevel));
+    }
 
     @Override
     protected void permissionsCheck() {
-        canBerserk = permInstance.berserk(player);
-        canBonusDamage = permInstance.unarmedBonus(player);
-        canDeflect = permInstance.deflect(player);
-        canDisarm = permInstance.disarm(player);
+        canBerserk = Permissions.berserk(player);
+        canBonusDamage = Permissions.unarmedBonus(player);
+        canDeflect = Permissions.deflect(player);
+        canDisarm = Permissions.disarm(player);
+        lucky = Permissions.luckyUnarmed(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -54,6 +95,11 @@ public class UnarmedCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.UNARMED) }) }));
+        }
+
         if (canBerserk) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
         }
@@ -83,15 +129,24 @@ public class UnarmedCommand extends SkillCommand {
         }
 
         if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { deflectChanceLucky }));
+            else
+                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 (lucky)
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { disarmChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
         }
 
         if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { berserkLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
         }
     }
 }

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

@@ -1,18 +1,31 @@
 package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
 
 public class WoodcuttingCommand extends SkillCommand {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private String treeFellerLength;
+    private String treeFellerLengthEndurance;
     private String doubleDropChance;
+    private String doubleDropChanceLucky;
+
+    private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
+    private double doubleDropsMaxBonus = advancedConfig.getWoodcuttingDoubleDropChance();
+    private int doubleDropsMaxLevel = advancedConfig.getWoodcuttingDoubleDropMaxLevel();
+    private int leafBlowUnlock = advancedConfig.getLeafBlowUnlockLevel();
 
     private boolean canTreeFell;
     private boolean canLeafBlow;
     private boolean canDoubleDrop;
     private boolean doubleDropsDisabled;
+    private boolean lucky;
+    private boolean endurance;
 
     public WoodcuttingCommand() {
         super(SkillType.WOODCUTTING);
@@ -20,24 +33,45 @@ public class WoodcuttingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
+        float doubleDropChanceF;
 
-        if (skillValue >= 1000) {
-            doubleDropChance = "100.00%";
+        //Tree Feller
+        int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
+        treeFellerLength = String.valueOf(length);
+
+        if (Permissions.activationTwelve(player)) {
+            length = length + 12;
         }
-        else {
-            doubleDropChance = percent.format(skillValue / 1000);
+        else if (Permissions.activationEight(player)) {
+            length = length + 8;
         }
+        else if (Permissions.activationFour(player)) {
+            length = length + 4;
+        }
+        int maxLength = SkillType.WOODCUTTING.getAbility().getMaxTicks();
+        if (maxLength != 0 && length > maxLength) {
+            length = maxLength;
+        }
+        treeFellerLengthEndurance = String.valueOf(length);
+
+        //Double Drops
+        if (skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus);
+        else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue);
+        doubleDropChance = percent.format(doubleDropChanceF / 100D);
+        if (doubleDropChanceF * 1.3333D >= 100D) doubleDropChanceLucky = percent.format(1D);
+        else doubleDropChanceLucky = percent.format(doubleDropChanceF * 1.3333D / 100D);
     }
 
     @Override
     protected void permissionsCheck() {
         Config configInstance = Config.getInstance();
 
-        canTreeFell = permInstance.treeFeller(player);
-        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
-        canLeafBlow = permInstance.leafBlower(player);
+        canTreeFell = Permissions.treeFeller(player);
+        canDoubleDrop = Permissions.woodcuttingDoubleDrops(player);
+        canLeafBlow = Permissions.leafBlower(player);
         doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
+        lucky = Permissions.luckyWoodcutting(player);
+        endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
     }
 
     @Override
@@ -47,6 +81,11 @@ public class WoodcuttingCommand extends SkillCommand {
 
     @Override
     protected void effectsDisplay() {
+        if (lucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { Skills.localizeSkillName(SkillType.WOODCUTTING) }) }));
+        }
+
         if (canTreeFell) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") }));
         }
@@ -69,8 +108,8 @@ public class WoodcuttingCommand extends SkillCommand {
     protected void statsDisplay() {
         //TODO: Remove? Basically duplicates the above.
         if (canLeafBlow) {
-            if (skillValue < 100) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0") }));
+            if (skillValue < leafBlowUnlock) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0", new Object[] { leafBlowUnlock }) }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1") }));
@@ -78,11 +117,17 @@ public class WoodcuttingCommand extends SkillCommand {
         }
 
         if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }));
+            if (lucky)
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky }));
+            else
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }));
         }
 
         if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
+            if (endurance)
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { treeFellerLengthEndurance }));
+            else
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
         }
     }
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -18,8 +17,8 @@ import com.gmail.nossr50.util.Users;
 public class MchudCommand implements CommandExecutor {
     @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
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mchud", "<DISABLED | STANDARD | SMALL | RETRO>"});
+        String invalid = LocaleLoader.getString("Commands.mchud.Invalid");
 
         if (CommandHelper.noConsoleUsage(sender)) {
             return true;

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

@@ -1,6 +1,5 @@
 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;
@@ -22,7 +21,7 @@ import com.gmail.nossr50.util.Users;
 public class XplockCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
+        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"xplock", "[skill]"});
 
         if (CommandHelper.noConsoleUsage(sender)) {
             return true;
@@ -65,7 +64,7 @@ public class XplockCommand implements CommandExecutor {
 
         case 1:
             if (Skills.isSkill(args[0])) {
-                if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
+                if (Permissions.hasPermission(player, "mcmmo.skills." + args[0].toLowerCase())) {
                     spoutHud.setXpBarLocked(true);
                     spoutHud.setSkillLock(Skills.getSkillType(args[0]));
                     spoutHud.updateXpBar();

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

@@ -0,0 +1,186 @@
+package com.gmail.nossr50.config;
+
+public class AdvancedConfig extends ConfigLoader {
+    private static AdvancedConfig instance;
+
+    private AdvancedConfig() {
+        super("advanced.yml");
+        loadKeys();
+    }
+    public static AdvancedConfig getInstance() {
+        if (instance == null) {
+            instance = new AdvancedConfig();
+        }
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {
+        // TODO Do we need to use this?
+    }
+    /* GENERAL */
+    public int getAbilityLength() { return config.getInt("Skills.General.Ability_IncreaseLevel", 50); }
+
+    /* ACROBATICS */
+    public double getDodgeChanceMax() { return config.getDouble("Skills.Acrobatics.Dodge_ChanceMax", 20.0D); }
+    public int getDodgeMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Dodge_MaxBonusLevel", 800); }
+
+    public double getRollChanceMax() { return config.getDouble("Skills.Acrobatics.Roll_ChanceMax", 100.0D); }
+    public int getRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Roll_MaxBonusLevel", 1000); }
+
+    public double getGracefulRollChanceMax() { return config.getDouble("Skills.Acrobatics.GracefulRoll_ChanceMax", 100.0D); }
+    public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll_MaxBonusLevel", 500); }
+
+    public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
+    public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
+    public int getFallXPModifier() { return config.getInt("Skills.Acrobatics.Fall_XP_Modifier", 120); }
+
+    /* ARCHERY */
+    public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot_IncreaseLevel", 50); }
+    public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot_IncreasePercentage", 0.1D); }
+    public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot_MaxBonus", 2.0D); }
+
+    public double getDazeBonusMax() { return config.getDouble("Skills.Archery.Daze_MaxChance", 50.0D); }
+    public int getDazeMaxBonusLevel() { return config.getInt("Skills.Archery.Daze_MaxBonusLevel", 1000); }
+    public int getDazeModifier() { return config.getInt("Skills.Archery.Daze_BonusDamage", 4); }
+
+    public double getRetrieveChanceMax() { return config.getDouble("Skills.Archery.Retrieve_MaxBonus", 100.0D); }
+    public int getRetrieveMaxBonusLevel() { return config.getInt("Skills.Archery.Retrieve_MaxBonusLevel", 1000); }
+
+    /* AXES */
+    public int getBonusDamageAxesBonusMax() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonus", 4); }
+    public int getBonusDamageAxesMaxBonusLevel() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonusLevel", 200); }
+
+    public double getAxesCriticalChance() { return config.getDouble("Skills.Axes.AxesCritical_MaxChance", 37.50D); }
+    public int getAxesCriticalMaxBonusLevel() { return config.getInt("Skills.Axes.AxesCritical_MaxBonusLevel", 750); }
+    public double getAxesCriticalPVPModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVP_Modifier", 1.5D); }
+    public double getAxesCriticalPVEModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVE_Modifier", 2.0D); }
+
+    public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact_Chance", 25.0D); }
+    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
+    public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
+
+    public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
+    public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage", 20.0D); }
+
+    public int getSkullSplitterModifier() { return config.getInt("Skills.Axes.SkullSplitter_DamagerModifier", 2); }
+
+    /* EXCAVATION */
+    //Nothing to configure, everything is already configurable in config.yml
+
+    /* FISHING */
+    public int getFishingTierLevelsTier1() { return config.getInt("Skills.Fishing.Tier_Levels.Tier1", 0); }
+    public int getFishingTierLevelsTier2() { return config.getInt("Skills.Fishing.Tier_Levels.Tier2", 200); }
+    public int getFishingTierLevelsTier3() { return config.getInt("Skills.Fishing.Tier_Levels.Tier3", 400); }
+    public int getFishingTierLevelsTier4() { return config.getInt("Skills.Fishing.Tier_Levels.Tier4", 600); }
+    public int getFishingTierLevelsTier5() { return config.getInt("Skills.Fishing.Tier_Levels.Tier5", 800); }
+
+    public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }
+
+    /* Shake */
+    public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
+    public int getShakeChanceRank1() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_1", 25); }
+    public int getShakeChanceRank2() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_2", 40); }
+    public int getShakeChanceRank3() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_3", 55); }
+    public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); }
+    public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); }
+
+    /* HERBALISM */
+    public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Food_RankChange", 200); }
+
+    public int getGreenThumbStageChange() { return config.getInt("Skills.Herbalism.GreenThumb_StageChange", 200); }
+    public int getGreenThumbChanceMax() { return config.getInt("Skills.Herbalism.GreenThumb_ChanceMax", 100); }
+    public int getGreenThumbMaxLevel() { return config.getInt("Skills.Herbalism.GreenThumb_MaxBonusLevel", 1500); }
+
+    public int getHerbalismDoubleDropsChanceMax() { return config.getInt("Skills.Herbalism.DoubleDrops_ChanceMax", 100); }
+    public int getHerbalismDoubleDropsMaxLevel() { return config.getInt("Skills.Herbalism.DoubleDrops_MaxBonusLevel", 1000); }
+
+    /* MINING */
+    public int getMiningDoubleDropChance() { return config.getInt("Skills.Mining.DoubleDrops_ChanceMax", 100); }
+    public int getMiningDoubleDropMaxLevel() { return config.getInt("Skills.Mining.DoubleDrops_MaxBonusLevel", 1000); }
+
+    public int getBlastMiningRank1() { return config.getInt("Skills.Mining.BlastMining_Rank1", 125); }
+    public int getBlastMiningRank2() { return config.getInt("Skills.Mining.BlastMining_Rank2", 250); }
+    public int getBlastMiningRank3() { return config.getInt("Skills.Mining.BlastMining_Rank3", 375); }
+    public int getBlastMiningRank4() { return config.getInt("Skills.Mining.BlastMining_Rank4", 500); }
+    public int getBlastMiningRank5() { return config.getInt("Skills.Mining.BlastMining_Rank5", 625); }
+    public int getBlastMiningRank6() { return config.getInt("Skills.Mining.BlastMining_Rank6", 750); }
+    public int getBlastMiningRank7() { return config.getInt("Skills.Mining.BlastMining_Rank7", 875); }
+    public int getBlastMiningRank8() { return config.getInt("Skills.Mining.BlastMining_Rank8", 1000); }
+
+    /* REPAIR */
+    public int getRepairMasteryMaxBonus() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusPercentage", 200); }
+    public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusLevel", 1000); }
+    public int getSuperRepairChanceMax() { return config.getInt("Skills.Repair.SuperRepair_ChanceMax", 100); }
+    public int getSuperRepairMaxLevel() { return config.getInt("Skills.Repair.SuperRepair_MaxBonusLevel", 1000); }
+
+    /* Arcane Forging */
+    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }
+    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
+    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
+    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
+    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
+    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.May_Lose_Enchants", true); }
+    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
+    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
+    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
+    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
+    public int getArcaneForgingRankLevels1() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1", 100); }
+    public int getArcaneForgingRankLevels2() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2", 250); }
+    public int getArcaneForgingRankLevels3() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3", 500); }
+    public int getArcaneForgingRankLevels4() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_4", 750); }
+
+    /* SWORDS */
+    public int getBleedChanceMax() { return config.getInt("Skills.Swords.Bleed_ChanceMax", 75); }
+    public int getBleedMaxBonusLevel() { return config.getInt("Skills.Swords.Bleed_MaxBonusLevel", 750); }
+    public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed_MaxTicks", 3); }
+    public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed_BaseTicks", 2); }
+
+    public int getCounterChanceMax() { return config.getInt("Skills.Swords.Counter_ChanceMax", 30); }
+    public int getCounterMaxBonusLevel() { return config.getInt("Skills.Swords.Counter_MaxBonusLevel", 600); }
+    public int getCounterModifier() { return config.getInt("Skills.Swords.Counter_DamageModifier", 2); }
+
+    public int getSerratedStrikesModifier() { return config.getInt("Skills.Swords.SerratedStrikes_DamageModifier", 4); }
+    public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes_BleedTicks", 5); }
+
+    /* TAMING */
+    public int getGoreChanceMax() { return config.getInt("Skills.Taming.Gore_ChanceMax", 100); }
+    public int getGoreMaxBonusLevel() { return config.getInt("Skills.Taming.Gore_MaxBonusLevel", 1000); }
+    public int getGoreBleedTicks() { return config.getInt("Skills.Taming.Gore_BleedTicks", 2); }
+    public int getGoreModifier() { return config.getInt("Skills.Taming.Gore_Modifier", 2); }
+
+    public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood_UnlockLevel", 50); }
+    public int getFastFoodChance() { return config.getInt("Skills.Taming.FastFood_Chance", 50); }
+
+    public int getEnviromentallyAwareUnlock() { return config.getInt("Skills.Taming.EnvironmentallyAware_UnlockLevel", 100); }
+
+    public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); }
+    public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); }
+
+    public int getShockProofUnlock() { return config.getInt("Skills.Taming.ShockProof_UnlockLevel", 500); }
+    public int getShockProofModifier() { return config.getInt("Skills.Taming.ShockProof_Modifier", 6); }
+
+    public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws_UnlockLevel", 750); }
+    public int getSharpenedClawsBonus() { return config.getInt("Skills.Taming.SharpenedClaws_Bonus", 2); }
+
+    /* UNARMED */
+    public int getDisarmChanceMax() { return config.getInt("Skills.Unarmed.Disarm_ChanceMax", 33); }
+    public int getDisarmMaxBonusLevel() { return config.getInt("Skills.Unarmed.Disarm_MaxBonusLevel", 1000); }
+    public int getDeflectChanceMax() { return config.getInt("Skills.Unarmed.Deflect_ChanceMax", 50); }
+    public int getDeflectMaxBonusLevel() { return config.getInt("Skills.Unarmed.Deflect_MaxBonusLevel", 1000); }
+    public int getIronGripChanceMax() { return config.getInt("Skills.Unarmed.IronGrip_ChanceMax", 100); }
+    public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); }
+    public int getIronArmBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); }
+    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); }
+
+    /* WOODCUTTING */
+    public int getLeafBlowUnlockLevel() { return config.getInt("Skills.Woodcutting.LeafBlower_UnlockLevel", 100); }
+    public int getWoodcuttingDoubleDropChance() { return config.getInt("Skills.Woodcutting.DoubleDrops_ChanceMax", 100); }
+    public int getWoodcuttingDoubleDropMaxLevel() { return config.getInt("Skills.Woodcutting.DoubleDrops_MaxBonusLevel", 1000); }
+
+    /* SPOUT STUFF*/
+    public int getSpoutNotificationTier1() { return config.getInt("Spout.Notifications.Tier1", 200); }
+    public int getSpoutNotificationTier2() { return config.getInt("Spout.Notifications.Tier2", 400); }
+    public int getSpoutNotificationTier3() { return config.getInt("Spout.Notifications.Tier3", 600); }
+    public int getSpoutNotificationTier4() { return config.getInt("Spout.Notifications.Tier4", 800); }
+}

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.config;
 
-import java.util.Iterator;
 import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
@@ -37,23 +36,35 @@ public class Config extends ConfigLoader {
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
     public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
 
+    /* Database Purging */
+    public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
+    public int getOldUsersCutoff() { return config.getInt("Database_Purging.Old_User_Cutoff", 6); }
+
     /* mySQL */
     public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
     public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
-    public String getMySQLDatabaseName() { return config.getString("MySQL.Database.Name", "DatabaseName"); }
-    public String getMySQLUserName() { return config.getString("MySQL.Database.User_Name", "UserName"); } //Really should be labeled under MySQL.User_Name instead...
+    public String getMySQLDatabaseName() { return getStringIncludingInts(config, "MySQL.Database.Name"); }
+    public String getMySQLUserName() { return getStringIncludingInts(config, "MySQL.Database.User_Name"); }
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
 
     public String getMySQLUserPassword() {
-        if (config.getString("MySQL.Database.User_Password", null) != null) {
-            return config.getString("MySQL.Database.User_Password", null);
-        }
-        else {
-            return "";
+        if (getStringIncludingInts(config, "MySQL.Database.User_Password") != null) {
+            return getStringIncludingInts(config, "MySQL.Database.User_Password");
         }
+
+        return "";
     }
 
+    private static String getStringIncludingInts(ConfigurationSection cfg, String key) {
+		String str = cfg.getString(key);
+		if (str == null)
+			str = String.valueOf(cfg.getInt(key));
+		if (str == null)
+			str = "No value set for '" + key + "'";
+		return str;
+	}
+
     /* Hardcore Mode */
     public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
     public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
@@ -69,6 +80,7 @@ public class Config extends ConfigLoader {
     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 getCommandMCRankEnabled() { return config.getBoolean("Commands.mcrank.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); }
@@ -80,6 +92,7 @@ public class Config extends ConfigLoader {
     public boolean getCommandSkillResetEnabled() { return config.getBoolean("Commands.skillreset.Enabled", true); }
     public boolean getCommandMmoeditEnabled() { return config.getBoolean("Commands.mmoedit.Enabled", true); }
     public boolean getCommandMCRemoveEnabled() { return config.getBoolean("Commands.mcremove.Enable", true); }
+    public boolean getCommandMCPurgeEnabled() { return config.getBoolean("Commands.mcpurge.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); }
@@ -146,12 +159,7 @@ public class Config extends ConfigLoader {
 
     /* 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); }
+    public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
 
     /* Herbalism */
     public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }
@@ -164,8 +172,12 @@ public class Config extends ConfigLoader {
     public int getHerbalismXPNetherWart() { return config.getInt("Experience.Herbalism.Nether_Wart", 50); }
     public int getHerbalismXPLilyPads() { return config.getInt("Experience.Herbalism.Lily_Pads", 100); }
     public int getHerbalismXPVines() { return config.getInt("Experience.Herbalism.Vines", 10); }
+    public int getHerbalismXPCocoa() { return config.getInt("Experience.Herbalism.Cocoa", 30); }
+    public int getHerbalismXPCarrot() { return config.getInt("Experience.Herbalism.Carrot", 50); }
+    public int getHerbalismXPPotato() { return config.getInt("Experience.Herbalism.Potato", 50); }
 
     public boolean getHerbalismGreenThumbCobbleToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); }
+    public boolean getHerbalismGreenThumbCobbleWallToMossyWall() { return config.getBoolean("Skills.Herbalism.Green_Thumb.CobbleWall_To_MossyWall", true); }
     public boolean getHerbalismGreenThumbSmoothbrickToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); }
     public boolean getHerbalismGreenThumbDirtToGrass() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true); }
 
@@ -181,24 +193,12 @@ public class Config extends ConfigLoader {
     public boolean getVinesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Vines", true); }
     public boolean getWaterLiliesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Water_Lilies", true); }
     public boolean getYellowFlowersDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Yellow_Flowers", true); }
+    public boolean getCocoaDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cocoa", true); }
+    public boolean getCarrotDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Carrot", true); }
+    public boolean getPotatoDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Potato", true); }
 
     public boolean herbalismDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Herbalism");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Herbalism." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
+        return doubleDropsDisabled("Herbalism");
     }
 
     /* Mining */
@@ -215,6 +215,7 @@ public class Config extends ConfigLoader {
     public int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
     public int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
     public int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
+    public int getMiningXPEmeraldOre() { return config.getInt("Experience.Mining.Emerald", 1000); }
 
     public boolean getCoalDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Coal", true); }
     public boolean getDiamondDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Diamond", true); }
@@ -229,24 +230,10 @@ public class Config extends ConfigLoader {
     public boolean getRedstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Redstone", true); }
     public boolean getSandstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Sandstone", true); }
     public boolean getStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Stone", true); }
+    public boolean getEmeraldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Emerald", true); }
 
     public boolean miningDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Mining");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Mining." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
+        return doubleDropsDisabled("Mining");
     }
 
     public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
@@ -254,6 +241,11 @@ public class Config extends ConfigLoader {
     /* Repair */
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
     public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
+    public boolean getSalvageEnabled() { return config.getBoolean("Skills.Repair.Salvage_enabled", true); }
+    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
+    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
+    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
 
     /* Taming */
     public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
@@ -273,54 +265,68 @@ public class Config extends ConfigLoader {
     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;
+        return doubleDropsDisabled("Woodcutting");
     }
 
-    /* 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); }
+    /* AFK Leveling */
+    public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
+    public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
+
+    /* Dogde Lightning */
+    public boolean getDodgeLightningDisabled() {return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
 
     /* 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); }
+    public int getLevelCapAcrobatics() {
+        return getLevelCap("Skills.Acrobatics.Level_Cap");
+    }
+
+    public int getLevelCapArchery() {
+        return getLevelCap("Skills.Archery.Level_Cap");
+    }
+
+    public int getLevelCapAxes() {
+        return getLevelCap("Skills.Axes.Level_Cap");
+    }
+
+    public int getLevelCapExcavation() {
+        return getLevelCap("Skills.Excavation.Level_Cap");
+    }
+
+    public int getLevelCapFishing() {
+        return getLevelCap("Skills.Fishing.Level_Cap");
+    }
+
+    public int getLevelCapHerbalism() {
+        return getLevelCap("Skills.Herbalism.Level_Cap");
+    }
+
+    public int getLevelCapMining() {
+        return getLevelCap("Skills.Mining.Level_Cap");
+    }
+
+    public int getLevelCapRepair() {
+        return getLevelCap("Skills.Repair.Level_Cap");
+    }
+
+    public int getLevelCapSwords() {
+        return getLevelCap("Skills.Swords.Level_Cap");
+    }
+
+    public int getLevelCapTaming() {
+        return getLevelCap("Skills.Taming.Level_Cap");
+    }
+
+    public int getLevelCapUnarmed() {
+        return getLevelCap("Skills.Unarmed.Level_Cap");
+    }
+
+    public int getLevelCapWoodcutting() {
+        return getLevelCap("Skills.Woodcutting.Level_Cap");
+    }
+
+    public int getPowerLevelCap() {
+        return getLevelCap("General.Power_Level_Cap");
+    }
 
     /* PVP & PVE Settings */
     public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }
@@ -362,6 +368,10 @@ public class Config extends ConfigLoader {
     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); }
+    public double getGiantXP() { return config.getDouble("Experience.Combat.Multiplier.Giant", 4.0); }
+    public double getWitherXP() { return config.getDouble("Experience.Combat.Multiplier.Wither", 7.0); }
+    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
+    public double getWitchXP() { return config.getDouble("Experience.Combat.Multiplier.Witch", 4.0); }
 
     /* XP Formula Multiplier */
     public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
@@ -377,4 +387,25 @@ public class Config extends ConfigLoader {
     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); }
+
+    private boolean doubleDropsDisabled(String skillName) {
+        ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName);
+        Set<String> keys = section.getKeys(false);
+
+        boolean disabled = true;
+
+        for (String key : keys) {
+            if (config.getBoolean("Double_Drops." + skillName + "." + key)) {
+                disabled = false;
+                break;
+            }
+        }
+
+        return disabled;
+    }
+
+    private int getLevelCap(String configString) {
+        int cap = config.getInt(configString, 0);
+        return ((cap <= 0) ? Integer.MAX_VALUE : cap);
+    }
 }

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

@@ -16,13 +16,13 @@ public abstract class ConfigLoader {
     protected File configFile;
     protected FileConfiguration config;
 
-    public ConfigLoader(String relativePath, String fileName){
+    public ConfigLoader(String relativePath, String fileName) {
         this.fileName = fileName;
         configFile = new File(plugin.getDataFolder(), relativePath + File.separator + fileName);
         loadFile();
     }
 
-    public ConfigLoader(String fileName){
+    public ConfigLoader(String fileName) {
         this.fileName = fileName;
         configFile = new File(plugin.getDataFolder(), fileName);
         loadFile();

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

@@ -9,6 +9,7 @@ public class HiddenConfig {
     private static String fileName;
     private static YamlConfiguration config;
     private static boolean chunkletsEnabled;
+    private static int conversionRate;
 
     public HiddenConfig(String fileName) {
         HiddenConfig.fileName = fileName;
@@ -27,10 +28,15 @@ public class HiddenConfig {
         if (mcMMO.p.getResource(fileName) != null) {
             config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
             chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
+            conversionRate = config.getInt("Options.ConversionRate", 1);
         }
     }
 
     public boolean getChunkletsEnabled() {
         return chunkletsEnabled;
     }
+
+    public int getConversionRate() {
+        return conversionRate;
+    }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -11,6 +10,7 @@ import java.util.Set;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
@@ -25,11 +25,7 @@ public class TreasuresConfig extends ConfigLoader{
     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>();
+    public List<FishingTreasure> fishingRewards = new ArrayList<FishingTreasure>();
 
     private TreasuresConfig() {
         super("treasures.yml");
@@ -49,10 +45,8 @@ public class TreasuresConfig extends ConfigLoader{
         Map<String, Treasure> treasures = new HashMap<String, Treasure>();
         ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
         Set<String> treasureConfigSet = treasureSection.getKeys(false);
-        Iterator<String> iterator = treasureConfigSet.iterator();
 
-        while (iterator.hasNext()) {
-            String treasureName = iterator.next();
+        for (String treasureName : treasureConfigSet) {
 
             // Validate all the things!
             List<String> reason = new ArrayList<String>();
@@ -125,7 +119,7 @@ public class TreasuresConfig extends ConfigLoader{
              * Drops From & Max Level
              */
 
-            ItemStack item = new ItemStack(id, amount, (short) 0, (byte) data);
+            ItemStack item = (new MaterialData(id, (byte) data)).toItemStack(amount);
 
             if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
                 if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
@@ -190,11 +184,8 @@ public class TreasuresConfig extends ConfigLoader{
 
         List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
         List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
-//        Iterator<String> treasureIterator = treasures.keySet().iterator();
-        Iterator<Entry<String,Treasure>> treasureIterator = treasures.entrySet().iterator();
 
-        while (treasureIterator.hasNext()) {
-            Entry<String,Treasure> nextEntry = treasureIterator.next();
+        for (Entry<String,Treasure> nextEntry : treasures.entrySet()) {
             String treasureKey = nextEntry.getKey();
             Treasure treasure = nextEntry.getValue();
 
@@ -203,30 +194,7 @@ public class TreasuresConfig extends ConfigLoader{
                     continue;
                 }
 
-                FishingTreasure fTreasure = (FishingTreasure) treasure;
-                int dropLevel = fTreasure.getDropLevel();
-                int maxLevel = fTreasure.getMaxLevel();
-
-                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier1() && maxLevel >= Config.getInstance().getFishingTierLevelsTier1()) {
-                    fishingRewardsTier1.add(fTreasure);
-                }
-
-                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier2() && maxLevel >= Config.getInstance().getFishingTierLevelsTier2()) {
-                    fishingRewardsTier2.add(fTreasure);
-                }
-
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier3() && maxLevel >= Config.getInstance().getFishingTierLevelsTier3()) {
-                    fishingRewardsTier3.add(fTreasure);
-                }
-
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier4() && maxLevel >= Config.getInstance().getFishingTierLevelsTier4()) {
-                    fishingRewardsTier4.add(fTreasure);
-                }
-
-                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier5() && maxLevel >= Config.getInstance().getFishingTierLevelsTier5()) {
-                    fishingRewardsTier5.add(fTreasure);
-                }
-
+                fishingRewards.add((FishingTreasure) treasure);
             }
             else if (treasure instanceof ExcavationTreasure) {
                 if (!excavationTreasures.contains(treasureKey)) {
@@ -270,11 +238,10 @@ public class TreasuresConfig extends ConfigLoader{
         if (issues.isEmpty()) {
             return true;
         }
-        else {
-            for (String issue : issues) {
-                plugin.getLogger().warning(issue);
-            }
-            return false;
+
+        for (String issue : issues) {
+            plugin.getLogger().warning(issue);
         }
+        return false;
     }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -49,12 +48,13 @@ public class CustomArmorConfig extends ConfigLoader{
 
     private void loadArmor(String armorType, List<Integer> idList) {
         ConfigurationSection armorSection = config.getConfigurationSection(armorType);
+
+        if (armorSection == null)
+            return;
+
         Set<String> armorConfigSet = armorSection.getKeys(false);
-        Iterator<String> iterator = armorConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String armorName = iterator.next();
 
+        for (String armorName : armorConfigSet) {
             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);
@@ -88,7 +88,7 @@ public class CustomArmorConfig extends ConfigLoader{
     }
 
     public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
+        if (repairables == null) return new ArrayList<Repairable>();
         return repairables;
     }
 }

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

@@ -1,12 +1,12 @@
 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 org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
@@ -48,12 +48,13 @@ public class CustomBlocksConfig extends ConfigLoader {
 
     private void loadBlocks(String skillType, List<ItemStack> blockList) {
         ConfigurationSection skillSection = config.getConfigurationSection(skillType);
+
+        if (skillSection == null)
+            return;
+
         Set<String> skillConfigSet = skillSection.getKeys(false);
-        Iterator<String> iterator = skillConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String blockName = iterator.next();
 
+        for (String blockName : skillConfigSet) {
             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);
@@ -74,7 +75,8 @@ public class CustomBlocksConfig extends ConfigLoader {
             }
 
             if (skillType.equals("Ability_Blocks")) {
-                blockItem = new ItemStack(id, 1, (short) 0, data);
+                blockItem = (new MaterialData(id, data)).toItemStack(1);
+
                 blockList.add(blockItem);
                 continue;
             }
@@ -85,14 +87,14 @@ public class CustomBlocksConfig extends ConfigLoader {
             }
 
             if (dropItem) {
-                itemDrop = new ItemStack(dropID, 1, (short) 0, dropData);
+                itemDrop = (new MaterialData(dropID, dropData)).toItemStack(1);
             }
             else {
-                itemDrop = new ItemStack(id, 1, (short) 0, data);
+                itemDrop = (new MaterialData(id, data)).toItemStack(1);
             }
 
             block = new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, tier, xp, data, id);
-            blockItem = new ItemStack(id, 1, (short) 0, data);
+            blockItem = (new MaterialData(id, data)).toItemStack(1);
 
             if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
                 customOres.add(blockItem);

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -53,12 +52,13 @@ public class CustomToolsConfig extends ConfigLoader {
 
     private void loadTool(String toolType, List<Integer> idList) {
         ConfigurationSection toolSection = config.getConfigurationSection(toolType);
+
+        if (toolSection == null)
+            return;
+
         Set<String> toolConfigSet = toolSection.getKeys(false);
-        Iterator<String> iterator = toolConfigSet.iterator();
-
-        while (iterator.hasNext()) {
-            String toolName = iterator.next();
 
+        for (String toolName : toolConfigSet) {
             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);
@@ -95,7 +95,7 @@ public class CustomToolsConfig extends ConfigLoader {
     }
 
     public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
+        if (repairables == null) return new ArrayList<Repairable>();
         return repairables;
     }
 }

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

@@ -99,11 +99,10 @@ public class RepairConfig extends ConfigLoader {
         if (issues.isEmpty()) {
             return true;
         }
-        else {
-            for (String issue : issues) {
-                plugin.getLogger().warning(issue);
-            }
-            return false;
+
+        for (String issue : issues) {
+            plugin.getLogger().warning(issue);
         }
+        return false;
     }
 }

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

@@ -144,35 +144,34 @@ public enum AbilityType {
      * @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);
+            return Permissions.berserk(player);
 
         case BLAST_MINING:
-            return permInstance.blastMining(player);
+            return Permissions.blastMining(player);
 
         case GIGA_DRILL_BREAKER:
-            return permInstance.gigaDrillBreaker(player);
+            return Permissions.gigaDrillBreaker(player);
 
         case GREEN_TERRA:
-            return permInstance.greenTerra(player);
+            return Permissions.greenTerra(player);
 
         case LEAF_BLOWER:
-            return permInstance.leafBlower(player);
+            return Permissions.leafBlower(player);
 
         case SERRATED_STRIKES:
-            return permInstance.serratedStrikes(player);
+            return Permissions.serratedStrikes(player);
 
         case SKULL_SPLIITER:
-            return permInstance.skullSplitter(player);
+            return Permissions.skullSplitter(player);
 
         case SUPER_BREAKER:
-            return permInstance.superBreaker(player);
+            return Permissions.superBreaker(player);
 
         case TREE_FELLER:
-            return permInstance.treeFeller(player);
+            return Permissions.treeFeller(player);
 
         default:
             return false;

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

@@ -2,5 +2,7 @@ package com.gmail.nossr50.datatypes;
 
 public enum DatabaseUpdate {
     FISHING,
-    BLAST_MINING;
+    BLAST_MINING,
+    CASCADE_DELETE, 
+    INDEX;
 }

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

@@ -12,6 +12,7 @@ import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.ModChecks;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class McMMOPlayer {
@@ -119,6 +120,11 @@ public class McMMOPlayer {
      * @param newvalue The amount of XP to add
      */
     public void addXP(SkillType skillType, int newValue) {
+        if (player == null)
+            return;
+        else if (player.getGameMode() == null)
+            return;
+
         if (player.getGameMode().equals(GameMode.CREATIVE)) {
             return;
         }
@@ -149,19 +155,19 @@ public class McMMOPlayer {
             }
         }
 
-        if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
+        if (Permissions.xpQuadruple(player)) {
             xp = xp * 4;
         }
-        else if (player.hasPermission("mcmmo.perks.xp.triple")) {
+        else if (Permissions.xpTriple(player)) {
             xp = xp * 3;
         }
-        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
+        else if (Permissions.xpDoubleAndOneHalf(player)) {
             xp = (int) (xp * 2.5);
         }
-        else if (player.hasPermission("mcmmo.perks.xp.double")) {
+        else if (Permissions.xpDouble(player)) {
             xp = xp * 2;
         }
-        else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
+        else if (Permissions.xpOneAndOneHalf(player)) {
             xp = (int) (xp * 1.5);
         }
 
@@ -203,9 +209,8 @@ public class McMMOPlayer {
         if (invite != null) {
             return true;
         }
-        else {
-            return false;
-        }
+
+        return false;
     }
 
     public void setParty(Party party) {
@@ -220,9 +225,8 @@ public class McMMOPlayer {
         if (party != null) {
             return true;
         }
-        else {
-            return false;
-        }
+
+        return false;
     }
 
     public void removeParty() {

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

@@ -18,7 +18,7 @@ import com.gmail.nossr50.util.Misc;
 public class PlayerProfile {
 
     private String playerName;
-    
+
     /* HUD */
     private SpoutHud spoutHud;
     private HudType hudType = SpoutConfig.getInstance().defaultHudType;
@@ -31,18 +31,20 @@ public class PlayerProfile {
     private boolean loaded;
 
     private boolean placedAnvil;
+    private boolean placedSalvageAnvil;
     private boolean partyChatMode, adminChatMode;
     private boolean godMode;
     private boolean greenTerraMode, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, serratedStrikesMode, skullSplitterMode, berserkMode;
     private boolean greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true,
-                    superBreakerInformed = true, blastMiningInformed = true, serratedStrikesInformed = true, treeFellerInformed = true;
+            superBreakerInformed = true, blastMiningInformed = true, serratedStrikesInformed = true, treeFellerInformed = true;
     private boolean hoePreparationMode, shovelPreparationMode, swordsPreparationMode, fistsPreparationMode,
-                    pickaxePreparationMode, axePreparationMode;
+    pickaxePreparationMode, axePreparationMode;
     private boolean abilityUse = true;
 
     /* Timestamps */
-    private int recentlyHurt;
+    private long recentlyHurt;
     private int respawnATS;
+    private long lastSave = 0L;
 
     /* mySQL STUFF */
     private int userId;
@@ -94,89 +96,88 @@ public class PlayerProfile {
         if (userId == 0) {
             return false;
         }
-        else {
-            HashMap<Integer, ArrayList<String>> huds = database.read("SELECT hudtype FROM " + tablePrefix + "huds WHERE user_id = " + userId);
 
-            if (huds.get(1) == null) {
-                database.write("INSERT INTO " + tablePrefix + "huds (user_id) VALUES (" + userId + ")");
-            }
-            else {
-                for (HudType type : HudType.values()) {
-                    if (type.toString().equals(huds.get(1).get(0))) {
-                        hudType = type;
-                    }
+        HashMap<Integer, ArrayList<String>> huds = database.read("SELECT hudtype FROM " + tablePrefix + "huds WHERE user_id = " + userId);
+
+        if (huds.get(1) == null) {
+            database.write("INSERT INTO " + tablePrefix + "huds (user_id) VALUES (" + userId + ")");
+        }
+        else {
+            for (HudType type : HudType.values()) {
+                if (type.toString().equals(huds.get(1).get(0))) {
+                    hudType = type;
                 }
             }
-
-            /*
-             * I'm still learning MySQL, this is a fix for adding a new table
-             * its not pretty but it works
-             */
-            HashMap<Integer, ArrayList<String>> cooldowns = database.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM " + tablePrefix + "cooldowns WHERE user_id = " + userId);
-            ArrayList<String> cooldownValues = cooldowns.get(1);
-
-            if (cooldownValues == null) {
-                database.write("INSERT INTO " + tablePrefix + "cooldowns (user_id) VALUES (" + userId + ")");
-                mcMMO.p.getLogger().warning(playerName + "does not exist in the cooldown table. Their cooldowns will be reset.");
-            }
-            else {
-                skillsDATS.put(AbilityType.SUPER_BREAKER, Integer.valueOf(cooldownValues.get(0)));
-                skillsDATS.put(AbilityType.TREE_FELLER, Integer.valueOf(cooldownValues.get(1)));
-                skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(cooldownValues.get(2)));
-                skillsDATS.put(AbilityType.GREEN_TERRA, Integer.valueOf(cooldownValues.get(3)));
-                skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, Integer.valueOf(cooldownValues.get(4)));
-                skillsDATS.put(AbilityType.SERRATED_STRIKES, Integer.valueOf(cooldownValues.get(5)));
-                skillsDATS.put(AbilityType.SKULL_SPLIITER, Integer.valueOf(cooldownValues.get(6)));
-                skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(cooldownValues.get(7)));
-            }
-
-            HashMap<Integer, ArrayList<String>> stats = database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "skills WHERE user_id = " + userId);
-            ArrayList<String> statValues = stats.get(1);
-
-            if (statValues == null) {
-                database.write("INSERT INTO " + tablePrefix + "skills (user_id) VALUES (" + userId + ")");
-                mcMMO.p.getLogger().warning(playerName + "does not exist in the skills table. Their stats will be reset.");
-            }
-            else {
-                skills.put(SkillType.TAMING, Integer.valueOf(statValues.get(0)));
-                skills.put(SkillType.MINING, Integer.valueOf(statValues.get(1)));
-                skills.put(SkillType.REPAIR, Integer.valueOf(statValues.get(2)));
-                skills.put(SkillType.WOODCUTTING, Integer.valueOf(statValues.get(3)));
-                skills.put(SkillType.UNARMED, Integer.valueOf(statValues.get(4)));
-                skills.put(SkillType.HERBALISM, Integer.valueOf(statValues.get(5)));
-                skills.put(SkillType.EXCAVATION, Integer.valueOf(statValues.get(6)));
-                skills.put(SkillType.ARCHERY, Integer.valueOf(statValues.get(7)));
-                skills.put(SkillType.SWORDS, Integer.valueOf(statValues.get(8)));
-                skills.put(SkillType.AXES, Integer.valueOf(statValues.get(9)));
-                skills.put(SkillType.ACROBATICS, Integer.valueOf(statValues.get(10)));
-                skills.put(SkillType.FISHING, Integer.valueOf(statValues.get(11)));
-            }
-
-            HashMap<Integer, ArrayList<String>> experience = database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "experience WHERE user_id = " + userId);
-            ArrayList<String> experienceValues = experience.get(1);
-
-            if (experienceValues == null) {
-                database.write("INSERT INTO " + tablePrefix + "experience (user_id) VALUES (" + userId + ")");
-                mcMMO.p.getLogger().warning(playerName + "does not exist in the experience table. Their experience will be reset.");
-            }
-            else {
-                skillsXp.put(SkillType.TAMING, Integer.valueOf(experienceValues.get(0)));
-                skillsXp.put(SkillType.MINING, Integer.valueOf(experienceValues.get(1)));
-                skillsXp.put(SkillType.REPAIR, Integer.valueOf(experienceValues.get(2)));
-                skillsXp.put(SkillType.WOODCUTTING, Integer.valueOf(experienceValues.get(3)));
-                skillsXp.put(SkillType.UNARMED, Integer.valueOf(experienceValues.get(4)));
-                skillsXp.put(SkillType.HERBALISM, Integer.valueOf(experienceValues.get(5)));
-                skillsXp.put(SkillType.EXCAVATION, Integer.valueOf(experienceValues.get(6)));
-                skillsXp.put(SkillType.ARCHERY, Integer.valueOf(experienceValues.get(7)));
-                skillsXp.put(SkillType.SWORDS, Integer.valueOf(experienceValues.get(8)));
-                skillsXp.put(SkillType.AXES, Integer.valueOf(experienceValues.get(9)));
-                skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(experienceValues.get(10)));
-                skillsXp.put(SkillType.FISHING, Integer.valueOf(experienceValues.get(11)));
-            }
-
-            loaded = true;
-            return true;
         }
+
+        /*
+         * I'm still learning MySQL, this is a fix for adding a new table
+         * its not pretty but it works
+         */
+        HashMap<Integer, ArrayList<String>> cooldowns = database.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM " + tablePrefix + "cooldowns WHERE user_id = " + userId);
+        ArrayList<String> cooldownValues = cooldowns.get(1);
+
+        if (cooldownValues == null) {
+            database.write("INSERT INTO " + tablePrefix + "cooldowns (user_id) VALUES (" + userId + ")");
+            mcMMO.p.getLogger().warning(playerName + "does not exist in the cooldown table. Their cooldowns will be reset.");
+        }
+        else {
+            skillsDATS.put(AbilityType.SUPER_BREAKER, Integer.valueOf(cooldownValues.get(0)));
+            skillsDATS.put(AbilityType.TREE_FELLER, Integer.valueOf(cooldownValues.get(1)));
+            skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(cooldownValues.get(2)));
+            skillsDATS.put(AbilityType.GREEN_TERRA, Integer.valueOf(cooldownValues.get(3)));
+            skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, Integer.valueOf(cooldownValues.get(4)));
+            skillsDATS.put(AbilityType.SERRATED_STRIKES, Integer.valueOf(cooldownValues.get(5)));
+            skillsDATS.put(AbilityType.SKULL_SPLIITER, Integer.valueOf(cooldownValues.get(6)));
+            skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(cooldownValues.get(7)));
+        }
+
+        HashMap<Integer, ArrayList<String>> stats = database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "skills WHERE user_id = " + userId);
+        ArrayList<String> statValues = stats.get(1);
+
+        if (statValues == null) {
+            database.write("INSERT INTO " + tablePrefix + "skills (user_id) VALUES (" + userId + ")");
+            mcMMO.p.getLogger().warning(playerName + "does not exist in the skills table. Their stats will be reset.");
+        }
+        else {
+            skills.put(SkillType.TAMING, Integer.valueOf(statValues.get(0)));
+            skills.put(SkillType.MINING, Integer.valueOf(statValues.get(1)));
+            skills.put(SkillType.REPAIR, Integer.valueOf(statValues.get(2)));
+            skills.put(SkillType.WOODCUTTING, Integer.valueOf(statValues.get(3)));
+            skills.put(SkillType.UNARMED, Integer.valueOf(statValues.get(4)));
+            skills.put(SkillType.HERBALISM, Integer.valueOf(statValues.get(5)));
+            skills.put(SkillType.EXCAVATION, Integer.valueOf(statValues.get(6)));
+            skills.put(SkillType.ARCHERY, Integer.valueOf(statValues.get(7)));
+            skills.put(SkillType.SWORDS, Integer.valueOf(statValues.get(8)));
+            skills.put(SkillType.AXES, Integer.valueOf(statValues.get(9)));
+            skills.put(SkillType.ACROBATICS, Integer.valueOf(statValues.get(10)));
+            skills.put(SkillType.FISHING, Integer.valueOf(statValues.get(11)));
+        }
+
+        HashMap<Integer, ArrayList<String>> experience = database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "experience WHERE user_id = " + userId);
+        ArrayList<String> experienceValues = experience.get(1);
+
+        if (experienceValues == null) {
+            database.write("INSERT INTO " + tablePrefix + "experience (user_id) VALUES (" + userId + ")");
+            mcMMO.p.getLogger().warning(playerName + "does not exist in the experience table. Their experience will be reset.");
+        }
+        else {
+            skillsXp.put(SkillType.TAMING, Integer.valueOf(experienceValues.get(0)));
+            skillsXp.put(SkillType.MINING, Integer.valueOf(experienceValues.get(1)));
+            skillsXp.put(SkillType.REPAIR, Integer.valueOf(experienceValues.get(2)));
+            skillsXp.put(SkillType.WOODCUTTING, Integer.valueOf(experienceValues.get(3)));
+            skillsXp.put(SkillType.UNARMED, Integer.valueOf(experienceValues.get(4)));
+            skillsXp.put(SkillType.HERBALISM, Integer.valueOf(experienceValues.get(5)));
+            skillsXp.put(SkillType.EXCAVATION, Integer.valueOf(experienceValues.get(6)));
+            skillsXp.put(SkillType.ARCHERY, Integer.valueOf(experienceValues.get(7)));
+            skillsXp.put(SkillType.SWORDS, Integer.valueOf(experienceValues.get(8)));
+            skillsXp.put(SkillType.AXES, Integer.valueOf(experienceValues.get(9)));
+            skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(experienceValues.get(10)));
+            skillsXp.put(SkillType.FISHING, Integer.valueOf(experienceValues.get(11)));
+        }
+
+        loaded = true;
+        return true;
     }
 
     public void addMySQLPlayer() {
@@ -276,7 +277,7 @@ public class PlayerProfile {
                     skillsXp.put(SkillType.FISHING, Integer.valueOf(character[35]));
                 if (character.length > 36)
                     skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(character[36]));
- 
+
                 loaded = true;
 
                 in.close();
@@ -291,7 +292,13 @@ public class PlayerProfile {
     }
 
     public void save() {
-        Long timestamp = System.currentTimeMillis() / 1000;
+        save(true);
+    }
+
+    public void save(boolean override) {
+        Long timestamp = System.currentTimeMillis();
+        if (timestamp < (lastSave + ((long) Config.getInstance().getSaveInterval() * 60000)) && !override)
+            return;
 
         // if we are using mysql save to database
         if (Config.getInstance().getUseMySQL()) {
@@ -299,7 +306,7 @@ public class PlayerProfile {
             String tablePrefix = Config.getInstance().getMySQLTablePrefix();
 
             database.write("UPDATE " + tablePrefix + "huds SET hudtype = '" + hudType.toString() + "' WHERE user_id = " + userId);
-            database.write("UPDATE " + tablePrefix + "users SET lastlogin = " + timestamp.intValue() + " WHERE id = " + userId);
+            database.write("UPDATE " + tablePrefix + "users SET lastlogin = " + ((int) (timestamp / 1000L)) + " WHERE id = " + userId);
             database.write("UPDATE " + tablePrefix + "cooldowns SET "
                     + " mining = " + skillsDATS.get(AbilityType.SUPER_BREAKER)
                     + ", woodcutting = " + skillsDATS.get(AbilityType.TREE_FELLER)
@@ -356,7 +363,7 @@ public class PlayerProfile {
                         writer.append(line).append("\r\n");
                     }
                     else {
-                      //Otherwise write the new player information
+                        //Otherwise write the new player information
                         writer.append(playerName + ":");
                         writer.append(skills.get(SkillType.MINING) + ":");
                         writer.append("" + ":");
@@ -410,6 +417,7 @@ public class PlayerProfile {
                 e.printStackTrace();
             }
         }
+	lastSave = timestamp;
     }
 
     public void addPlayer() {
@@ -491,7 +499,7 @@ public class PlayerProfile {
     }
 
     /*
-     * Anvil Placement
+     * Repair Anvil Placement
      */
 
     public void togglePlacedAnvil() {
@@ -501,6 +509,16 @@ public class PlayerProfile {
     public Boolean getPlacedAnvil() {
         return placedAnvil;
     }
+    /*
+     * Salvage Anvil Placement
+     */
+    public void togglePlacedSalvageAnvil() {
+        placedSalvageAnvil = !placedSalvageAnvil;
+    }
+
+    public Boolean getPlacedSalvageAnvil() {
+        return placedSalvageAnvil;
+    }
 
     /*
      * HUD Stuff
@@ -826,11 +844,11 @@ public class PlayerProfile {
      * Recently Hurt
      */
 
-    public int getRecentlyHurt() {
+    public long getRecentlyHurt() {
         return recentlyHurt;
     }
 
-    public void setRecentlyHurt(int value) {
+    public void setRecentlyHurt(long value) {
         recentlyHurt = value;
     }
 
@@ -873,8 +891,8 @@ public class PlayerProfile {
     }
 
     /*
-    * Exploit Prevention
-    */
+     * Exploit Prevention
+     */
 
     public int getRespawnATS() {
         return respawnATS;
@@ -898,120 +916,123 @@ public class PlayerProfile {
 
     public void setSkillXPLevel(SkillType skillType, int newValue) {
         skillsXp.put(skillType, newValue);
+        save(false);
     }
 
     public void skillUp(SkillType skillType, int newValue) {
         skills.put(skillType, skills.get(skillType) + newValue);
+        save(false);
     }
-    
+
     public void resetSkill(SkillType skillType)
     {
-    	//do a single skilltype
-    	if (skillType != SkillType.ALL)
-    		skills.put(skillType, 0);
-    	else //do them all
-    	{
-    		for(SkillType skill : SkillType.values()) //iterate over all items in the enumeration
-    		{
-    			if (skill != SkillType.ALL) // skip the "all" value
-    				skills.put(skill,  0);
-    		}
-    	}
+        //do a single skilltype
+        if (skillType != SkillType.ALL)
+            skills.put(skillType, 0);
+        else //do them all
+        {
+            for (SkillType skill : SkillType.values()) //iterate over all items in the enumeration
+            {
+                if (skill != SkillType.ALL) // skip the "all" value
+                    skills.put(skill,  0);
+            }
+        }
+        save(false);
     }
 
-//    /**
-//     * 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 addXPOverride(SkillType skillType, int newValue) {
-//        if (skillType.equals(SkillType.ALL)) {
-//            for (SkillType x : SkillType.values()) {
-//                if (x.equals(SkillType.ALL)) {
-//                    continue;
-//                }
-//
-//                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
-//                skillsXp.put(x, skillsXp.get(x) + newValue);
-//            }
-//        }
-//        else {
-//            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
-//            skillsXp.put(skillType, skillsXp.get(skillType) + newValue);
-//            spoutHud.setLastGained(skillType);
-//        }
-//    }
+    //    /**
+    //     * 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 addXPOverride(SkillType skillType, int newValue) {
+    //        if (skillType.equals(SkillType.ALL)) {
+    //            for (SkillType x : SkillType.values()) {
+    //                if (x.equals(SkillType.ALL)) {
+    //                    continue;
+    //                }
+    //
+    //                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
+    //                skillsXp.put(x, skillsXp.get(x) + newValue);
+    //            }
+    //        }
+    //        else {
+    //            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
+    //            skillsXp.put(skillType, skillsXp.get(skillType) + newValue);
+    //            spoutHud.setLastGained(skillType);
+    //        }
+    //    }
 
-//    /**
-//     * Adds XP to the player, this ignores skill modifiers.
-//     *
-//     * @param skillType The skill to add XP to
-//     * @param newValue The amount of XP to add
-//     */
-//    public void addXPOverrideBonus(SkillType skillType, int newValue) {
-//        int xp = newValue * Config.getInstance().xpGainMultiplier;
-//        addXPOverride(skillType, xp);
-//    }
+    //    /**
+    //     * Adds XP to the player, this ignores skill modifiers.
+    //     *
+    //     * @param skillType The skill to add XP to
+    //     * @param newValue The amount of XP to add
+    //     */
+    //    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 and Permissions
-//     *
-//     * @param skillType The skill to add XP to
-//     * @param newvalue The amount of XP to add
-//     */
-//    public void addXP(SkillType skillType, int newValue) {
-//        if (player.getGameMode().equals(GameMode.CREATIVE)) {
-//            return;
-//        }
-//
-//        double bonusModifier = 0;
-//
-//        if (inParty()) {
-//            bonusModifier = partyModifier(skillType);
-//        }
-//
-//        int xp = (int) (newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier;
-//
-//        if (bonusModifier > 0) {
-//            if (bonusModifier >= 2) {
-//                bonusModifier = 2;
-//            }
-//
-//            double trueBonus = bonusModifier * xp;
-//            xp += trueBonus;
-//        }
-//
-//        if (Config.getInstance().getToolModsEnabled()) {
-//            ItemStack item = player.getItemInHand();
-//            CustomTool tool = ModChecks.getToolFromItemStack(item);
-//
-//            if (tool != null) {
-//                xp = (int) (xp * tool.getXpMultiplier());
-//            }
-//        }
-//
-//        //TODO: Can we make this so we do perks by doing "mcmmo.perks.xp.[multiplier]" ?
-//        if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
-//            xp = xp * 4;
-//        }
-//        else if (player.hasPermission("mcmmo.perks.xp.triple")) {
-//            xp = xp * 3;
-//        }
-//        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
-//            xp = (int) (xp * 2.5);
-//        }
-//        else if (player.hasPermission("mcmmo.perks.xp.double")) {
-//            xp = xp * 2;
-//        }
-//        else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
-//            xp = (int) (xp * 1.5);
-//        }
-//
-//        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
-//        skillsXp.put(skillType, skillsXp.get(skillType) + xp);
-//        spoutHud.setLastGained(skillType);
-//    }
+    //    /**
+    //     * Adds XP to the player, this is affected by skill modifiers and XP Rate and Permissions
+    //     *
+    //     * @param skillType The skill to add XP to
+    //     * @param newvalue The amount of XP to add
+    //     */
+    //    public void addXP(SkillType skillType, int newValue) {
+    //        if (player.getGameMode().equals(GameMode.CREATIVE)) {
+    //            return;
+    //        }
+    //
+    //        double bonusModifier = 0;
+    //
+    //        if (inParty()) {
+    //            bonusModifier = partyModifier(skillType);
+    //        }
+    //
+    //        int xp = (int) (newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier;
+    //
+    //        if (bonusModifier > 0) {
+    //            if (bonusModifier >= 2) {
+    //                bonusModifier = 2;
+    //            }
+    //
+    //            double trueBonus = bonusModifier * xp;
+    //            xp += trueBonus;
+    //        }
+    //
+    //        if (Config.getInstance().getToolModsEnabled()) {
+    //            ItemStack item = player.getItemInHand();
+    //            CustomTool tool = ModChecks.getToolFromItemStack(item);
+    //
+    //            if (tool != null) {
+    //                xp = (int) (xp * tool.getXpMultiplier());
+    //            }
+    //        }
+    //
+    //        //TODO: Can we make this so we do perks by doing "mcmmo.perks.xp.[multiplier]" ?
+    //        if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
+    //            xp = xp * 4;
+    //        }
+    //        else if (player.hasPermission("mcmmo.perks.xp.triple")) {
+    //            xp = xp * 3;
+    //        }
+    //        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
+    //            xp = (int) (xp * 2.5);
+    //        }
+    //        else if (player.hasPermission("mcmmo.perks.xp.double")) {
+    //            xp = xp * 2;
+    //        }
+    //        else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
+    //            xp = (int) (xp * 1.5);
+    //        }
+    //
+    //        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
+    //        skillsXp.put(skillType, skillsXp.get(skillType) + xp);
+    //        spoutHud.setLastGained(skillType);
+    //    }
 
     /**
      * Remove XP from a skill.
@@ -1032,6 +1053,7 @@ public class PlayerProfile {
         else {
             skillsXp.put(skillType, skillsXp.get(skillType) - xp);
         }
+        save(false);
     }
 
     /**
@@ -1055,6 +1077,7 @@ public class PlayerProfile {
             skills.put(skillType, newValue);
             skillsXp.put(skillType, 0);
         }
+        save(false);
     }
 
     /**
@@ -1078,6 +1101,7 @@ public class PlayerProfile {
             skills.put(skillType, skills.get(skillType) + levels);
             skillsXp.put(skillType, 0);
         }
+        save(false);
     }
 
     /**
@@ -1090,49 +1114,49 @@ public class PlayerProfile {
         return 1020 + (skills.get(skillType) *  Config.getInstance().getFormulaMultiplierCurve());
     }
 
-//    /**
-//     * Gets the power level of a player.
-//     *
-//     * @return the power level of the player
-//     */
-//    public int getPowerLevel() {
-//        int powerLevel = 0;
-//
-//        for (SkillType type : SkillType.values()) {
-//            if (type.getPermissions(player)) {
-//                powerLevel += getSkillLevel(type);
-//            }
-//        }
-//
-//        return powerLevel;
-//    }
+    //    /**
+    //     * Gets the power level of a player.
+    //     *
+    //     * @return the power level of the player
+    //     */
+    //    public int getPowerLevel() {
+    //        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) {
-//        double bonusModifier = 0.0;
-//
-//        for (Player member : party.getOnlineMembers()) {
-//            if (party.getLeader().equals(member.getName())) {
-//                if (Misc.isNear(player.getLocation(), member.getLocation(), 25.0)) {
-//                    PlayerProfile PartyLeader = Users.getProfile(member);
-//                    int leaderSkill = PartyLeader.getSkillLevel(skillType);
-//                    int playerSkill = getSkillLevel(skillType);
-//
-//                    if (leaderSkill >= playerSkill) {
-//                        int difference = leaderSkill - playerSkill;
-//                        bonusModifier = (difference * 0.75) / 100.0;
-//                    }
-//                }
-//            }
-//        }
-//
-//        return bonusModifier;
-//    }
+    //    /**
+    //     * Calculate the party XP modifier.
+    //     *
+    //     * @param skillType Type of skill to check
+    //     * @return the party bonus multiplier
+    //     */
+    //    private double partyModifier(SkillType skillType) {
+    //        double bonusModifier = 0.0;
+    //
+    //        for (Player member : party.getOnlineMembers()) {
+    //            if (party.getLeader().equals(member.getName())) {
+    //                if (Misc.isNear(player.getLocation(), member.getLocation(), 25.0)) {
+    //                    PlayerProfile PartyLeader = Users.getProfile(member);
+    //                    int leaderSkill = PartyLeader.getSkillLevel(skillType);
+    //                    int playerSkill = getSkillLevel(skillType);
+    //
+    //                    if (leaderSkill >= playerSkill) {
+    //                        int difference = leaderSkill - playerSkill;
+    //                        bonusModifier = (difference * 0.75) / 100.0;
+    //                    }
+    //                }
+    //            }
+    //        }
+    //
+    //        return bonusModifier;
+    //    }
 
     /*
      * Party Stuff
@@ -1150,13 +1174,13 @@ public class PlayerProfile {
         if (invite != null) {
             return true;
         }
-        else {
-            return false;
-        }
+
+        return false;
     }
 
     public void setParty(Party party) {
         this.party = party;
+        save(false);
     }
 
     public Party getParty() {
@@ -1167,13 +1191,13 @@ public class PlayerProfile {
         if (party != null) {
             return true;
         }
-        else {
-            return false;
-        }
+
+        return false;
     }
 
     public void removeParty() {
         party = null;
+        save(false);
     }
 
     public void removeInvite() {

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

@@ -3,4 +3,11 @@ package com.gmail.nossr50.datatypes;
 public class PlayerStat {
     public String name;
     public int statVal = 0;
+
+    public PlayerStat() {};
+
+    public PlayerStat(String name, int value) {
+        this.name = name;
+        this.statVal = value;
+    }
 }

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

@@ -57,9 +57,8 @@ public enum SkillType {
         if (maxLevel > 0) {
             return maxLevel;
         }
-        else {
-            return Integer.MAX_VALUE;
-        }
+
+        return Integer.MAX_VALUE;
     }
 
     public ToolType getTool() {
@@ -75,40 +74,40 @@ public enum SkillType {
     public boolean getPermissions(Player player) {
         switch (this) {
         case ACROBATICS:
-            return Permissions.getInstance().acrobatics(player);
+            return Permissions.acrobatics(player);
 
         case ARCHERY:
-            return Permissions.getInstance().archery(player);
+            return Permissions.archery(player);
 
         case AXES:
-            return Permissions.getInstance().axes(player);
+            return Permissions.axes(player);
 
         case EXCAVATION:
-            return Permissions.getInstance().excavation(player);
+            return Permissions.excavation(player);
 
         case FISHING:
-            return Permissions.getInstance().fishing(player);
+            return Permissions.fishing(player);
 
         case HERBALISM:
-            return Permissions.getInstance().herbalism(player);
+            return Permissions.herbalism(player);
 
         case MINING:
-            return Permissions.getInstance().mining(player);
+            return Permissions.mining(player);
 
         case REPAIR:
-            return Permissions.getInstance().repair(player);
+            return Permissions.repair(player);
 
         case SWORDS:
-            return Permissions.getInstance().swords(player);
+            return Permissions.swords(player);
 
         case TAMING:
-            return Permissions.getInstance().taming(player);
+            return Permissions.taming(player);
 
         case UNARMED:
-            return Permissions.getInstance().unarmed(player);
+            return Permissions.unarmed(player);
 
         case WOODCUTTING:
-            return Permissions.getInstance().woodcutting(player);
+            return Permissions.woodcutting(player);
 
         default:
             return false;
@@ -118,6 +117,19 @@ public enum SkillType {
     public double getXpModifier() {
         return xpModifier;
     }
+    
+    public static SkillType getSkill(String skillName) {
+    	if(skillName.equalsIgnoreCase("powerlevel") || skillName.equalsIgnoreCase("all")) {
+    		return SkillType.ALL;
+    	} else {
+	    	for(SkillType st : SkillType.values()) {
+	    		if(st.name().equalsIgnoreCase(skillName))
+	    			return st;
+	    	}
+	    	System.out.println("[DEBUG] Invalid mcMMO skill ("+skillName+")");
+	    	return null;
+    	}
+    }
 
     /**
      * Get the skill level for this skill.

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

@@ -1,50 +0,0 @@
-package com.gmail.nossr50.datatypes;
-
-import java.util.ArrayList;
-
-public class Tree {
-
-    private TreeNode root = null;
-
-    /**
-     * Add a node to this tree.
-     *
-     * @param p Player name
-     * @param in Stat value
-     */
-    public void add(String p, int in) {
-        if (root == null) {
-            root = new TreeNode(p, in);
-        }
-        else {
-            root.add(p, in);
-        }
-    }
-
-    /**
-     * Retrieve an array of PlayerStats from the Tree.
-     *
-     * @return the player stats of this tree, in order
-     */
-    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.
-             * It's not a good fix but its better than rewriting the whole system.
-             */
-            ArrayList<PlayerStat> x = new ArrayList<PlayerStat>();
-            PlayerStat y = new PlayerStat();
-
-            y.name = "$mcMMO_DummyInfo";
-            y.statVal = 0;
-            x.add(y);
-
-            return x.toArray(new PlayerStat[x.size()]);
-        }
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.gmail.nossr50.datatypes;
-
-import java.util.ArrayList;
-
-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 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/McmmoButton.java

@@ -9,7 +9,7 @@ public class McmmoButton extends GenericButton {
         this.setText(text);
         this.setTooltip(toolTip);
     }
-    
+
     public void connect(Slot slot) {
         this.slot = slot;
     }

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.datatypes.popups;
 
-import org.bukkit.ChatColor;
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
 import org.getspout.spoutapi.gui.InGameHUD;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton.Slot;
+import com.gmail.nossr50.locale.LocaleLoader;
 
 public class Menu extends GenericPopup {
     private McmmoButton hudButton;
@@ -23,19 +23,19 @@ public class Menu extends GenericPopup {
 
     public Menu(final SpoutPlayer spoutPlayer, final PlayerProfile playerProfile) {
         //240, 427 are the bottom right
-        titleLabel.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
+        titleLabel.setText(LocaleLoader.getString("Spout.Menu.Title"));
         titleLabel.setWidth(100);
         titleLabel.setHeight(100);
         titleLabel.setX(centerX - 35);
         titleLabel.setY((centerY / 2) - 20);
 
-        escapeLabel.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
+        escapeLabel.setText(LocaleLoader.getString("Spout.Menu.Exit"));
         escapeLabel.setWidth(100);
         escapeLabel.setHeight(100);
         escapeLabel.setX(titleLabel.getX() - 15);
         escapeLabel.setY(titleLabel.getY() + 10);
 
-        hudButton = new McmmoButton("HUD Type: " + playerProfile.getHudType().toString(), "Change your HUD style!");
+        hudButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.HudButton.1", new Object[] {playerProfile.getHudType().toString()}), LocaleLoader.getString("Spout.Menu.HudButton.2"));
         hudButton.setWidth(120);
         hudButton.setHeight(20);
         hudButton.setX(centerX - (hudButton.getWidth() / 2));
@@ -54,7 +54,7 @@ public class Menu extends GenericPopup {
             }
         });
 
-        escapeButton = new McmmoButton("EXIT", null);
+        escapeButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.ExitButton"), null);
         escapeButton.setWidth(60);
         escapeButton.setHeight(20);
         escapeButton.setX(centerX - (escapeButton.getWidth() / 2));

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

@@ -32,7 +32,7 @@ public class XpBar {
         case RETRO:
             initializeXpBarRetro();
             break;
-            
+
         case STANDARD:
             initializeXpBarStandard();
             break;
@@ -44,7 +44,7 @@ public class XpBar {
         case DISABLED:
             break;
         }
-        
+
         spoutPlayer.getMainScreen().setDirty(true);
     }
 
@@ -77,7 +77,7 @@ public class XpBar {
         xpFill.setTopColor(green);
         xpFill.setPriority(RenderPriority.Lowest);
         spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpFill);
-        
+
         xpBackground.setWidth(126);
         xpBackground.setHeight(2);
         xpBackground.setX(150);
@@ -231,44 +231,44 @@ public class XpBar {
 
     private static Color getRetroColor(SkillType type) {
         switch (type) {
-            case ACROBATICS:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDAcrobaticsRed(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsGreen(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsBlue(), 1f);
+        case ACROBATICS:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDAcrobaticsRed(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsGreen(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsBlue(), 1f);
 
-            case ARCHERY:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDArcheryRed(), (float) SpoutConfig.getInstance().getRetroHUDArcheryGreen(), (float) SpoutConfig.getInstance().getRetroHUDArcheryBlue(), 1f);
+        case ARCHERY:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDArcheryRed(), (float) SpoutConfig.getInstance().getRetroHUDArcheryGreen(), (float) SpoutConfig.getInstance().getRetroHUDArcheryBlue(), 1f);
 
-            case AXES:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDAxesRed(), (float) SpoutConfig.getInstance().getRetroHUDAxesGreen(), (float) SpoutConfig.getInstance().getRetroHUDAxesBlue(), 1f);
+        case AXES:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDAxesRed(), (float) SpoutConfig.getInstance().getRetroHUDAxesGreen(), (float) SpoutConfig.getInstance().getRetroHUDAxesBlue(), 1f);
 
-            case EXCAVATION:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDExcavationRed(), (float) SpoutConfig.getInstance().getRetroHUDExcavationGreen(), (float) SpoutConfig.getInstance().getRetroHUDExcavationBlue(), 1f);
+        case EXCAVATION:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDExcavationRed(), (float) SpoutConfig.getInstance().getRetroHUDExcavationGreen(), (float) SpoutConfig.getInstance().getRetroHUDExcavationBlue(), 1f);
 
-            case HERBALISM:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDHerbalismRed(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismGreen(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismBlue(), 1f);
+        case HERBALISM:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDHerbalismRed(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismGreen(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismBlue(), 1f);
 
-            case MINING:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDMiningRed(), (float) SpoutConfig.getInstance().getRetroHUDMiningGreen(), (float) SpoutConfig.getInstance().getRetroHUDMiningBlue(), 1f);
+        case MINING:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDMiningRed(), (float) SpoutConfig.getInstance().getRetroHUDMiningGreen(), (float) SpoutConfig.getInstance().getRetroHUDMiningBlue(), 1f);
 
-            case REPAIR:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDRepairRed(), (float) SpoutConfig.getInstance().getRetroHUDRepairGreen(), (float) SpoutConfig.getInstance().getRetroHUDRepairBlue(), 1f);
+        case REPAIR:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDRepairRed(), (float) SpoutConfig.getInstance().getRetroHUDRepairGreen(), (float) SpoutConfig.getInstance().getRetroHUDRepairBlue(), 1f);
 
-            case SWORDS:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDSwordsRed(), (float) SpoutConfig.getInstance().getRetroHUDSwordsGreen(), (float) SpoutConfig.getInstance().getRetroHUDSwordsBlue(), 1f);
+        case SWORDS:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDSwordsRed(), (float) SpoutConfig.getInstance().getRetroHUDSwordsGreen(), (float) SpoutConfig.getInstance().getRetroHUDSwordsBlue(), 1f);
 
-            case TAMING:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDTamingRed(), (float) SpoutConfig.getInstance().getRetroHUDTamingGreen(), (float) SpoutConfig.getInstance().getRetroHUDTamingBlue(), 1f);
+        case TAMING:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDTamingRed(), (float) SpoutConfig.getInstance().getRetroHUDTamingGreen(), (float) SpoutConfig.getInstance().getRetroHUDTamingBlue(), 1f);
 
-            case UNARMED:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDUnarmedRed(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedGreen(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedBlue(), 1f);
+        case UNARMED:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDUnarmedRed(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedGreen(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedBlue(), 1f);
 
-            case WOODCUTTING:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDWoodcuttingRed(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingGreen(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingBlue(), 1f);
+        case WOODCUTTING:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDWoodcuttingRed(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingGreen(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingBlue(), 1f);
 
-            case FISHING:
-                return new Color((float) SpoutConfig.getInstance().getRetroHUDFishingRed(), (float) SpoutConfig.getInstance().getRetroHUDFishingGreen(), (float) SpoutConfig.getInstance().getRetroHUDFishingBlue(), 1f);
+        case FISHING:
+            return new Color((float) SpoutConfig.getInstance().getRetroHUDFishingRed(), (float) SpoutConfig.getInstance().getRetroHUDFishingGreen(), (float) SpoutConfig.getInstance().getRetroHUDFishingBlue(), 1f);
 
-            default:
-                return new Color(0.3f, 0.3f, 0.75f, 1f);
+        default:
+            return new Color(0.3f, 0.3f, 0.75f, 1f);
         }
     }
 

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

@@ -11,7 +11,6 @@ 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.BlockPhysicsEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -31,9 +30,10 @@ import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.runnables.StickyPistonTracker;
 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.mining.MiningManager;
 import com.gmail.nossr50.skills.gathering.WoodCutting;
 import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.Salvage;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.ItemChecks;
@@ -58,11 +58,15 @@ public class BlockListener implements Listener {
     public void onBlockPistonExtend(BlockPistonExtendEvent event) {
         List<Block> blocks = event.getBlocks();
         BlockFace direction = event.getDirection();
+        // Block that would be air after piston is finished
+        Block futureEmptyBlock = event.getBlock().getRelative(direction);
 
         for (Block b : blocks) {
             if (mcMMO.placeStore.isTrue(b)) {
                 b.getRelative(direction).setMetadata("pistonTrack", new FixedMetadataValue(plugin, true));
-                mcMMO.placeStore.setFalse(b);
+                if (b.equals(futureEmptyBlock)) {
+                    mcMMO.placeStore.setFalse(b);
+                }
             }
         }
 
@@ -74,25 +78,6 @@ public class BlockListener implements Listener {
         }
     }
 
-    /**
-     * Monitor BlockPhysics events.
-     *
-     * @param event The event to monitor
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-        //TODO: Figure out how to REMOVE metadata from the location the sand/gravel fell from.
-        Material type = event.getChangedType();
-
-        if (type == Material.GRAVEL || type == Material.SAND) {
-            Block fallenBlock = event.getBlock().getRelative(BlockFace.UP);
-
-            if (fallenBlock.getType() == type) {
-                mcMMO.placeStore.setTrue(fallenBlock);
-            }
-        }
-    }
-
     /**
      * Monitor BlockPistonRetract events.
      *
@@ -118,32 +103,20 @@ public class BlockListener implements Listener {
         Block block = event.getBlock();
         Player player = event.getPlayer();
         int id = block.getTypeId();
-        Material type = block.getType();
 
-        /* Code to prevent issues with placed falling Sand/Gravel not being tracked */
-        if (type.equals(Material.SAND) || type.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;
-                }
-            }
-        }
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
 
         /* Check if the blocks placed should be monitored so they do not give out XP in the future */
         if (BlockChecks.shouldBeWatched(block)) {
-            if (!((type == Material.SAND || type == Material.GRAVEL) && block.getRelative(BlockFace.DOWN).getType() == Material.AIR)) { //Don't wanna track sand that's gonna fall.
-                mcMMO.placeStore.setTrue(block);
-            }
+            mcMMO.placeStore.setTrue(block);
         }
 
         if (id == configInstance.getRepairAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) {
             Repair.placedAnvilCheck(player, id);
         }
+        if (id == configInstance.getSalvageAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) {
+            Salvage.placedAnvilCheck(player, id);
+        }
     }
 
     /**
@@ -158,6 +131,9 @@ public class BlockListener implements Listener {
         }
 
         Player player = event.getPlayer();
+
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         PlayerProfile profile = Users.getProfile(player);
 
         if (profile == null) {
@@ -168,12 +144,11 @@ public class BlockListener implements Listener {
         ItemStack inHand = player.getItemInHand();
 
         Config configInstance = Config.getInstance();
-        Permissions permInstance = Permissions.getInstance();
 
         /* HERBALISM */
         if (BlockChecks.canBeGreenTerra(block)) {
             /* Green Terra */
-            if (profile.getToolPreparationMode(ToolType.HOE) && permInstance.greenTerra(player)) {
+            if (profile.getToolPreparationMode(ToolType.HOE) && Permissions.greenTerra(player)) {
                 Skills.abilityCheck(player, SkillType.HERBALISM);
             }
 
@@ -182,25 +157,26 @@ public class BlockListener implements Listener {
                 Herbalism.herbalismProcCheck(block, player, event, plugin);
             }
 
-            if (permInstance.herbalism(player)) {
+            if (Permissions.herbalism(player)) {
                 Herbalism.herbalismProcCheck(block, player, event, plugin);
             }
         }
 
         /* MINING */
-        else if (BlockChecks.canBeSuperBroken(block) && permInstance.mining(player)) {
+        else if (BlockChecks.canBeSuperBroken(block) && Permissions.mining(player)) {
+            MiningManager miningManager = new MiningManager(player);
             if (configInstance.getMiningRequiresTool()) {
                 if (ItemChecks.isPickaxe(inHand)) {
-                    Mining.miningBlockCheck(player, block);
+                    miningManager.miningBlockCheck(block);
                 }
             }
             else {
-                Mining.miningBlockCheck(player, block);
+                miningManager.miningBlockCheck(block);
             }
         }
 
         /* WOOD CUTTING */
-        else if (BlockChecks.isLog(block) && permInstance.woodcutting(player)) {
+        else if (BlockChecks.isLog(block) && Permissions.woodcutting(player)) {
             if (configInstance.getWoodcuttingRequiresTool()) {
                 if (ItemChecks.isAxe(inHand)) {
                     WoodCutting.woodcuttingBlockCheck(player, block);
@@ -210,13 +186,13 @@ public class BlockListener implements Listener {
                 WoodCutting.woodcuttingBlockCheck(player, block);
             }
 
-            if (profile.getAbilityMode(AbilityType.TREE_FELLER) && permInstance.treeFeller(player) && ItemChecks.isAxe(inHand)) {
+            if (profile.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.treeFeller(player) && ItemChecks.isAxe(inHand)) {
                 WoodCutting.treeFeller(event);
             }
         }
 
         /* EXCAVATION */
-        else if (BlockChecks.canBeGigaDrillBroken(block) && permInstance.excavation(player) && !mcMMO.placeStore.isTrue(block)) {
+        else if (BlockChecks.canBeGigaDrillBroken(block) && Permissions.excavation(player) && !mcMMO.placeStore.isTrue(block)) {
             if (configInstance.getExcavationRequiresTool()) {
                 if (ItemChecks.isShovel(inHand)) {
                     Excavation.excavationProcCheck(block, player);
@@ -231,26 +207,6 @@ public class BlockListener implements Listener {
         if (BlockChecks.shouldBeWatched(block)) {
             mcMMO.placeStore.setFalse(block);
         }
-
-        //Remove metadata from fallen sand/gravel
-        Material aboveType = block.getRelative(BlockFace.UP).getType();
-
-        if (aboveType == Material.SAND || aboveType == Material.GRAVEL) {
-            for (int y = 1; block.getY() + y <= block.getWorld().getMaxHeight(); y++) {
-                Block relative = block.getRelative(0, y, 0);
-                Material relativeType = relative.getType();
-
-                if ((relativeType == Material.SAND || relativeType == Material.GRAVEL) && mcMMO.placeStore.isTrue(relative)) {
-                    mcMMO.placeStore.setFalse(relative);
-                }
-                else if (!BlockChecks.shouldBeWatched(relative) && mcMMO.placeStore.isTrue(relative)){
-                    mcMMO.placeStore.setFalse(relative);
-                }
-                else {
-                    break;
-                }
-            }
-        }
     }
 
     /**
@@ -268,6 +224,9 @@ public class BlockListener implements Listener {
         final int LEAF_BLOWER_LEVEL = 100;
 
         Player player = event.getPlayer();
+
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         PlayerProfile profile = Users.getProfile(player);
 
         if (profile == null) {
@@ -279,7 +238,6 @@ public class BlockListener implements Listener {
         Material material = block.getType();
 
         Config configInstance = Config.getInstance();
-        Permissions permInstance = Permissions.getInstance();
 
         /*
          * ABILITY PREPARATION CHECKS
@@ -288,7 +246,7 @@ public class BlockListener implements Listener {
             if (profile.getToolPreparationMode(ToolType.HOE) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.makeMossy(block))) {
                 Skills.abilityCheck(player, SkillType.HERBALISM);
             }
-            else if (profile.getToolPreparationMode(ToolType.AXE) && BlockChecks.isLog(block) && permInstance.treeFeller(player)) {  //TODO: Why are we checking the permissions here?
+            else if (profile.getToolPreparationMode(ToolType.AXE) && BlockChecks.isLog(block) && Permissions.treeFeller(player)) {  //TODO: Why are we checking the permissions here?
                 Skills.abilityCheck(player, SkillType.WOODCUTTING);
             }
             else if (profile.getToolPreparationMode(ToolType.PICKAXE) && BlockChecks.canBeSuperBroken(block)) {
@@ -310,7 +268,7 @@ public class BlockListener implements Listener {
         /*
          * ABILITY TRIGGER CHECKS
          */
-        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) && permInstance.greenTerra(player) && BlockChecks.makeMossy(block)) {
+        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) && Permissions.greenTerra(player) && BlockChecks.makeMossy(block)) {
             Herbalism.greenTerra(player, block);
         }
         else if (profile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
@@ -338,15 +296,17 @@ public class BlockListener implements Listener {
             }
         }
         else if (profile.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
+            MiningManager miningManager = new MiningManager(player);
+
             if (configInstance.getMiningRequiresTool()) {
                 if (ItemChecks.isPickaxe(inHand)) {
                     event.setInstaBreak(true);
-                    Mining.superBreakerBlockCheck(player, block);
+                    miningManager.superBreakerBlockCheck(block);
                 }
             }
             else {
                 event.setInstaBreak(true);
-                Mining.superBreakerBlockCheck(player, block);
+                miningManager.superBreakerBlockCheck(block);
             }
         }
         else if (profile.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && (material.equals(Material.LEAVES) || (configInstance.getBlockModsEnabled() && ModChecks.isCustomLeafBlock(block)))) {

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

@@ -1,9 +1,11 @@
 package com.gmail.nossr50.listeners;
 
 import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -15,6 +17,7 @@ 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.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@@ -23,9 +26,9 @@ 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.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
@@ -35,7 +38,7 @@ import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.BleedTimer;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
 import com.gmail.nossr50.skills.archery.Archery;
-import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.Misc;
@@ -50,6 +53,24 @@ public class EntityListener implements Listener {
         this.plugin = plugin;
     }
 
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntityChangeBlockEvent(EntityChangeBlockEvent event) {
+        Entity entity = event.getEntity();
+
+        if (entity instanceof FallingBlock) {
+            Block block = event.getBlock();
+
+            if (mcMMO.placeStore.isTrue(block) && !mcMMO.placeStore.isSpawnedMob(entity)) {
+                mcMMO.placeStore.setFalse(block);
+                mcMMO.placeStore.addSpawnedMob(entity);
+            }
+            else if (mcMMO.placeStore.isSpawnedMob(entity)) {
+                mcMMO.placeStore.setTrue(block);
+                mcMMO.placeStore.removeSpawnedMob(entity);
+            }
+        }
+    }
+
     /**
      * Monitor EntityDamageByEntity events.
      *
@@ -57,13 +78,17 @@ public class EntityListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        if (event instanceof FakeEntityDamageByEntityEvent) {
+        if (event instanceof FakeEntityDamageByEntityEvent)
+            return;
+
+        if (event.getDamage() <= 0)
             return;
-        }
 
         Entity attacker = event.getDamager();
         Entity defender = event.getEntity();
 
+        if (attacker.hasMetadata("NPC") || defender.hasMetadata("NPC")) return; // Check if either players is are Citizens NPCs
+
         if (attacker instanceof Projectile) {
             attacker = ((Projectile) attacker).getShooter();
         }
@@ -114,6 +139,8 @@ public class EntityListener implements Listener {
         Entity entity = event.getEntity();
         DamageCause cause = event.getCause();
 
+        if (entity.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         if (!(entity instanceof LivingEntity)) {
             return;
         }
@@ -144,8 +171,9 @@ public class EntityListener implements Listener {
                     AcrobaticsManager acroManager = new AcrobaticsManager(player);
                     acroManager.rollCheck(event);
                 }
-                else if (cause == DamageCause.BLOCK_EXPLOSION && Permissions.getInstance().demolitionsExpertise(player)) {
-                    BlastMining.demolitionsExpertise(player, event);
+                else if (cause == DamageCause.BLOCK_EXPLOSION && Permissions.demolitionsExpertise(player)) {
+                    MiningManager miningManager = new MiningManager(player); 
+                    miningManager.demolitionsExpertise(event);
                 }
 
                 if (event.getDamage() >= 1) {
@@ -172,9 +200,13 @@ public class EntityListener implements Listener {
     public void onEntityDeath(EntityDeathEvent event) {
         LivingEntity entity = event.getEntity();
 
+        if (entity.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         entity.setFireTicks(0);
         BleedTimer.remove(entity);
         Archery.arrowRetrievalCheck(entity);
+        mcMMO.placeStore.removeSpawnedMob(entity);
+        mcMMO.placeStore.removeSpawnedPet(entity);
     }
 
     /**
@@ -187,7 +219,7 @@ public class EntityListener implements Listener {
         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));
+            mcMMO.placeStore.addSpawnedMob(event.getEntity());
         }
     }
 
@@ -200,14 +232,17 @@ public class EntityListener implements Listener {
     public void onExplosionPrime(ExplosionPrimeEvent event) {
         Entity entity = event.getEntity();
 
+        if (entity.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         if (entity instanceof TNTPrimed) {
             int id = entity.getEntityId();
 
             if (plugin.tntIsTracked(id)) {
                 Player player = plugin.getTNTPlayer(id);
 
-                if (Permissions.getInstance().biggerBombs(player)) {
-                    BlastMining.biggerBombs(player, event);
+                if (Permissions.biggerBombs(player)) {
+                    MiningManager miningManager = new MiningManager(player);
+                    miningManager.biggerBombs(event);
                 }
             }
         }
@@ -222,12 +257,17 @@ public class EntityListener implements Listener {
     public void onEnitityExplode(EntityExplodeEvent event) {
         Entity entity = event.getEntity();
 
-        if (event.getEntity() instanceof TNTPrimed) {
+        if (entity == null) return;
+
+        if (entity.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
+        if (entity instanceof TNTPrimed) {
             int id = entity.getEntityId();
 
             if (plugin.tntIsTracked(id)) {
                 Player player = plugin.getTNTPlayer(id);
-                BlastMining.dropProcessing(player, event);
+                MiningManager miningManager = new MiningManager(player);
+                miningManager.blastMiningDropProcessing(event);
                 plugin.removeFromTNTTracker(id);
             }
         }
@@ -240,16 +280,16 @@ public class EntityListener implements Listener {
      */
     @EventHandler (priority = EventPriority.LOW)
     public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
         if (event.getEntity() instanceof Player) {
             Player player = (Player) event.getEntity();
+
+            if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
             PlayerProfile profile = 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
@@ -260,36 +300,101 @@ public class EntityListener implements Listener {
             if (newFoodLevel > currentFoodLevel) {
                 Material food = player.getItemInHand().getType();
                 int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
+                int fishLevel = profile.getSkillLevel(SkillType.FISHING);
                 int foodChange = newFoodLevel - currentFoodLevel;
                 int rankChange = 0;
+                boolean fish = false;
+                boolean herb = false;
+                int FoodRank1 = advancedConfig.getFarmerDietRankChange();
+                int FoodRank2 = advancedConfig.getFarmerDietRankChange() * 2;
+                int FoodRankMax = advancedConfig.getFarmerDietRankChange() * 5;
 
                 switch (food) {
                 case BREAD:
                     /* BREAD RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
-                    rankChange = 200;
+                    herb = true;
+                    rankChange = FoodRank1;
                     break;
 
                 case COOKIE:
                     /* COOKIE RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
-                    rankChange = 400;
+                    herb = true;
+                    rankChange = FoodRank2;
                     break;
 
                 case MELON:
                     /* MELON RESTORES  1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
-                    rankChange = 400;
+                    herb = true;
+                    rankChange = FoodRank2;
                     break;
 
                 case MUSHROOM_SOUP:
                     /* MUSHROOM SOUP RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
-                    rankChange = 200;
+                    herb = true;
+                    rankChange = FoodRank1;
                     break;
 
+                case CARROT_ITEM:
+                    /* CARROT RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank1;
+                    break;
+
+                case POTATO_ITEM:
+                    /* POTATO RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank2;
+                    break;
+
+                case BAKED_POTATO:
+                    /* BAKED POTATO RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank1;
+                    break;
+
+                case POISONOUS_POTATO:
+                    /* POISONOUS POTATO RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank2;
+                    break;
+
+                case GOLDEN_CARROT:
+                    /* GOLDEN CARROT RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank1;
+                    break;
+
+                case PUMPKIN_PIE:
+                    /* PUMPKIN PIE RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
+                    herb = true;
+                    rankChange = FoodRank1;
+                    break;
+
+                case RAW_FISH:
+                    /* RAW FISH RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
+                    rankChange = FoodRank2;
+                    fish = true;
+                    break;
+
+                case COOKED_FISH:
+                    /* COOKED FISH RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
+                    rankChange = FoodRank1;
+                    fish = true;
+
+                    break;
                 default:
                     return;
                 }
 
-                for (int i = 200; i <= 1000; i += rankChange) {
-                    if (herbLevel >= i) {
+                if (herb && !Permissions.farmersDiet(player)) {
+                    return;
+                }
+                else if (fish && !Permissions.fishermansDiet(player)) {
+                    return;
+                }
+
+                for (int i = FoodRank1; i <= FoodRankMax; i += rankChange) {
+                    if ((herb && herbLevel >= i) || (fish && fishLevel >= i)) {
                         foodChange++;
                     }
                 }
@@ -315,7 +420,9 @@ public class EntityListener implements Listener {
     public void onEntityTame(EntityTameEvent event) {
         Player player = (Player) event.getOwner();
 
-        if (Permissions.getInstance().taming(player) && !event.getEntity().hasMetadata("mcmmoSummoned")) {
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
+        if (Permissions.taming(player) && !mcMMO.placeStore.isSpawnedPet(event.getEntity())) {
             PlayerProfile profile = Users.getProfile(player);
             EntityType type = event.getEntityType();
             int xp = 0;

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

@@ -21,8 +21,10 @@ public class HardcoreListener implements Listener {
     public void onPlayerDeath(PlayerDeathEvent event) {
         Player player = event.getEntity(); //Note this returns a Player object for this subevent
 
-        if (!Permissions.getInstance().hardcoremodeBypass(player)) {
-            if (Config.getInstance().getHardcoreVampirismEnabled()) {
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
+        if (!Permissions.hardcoremodeBypass(player)) {
+            if (player.getKiller() != null && Config.getInstance().getHardcoreVampirismEnabled()) {
                 Hardcore.invokeVampirism(player.getKiller(), player);
             }
 

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

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.listeners;
 
-import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
@@ -24,6 +24,7 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.general.XprateCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
@@ -33,9 +34,10 @@ import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.runnables.BleedTimer;
-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.mining.MiningManager;
+import com.gmail.nossr50.skills.repair.Salvage;
 import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Item;
@@ -44,6 +46,7 @@ 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) {
@@ -58,6 +61,9 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
         Player player = event.getPlayer();
+
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         PlayerProfile profile = Users.getProfile(player);
 
         if (profile == null) {
@@ -65,14 +71,14 @@ public class PlayerListener implements Listener {
         }
 
         if (profile.getGodMode()) {
-            if (!Permissions.getInstance().mcgod(player)) {
+            if (!Permissions.mcgod(player)) {
                 profile.toggleGodMode();
                 player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden"));
             }
         }
 
         if (profile.inParty()) {
-            if (!Permissions.getInstance().party(player)) {
+            if (!Permissions.party(player)) {
                 profile.removeParty();
                 player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
             }
@@ -86,9 +92,13 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerFish(PlayerFishEvent event) {
+        AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
+        int shakeUnlockLevel = advancedConfig.getShakeUnlockLevel();
         Player player = event.getPlayer();
 
-        if (Permissions.getInstance().fishing(player)) {
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
+        if (Permissions.fishing(player)) {
             State state = event.getState();
 
             switch (state) {
@@ -101,7 +111,7 @@ public class PlayerListener implements Listener {
                     return;
                 }
 
-                if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= 150 && Permissions.getInstance().shakeMob(player)) {
+                if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= shakeUnlockLevel && Permissions.shakeMob(player)) {
                     Fishing.shakeMob(event);
                 }
                 break;
@@ -119,6 +129,9 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(ignoreCancelled = true)
     public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+
+        if (event.getPlayer().hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         PlayerProfile profile = Users.getProfile(event.getPlayer());
 
         if (profile == null) {
@@ -126,7 +139,7 @@ public class PlayerListener implements Listener {
         }
 
         if (profile.getAbilityMode(AbilityType.BERSERK)) {
-             event.setCancelled(true);
+            event.setCancelled(true);
         }
     }
 
@@ -137,6 +150,7 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerLogin(PlayerLoginEvent event) {
+        if (event.getPlayer().hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
         Users.addUser(event.getPlayer()).getProfile().actualizeRespawnATS();
     }
 
@@ -149,6 +163,8 @@ public class PlayerListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
 
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         /* GARBAGE COLLECTION */
 
         //Bleed it out
@@ -164,37 +180,66 @@ public class PlayerListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
-        //TODO: Locale ALL the things.
-        if (Config.getInstance().getMOTDEnabled() && Permissions.getInstance().motd(player)) {
-            String prefix = ChatColor.GOLD + "[mcMMO] ";
-            String perkPrefix = ChatColor.RED + "[mcMMO Perks] ";
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
 
-            player.sendMessage(prefix + ChatColor.YELLOW + "Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale
+        if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+
+            player.sendMessage(LocaleLoader.getString("MOTD.Version", new Object[] {plugin.getDescription().getVersion()}));
 
             if (Config.getInstance().getHardcoreEnabled()) {
                 if (Config.getInstance().getHardcoreVampirismEnabled()) {
-                    player.sendMessage(prefix + ChatColor.DARK_RED + "Hardcore & Vampirism enabled.");
-                    player.sendMessage(prefix + ChatColor.DARK_AQUA + "Skill Death Penalty: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreDeathStatPenaltyPercentage() + "% " + ChatColor.DARK_AQUA + "Vampirism Stat Leech: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreVampirismStatLeechPercentage() + "%");
+                    player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.VampireOn"));
+                    player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Stats", new Object[] {Config.getInstance().getHardcoreDeathStatPenaltyPercentage()}));
+                    player.sendMessage(LocaleLoader.getString("MOTD.Vampire.Stats", new Object[] {Config.getInstance().getHardcoreVampirismStatLeechPercentage()}));
                 }
                 else {
-                    player.sendMessage(prefix + ChatColor.DARK_RED + "Hardcore enabled.");
-                    player.sendMessage(prefix + ChatColor.DARK_AQUA + "Skill Death Penalty: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreDeathStatPenaltyPercentage() + "%");
+                    player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.VampireOff"));
+                    player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Stats", new Object[] {Config.getInstance().getHardcoreDeathStatPenaltyPercentage()}));
                 }
-            }   
-
-            if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
-                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Quadruple XP - Receive 4x XP.");
-            }
-            else if (player.hasPermission("mcmmo.perks.xp.triple")) {
-                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Triple XP - Receive 3x XP.");
-            }
-            else if (player.hasPermission("mcmmo.perks.xp.double")) {
-                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Double XP - Receive 2x XP.");
             }
 
-            player.sendMessage(ChatColor.GOLD+"[mcMMO] " + ChatColor.GREEN + "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale
-            //player.sendMessage(LocaleLoader.getString("mcMMO.MOTD", new Object[] {plugin.getDescription().getVersion()}));
-            //player.sendMessage(LocaleLoader.getString("mcMMO.Website"));
+            if (Permissions.xpQuadruple(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.xp.name"), LocaleLoader.getString("Perks.xp.desc", new Object[] { 4 }) }));
+            }
+            else if (Permissions.xpTriple(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.xp.name"), LocaleLoader.getString("Perks.xp.desc", new Object[] { 3 }) }));
+            }
+            else if (Permissions.xpDoubleAndOneHalf(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.xp.name"), LocaleLoader.getString("Perks.xp.desc", new Object[] { 2.5 }) }));
+            }
+            else if (Permissions.xpDouble(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.xp.name"), LocaleLoader.getString("Perks.xp.desc", new Object[] { 2 }) }));
+            }
+            else if (Permissions.xpOneAndOneHalf(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.xp.name"), LocaleLoader.getString("Perks.xp.desc", new Object[] { 1.5 }) }));
+            }
+
+            if (Permissions.cooldownsHalved(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.cooldowns.name"), LocaleLoader.getString("Perks.cooldowns.desc", new Object[] { "1/2" }) }));
+            }
+            else if (Permissions.cooldownsThirded(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.cooldowns.name"), LocaleLoader.getString("Perks.cooldowns.desc", new Object[] { "1/3" }) }));
+            }
+            else if (Permissions.cooldownsQuartered(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.cooldowns.name"), LocaleLoader.getString("Perks.cooldowns.desc", new Object[] { "1/4" }) }));
+            }
+
+            if (Permissions.activationTwelve(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.activationtime.name"), LocaleLoader.getString("Perks.activationtime.desc", new Object[] { 12 }) }));
+            }
+            else if (Permissions.activationEight(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.activationtime.name"), LocaleLoader.getString("Perks.activationtime.desc", new Object[] { 8 }) }));
+            }
+            else if (Permissions.activationFour(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.activationtime.name"), LocaleLoader.getString("Perks.activationtime.desc", new Object[] { 4 }) }));
+            }
+
+            if (Permissions.luckyAcrobatics(player) || Permissions.luckyArchery(player) || Permissions.luckyAxes(player) || Permissions.luckyFishing(player) || Permissions.luckyHerbalism(player) || Permissions.luckyMining(player) || Permissions.luckyRepair(player) || Permissions.luckySwords(player) || Permissions.luckyTaming(player) || Permissions.luckyUnarmed(player) || Permissions.luckyWoodcutting(player)) {
+                player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") }));
+            }
+
+            player.sendMessage(LocaleLoader.getString("MOTD.Website", new Object[] {plugin.getDescription().getWebsite()}));
         }
 
         //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
@@ -205,6 +250,7 @@ public class PlayerListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
+        if (event.getPlayer().hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
         PlayerProfile profile = Users.getProfile(event.getPlayer());
 
         if (profile != null) {
@@ -220,6 +266,7 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerInteract(PlayerInteractEvent event) {
         Player player = event.getPlayer();
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
         Action action = event.getAction();
         Block block = event.getClickedBlock();
         ItemStack inHand = player.getItemInHand();
@@ -237,13 +284,22 @@ public class PlayerListener implements Listener {
         case RIGHT_CLICK_BLOCK:
 
             /* REPAIR CHECKS */
-            if (Permissions.getInstance().repair(player) && block.getTypeId() == Config.getInstance().getRepairAnvilId()) {
+            if (Permissions.repair(player) && block.getTypeId() == Config.getInstance().getRepairAnvilId()) {
                 if (mcMMO.repairManager.isRepairable(inHand)) {
                     mcMMO.repairManager.handleRepair(player, inHand);
                     event.setCancelled(true);
                     player.updateInventory();
                 }
             }
+            /* SALVAGE CHECKS */
+            if (Permissions.salvage(player) && block.getTypeId() == Config.getInstance().getSalvageAnvilId()) {
+                if (Salvage.isSalvageable(inHand)) {
+                    final Location location = block.getLocation();
+                    Salvage.handleSalvage(player, location, inHand);
+                    event.setCancelled(true);
+                    player.updateInventory();
+                }
+            }
 
             /* ACTIVATION CHECKS */
             if (Config.getInstance().getAbilitiesEnabled() && BlockChecks.abilityBlockCheck(block)) {
@@ -260,7 +316,7 @@ public class PlayerListener implements Listener {
             }
 
             /* GREEN THUMB CHECK */
-            if (inHand.getType().equals(Material.SEEDS) && BlockChecks.makeMossy(block) && Permissions.getInstance().greenThumbBlocks(player)) {
+            if (inHand.getType().equals(Material.SEEDS) && BlockChecks.makeMossy(block) && Permissions.greenThumbBlocks(player)) {
                 Herbalism.greenThumbBlocks(inHand, player, block);
             }
 
@@ -270,8 +326,9 @@ public class PlayerListener implements Listener {
             }
 
             /* BLAST MINING CHECK */
-            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.getInstance().blastMining(player)) {
-                BlastMining.detonate(event, player, plugin);
+            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.blastMining(player)) {
+                MiningManager miningManager = new MiningManager(player);
+                miningManager.detonate(event);
             }
 
             break;
@@ -293,8 +350,9 @@ public class PlayerListener implements Listener {
             Item.itemChecks(player);
 
             /* BLAST MINING CHECK */
-            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.getInstance().blastMining(player)) {
-                BlastMining.detonate(event, player, plugin);
+            if (player.isSneaking() && inHand.getTypeId() == Config.getInstance().getDetonatorItemID() && Permissions.blastMining(player)) {
+                MiningManager miningManager = new MiningManager(player);
+                miningManager.detonate(event);
             }
 
             break;
@@ -331,6 +389,9 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerChat(AsyncPlayerChatEvent event) {
         Player player = event.getPlayer();
+
+        if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
+
         PlayerProfile profile = Users.getProfile(player);
 
         if (profile == null) {
@@ -341,7 +402,7 @@ public class PlayerListener implements Listener {
             Party party = profile.getParty();
 
             if (party == null) {
-                player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
+                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                 return;
             }
 
@@ -354,12 +415,10 @@ public class PlayerListener implements Listener {
                 return;
             }
 
-            String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + playerName + ChatColor.GREEN + ") ";
-
             plugin.getLogger().info("[P](" + partyName + ")" + "<" + playerName + "> " + chatEvent.getMessage());
 
             for (Player member : party.getOnlineMembers()) {
-                member.sendMessage(prefix + chatEvent.getMessage());
+                member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {playerName}) + chatEvent.getMessage());
             }
 
             event.setCancelled(true);
@@ -373,13 +432,11 @@ public class PlayerListener implements Listener {
                 return;
             }
 
-            String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + playerName + ChatColor.AQUA + "} ";
-
             plugin.getLogger().info("[A]<" + playerName + "> " + chatEvent.getMessage());
 
             for (Player otherPlayer : plugin.getServer().getOnlinePlayers()) {
-                if (Permissions.getInstance().adminChat(otherPlayer) || otherPlayer.isOp()) {
-                    otherPlayer.sendMessage(prefix + chatEvent.getMessage());
+                if (Permissions.adminChat(otherPlayer) || otherPlayer.isOp()) {
+                    otherPlayer.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {playerName}) + chatEvent.getMessage());
                 }
             }
 

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

@@ -19,7 +19,7 @@ public class SelfListener implements Listener {
     public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
         int xp = event.getXpGained();
 
-        if(xp < 0) {
+        if (xp < 0) {
             try {
                 throw new Exception("Gained negative XP!");
             }

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.listeners;
 
-import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.getspout.spoutapi.event.input.KeyPressedEvent;
@@ -17,6 +16,7 @@ import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton;
 import com.gmail.nossr50.datatypes.popups.Menu;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Users;
 
@@ -34,7 +34,7 @@ public class SpoutListener implements Listener {
 
         //TODO: Add custom titles based on skills
         if (SpoutConfig.getInstance().getShowPowerLevel()) {
-            spoutPlayer.setTitle(spoutPlayer.getName() + "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(mcMMOPlayer.getPowerLevel()));
+            spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()}));
         }
 
         profile.setSpoutHud(new SpoutHud(mcMMOPlayer)); //Setup Party HUD stuff

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

@@ -1,23 +1,54 @@
 package com.gmail.nossr50.listeners;
 
 import java.io.File;
+import java.util.ArrayList;
 
+import org.bukkit.TreeType;
+import org.bukkit.block.BlockState;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 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.StructureGrowEvent;
+import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.event.world.WorldUnloadEvent;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.blockstoreconversion.BlockStoreConversionMain;
 
 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();
+    ArrayList<BlockStoreConversionMain> converters = new ArrayList<BlockStoreConversionMain>();
+
+    @EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onStructureGrow(StructureGrowEvent event) {
+        TreeType species = event.getSpecies();
+
+        if (species == TreeType.BROWN_MUSHROOM || species == TreeType.RED_MUSHROOM) {
+            return;
         }
+
+        if (mcMMO.placeStore.isTrue(event.getLocation().getBlock())) {
+            for (BlockState block : event.getBlocks()) {
+                mcMMO.placeStore.setFalse(block.getBlock());
+            }   
+        }
+    }
+
+    @EventHandler
+    public void onWorldInit(WorldInitEvent event) {
+        File dataDir = new File(event.getWorld().getWorldFolder(), "mcmmo_data");
+        if (!dataDir.exists()) {
+            return;
+        }
+
+        if (mcMMO.p == null)
+            return;
+
+        mcMMO.p.getLogger().info("Converting block storage for " + event.getWorld().getName() + " to a new format.");
+        BlockStoreConversionMain converter = new BlockStoreConversionMain(event.getWorld());
+        converter.run();
+        converters.add(converter);
     }
 
     @EventHandler
@@ -25,13 +56,21 @@ public class WorldListener implements Listener {
         mcMMO.placeStore.unloadWorld(event.getWorld());
     }
 
-    @EventHandler
-    public void onWorldSave(WorldSaveEvent event) {
-        mcMMO.placeStore.saveWorld(event.getWorld());
-    }
+    // This gets called every 45 seconds, by default.
+    // The call can and does result in excessive lag, especially on larger servers.
+    //@EventHandler
+    //public void onWorldSave(WorldSaveEvent event) {
+    //    mcMMO.placeStore.saveWorld(event.getWorld());
+    //}
 
     @EventHandler
     public void onChunkUnload(ChunkUnloadEvent event) {
         mcMMO.placeStore.chunkUnloaded(event.getChunk().getX(), event.getChunk().getZ(), event.getWorld());
     }
+
+    @EventHandler
+    public void onChunkLoad(ChunkLoadEvent event) {
+        if (event.getChunk().getEntities().length > 0)
+            mcMMO.placeStore.loadChunk(event.getChunk().getX(), event.getChunk().getZ(), event.getWorld());
+    }
 }

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

@@ -75,6 +75,12 @@ public class LocaleLoader {
         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());
+        input = input.replaceAll("\\Q[[BOLD]]\\E", ChatColor.BOLD.toString());
+        input = input.replaceAll("\\Q[[UNDERLINE]]\\E", ChatColor.UNDERLINE.toString());
+        input = input.replaceAll("\\Q[[ITALIC]]\\E", ChatColor.ITALIC.toString());
+        input = input.replaceAll("\\Q[[STRIKE]]\\E", ChatColor.STRIKETHROUGH.toString());
+        input = input.replaceAll("\\Q[[MAGIC]]\\E", ChatColor.MAGIC.toString());
+        input = input.replaceAll("\\Q[[RESET]]\\E", ChatColor.RESET.toString());
 
         return input;
     }

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

@@ -9,12 +9,12 @@ import java.util.List;
 import net.shatteredlands.shatt.backup.ZipLibrary;
 
 import org.bukkit.OfflinePlayer;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
-
 import com.gmail.nossr50.commands.general.AddlevelsCommand;
 import com.gmail.nossr50.commands.general.AddxpCommand;
 import com.gmail.nossr50.commands.general.InspectCommand;
@@ -27,6 +27,8 @@ import com.gmail.nossr50.commands.mc.McabilityCommand;
 import com.gmail.nossr50.commands.mc.MccCommand;
 import com.gmail.nossr50.commands.mc.McgodCommand;
 import com.gmail.nossr50.commands.mc.McmmoCommand;
+import com.gmail.nossr50.commands.mc.McpurgeCommand;
+import com.gmail.nossr50.commands.mc.McrankCommand;
 import com.gmail.nossr50.commands.mc.McrefreshCommand;
 import com.gmail.nossr50.commands.mc.McremoveCommand;
 import com.gmail.nossr50.commands.mc.MctopCommand;
@@ -50,6 +52,7 @@ import com.gmail.nossr50.commands.skills.UnarmedCommand;
 import com.gmail.nossr50.commands.skills.WoodcuttingCommand;
 import com.gmail.nossr50.commands.spout.MchudCommand;
 import com.gmail.nossr50.commands.spout.XplockCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.config.TreasuresConfig;
@@ -66,23 +69,25 @@ import com.gmail.nossr50.listeners.WorldListener;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.runnables.ChunkletUnloader;
+import com.gmail.nossr50.runnables.MobStoreCleaner;
 import com.gmail.nossr50.runnables.SaveTimer;
 import com.gmail.nossr50.runnables.SkillMonitor;
 import com.gmail.nossr50.runnables.SpoutStart;
+import com.gmail.nossr50.runnables.UserPurgeTask;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.RepairManagerFactory;
 import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.util.Anniversary;
 import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Metrics;
 import com.gmail.nossr50.util.Metrics.Graph;
 import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.blockmeta.ChunkletManager;
-import com.gmail.nossr50.util.blockmeta.ChunkletManagerFactory;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
+
 
 public class mcMMO extends JavaPlugin {
-
     private final PlayerListener playerListener = new PlayerListener(this);
     private final BlockListener blockListener = new BlockListener(this);
     private final EntityListener entityListener = new EntityListener(this);
@@ -95,7 +100,7 @@ public class mcMMO extends JavaPlugin {
     private static Database database;
     public static mcMMO p;
 
-    public static ChunkletManager placeStore;
+    public static ChunkManager placeStore;
     public static RepairManager repairManager;
 
     /* Jar Stuff */
@@ -105,7 +110,6 @@ public class mcMMO extends JavaPlugin {
     private static String mainDirectory;
     private static String flatFileDirectory;
     private static String usersFile;
-    private static String leaderboardDirectory;
     private static String modDirectory;
 
     //Spout Check
@@ -123,6 +127,7 @@ public class mcMMO extends JavaPlugin {
         Config configInstance = Config.getInstance();
         TreasuresConfig.getInstance();
         HiddenConfig.getInstance();
+        AdvancedConfig.getInstance();
 
         List<Repairable> repairables = new ArrayList<Repairable>();
 
@@ -144,6 +149,11 @@ public class mcMMO extends JavaPlugin {
         repairManager = RepairManagerFactory.getRepairManager(repairables.size());
         repairManager.registerRepairables(repairables);
 
+        //Check if Repair Anvil and Salvage Anvil have different itemID's
+        if (configInstance.getSalvageAnvilId() == configInstance.getRepairAnvilId()) {
+            getLogger().warning("Can't use the same itemID for Repair/Salvage Anvils!");
+        }
+
         if (!configInstance.getUseMySQL()) {
             Users.loadUsers();
         }
@@ -162,20 +172,20 @@ public class mcMMO extends JavaPlugin {
 
         PluginDescriptionFile pdfFile = getDescription();
 
-        //Setup the leaderboards
+        //Setup the leader boards
         if (configInstance.getUseMySQL()) {
             database = new Database(this);
             database.createStructure();
         }
         else {
-            Leaderboard.makeLeaderboards();
+            Leaderboard.updateLeaderboards();
         }
 
         for (Player player : getServer().getOnlinePlayers()) {
             Users.addUser(player); //In case of reload add all users back into PlayerProfile
         }
 
-        System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!" );
+        getLogger().info("Version " + pdfFile.getVersion() + " is enabled!");
 
         BukkitScheduler scheduler = getServer().getScheduler();
 
@@ -187,8 +197,15 @@ public class mcMMO extends JavaPlugin {
         scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(this), 0, 20);
         //Bleed timer (Runs every two seconds)
         scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
-        //Chunklet unloader (Runs every 20 seconds by default)
-        scheduler.scheduleSyncRepeatingTask(this, new ChunkletUnloader(), 0, ChunkletUnloader.RUN_INTERVAL * 20);
+
+        //Old & Powerless User remover
+        int purgeInterval = Config.getInstance().getPurgeInterval();
+        if (purgeInterval == 0) {
+            scheduler.scheduleSyncDelayedTask(this, new UserPurgeTask(), 40); //Start 2 seconds after startup.
+        }
+        else if (purgeInterval > 0) {
+            scheduler.scheduleSyncRepeatingTask(this, new UserPurgeTask(), 0, purgeInterval * 60L * 60L * 20L);
+        }
 
         registerCommands();
 
@@ -223,7 +240,14 @@ public class mcMMO extends JavaPlugin {
         }
 
         // Get our ChunkletManager
-        placeStore = ChunkletManagerFactory.getChunkletManager();
+        placeStore = ChunkManagerFactory.getChunkManager();
+
+        // Automatically starts and stores itself
+        new MobStoreCleaner();
+
+        // Create Anniversary files
+        Anniversary anniversary = new Anniversary();
+        anniversary.createAnniversaryFile();
     }
 
     /**
@@ -234,7 +258,6 @@ public class mcMMO extends JavaPlugin {
         mainDirectory = getDataFolder().getPath() + File.separator;
         flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
         usersFile = flatFileDirectory + "mcmmo.users";
-        leaderboardDirectory = flatFileDirectory + "Leaderboards" + File.separator;
         modDirectory = mainDirectory + "ModConfigs" + File.separator;
     }
 
@@ -293,8 +316,10 @@ public class mcMMO extends JavaPlugin {
         catch (IOException e) {
             getLogger().severe(e.toString());
         }
+        Anniversary anniversary = new Anniversary();
+        anniversary.saveAnniversaryFiles();
 
-        System.out.println("mcMMO was disabled."); //How informative!
+        getLogger().info("Was disabled."); //How informative!
     }
 
     /**
@@ -334,6 +359,9 @@ public class mcMMO extends JavaPlugin {
         Config configInstance = Config.getInstance();
 
         //mc* commands
+        if (configInstance.getCommandMCPurgeEnabled()) {
+            getCommand("mcpurge").setExecutor(new McpurgeCommand());
+        }
         if (configInstance.getCommandMCRemoveEnabled()) {
             getCommand("mcremove").setExecutor(new McremoveCommand(this));
         }
@@ -361,6 +389,10 @@ public class mcMMO extends JavaPlugin {
         if (configInstance.getCommandMCTopEnabled()) {
             getCommand("mctop").setExecutor(new MctopCommand());
         }
+        
+        if(configInstance.getCommandMCRankEnabled()) {
+        	getCommand("mcrank").setExecutor(new McrankCommand());
+        }
 
         if (configInstance.getCommandMCStatsEnabled()) {
             getCommand("mcstats").setExecutor(new McstatsCommand());
@@ -497,10 +529,6 @@ public class mcMMO extends JavaPlugin {
         return usersFile;
     }
 
-    public static String getLeaderboardDirectory() {
-        return leaderboardDirectory;
-    }
-
     public static String getModDirectory() {
         return modDirectory;
     }

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

@@ -224,7 +224,7 @@ public class PartyManager {
 
             parties.add(party);
         }
-        else if (!checkJoinability(player, playerProfile, party, password)) {
+        else if (!checkJoinability(player, party, password)) {
             return;
         }
 
@@ -241,23 +241,23 @@ public class PartyManager {
      * @param password The password provided by the player
      * @return true if the player can join the party
      */
-    private boolean checkJoinability(Player player, PlayerProfile playerProfile, Party party, String password) {
+    public boolean checkJoinability(Player player, Party party, String password) {
         //Don't care about passwords if it isn't locked
         if (party.isLocked()) {
             String partyPassword = party.getPassword();
 
             if (partyPassword != null) {
                 if (password == null) {
-                    player.sendMessage("This party requires a password. Use /party <party> <password> to join it."); //TODO: Needs more locale.
+                    player.sendMessage(LocaleLoader.getString("Party.Help.1"));
                     return false;
                 }
                 else if (!password.equals(partyPassword)) {
-                    player.sendMessage("Party password incorrect."); //TODO: Needs more locale.
+                    player.sendMessage(LocaleLoader.getString("Party.Password.Incorrect"));
                     return false;
                 }
             }
             else {
-                player.sendMessage("Party is locked."); //TODO: Needs more locale.
+                player.sendMessage(LocaleLoader.getString("Party.Locked"));
                 return false;
             }
         }
@@ -323,13 +323,13 @@ public class PartyManager {
 
         for (Player member : party.getOnlineMembers()) {
             if (member.getName().equals(playerName)) {
-                member.sendMessage("You are now the party owner."); //TODO: Needs more locale.
+                member.sendMessage(LocaleLoader.getString("Party.Owner.Player"));
             }
             else if (member.equals(leaderName)) {
-                member.sendMessage("You are no longer party owner."); //TODO: Needs more locale.
+                member.sendMessage(LocaleLoader.getString("Party.Owner.NotLeader"));
             }
             else {
-                member.sendMessage(playerName + " is the new party owner."); //TODO: Needs more Locale.
+                member.sendMessage(LocaleLoader.getString("Party.Owner.New", new Object[] {playerName}));
             }
         }
 
@@ -374,7 +374,7 @@ public class PartyManager {
      */
     private void loadParties() {
         File file = new File(partiesFilePath);
-        
+
         if (!file.exists()) {
             return;
         }

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

@@ -91,7 +91,7 @@ public class BleedTimer implements Runnable {
         if (bleedList.containsKey(entity)) {
             Combat.dealDamage(entity, bleedList.get(entity) * 2);
             bleedList.remove(entity);
-       }
+        }
     }
 
     /**

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

@@ -1,58 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.Chunk;
-import org.bukkit.World;
-
-import com.gmail.nossr50.mcMMO;
-
-public class ChunkletUnloader implements Runnable {
-    private static Map<Chunk, Integer> unloadedChunks = new HashMap<Chunk, Integer>();
-    private static int minimumInactiveTime = 60; //Should be a multiple of RUN_INTERVAL for best performance
-    public static final int RUN_INTERVAL = 20;
-
-    public static void addToList(Chunk chunk) {
-        //Unfortunately we can't use Map.contains() because Chunks are always new objects
-        //This method isn't efficient enough for me
-        for (Chunk otherChunk : unloadedChunks.keySet()) {
-            if (chunk.getX() == otherChunk.getX() && chunk.getZ() == otherChunk.getZ()) {
-                return;
-            }
-        }
-
-        unloadedChunks.put(chunk, 0);
-    }
-
-    public static void addToList(int cx, int cz, World world) {
-        addToList(world.getChunkAt(cx, cz));
-    }
-
-    @Override
-    public void run() {
-        for (Iterator<Entry<Chunk, Integer>> it = unloadedChunks.entrySet().iterator() ; it.hasNext() ; ) {
-            Entry<Chunk, Integer> entry = it.next();
-            Chunk chunk = entry.getKey();
-
-            if (!chunk.isLoaded()) {
-                int inactiveTime = entry.getValue() + RUN_INTERVAL;
-
-                //Chunklets are unloaded only if their chunk has been unloaded for minimumInactiveTime
-                if (inactiveTime >= minimumInactiveTime) {
-                    mcMMO.placeStore.unloadChunk(chunk.getX(), chunk.getZ(), chunk.getWorld());
-                    it.remove();
-                    continue;
-                }
-
-                unloadedChunks.put(entry.getKey(), inactiveTime);
-            }
-            else {
-                //Just remove the entry if the chunk has been reloaded.
-                it.remove();
-            }
-        }
-    }
-}

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

@@ -4,40 +4,92 @@ import org.bukkit.CropState;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 
 public class GreenThumbTimer implements Runnable {
+    AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
     private Block block;
     private PlayerProfile profile;
+    private Material type;
 
-    public GreenThumbTimer(Block block, PlayerProfile profile) {
+    public GreenThumbTimer(Block block, PlayerProfile profile, Material material) {
         this.block = block;
         this.profile = profile;
+        this.type = material;
     }
 
     @Override
     public void run() {
-        block.setType(Material.CROPS);
+        if (this.block.getType() != this.type)
+            this.block.setType(this.type);
 
-        //This replants the wheat at a certain stage in development based on Herbalism Skill
-        if (!profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
-            if (profile.getSkillLevel(SkillType.HERBALISM) >= 600) {
-                block.setData(CropState.MEDIUM.getData());
-            }
-            else if (profile.getSkillLevel(SkillType.HERBALISM) >= 400) {
-                block.setData(CropState.SMALL.getData());
-            }
-            else if (profile.getSkillLevel(SkillType.HERBALISM) >= 200) {
-                block.setData(CropState.VERY_SMALL.getData());
+        int skillLevel = this.profile.getSkillLevel(SkillType.HERBALISM);
+
+    	final int STAGE_CHANGE = advancedConfig.getGreenThumbStageChange();
+
+        int greenThumbStage = (int) ((double) skillLevel / (double) STAGE_CHANGE);
+        if (greenThumbStage > 4) greenThumbStage = 4;
+
+        switch(this.type) {
+        case CROPS:
+        case CARROT:
+        case POTATO:
+            //This replants the wheat at a certain stage in development based on Herbalism Skill
+            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
+                if (greenThumbStage == 3) {
+                    this.block.setData(CropState.MEDIUM.getData());
+                }
+                else if (greenThumbStage == 2) {
+                    this.block.setData(CropState.SMALL.getData());
+                }
+                else if (greenThumbStage == 1) {
+                    this.block.setData(CropState.VERY_SMALL.getData());
+                }
+                else {
+                    this.block.setData(CropState.GERMINATED.getData());
+                }
             }
             else {
-                block.setData(CropState.GERMINATED.getData());
+                this.block.setData(CropState.MEDIUM.getData());
             }
-        }
-        else {
-            block.setData(CropState.MEDIUM.getData());
+            break;
+        case NETHER_WARTS:
+            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
+                if (greenThumbStage == 3) {
+                    this.block.setData((byte) 2);
+                }
+                else if (greenThumbStage == 2) {
+                    this.block.setData((byte) 1);
+                }
+                else {
+                    this.block.setData((byte) 0);
+                }
+            }
+            else {
+                this.block.setData((byte) 2);
+            }
+            break;
+        case COCOA:
+            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
+                if (greenThumbStage == 3) {
+                    this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+                }
+                else if (greenThumbStage == 2) {
+                    this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+                }
+                else {
+                    this.block.setData((byte) (this.block.getData() ^ ((byte) 0xc)));
+                }
+            }
+            else {
+                this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+            }
+            break;
+        default:
+            break;
         }
     }
 }

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

@@ -0,0 +1,55 @@
+package com.gmail.nossr50.runnables;
+
+import java.util.Map;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.util.Skills;
+
+public class McRankAsync implements Runnable {
+    private Database database = mcMMO.getPlayerDatabase();
+    private final String playerName;
+    private final CommandSender sender;
+
+    public McRankAsync(String playerName, CommandSender sender) {
+        this.playerName = playerName;
+        this.sender = sender;
+    }
+
+    @Override
+    public void run() {
+        final Map<String, Integer> skills = database.readSQLRank(playerName);
+        Bukkit.getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new Runnable() {
+
+            @Override
+            public void run() {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName}));
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.equals(SkillType.ALL))
+                        continue; // We want the overall ranking to be at the bottom
+
+                    if (skills.get(skillType.name()) == null) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} ));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {Skills.localizeSkillName(skillType), skills.get(skillType.name())} ));
+                    }
+                }
+
+                if (skills.get("ALL") == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} ));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {skills.get("ALL")} ));
+                }
+            }
+
+        }, 1L);
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.gmail.nossr50.runnables;
+
+import java.lang.Runnable;
+
+import org.bukkit.Bukkit;
+import org.bukkit.scheduler.BukkitScheduler;
+
+import com.gmail.nossr50.mcMMO;
+
+public class MobStoreCleaner implements Runnable
+{
+    private int taskID;
+
+    public MobStoreCleaner()
+    {
+        taskID = -1;
+        start();
+    }
+
+    public void start()
+    {
+        if (taskID >= 0)
+            return;
+
+        BukkitScheduler scheduler = Bukkit.getServer().getScheduler();
+        taskID = scheduler.scheduleSyncRepeatingTask(mcMMO.p, this, 12000, 12000);
+    }
+
+    public void stop()
+    {
+        if(taskID < 0)
+            return;
+
+        Bukkit.getServer().getScheduler().cancelTask(taskID);
+        taskID = -1;
+    }
+
+    public void run()
+    {
+        mcMMO.placeStore.cleanMobLists();
+    }
+}

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

@@ -221,9 +221,9 @@ public class SQLConversionTask implements Runnable {
                             + playerName + "',"
                             + System.currentTimeMillis() / 1000 + ")");
                     id = database.getInt("SELECT id FROM "
-                                    + tablePrefix
-                                    + "users WHERE user = '"
-                                    + playerName + "'");
+                            + tablePrefix
+                            + "users WHERE user = '"
+                            + playerName + "'");
                     database.write("INSERT INTO "
                             + tablePrefix
                             + "skills (user_id) VALUES (" + id + ")");
@@ -275,7 +275,7 @@ public class SQLConversionTask implements Runnable {
                 }
             }
 
-            System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB"); //TODO: Locale
+            System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB");
             in.close();
         }
         catch (Exception e) {

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

@@ -15,15 +15,12 @@ public class SQLReconnect implements Runnable {
 
     @Override
     public void run() {
-        if (!Database.isConnected()) {
-            Database.connect();
-            if (Database.isConnected()) {
-                Users.saveAll(); //Save all profiles
-                Users.clearAll(); //Clear the profiles
+        if (Database.checkConnected()) {
+            Users.saveAll(); //Save all profiles
+            Users.clearAll(); //Clear the profiles
 
-                for (Player player : plugin.getServer().getOnlinePlayers()) {
-                    Users.addUser(player); //Add in new profiles, forcing them to 'load' again from MySQL
-                }
+            for (Player player : plugin.getServer().getOnlinePlayers()) {
+                Users.addUser(player); //Add in new profiles, forcing them to 'load' again from MySQL
             }
         }
     }

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

@@ -0,0 +1,27 @@
+package com.gmail.nossr50.runnables;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.Database;
+
+public class UserPurgeTask implements Runnable {
+    private Database database = mcMMO.getPlayerDatabase();
+
+    public UserPurgeTask() {
+        
+    }
+
+    @Override
+    public void run() {
+        if (Config.getInstance().getUseMySQL()) {
+            database.purgePowerlessSQL();
+
+            if (Config.getInstance().getOldUsersCutoff() != -1) {
+                database.purgeOldSQL();
+            }
+        }
+        else {
+            //TODO: Make this work for Flatfile data.
+        }
+    }
+}

src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionMain.java

@@ -0,0 +1,91 @@
+package com.gmail.nossr50.runnables.blockstoreconversion;
+
+import java.io.File;
+import java.lang.Runnable;
+
+import org.bukkit.scheduler.BukkitScheduler;
+
+import com.gmail.nossr50.config.HiddenConfig;
+import com.gmail.nossr50.mcMMO;
+
+public class BlockStoreConversionMain implements Runnable {
+    private int taskID, i;
+    private org.bukkit.World world;
+    BukkitScheduler scheduler;
+    File dataDir;
+    File[] xDirs;
+    BlockStoreConversionXDirectory[] converters;
+
+    public BlockStoreConversionMain(org.bukkit.World world) {
+        this.taskID = -1;
+        this.world = world;
+        this.scheduler = mcMMO.p.getServer().getScheduler();
+        this.dataDir = new File(this.world.getWorldFolder(), "mcmmo_data");
+        this.converters = new BlockStoreConversionXDirectory[HiddenConfig.getInstance().getConversionRate()];
+    }
+
+    public void start() {
+        if (this.taskID >= 0)
+            return;
+
+        this.taskID = this.scheduler.scheduleSyncDelayedTask(mcMMO.p, this, 1);
+        return;
+    }
+
+    @Override
+    public void run() {
+        if (!this.dataDir.exists()) {
+            softStop();
+            return;
+        }
+
+        if (!this.dataDir.isDirectory()) {
+            this.dataDir.delete();
+            softStop();
+            return;
+        }
+
+        if (this.dataDir.listFiles().length <= 0) {
+            this.dataDir.delete();
+            softStop();
+            return;
+        }
+
+        this.xDirs = this.dataDir.listFiles();
+
+        for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.xDirs.length); this.i++) {
+            if (this.converters[this.i] == null)
+                this.converters[this.i] = new BlockStoreConversionXDirectory();
+
+            this.converters[this.i].start(this.world, this.xDirs[this.i]);
+        }
+
+        softStop();
+    }
+
+    public void stop() {
+        if (this.taskID < 0)
+            return;
+
+        this.scheduler.cancelTask(this.taskID);
+        this.taskID = -1;
+    }
+
+    public void softStop() {
+        stop();
+
+        if (this.dataDir.exists() || this.dataDir.isDirectory()) {
+            start();
+            return;
+        }
+
+        mcMMO.p.getLogger().info("Finished converting the storage for " + world.getName() + ".");
+
+        this.dataDir = null;
+        this.xDirs = null;
+        this.world = null;
+        this.scheduler = null;
+        this.converters = null;
+        return;
+    }
+}

src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionXDirectory.java

@@ -0,0 +1,80 @@
+package com.gmail.nossr50.runnables.blockstoreconversion;
+
+import java.io.File;
+import java.lang.Runnable;
+
+import org.bukkit.scheduler.BukkitScheduler;
+
+import com.gmail.nossr50.config.HiddenConfig;
+import com.gmail.nossr50.mcMMO;
+
+public class BlockStoreConversionXDirectory implements Runnable {
+    private int taskID, i;
+    private org.bukkit.World world;
+    BukkitScheduler scheduler;
+    File dataDir;
+    File[] zDirs;
+    BlockStoreConversionZDirectory[] converters;
+
+    public BlockStoreConversionXDirectory() {
+        this.taskID = -1;
+    }
+
+    public void start(org.bukkit.World world, File dataDir) {
+        this.world = world;
+        this.scheduler = mcMMO.p.getServer().getScheduler();
+        this.converters = new BlockStoreConversionZDirectory[HiddenConfig.getInstance().getConversionRate()];
+        this.dataDir = dataDir;
+
+        if (this.taskID >= 0)
+            return;
+
+        this.taskID = this.scheduler.scheduleSyncDelayedTask(mcMMO.p, this, 1);
+        return;
+    }
+
+    @Override
+    public void run() {
+        if (!this.dataDir.exists()) {
+            stop();
+            return;
+        }
+
+        if (!this.dataDir.isDirectory()) {
+            this.dataDir.delete();
+            stop();
+            return;
+        }
+
+        if (this.dataDir.listFiles().length <= 0) {
+            this.dataDir.delete();
+            stop();
+            return;
+        }
+
+        this.zDirs = this.dataDir.listFiles();
+
+        for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
+            if (this.converters[this.i] == null)
+                this.converters[this.i] = new BlockStoreConversionZDirectory();
+
+            this.converters[this.i].start(this.world, this.dataDir, this.zDirs[this.i]);
+        }
+
+        stop();
+    }
+
+    public void stop() {
+        if (this.taskID < 0)
+            return;
+
+        this.scheduler.cancelTask(this.taskID);
+        this.taskID = -1;
+
+        this.dataDir = null;
+        this.zDirs = null;
+        this.world = null;
+        this.scheduler = null;
+        this.converters = null;
+    }
+}

src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionZDirectory.java

@@ -0,0 +1,181 @@
+package com.gmail.nossr50.runnables.blockstoreconversion;
+
+import java.io.File;
+import java.lang.Runnable;
+import java.lang.String;
+
+import org.bukkit.scheduler.BukkitScheduler;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.blockmeta.ChunkletStore;
+import com.gmail.nossr50.util.blockmeta.PrimitiveChunkletStore;
+import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore;
+import com.gmail.nossr50.util.blockmeta.HashChunkletManager;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.HashChunkManager;
+
+public class BlockStoreConversionZDirectory implements Runnable {
+    public int taskID, cx, cz, x, y, z, y2, xPos, zPos, cxPos, czPos;
+    private String cxs, czs, chunkletName, chunkName;
+    private org.bukkit.World world;
+    private BukkitScheduler scheduler;
+    private File xDir, dataDir;
+    private HashChunkletManager manager;
+    private HashChunkManager newManager;
+    private ChunkletStore tempChunklet;
+    private PrimitiveChunkletStore primitiveChunklet = null;
+    private PrimitiveExChunkletStore primitiveExChunklet = null;
+    private PrimitiveChunkStore currentChunk;
+    private boolean[] oldArray, newArray;
+
+    public BlockStoreConversionZDirectory() {
+        this.taskID = -1;
+    }
+
+    public void start(org.bukkit.World world, File xDir, File dataDir) {
+        this.world = world;
+        this.scheduler = mcMMO.p.getServer().getScheduler();
+        this.manager = new HashChunkletManager();
+        this.newManager = (HashChunkManager) mcMMO.placeStore;
+        this.dataDir = dataDir;
+        this.xDir = xDir;
+
+        if (this.taskID >= 0)
+            return;
+
+        this.taskID = this.scheduler.scheduleSyncDelayedTask(mcMMO.p, this, 1);
+        return;
+    }
+
+    @Override
+    public void run() {
+        if (!this.dataDir.exists()) {
+            stop();
+            return;
+        }
+
+        if (!this.dataDir.isDirectory()) {
+            this.dataDir.delete();
+            stop();
+            return;
+        }
+
+        if (this.dataDir.listFiles().length <= 0) {
+            this.dataDir.delete();
+            stop();
+            return;
+        }
+
+        this.cxs = this.xDir.getName();
+        this.czs = this.dataDir.getName();
+        this.cx = 0;
+        this.cz = 0;
+
+        try {
+            this.cx = Integer.parseInt(this.cxs);
+            this.cz = Integer.parseInt(this.czs);
+        }
+        catch(Exception e) {
+            this.dataDir.delete();
+            stop();
+            return;
+        }
+
+        this.manager.loadChunk(this.cx, this.cz, this.world);
+
+        for (this.y = 0; this.y < (this.world.getMaxHeight() / 64); this.y++) {
+            this.chunkletName = this.world.getName() + "," + this.cx + "," + this.cz + "," + this.y;
+            this.tempChunklet = this.manager.store.get(this.chunkletName);
+
+            if (this.tempChunklet instanceof PrimitiveChunkletStore) {
+                this.primitiveChunklet = (PrimitiveChunkletStore) this.tempChunklet;
+            }
+            else if (this.tempChunklet instanceof PrimitiveExChunkletStore) {
+                this.primitiveExChunklet = (PrimitiveExChunkletStore) this.tempChunklet;
+            }
+
+            if (this.tempChunklet == null) {
+                continue;
+            }
+
+            this.chunkName = this.world.getName() + "," + this.cx + "," + this.cz;
+            this.currentChunk = (PrimitiveChunkStore) this.newManager.store.get(this.chunkName);
+
+            if (this.currentChunk != null) {
+                this.xPos = this.cx * 16;
+                this.zPos = this.cz * 16;
+
+                for (this.x = 0; this.x < 16; this.x++) {
+                    for (this.z = 0; this.z < 16; this.z++) {
+                        this.cxPos = this.xPos + this.x;
+                        this.czPos = this.zPos + this.z;
+
+                        for (this.y2 = (64 * this.y); this.y2 < (64 * this.y + 64); this.y2++) {
+                            try {
+                                if (!this.manager.isTrue(this.cxPos, this.y2, this.czPos, this.world))
+                                    continue;
+
+                                this.newManager.setTrue(this.cxPos, this.y2, this.czPos, this.world);
+                            }
+                            catch(Exception e) {}
+                        }
+                    }
+                }
+                continue;
+            }
+
+            this.newManager.setTrue(this.cx * 16, 0, this.cz * 16, this.world);
+            this.newManager.setFalse(this.cx * 16, 0, this.cz * 16, this.world);
+            this.currentChunk = (PrimitiveChunkStore) this.newManager.store.get(this.chunkName);
+
+            for (this.x = 0; this.x < 16; this.x++) {
+                for (this.z = 0; this.z < 16; this.z++) {
+                    if (this.primitiveChunklet != null)
+                        this.oldArray = this.primitiveChunklet.store[x][z];
+                    if (this.primitiveExChunklet != null)
+                        this.oldArray = this.primitiveExChunklet.store[x][z];
+                    else
+                        return;
+                    this.newArray = this.currentChunk.store[x][z];
+                    if (this.oldArray.length < 64)
+                        return;
+                    else if (this.newArray.length < ((this.y * 64) + 64))
+                        return;
+                    System.arraycopy(this.oldArray, 0, this.newArray, (this.y * 64), 64);
+                }
+            }
+        }
+
+        this.manager.unloadChunk(this.cx, this.cz, this.world);
+        this.newManager.unloadChunk(this.cx, this.cz, this.world);
+
+        for (File yFile : dataDir.listFiles()) {
+            if (!yFile.exists())
+                continue;
+
+            yFile.delete();
+        }
+
+        stop();
+    }
+
+    public void stop() {
+        if (this.taskID < 0)
+            return;
+
+        this.scheduler.cancelTask(taskID);
+        this.taskID = -1;
+
+        this.cxs = null;
+        this.czs = null;
+        this.chunkletName = null;
+        this.chunkName = null;
+        this.manager = null;
+        this.xDir = null;
+        this.dataDir = null;
+        this.tempChunklet = null;
+        this.primitiveChunklet = null;
+        this.primitiveExChunklet = null;
+        this.currentChunk = null;
+    }
+}

src/main/java/com/gmail/nossr50/skills/SkillManager.java

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.skills;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Users;
+
+public abstract class SkillManager {
+    protected Player player;
+    protected PlayerProfile profile;
+    protected int skillLevel;
+
+    public SkillManager(Player player, SkillType skill) {
+        this.player = player;
+        this.profile = Users.getProfile(player);
+        this.skillLevel = profile.getSkillLevel(skill);
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public PlayerProfile getProfile() {
+        return profile;
+    }
+
+    public int getSkillLevel() {
+        return skillLevel;
+    }
+}

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

@@ -1,18 +1,17 @@
 package com.gmail.nossr50.skills.acrobatics;
 
-import java.util.Random;
+import com.gmail.nossr50.config.AdvancedConfig;
 
 public class Acrobatics {
-    public static final int DODGE_MAX_BONUS_LEVEL = 800;
-    public static final int DODGE_XP_MODIFIER = 120;
+    public static double dodgeMaxChance = AdvancedConfig.getInstance().getDodgeChanceMax();
+    public static int dodgeMaxBonusLevel = AdvancedConfig.getInstance().getDodgeMaxBonusLevel();
+    public static int dodgeXpModifier = AdvancedConfig.getInstance().getDodgeXPModifier();
 
-    public static final int FALL_XP_MODIFIER = 120;
-    public static final int ROLL_MAX_BONUS_LEVEL = 1000;
-    public static final int ROLL_XP_MODIFIER = 80;
+    public static double rollMaxChance = AdvancedConfig.getInstance().getRollChanceMax();
+    public static int rollMaxBonusLevel = AdvancedConfig.getInstance().getRollMaxBonusLevel();
+    public static double gracefulRollMaxChance = AdvancedConfig.getInstance().getGracefulRollChanceMax();
+    public static int gracefulRollMaxBonusLevel = AdvancedConfig.getInstance().getGracefulRollMaxBonusLevel();
 
-    private static Random random = new Random();
-
-    public static Random getRandom() {
-        return random;
-    }
+    public static int rollXpModifier = AdvancedConfig.getInstance().getRollXPModifier();
+    public static int fallXpModifier = AdvancedConfig.getInstance().getFallXPModifier();
 }

src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsEventHandler.java

@@ -3,6 +3,8 @@ package com.gmail.nossr50.skills.acrobatics;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 
+import com.gmail.nossr50.util.Misc;
+
 public abstract class AcrobaticsEventHandler {
     protected AcrobaticsManager manager;
     protected Player player;
@@ -51,11 +53,10 @@ public abstract class AcrobaticsEventHandler {
      * @return true if the damage is fatal, false otherwise
      */
     protected boolean isFatal(int damage) {
-        if (player.getHealth() - damage < 1) {
+        if (Misc.isNPC(player) || player.getHealth() - damage < 1) {
             return true;
         }
-        else {
-            return false;
-        }
+
+        return false;
     }
 }

src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

@@ -3,21 +3,15 @@ package com.gmail.nossr50.skills.acrobatics;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class AcrobaticsManager {
-    private Player player;
-    private PlayerProfile profile;
-    private int skillLevel;
-    private Permissions permissionInstance = Permissions.getInstance();
 
+public class AcrobaticsManager extends SkillManager {
     public AcrobaticsManager (Player player) {
-        this.player = player;
-        this.profile = Users.getProfile(player);
-        this.skillLevel = profile.getSkillLevel(SkillType.ACROBATICS);
+        super(player, SkillType.ACROBATICS);
     }
 
     /**
@@ -26,25 +20,37 @@ public class AcrobaticsManager {
      * @param event The event to check
      */
     public void rollCheck(EntityDamageEvent event) {
-        if (!permissionInstance.roll(player)) {
+        if (Misc.isNPC(player) || !Permissions.roll(player)) {
+            return;
+        }
+
+        if (Config.getInstance().getAcrobaticsAFKDisabled() && player.isInsideVehicle()) {
             return;
         }
 
         RollEventHandler eventHandler = new RollEventHandler(this, event);
 
-        int randomChance = 1000;
-
-        if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) {
-            randomChance = (int) (randomChance * 0.75);
+        int randomChance = 100;
+        if (Permissions.luckyAcrobatics(player)) {
+            randomChance = 75;
         }
 
-        if (Acrobatics.getRandom().nextInt(randomChance) <= eventHandler.skillModifier && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
+        double chance;
+
+        if (eventHandler.isGraceful) {
+            chance = (Acrobatics.gracefulRollMaxChance / Acrobatics.gracefulRollMaxBonusLevel) * eventHandler.skillModifier;
+        }
+        else {
+            chance = (Acrobatics.rollMaxChance / Acrobatics.rollMaxBonusLevel) * eventHandler.skillModifier;
+        }
+
+        if (chance > Misc.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
             eventHandler.modifyEventDamage();
             eventHandler.sendAbilityMessage();
-            eventHandler.processXPGain(eventHandler.damage * Acrobatics.ROLL_XP_MODIFIER);
+            eventHandler.processXPGain(eventHandler.damage * Acrobatics.rollXpModifier);
         }
         else if (!eventHandler.isFatal(event.getDamage())) {
-            eventHandler.processXPGain(eventHandler.damage * Acrobatics.FALL_XP_MODIFIER);
+            eventHandler.processXPGain(eventHandler.damage * Acrobatics.fallXpModifier);
         }
     }
 
@@ -54,34 +60,23 @@ public class AcrobaticsManager {
      * @param event The event to check
      */
     public void dodgeCheck(EntityDamageEvent event) {
-        if (!permissionInstance.dodge(player)) {
+        if (Misc.isNPC(player) || !Permissions.dodge(player)) {
             return;
         }
 
         DodgeEventHandler eventHandler = new DodgeEventHandler(this, event);
 
-        int randomChance = 4000;
-
-        if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) {
-            randomChance = (int) (randomChance * 0.75);
+        int randomChance = 100;
+        if (Permissions.luckyAcrobatics(player)) {
+            randomChance = 75;
         }
 
-        if (Acrobatics.getRandom().nextInt(randomChance) <= eventHandler.skillModifier && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
+        double chance = (Acrobatics.dodgeMaxChance / Acrobatics.dodgeMaxBonusLevel) * eventHandler.skillModifier;
+
+        if (chance > Misc.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) {
             eventHandler.modifyEventDamage();
             eventHandler.sendAbilityMessage();
-            eventHandler.processXPGain(eventHandler.damage * Acrobatics.DODGE_XP_MODIFIER);
+            eventHandler.processXPGain(eventHandler.damage * Acrobatics.dodgeXpModifier);
         }
     }
-
-    protected Player getPlayer() {
-        return player;
-    }
-
-    protected PlayerProfile getProfile() {
-        return profile;
-    }
-
-    protected int getSkillLevel() {
-        return skillLevel;
-    }
 }

src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java

@@ -18,7 +18,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {
 
     @Override
     protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Acrobatics.DODGE_MAX_BONUS_LEVEL);
+        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Acrobatics.dodgeMaxBonusLevel);
     }
 
     @Override
@@ -46,7 +46,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {
     protected void processXPGain(int xp) {
         PlayerProfile profile = manager.getProfile();
 
-        if (System.currentTimeMillis() >= profile.getRespawnATS() + 5) {
+        if (System.currentTimeMillis() >= profile.getRespawnATS() + Misc.PLAYER_RESPAWN_COOLDOWN_SECONDS) {
             Skills.xpProcessing(player, profile, SkillType.ACROBATICS, xp);
         }
     }

src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java

@@ -9,7 +9,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 
 public class RollEventHandler extends AcrobaticsEventHandler {
-    private boolean isGraceful;
+    protected boolean isGraceful;
     private int damageThreshold;
 
     protected RollEventHandler(AcrobaticsManager manager, EntityDamageEvent event) {
@@ -29,7 +29,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
             skillModifer = skillModifer * 2;
         }
 
-        skillModifer = Misc.skillCheck(skillModifer, Acrobatics.ROLL_MAX_BONUS_LEVEL);
+        skillModifer = Misc.skillCheck(skillModifer, Acrobatics.rollMaxBonusLevel);
         this.skillModifier = skillModifer;
     }
 
@@ -74,7 +74,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
      * Check if this is a graceful roll.
      */
     private void isGracefulRoll() {
-        if (Permissions.getInstance().gracefulRoll(player)) {
+        if (Permissions.gracefulRoll(player)) {
             this.isGraceful = player.isSneaking();
         }
         else {

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

@@ -3,37 +3,37 @@ package com.gmail.nossr50.skills.archery;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Random;
 
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.util.Misc;
 
 public class Archery {
-    private static Random random = new Random();
     private static List<TrackedEntity> trackedEntities = new ArrayList<TrackedEntity>();
 
-    public static final int ARROW_TRACKING_MAX_BONUS_LEVEL = 1000;
+    public static int retrieveMaxBonusLevel = AdvancedConfig.getInstance().getRetrieveMaxBonusLevel();
+    public static double retrieveMaxChance = AdvancedConfig.getInstance().getRetrieveChanceMax();
 
-    public static final int BONUS_DAMAGE_INCREASE_LEVEL = 50;
-    public static final double BONUS_DAMAGE_INCREASE_PERCENT = 0.1D;
-    public static final double BONUS_DAMAGE_MAX_BONUS_PERCENTAGE = 2.0D;
+    public static int skillShotIncreaseLevel = AdvancedConfig.getInstance().getSkillShotIncreaseLevel();
+    public static double skillShotIncreasePercentage = AdvancedConfig.getInstance().getSkillShotIncreasePercentage();
+    public static double skillShotMaxBonusPercentage = AdvancedConfig.getInstance().getSkillShotBonusMax();
 
-    public static final int DAZE_MAX_BONUS_LEVEL = 1000;
-    public static final int DAZE_MODIFIER = 4;
+    public static int dazeMaxBonusLevel = AdvancedConfig.getInstance().getDazeMaxBonusLevel();
+    public static double dazeMaxBonus = AdvancedConfig.getInstance().getDazeBonusMax();
+    public static int dazeModifier = AdvancedConfig.getInstance().getDazeModifier();
 
     protected static void incrementTrackerValue(LivingEntity livingEntity) {
         for (TrackedEntity trackedEntity : trackedEntities) {
-            if (trackedEntity.getLivingEntity() == livingEntity) {
+            if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
                 trackedEntity.incrementArrowCount();
                 return;
             }
         }
 
-        //If the entity isn't tracked yet
-        addToTracker(livingEntity);
+        addToTracker(livingEntity); //If the entity isn't tracked yet
     }
 
     protected static void addToTracker(LivingEntity livingEntity) {
@@ -53,18 +53,14 @@ public class Archery {
      * @param entity The entity hit by the arrows
      */
     public static void arrowRetrievalCheck(LivingEntity livingEntity) {
-        for (Iterator<TrackedEntity> it = trackedEntities.iterator() ; it.hasNext() ; ) {
-            TrackedEntity trackedEntity = it.next();
+        for (Iterator<TrackedEntity> entityIterator = trackedEntities.iterator(); entityIterator.hasNext(); ) {
+            TrackedEntity trackedEntity = entityIterator.next();
 
-            if (trackedEntity.getLivingEntity() == livingEntity) {
+            if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
                 Misc.dropItems(livingEntity.getLocation(), new ItemStack(Material.ARROW), trackedEntity.getArrowCount());
-                it.remove();
+                entityIterator.remove();
                 return;
             }
         }
     }
-
-    protected static Random getRandom() {
-        return random;
-    }
 }

src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java

@@ -4,22 +4,14 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class ArcheryManager {
-    private Player player;
-    private PlayerProfile profile;
-    private int skillLevel;
-    private Permissions permissionsInstance;
 
+public class ArcheryManager extends SkillManager {
     public ArcheryManager (Player player) {
-        this.player = player;
-        this.profile = Users.getProfile(player);
-        this.skillLevel = profile.getSkillLevel(SkillType.ARCHERY);
-        this.permissionsInstance =  Permissions.getInstance();
+        super(player, SkillType.ARCHERY);
     }
 
     /**
@@ -28,19 +20,20 @@ public class ArcheryManager {
      * @param livingEntity Entity damaged by the arrow
      */
     public void trackArrows(LivingEntity livingEntity) {
-        if (!permissionsInstance.trackArrows(player)) {
+        if (Misc.isNPC(player) || !Permissions.trackArrows(player)) {
             return;
         }
 
         ArrowTrackingEventHandler eventHandler = new ArrowTrackingEventHandler(this, livingEntity);
 
-        int randomChance = 1000;
-
-        if (player.hasPermission("mcmmo.perks.lucky.archery")) {
-            randomChance = (int) (randomChance * 0.75);
+        int randomChance = 100;
+        if (Permissions.luckyArchery(player)) {
+            randomChance = 75;
         }
 
-        if (Archery.getRandom().nextInt(randomChance) < eventHandler.skillModifier) {
+        double chance = (Archery.retrieveMaxChance / Archery.retrieveMaxBonusLevel) * eventHandler.skillModifier;
+
+        if (chance > Misc.getRandom().nextInt(randomChance)) {
             eventHandler.addToTracker();
         }
     }
@@ -52,19 +45,20 @@ public class ArcheryManager {
      * @param event The event to modify
      */
     public void dazeCheck(Player defender, EntityDamageEvent event) {
-        if (!permissionsInstance.daze(player)) {
+        if (Misc.isNPC(player) || !Permissions.daze(player)) {
             return;
         }
 
         DazeEventHandler eventHandler = new DazeEventHandler(this, event, defender);
 
-        int randomChance = 2000;
-
-        if (player.hasPermission("mcmmo.perks.lucky.archery")) {
-            randomChance = (int) (randomChance * 0.75);
+        int randomChance = 100;
+        if (Permissions.luckyArchery(player)) {
+            randomChance = 75;
         }
 
-        if (Archery.getRandom().nextInt(randomChance) < eventHandler.skillModifier) {
+        double chance = (Archery.dazeMaxBonus / Archery.dazeMaxBonusLevel) * eventHandler.skillModifier;
+
+        if (chance > Misc.getRandom().nextInt(randomChance)) {
             eventHandler.handleDazeEffect();
             eventHandler.sendAbilityMessages();
         }
@@ -75,24 +69,16 @@ public class ArcheryManager {
      *
      * @param event The event to modify.
      */
-    public void bonusDamage(EntityDamageEvent event) {
-        if (!permissionsInstance.archeryBonus(player)) {
+    public void skillShot(EntityDamageEvent event) {
+        if (Misc.isNPC(player) || !Permissions.archeryBonus(player)) {
             return;
         }
 
-        if (skillLevel >= Archery.BONUS_DAMAGE_INCREASE_LEVEL) {
-            ArcheryBonusDamageEventHandler eventHandler = new ArcheryBonusDamageEventHandler(this, event);
+        if (skillLevel >= Archery.skillShotIncreaseLevel) {
+            SkillShotEventHandler eventHandler = new SkillShotEventHandler(this, event);
 
             eventHandler.calculateDamageBonus();
             eventHandler.modifyEventDamage();
         }
     }
-
-    protected int getSkillLevel() {
-        return skillLevel;
-    }
-
-    protected Player getPlayer() {
-        return player;
-    }
 }

src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java

@@ -18,7 +18,7 @@ public class ArrowTrackingEventHandler {
     }
 
     protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.ARROW_TRACKING_MAX_BONUS_LEVEL);
+        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.retrieveMaxBonusLevel);
     }
 
     protected void addToTracker() {

src/main/java/com/gmail/nossr50/skills/archery/DazeEventHandler.java

@@ -12,6 +12,8 @@ public class DazeEventHandler {
     private EntityDamageEvent event;
     private Player defender;
 
+    private final static int DAZE_CHANCE = 50;
+
     protected int skillModifier;
 
     protected DazeEventHandler (ArcheryManager manager, EntityDamageEvent event, Player defender) {
@@ -23,13 +25,13 @@ public class DazeEventHandler {
     }
 
     protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.DAZE_MAX_BONUS_LEVEL);
+        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.dazeMaxBonusLevel);
     }
 
     protected void handleDazeEffect() {
         Location location = defender.getLocation();
 
-        if (Archery.getRandom().nextInt(10) > 5) {
+        if (Misc.getRandom().nextInt(100) > DAZE_CHANCE) {
             location.setPitch(90);
         }
         else {
@@ -37,7 +39,7 @@ public class DazeEventHandler {
         }
 
         defender.teleport(location);
-        event.setDamage(event.getDamage() + Archery.DAZE_MODIFIER);
+        event.setDamage(event.getDamage() + Archery.dazeModifier);
     }
 
     protected void sendAbilityMessages() {

src/main/java/com/gmail/nossr50/skills/archery/SkillShotEventHandler.java

@@ -2,25 +2,23 @@ package com.gmail.nossr50.skills.archery;
 
 import org.bukkit.event.entity.EntityDamageEvent;
 
-public class ArcheryBonusDamageEventHandler {
+public class SkillShotEventHandler {
     private ArcheryManager manager;
     private EntityDamageEvent event;
 
     protected double damageBonusPercent;
 
-    protected ArcheryBonusDamageEventHandler(ArcheryManager manager, EntityDamageEvent event) {
+    protected SkillShotEventHandler(ArcheryManager manager, EntityDamageEvent event) {
         this.manager = manager;
         this.event = event;
     }
 
     protected void calculateDamageBonus() {
-        double damageBonus = ((manager.getSkillLevel() / Archery.BONUS_DAMAGE_INCREASE_LEVEL) * Archery.BONUS_DAMAGE_INCREASE_PERCENT);
+        this.damageBonusPercent = ((manager.getSkillLevel() / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage);
 
-        if (damageBonus > Archery.BONUS_DAMAGE_MAX_BONUS_PERCENTAGE) {
-            damageBonus = Archery.BONUS_DAMAGE_MAX_BONUS_PERCENTAGE;
+        if (damageBonusPercent > Archery.skillShotMaxBonusPercentage) {
+            damageBonusPercent = Archery.skillShotMaxBonusPercentage;
         }
-
-        this.damageBonusPercent = damageBonus;
     }
 
     protected void modifyEventDamage() {

src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.archery;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.scheduler.BukkitScheduler;
 
 import com.gmail.nossr50.mcMMO;
 
@@ -10,15 +11,17 @@ public class TrackedEntity implements Runnable {
     private int arrowCount;
     private int previousTicksLived;
     private int taskId;
+    private BukkitScheduler scheduler;
 
-    public TrackedEntity(LivingEntity livingEntity) {
+    protected TrackedEntity(LivingEntity livingEntity) {
         this.livingEntity = livingEntity;
-        taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(mcMMO.p, this, 12000, 12000);
+        this.scheduler = Bukkit.getScheduler();
+        this.taskId = scheduler.scheduleSyncRepeatingTask(mcMMO.p, this, 12000, 12000);
     }
 
     //LivingEntity.isDead() isn't a reliable way to know if an entity is still active
     //This method must not be called more than once per server tick
-    public boolean isActive() {
+    private boolean isActive() {
         int currentTicksLived = livingEntity.getTicksLived();
 
         if (currentTicksLived == previousTicksLived) {
@@ -29,15 +32,15 @@ public class TrackedEntity implements Runnable {
         return true;
     }
 
-    public LivingEntity getLivingEntity() {
+    protected LivingEntity getLivingEntity() {
         return livingEntity;
     }
 
-    public int getArrowCount() {
+    protected int getArrowCount() {
         return arrowCount;
     }
 
-    public void incrementArrowCount() {
+    protected void incrementArrowCount() {
         arrowCount++;
     }
 
@@ -45,7 +48,7 @@ public class TrackedEntity implements Runnable {
     public void run() {
         if (!isActive()) {
             Archery.removeFromTracker(this);
-            Bukkit.getScheduler().cancelTask(taskId);
+            scheduler.cancelTask(taskId);
         }
     }
 }

src/main/java/com/gmail/nossr50/skills/axes/AxeBonusDamageEventHandler.java

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.skills.axes;
+
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class AxeBonusDamageEventHandler {
+    private int skillLevel;
+    private EntityDamageByEntityEvent event;
+    private int damageBonus;
+
+    public AxeBonusDamageEventHandler(AxeManager manager, EntityDamageByEntityEvent event) {
+        this.skillLevel = manager.getSkillLevel();
+        this.event = event;
+    }
+
+    protected void calculateDamageBonus() {
+        int increaseLevel = Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus;
+
+        /* Add 1 DMG for every 50 skill levels (default value) */
+        damageBonus = skillLevel / increaseLevel;
+
+        if (damageBonus > Axes.bonusDamageMaxBonus) {
+            damageBonus = Axes.bonusDamageMaxBonus;
+        }
+    }
+
+    protected void modifyEventDamage() {
+        int damage = event.getDamage();
+
+        event.setDamage(damage + damageBonus);
+    }
+}

src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java

@@ -0,0 +1,100 @@
+package com.gmail.nossr50.skills.axes;
+
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+import com.gmail.nossr50.datatypes.AbilityType;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+
+public class AxeManager extends SkillManager {
+    public AxeManager(Player player) {
+        super(player, SkillType.AXES);
+    }
+
+    /**
+     * Apply bonus to damage done by axes.
+     *
+     * @param event The event to modify
+     */
+    public void bonusDamage(EntityDamageByEntityEvent event) {
+        if (Misc.isNPC(player) || !Permissions.axeBonus(player)) {
+            return;
+        }
+
+        AxeBonusDamageEventHandler eventHandler = new AxeBonusDamageEventHandler(this, event);
+
+        eventHandler.calculateDamageBonus();
+        eventHandler.modifyEventDamage();
+    }
+
+    /**
+     * Check for critical chances on axe damage.
+     *
+     * @param event The event to modify
+     */
+    public void criticalHitCheck(EntityDamageByEntityEvent event) {
+        if (Misc.isNPC(player) || !Permissions.criticalHit(player)) {
+            return;
+        }
+
+        CriticalHitEventHandler eventHandler = new CriticalHitEventHandler(this, event);
+
+        if (eventHandler.defender instanceof Tameable && Misc.isFriendlyPet(player, (Tameable) eventHandler.defender)) {
+            return;
+        }
+
+        int randomChance = 100;
+        if (Permissions.luckyAxes(player)) {
+            randomChance = 75;
+        }
+
+        double chance = (Axes.criticalHitMaxChance / Axes.criticalHitMaxBonusLevel) * eventHandler.skillModifier;
+
+        if (chance > Misc.getRandom().nextInt(randomChance) && !eventHandler.defender.isDead()) {
+            eventHandler.modifyEventDamage();
+            eventHandler.sendAbilityMessages();
+        }
+    }
+
+    /**
+     * Check for Impact ability.
+     *
+     * @param event The event to modify
+     */
+    public void impact(EntityDamageByEntityEvent event) {
+        if (Misc.isNPC(player) || !Permissions.impact(player)) {
+            return;
+        }
+
+        ImpactEventHandler eventHandler = new ImpactEventHandler(this, event);
+
+        if (eventHandler.livingDefender == null) {
+            return;
+        }
+
+        if (!Misc.hasArmor(eventHandler.livingDefender)) {
+            eventHandler.damageArmor();
+        }
+        else {
+            eventHandler.applyGreaterImpact();
+        }
+    }
+
+    /**
+     * Check for Skull Splitter ability.
+     *
+     * @param event The event to process
+     */
+    public void skullSplitter(EntityDamageByEntityEvent event) {
+        if (Misc.isNPC(player) || !Permissions.skullSplitter(player) || !profile.getAbilityMode(AbilityType.SKULL_SPLIITER)) {
+            return;
+        }
+
+        SkullSplitterEventHandler eventHandler = new SkullSplitterEventHandler(this, event);
+        eventHandler.applyAbilityEffects();
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.gmail.nossr50.skills.axes;
+
+import com.gmail.nossr50.config.AdvancedConfig;
+
+public class Axes {
+    public static int bonusDamageMaxBonus = AdvancedConfig.getInstance().getBonusDamageAxesBonusMax();
+    public static int bonusDamageMaxBonusLevel = AdvancedConfig.getInstance().getBonusDamageAxesMaxBonusLevel();
+
+    public static int criticalHitMaxBonusLevel = AdvancedConfig.getInstance().getAxesCriticalMaxBonusLevel();
+    public static double criticalHitMaxChance = AdvancedConfig.getInstance().getAxesCriticalChance();
+    public static double criticalHitPVPModifier = AdvancedConfig.getInstance().getAxesCriticalPVPModifier();
+    public static double criticalHitPVEModifier = AdvancedConfig.getInstance().getAxesCriticalPVEModifier();
+
+    public static int impactIncreaseLevel = AdvancedConfig.getInstance().getArmorImpactIncreaseLevel();
+    public static double impactMaxDurabilityDamageModifier = AdvancedConfig.getInstance().getArmorImpactMaxDurabilityDamage() / 100D;
+
+    public static double greaterImpactChance = AdvancedConfig.getInstance().getGreaterImpactChance();
+    public static double greaterImpactKnockbackMultiplier = AdvancedConfig.getInstance().getGreaterImpactModifier();
+    public static int greaterImpactBonusDamage = AdvancedConfig.getInstance().getGreaterImpactBonusDamage();
+
+    public static int skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier();
+}