Spout support cleanup

Cleanup imports
Revert "Dropped SpoutPlugin support"
2026-02-18 17:53:00 +01:00 · 2014-02-15 16:37:06 +01:00 · 2014-02-15 16:13:40 +01:00 · 2014-02-15 16:13:38 +01:00
467 changed files with 3291 additions and 3511 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,41 +7,7 @@ Key:
  ! Change
  - Removal

-Version 1.5.01-dev
- + Added new child skill; Salvage
- + Added new feature to Herbalism. Instantly-regrown crops are protected from being broken for 1 second
- + Added option to config.yml to show the /mcstats scoreboard automatically after logging in
- + Added option to config.yml for Alchemy. Skills.Alchemy.Prevent_Hopper_Transfer_Bottles
- + Added support for `MATERIAL|data` format in treasures.yml
- + Added API to experience events to get XP gain reason
- + Added API to check if an entity is bleeding
- = Fixed bug where the Updater was running on the main thread.
- = Fixed bug when players would use /ptp without being in a party
- = Fixed bug where player didn't have a mcMMOPlayer object in AsyncPlayerChatEvent
- = Fixed bug where dodge would check the wrong player skill level
- = Fixed bug which causes /party teleport to stop working
- = Fixed bug where SaveTimerTask would produce an IndexOutOfBoundsException
- ! Changed player data saving. Save tasks are now asynchronous
- ! Vanished players no longer get hit by AoE effects
- ! Changed Alchemy config option 'Prevent_Hopper_Transfer' renamed to 'Prevent_Hopper_Transfer_Ingredients'
- ! Changed Alchemy XP distribution. XP is granted based on the stage of the potion.
- - Removed salvage ability from Repair, salvage has it's own (child) skill now
-
-Version 1.5.00
- + Added Podzol & Red Sand to Excavation
- + Added Hardened Clay, Stained Clay, and Packed Ice to Mining blocks
- + Added Acacia and Dark Oak to Woodcutting blocks
- + Added Salmon, Clownfish, and Pufferfish to Fishing XP
- + Added new flowers and grasses to Herbalism XP
- + Added option to config.yml which allows players to always catch fish, even when a treasure is found
- + Added option to config.yml to override vanilla Minecraft treasures
- ! Fishing XP now depends on the type of fish.
- ! Woodcutting XP in experience.yml and Woodcutting double drops in config.yml now use the tree species names. Oak is now Generic, and Spruce is now Redwood.
- ! Red_Rose was replaced by Poppy, and so the key in experience.yml has been updated accordingly.
- - Removed deprecated permission nodes
- - Removed "Treasure found!" message
-
-Version 1.4.08
+Version 1.4.08-dev
 + Added a new skill; Alchemy. Special thanks to EasyMFnE for creating this!
 + Added SecondaryAbilityType enum, and new SecondaryAbilityWeightedActivationCheckEvent, fired when a secondary ability checkes its activation chances
 + Added the possibility to gain experience when using Fishing "Shake"
@@ -55,13 +21,6 @@ Version 1.4.08
 + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
 + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
 + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
- + Added config options to configure the items used in "Call of the Wild"
- + Added config option to configure the database command cooldown
- = Fixed bug where healthbars wouldn't display if skills were disabled
- = Fixed bug with "Call of the Wild" entities despawning
- = Fixed bug with updating (very) old user data.
- = Fixed bug with checking maximum durability of mod items.
- = Fixed exploit involving Call of The Wild.
 = Fixed bug where LeafBlower permissions were ignored
 = Fixed bug with toggle commands not properly displaying the success message.
 = Fixed IllegalArgumentException caused by an empty Fishing treasure category
@@ -75,12 +34,9 @@ Version 1.4.08
 = Fixed bug where party chat broke if the display name contained special characters
 = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
 = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse
- = Fixed bug where some horses summoned with "Call of the Wild" were unable to jump
 = Fixed bug where the /ptp request expiration time was checked wrongly - preventing players from using the command
 = Fixed bug where Hylian Luck was broken
 = Fixed bug where Snow would never drop treasures
- = Fixed issues with commands giving away vanished players.
- = Fixed bug where the Repair lucky perk would increase the Arcane Forging downgrade chance, instead of decreasing it
 ! Changed party system. Parties now have XP and Levels. Party features such as party teleport and party chat have to be unlocked before they can be used by the party members
 ! Changed appearance of party member list. Gold = party leader, White = online, Gray = offline, Italic = not nearby
 ! Updated localization files
@@ -90,8 +46,6 @@ Version 1.4.08
 ! Changed /ptp config setting, Commands.ptp.Confirm_Required is now Commands.ptp.Accept.Required
 ! Changed config validation for UnlockLevels, they can now also be 0
 ! Changed config validation for Rank_Levels, successive Ranks can now be less than or equal to each other
- ! Changed default amount of XP gained from mining Quartz Ore. From 250 to 100 XP.
- ! Changed Acrobatics config setting, Skills.Acrobatics.Prevent_XP_After_Teleport is now Skills.Acrobatics.XP_After_Teleport_Cooldown
 - Removed /stats alias for /mcstats

 Version 1.4.07
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).

 ### Brief Description
-The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Additionally, when run in conjuction with SpoutPlugin, mcMMO also has a custom XP bar to allow for easy tracking of progress towards leveling up. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.

 ## About the Team

@@ -34,7 +34,7 @@ mcMMO is currently developed by a team of individuals from all over the world.

 ### Special thanks
 [![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
-(https://github.com/EasyMFnE)  
+(https://github.com/EasyMFnE)
 Added the Alchemy skill

 ## Compiling
@@ -47,5 +47,6 @@ Required Libraries:
 * JUnit
 * EMetrics
 * Bukkit
+* SpoutPlugin API

 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gmail.nossr50.mcMMO</groupId>
    <artifactId>mcMMO</artifactId>
-    <version>1.5.01-SNAPSHOT</version>
+    <version>1.4.08-SNAPSHOT</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -22,6 +22,38 @@
                    <include>.jenkins</include>
                </includes>
            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <includes>
+                    <include>xpbar*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <includes>
+                    <include>health*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/skillicon/</directory>
+                <includes>
+                    <include>*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/sound/</directory>
+                <includes>
+                    <include>*.wav</include>
+                </includes>
+            </resource>
            <resource>
                <targetPath>com/gmail/nossr50/locale</targetPath>
                <filtering>true</filtering>
@@ -112,6 +144,18 @@
            <id>md_5-releases</id>
            <url>http://repo.md-5.net/content/repositories/releases/</url>
        </repository>
+        <repository>
+            <id>sonatype-nexus-releases</id>
+            <url>https://oss.sonatype.org/content/repositories/releases</url>
+        </repository>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
        <repository>
            <id>Plugin MetricsExtension</id>
            <url>http://repo.turt2live.com</url>
@@ -121,10 +165,15 @@
        <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-            <version>LATEST</version>
+            <version>1.6.4-R2.0</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>org.spoutcraft</groupId>
+            <artifactId>spoutcraftplugin</artifactId>
+            <version>LATEST</version>
+        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit-dep</artifactId>
--- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
@@ -1,11 +1,9 @@
 package com.gmail.nossr50.api;

-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.util.player.UserManager;

 public final class AbilityAPI {
@@ -82,8 +80,4 @@ public final class AbilityAPI {
    public static void setTreeFellerCooldown(Player player, long cooldown) {
        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
    }
-
-    public static boolean isBleeding(LivingEntity entity) {
-        return BleedTimerTask.isBleeding(entity);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
@@ -7,12 +7,10 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
-import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;

@@ -45,7 +43,9 @@ public final class ExperienceAPI {
    public static boolean isNonChildSkill(String skillType) {
        SkillType skill = SkillType.getSkill(skillType);

-        return skill != null && !skill.isChildSkill();
+        if (skill == null) return false;
+
+        return !skill.isChildSkill();
    }

    @Deprecated
@@ -64,26 +64,8 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addRawXP(Player player, String skillType, float XP) {
-        addRawXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addRawXP(Player player, String skillType, float XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
    }

    @Deprecated
@@ -118,26 +100,8 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addMultipliedXP(Player player, String skillType, int XP) {
-        addMultipliedXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate only.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addMultipliedXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -167,28 +131,10 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addModifiedXP(Player player, String skillType, int XP) {
-        addModifiedXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifier.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason) {
        SkillType skill = getSkillType(skillType);

-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -221,27 +167,8 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addXP(Player player, String skillType, int XP) {
-        addXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
-     * and party sharing.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
    }

    /**
@@ -422,12 +349,12 @@ public final class ExperienceAPI {
                profile.addLevels(parentSkill, (levels / parentSkills.size()));
            }

-            profile.scheduleAsyncSave();
+            profile.save();
            return;
        }

        profile.addLevels(skill, levels);
-        profile.scheduleAsyncSave();
+        profile.save();
    }

    /**
@@ -656,7 +583,7 @@ public final class ExperienceAPI {
        PlayerProfile profile = getOfflineProfile(playerName);

        profile.addXp(skill, XP);
-        profile.scheduleAsyncSave();
+        profile.save();
    }

    private static PlayerProfile getOfflineProfile(String playerName) {
@@ -688,14 +615,4 @@ public final class ExperienceAPI {

        return skill;
    }
-
-    private static XPGainReason getXPGainReason(String reason) throws InvalidXPGainReasonException {
-        XPGainReason xpGainReason = XPGainReason.getXPGainReason(reason);
-
-        if (xpGainReason == null) {
-            throw new InvalidXPGainReasonException();
-        }
-
-        return xpGainReason;
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
@@ -176,7 +176,7 @@ public final class PartyAPI {
    }

    public static boolean hasAlly(String partyName) {
-        return getAllyName(partyName) != null;
+        return PartyManager.getParty(partyName).getAlly() != null;
    }

    public static String getAllyName(String partyName) {
--- a/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
@@ -0,0 +1,29 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SpoutHudAPI {
+    private SpoutHudAPI() {}
+
+    /**
+     * Disable the mcMMO XP bar for a player.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar(Player player) {
+        UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED);
+    }
+
+    /**
+     * Disable the mcMMO XP bar for the server.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar() {
+        SpoutConfig.getInstance().setXPBarEnabled(false);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
@@ -0,0 +1,79 @@
+package com.gmail.nossr50.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.skills.ToolType;
+
+public final class SpoutToolsAPI {
+    public static final List<ItemStack> spoutSwords   = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutAxes     = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutHoes     = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutShovels  = new ArrayList<ItemStack>();
+
+    private SpoutToolsAPI() {}
+
+    /**
+     * Add a custom Spout tool to mcMMO for XP gain & ability use.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param spoutTool The tool to add
+     * @param type The type of tool to add
+     */
+    public static void addCustomTool(ItemStack spoutTool, ToolType type) {
+        switch (type) {
+            case AXE:
+                spoutAxes.add(spoutTool);
+                break;
+
+            case HOE:
+                spoutHoes.add(spoutTool);
+                break;
+
+            case PICKAXE:
+                spoutPickaxes.add(spoutTool);
+                break;
+
+            case SHOVEL:
+                spoutShovels.add(spoutTool);
+                break;
+
+            case SWORD:
+                spoutSwords.add(spoutTool);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    public static boolean isSpoutTool(ItemStack spoutTool, ToolType type) {
+        return getSpoutTools(type) != null && getSpoutTools(type).contains(spoutTool);
+    }
+
+    private static List<ItemStack> getSpoutTools(ToolType type) {
+        switch (type) {
+            case AXE:
+                return spoutAxes;
+
+            case HOE:
+                return spoutHoes;
+
+            case PICKAXE:
+                return spoutPickaxes;
+
+            case SHOVEL:
+                return spoutShovels;
+
+            case SWORD:
+                return spoutSwords;
+
+            default:
+                return null;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java
+++ b/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java
@@ -1,9 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-public class InvalidXPGainReasonException extends RuntimeException {
-    private static final long serialVersionUID = 4427052841957931157L;
-
-    public InvalidXPGainReasonException() {
-        super("That is not a valid XPGainReason.");
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -57,7 +58,7 @@ public class KrakenCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
@@ -4,12 +4,14 @@ 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.party.PartySubcommandType;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.spout.SpoutUtils;

 public class McmmoCommand implements CommandExecutor {
    @Override
@@ -26,14 +28,16 @@ public class McmmoCommand implements CommandExecutor {
                sender.sendMessage(mcSplit);

                if (Config.getInstance().getDonateMessageEnabled()) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
-                }
-
-                if (Permissions.showversion(sender)) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                    if (mcMMO.isSpoutEnabled() && sender instanceof Player) {
+                        SpoutUtils.sendDonationNotification((Player) sender);
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                        sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                    }
                }

+                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
                mcMMO.getHolidayManager().anniversaryCheck(sender);
                return true;

--- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -61,7 +62,7 @@ public abstract class ToggleCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.database;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -22,7 +23,7 @@ public class McremoveCommand implements TabExecutor {
            case 1:
                String playerName = CommandUtils.getMatchedPlayerName(args[0]);

-                if (UserManager.getOfflinePlayer(playerName) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
                    return true;
                }

@@ -44,7 +45,7 @@ public class McremoveCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
@@ -5,7 +5,6 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
@@ -27,11 +26,11 @@ public class AddlevelsCommand extends ExperienceCommand {
        profile.addLevels(skill, value);

        if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
            return;
        }

-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
    }

    @Override
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
@@ -5,7 +5,6 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -24,11 +23,11 @@ public class AddxpCommand extends ExperienceCommand {
    @Override
    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
        if (player != null) {
-            UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND);
+            UserManager.getPlayer(player).applyXpGain(skill, value);
        }
        else {
            profile.addXp(skill, value);
-            profile.scheduleAsyncSave();
+            profile.save();
        }
    }

--- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -67,7 +68,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                int value = Integer.parseInt(args[2]);

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
@@ -95,7 +96,7 @@ public abstract class ExperienceCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            case 2:
                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
--- a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
@@ -5,7 +5,6 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
@@ -29,7 +28,7 @@ public class MmoeditCommand extends ExperienceCommand {
        profile.modifySkill(skill, value);

        if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
            return;
        }

@@ -37,7 +36,7 @@ public class MmoeditCommand extends ExperienceCommand {
            return;
        }

-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
    }

    @Override
--- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -13,7 +14,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
@@ -66,7 +66,7 @@ public class SkillresetCommand implements TabExecutor {
                }

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
@@ -94,7 +94,7 @@ public class SkillresetCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            case 2:
                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
@@ -110,11 +110,11 @@ public class SkillresetCommand implements TabExecutor {
        profile.modifySkill(skill, 0);

        if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
            return;
        }

-        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false, XPGainReason.COMMAND);
+        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
    }

    protected boolean permissionsCheckSelf(CommandSender sender) {
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -12,10 +13,10 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.chat.PartyChatCommand;
 import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -55,7 +56,7 @@ public class PartyCommand implements TabExecutor {
    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-    private CommandExecutor partyTeleportCommand       = new PtpCommand();
+    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
    private CommandExecutor partyChatCommand           = new PartyChatCommand();
    private CommandExecutor partyAllianceCommand       = new PartyAllianceCommand();

@@ -178,7 +179,7 @@ public class PartyCommand implements TabExecutor {
                    case INVITE:
                    case KICK:
                    case OWNER:
-                        List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                        Set<String> playerNames = UserManager.getPlayerNames();
                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                    case XPSHARE:
                        return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<String>(XPSHARE_COMPLETIONS.size()));
@@ -193,10 +194,7 @@ public class PartyCommand implements TabExecutor {
                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));

                        if (matches.size() == 0) {
-                            Player player = (Player) sender;
-                            Party party = UserManager.getPlayer(player).getParty();
-
-                            playerNames = party.getOnlinePlayerNames(player);
+                            playerNames = UserManager.getPlayerNames();
                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                        }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
@@ -18,7 +18,7 @@ public class PartyInviteCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);

                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                    return false;
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyKickCommand implements CommandExecutor {
@@ -20,15 +19,13 @@ public class PartyKickCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);

-                if (!playerParty.getMembers().contains(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                if (!playerParty.getMembers().contains(target.getName())) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
                    return true;
                }

-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
-
                if (target.isOnline()) {
                    Player onlineTarget = target.getPlayer();
                    String partyName = playerParty.getName();
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.party.alliance;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -110,7 +111,7 @@ public class PartyAllianceCommand implements TabExecutor {
                List<String> matches = StringUtil.copyPartialMatches(args[0], ALLIANCE_SUBCOMMANDS, new ArrayList<String>(ALLIANCE_SUBCOMMANDS.size()));

                if (matches.size() == 0) {
-                    List<String> playerNames = CommandUtils.getOnlinePlayerNames(commandSender);
+                    Set<String> playerNames = UserManager.getPlayerNames();
                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                }

--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
@@ -18,7 +18,7 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
        switch (args.length) {
            case 3:
                String targetName = CommandUtils.getMatchedPlayerName(args[2]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);

                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                    return false;
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.party.teleport;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -43,12 +44,6 @@ public class PtpCommand implements TabExecutor {

        Player player = (Player) sender;
        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (!mcMMOPlayer.inParty()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return true;
-        }
-
        Party party = mcMMOPlayer.getParty();

        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
@@ -114,14 +109,7 @@ public class PtpCommand implements TabExecutor {
                List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));

                if (matches.size() == 0) {
-                    Player player = (Player) sender;
-                    McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-                    if (!mcMMOPlayer.inParty()) {
-                        return ImmutableList.of();
-                    }
-
-                    List<String> playerNames = mcMMOPlayer.getParty().getOnlinePlayerNames(player);
+                    Set<String> playerNames = UserManager.getPlayerNames();
                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                }

--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,7 +29,7 @@ public class InspectCommand implements TabExecutor {
        switch (args.length) {
            case 1:
                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
@@ -103,7 +104,7 @@ public class InspectCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -14,6 +15,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -45,7 +47,7 @@ public class McrankCommand implements TabExecutor {
                }

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                if (mcMMOPlayer != null) {
                    Player player = mcMMOPlayer.getPlayer();
@@ -71,7 +73,7 @@ public class McrankCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
@@ -81,9 +83,8 @@ public class McrankCommand implements TabExecutor {
    private void display(CommandSender sender, String playerName) {
        if (sender instanceof Player) {
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);

-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                return;
            }
--- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -15,6 +15,7 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -84,9 +85,8 @@ public class MctopCommand implements TabExecutor {

        if (sender instanceof Player) {
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);

-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                return;
            }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
@@ -1,205 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-
-import com.google.common.collect.ImmutableList;
-
-public class AprilCommand implements TabExecutor {
-    private String skillName;
-
-    protected DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected DecimalFormat decimal = new DecimalFormat("##0.00");
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        skillName = StringUtils.getCapitalized(label);
-
-        switch (args.length) {
-            case 0:
-                Player player = (Player) sender;
-                FakeSkillType fakeSkillType = FakeSkillType.getByName(skillName);
-
-                float skillValue = Misc.getRandom().nextInt(99);
-
-                player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-                player.sendMessage(LocaleLoader.getString("Commands.XPGain", getXPGainString(fakeSkillType)));
-                player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, Misc.getRandom().nextInt(1000), 1000 + Misc.getRandom().nextInt(1000)));
-
-
-                List<String> effectMessages = effectsDisplay(fakeSkillType);
-
-                if (!effectMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-                    for (String message : effectMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                List<String> statsMessages = statsDisplay(fakeSkillType);
-
-                if (!statsMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-                    for (String message : statsMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                player.sendMessage(LocaleLoader.formatString("[[DARK_AQUA]]Guide for {0} available - type /APRIL FOOLS ! :D", skillName));
-                return true;
-
-            default:
-                return true;
-        }
-    }
-
-    private String getXPGainString(FakeSkillType fakeSkillType) {
-        switch (fakeSkillType) {
-            case MACHO:
-                return "Get beaten up";
-            case JUMPING:
-                return "Kris Kross will make ya Jump Jump";
-            case THROWING:
-                return "Chuck your items on the floor";
-            case WRECKING:
-                return "I'M GONNA WRECK IT!";
-            case CRAFTING:
-                return "Craft apple pies";
-            case WALKING:
-                return "Walk around the park";
-            case SWIMMING:
-                return "Like a fish on a bicycle";
-            case FALLING:
-                return "Faceplant the floor, headbutt the ground";
-            case CLIMBING:
-                return "Climb the highest mountain";
-            case FLYING:
-                return "I believe I can fly";
-            case DIVING:
-                return "Scuba club 4000";
-            case PIGGY:
-                return "OINK! OINK!";
-            default:
-                return "Sit and wait?";
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return ImmutableList.of("?");
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private List<String> effectsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.getString("Effects.Template", "Punching bag", "Absorb damage, like a bag of sand"));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump", "PRESS SPACE TO JUMP"));
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump Twice", "PRESS SPACE TWICE TO JUMP TWICE"));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Drop Item", "Randomly drop items, at random"));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Ralphinator", "Smash windows with your fists"));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Crafting", "Chance of successful craft"));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Walk", "Traveling gracefully by foot"));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Swim", "Just keep swimming, swimming, swimming"));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Skydiving", "Go jump of a cliff. No, seriously."));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Rock Climber", "Use string to climb mountains faster"));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Fly", "Throw yourself at the ground and miss"));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Hold Breath", "Press shift to hold your breath longer"));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.getString("Effects.Template", "Carrot Turbo", "Supercharge your pigs with carrots"));
-                break;
-        }
-
-        return messages;
-    }
-
-    private List<String> statsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.formatString("[[RED]]Damage Taken: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(77))));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.formatString("[[RED]]Double Jump Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.formatString("[[RED]]Drop Item Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(87))));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Wrecking Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(14))));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.formatString("[[RED]]Crafting Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Walk Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.formatString("[[RED]]Swim Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.formatString("[[RED]]Skydiving Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(37))));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.formatString("[[RED]]Rock Climber Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.formatString("[[RED]]Fly Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.formatString("[[RED]]Hold Breath Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.formatString("[[RED]]Carrot Turbo Boost: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(80)) + 10));
-                break;
-        }
-
-        return messages;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;

 import org.bukkit.Location;
+import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

@@ -50,6 +51,7 @@ public class FishingCommand extends SkillCommand {
    @Override
    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
+        boolean isStorming = player.getWorld().hasStorm();

        // TREASURE HUNTER
        if (canTreasureHunt) {
@@ -68,7 +70,7 @@ public class FishingCommand extends SkillCommand {
            double totalEnchantChance = 0;

            for (Rarity rarity : Rarity.values()) {
-                if (rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
+                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
                }
            }
@@ -90,14 +92,16 @@ public class FishingCommand extends SkillCommand {

        // MASTER ANGLER
        if (canMasterAngler) {
-            double rawBiteChance = 1.0 / (player.getWorld().hasStorm() ? 300 : 500);
+            double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
            Location location = fishingManager.getHookLocation();

            if (location == null) {
                location = player.getLocation();
            }

-            if (Fishing.masterAnglerBiomes.contains(location.getBlock().getBiome())) {
+            Biome biome = location.getBlock().getBiome();
+
+            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
            }

--- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
@@ -7,7 +7,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -27,6 +26,7 @@ public class RepairCommand extends SkillCommand {
    private boolean canSuperRepair;
    private boolean canMasterRepair;
    private boolean canArcaneForge;
+    private boolean canSalvage;
    private boolean canRepairStone;
    private boolean canRepairIron;
    private boolean canRepairGold;
@@ -77,13 +77,14 @@ public class RepairCommand extends SkillCommand {
        canSuperRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR);
        canMasterRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY);
        canArcaneForge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING);
-        canRepairDiamond = Permissions.repairMaterialType(player, MaterialType.DIAMOND);
-        canRepairGold = Permissions.repairMaterialType(player, MaterialType.GOLD);
-        canRepairIron = Permissions.repairMaterialType(player, MaterialType.IRON);
-        canRepairStone = Permissions.repairMaterialType(player, MaterialType.STONE);
-        canRepairString = Permissions.repairMaterialType(player, MaterialType.STRING);
-        canRepairLeather = Permissions.repairMaterialType(player, MaterialType.LEATHER);
-        canRepairWood = Permissions.repairMaterialType(player, MaterialType.WOOD);
+        canSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SALVAGE);
+        canRepairDiamond = Permissions.repairDiamond(player);
+        canRepairGold = Permissions.repairGold(player);
+        canRepairIron = Permissions.repairIron(player);
+        canRepairStone = Permissions.repairStone(player);
+        canRepairString = Permissions.repairString(player);
+        canRepairLeather = Permissions.repairLeather(player);
+        canRepairWood = Permissions.repairWood(player);
        arcaneBypass = Permissions.arcaneBypass(player);
    }

@@ -121,6 +122,10 @@ public class RepairCommand extends SkillCommand {
            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
        }

+        if (canSalvage && Repair.salvageUnlockLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+        }
+
        if (canArcaneForge) {
            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
        }
--- a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java
@@ -1,79 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.salvage.Salvage;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class SalvageCommand extends SkillCommand {
-    private boolean canAdvancedSalvage;
-    private boolean canArcaneSalvage;
-
-    public SalvageCommand() {
-        super(SkillType.SALVAGE);
-    }
-
-    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    protected void permissionsCheck(Player player) {
-        canAdvancedSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ADVANCED_SALVAGE);
-        canArcaneSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_SALVAGE);
-    }
-
-    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canAdvancedSalvage) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Salvage.Effect.0"), LocaleLoader.getString("Salvage.Effect.1")));
-        }
-
-        if (canArcaneSalvage) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Salvage.Effect.2"), LocaleLoader.getString("Salvage.Effect.3")));
-        }
-
-        return messages;
-    }
-
-    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
-        SalvageManager salvageManager = UserManager.getPlayer(player).getSalvageManager();
-
-        if (canAdvancedSalvage) {
-            if (skillValue < Salvage.advancedSalvageUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Salvage.Ability.Locked.0", Salvage.advancedSalvageUnlockLevel)));
-            }
-            else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Ability.Bonus.0"), LocaleLoader.getString("Salvage.Ability.Bonus.1", percent.format(salvageManager.getMaxSalvagePercentage()))));
-            }
-        }
-
-        if (canArcaneSalvage) {
-            messages.add(LocaleLoader.getString("Salvage.Arcane.Rank", salvageManager.getArcaneSalvageRank(), Salvage.Tier.values().length));
-
-            if (Salvage.arcaneSalvageEnchantLoss) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Arcane.ExtractFull"), percent.format(salvageManager.getExtractFullEnchantChance() / 100)));
-            }
-
-            if (Salvage.arcaneSalvageDowngrades) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Arcane.ExtractPartial"), percent.format(salvageManager.getExtractPartialEnchantChance() / 100)));
-            }
-        }
-
-        return messages;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
@@ -91,9 +91,9 @@ public class TamingCommand extends SkillCommand {

        if (canCallWild) {
            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWCost(EntityType.OCELOT)));
-            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWCost(EntityType.WOLF)));
-            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWCost(EntityType.HORSE)));
+            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
        }

        return messages;
--- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
@@ -57,7 +57,7 @@ public class UnarmedCommand extends SkillCommand {

        // IRON ARM
        if (canIronArm) {
-            ironArmBonus = Math.min(Unarmed.ironArmMinBonusDamage + ((int) skillValue / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage);
+            ironArmBonus = Math.min(3 + ((int) skillValue / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage);
        }

        // IRON GRIP
--- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
@@ -0,0 +1,58 @@
+package com.gmail.nossr50.commands.spout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+public class MchudCommand extends SpoutCommand {
+    private static final List<String> HUD_TYPES;
+
+    static {
+        ArrayList<String> types = new ArrayList<String>();
+
+        for (HudType type : HudType.values()) {
+            types.add(type.toString());
+        }
+
+        Collections.sort(types);
+        HUD_TYPES = ImmutableList.copyOf(types);
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], HUD_TYPES, new ArrayList<String>(HUD_TYPES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    @Override
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
+        return false;
+    }
+
+    @Override
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
+        try {
+            playerProfile.setHudType(HudType.valueOf(args[0].toUpperCase().trim()));
+            spoutHud.initializeXpBar();
+            spoutHud.updateXpBar();
+            return true;
+        }
+        catch (IllegalArgumentException ex) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java
@@ -0,0 +1,54 @@
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public abstract class SpoutCommand implements TabExecutor {
+    protected PlayerProfile playerProfile;
+    protected McMMOHud spoutHud;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!mcMMO.isSpoutEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        playerProfile = UserManager.getPlayer((Player) sender).getProfile();
+        spoutHud = playerProfile.getSpoutHud();
+
+        if (spoutHud == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                return noArguments(command, sender, args);
+
+            case 1:
+                return oneArgument(command, sender, args);
+
+            default:
+                return false;
+        }
+    }
+
+    protected abstract boolean noArguments(Command command, CommandSender sender, String[] args);
+
+    protected abstract boolean oneArgument(Command command, CommandSender sender, String[] args);
+}
--- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
@@ -0,0 +1,89 @@
+package com.gmail.nossr50.commands.spout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public class XplockCommand extends SpoutCommand {
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> matches = StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+
+                if (matches.size() == 0) {
+                    return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+                }
+
+                return matches;
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    @Override
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
+        if (spoutHud.getXpBarLocked()) {
+            unlockXpBar(sender);
+            return true;
+        }
+
+        lockXpBar(sender, spoutHud.getLastGained());
+        return true;
+    }
+
+    @Override
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
+        if (CommandUtils.shouldEnableToggle(args[0])) {
+            lockXpBar(sender, spoutHud.getLastGained());
+            return true;
+        }
+
+        if (CommandUtils.shouldDisableToggle(args[0])) {
+            unlockXpBar(sender);
+            return true;
+        }
+
+        if (CommandUtils.isInvalidSkill(sender, args[0])) {
+            return true;
+        }
+
+        SkillType skill = SkillType.getSkill(args[0]);
+
+        if (CommandUtils.isChildSkill(sender, skill)) {
+            return true;
+        }
+
+        if (!Permissions.xplock(sender, skill)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        lockXpBar(sender, skill);
+        return true;
+    }
+
+    private void lockXpBar(CommandSender sender, SkillType skill) {
+        if (skill != null) {
+            spoutHud.setXpBarLocked(true);
+            spoutHud.setSkillLock(skill);
+            spoutHud.updateXpBar();
+            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", skill.getName()));
+        }
+    }
+
+    private void unlockXpBar(CommandSender sender) {
+        spoutHud.setXpBarLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -10,7 +10,6 @@ import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.fishing.Fishing;
 import com.gmail.nossr50.skills.mining.BlastMining;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
-import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.smelting.Smelting;
 import com.gmail.nossr50.util.StringUtils;

@@ -379,6 +378,10 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
            reason.add("Skills.Repair.SuperRepair.MaxBonusLevel should be at least 1!");
        }

+        if (getSalvageUnlockLevel() < 0) {
+            reason.add("Skills.Repair.Salvage.UnlockLevel should be at least 0!");
+        }
+
        List<ArcaneForging.Tier> arcaneForgingTierList = Arrays.asList(ArcaneForging.Tier.values());

        for (ArcaneForging.Tier tier : arcaneForgingTierList) {
@@ -411,51 +414,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
            }
        }

-        /* SALVAGE */
-        if (getSalvageMaxPercentage() < 1) {
-            reason.add("Skills.Salvage.MaxPercentage should be at least 1!");
-        }
-
-        if (getSalvageMaxPercentageLevel() < 1) {
-            reason.add("Skills.Salvage.MaxPercentageLevel should be at least 1!");
-        }
-
-        if (getAdvancedSalvageUnlockLevel() < 1) {
-            reason.add("Skills.Salvage.AdvancedSalvage.UnlockLevel should be at least 1!");
-        }
-
-        List<Salvage.Tier> salvageTierList = Arrays.asList(Salvage.Tier.values());
-
-        for (Salvage.Tier tier : salvageTierList) {
-            if (getArcaneSalvageRankLevel(tier) < 0) {
-                reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be at least 0!");
-            }
-
-            if (getArcaneSalvageExtractFullEnchantsChance(tier) < 0 || getArcaneSalvageExtractFullEnchantsChance(tier) > 100) {
-                reason.add("Skills.Salvage.ArcaneSalvage.ExtractFullEnchant.Rank_" + tier.toNumerical() + " only accepts values from 0 to 100!");
-            }
-
-            if (getArcaneSalvageExtractPartialEnchantsChance(tier) < 0 || getArcaneSalvageExtractPartialEnchantsChance(tier) > 100) {
-                reason.add("Skills.Salvage.ArcaneSalvage.ExtractPartialEnchant.Rank_" + tier.toNumerical() + " only accepts values from 0 to 100!");
-            }
-
-            if (tier != Salvage.Tier.EIGHT) {
-                Salvage.Tier nextTier = salvageTierList.get(salvageTierList.indexOf(tier) - 1);
-
-                if (getArcaneSalvageRankLevel(tier) >= getArcaneSalvageRankLevel(nextTier)) {
-                    reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be less than Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + nextTier.toNumerical() + "!");
-                }
-
-                if (getArcaneSalvageExtractFullEnchantsChance(tier) > getArcaneSalvageExtractFullEnchantsChance(nextTier)) {
-                    reason.add("Skills.Salvage.ArcaneSalvage.ExtractFullEnchant.Rank_" + tier.toNumerical() + " should be less than or equal to Skills.Salvage.ArcaneSalvage.ExtractFullEnchant.Rank_" + nextTier.toNumerical() + "!");
-                }
-
-                if (getArcaneSalvageExtractPartialEnchantsChance(tier) > getArcaneSalvageExtractPartialEnchantsChance(nextTier)) {
-                    reason.add("Skills.Salvage.ArcaneSalvage.ExtractPartialEnchant.Rank_" + tier.toNumerical() + " should be less than or equal to Skills.Salvage.ArcaneSalvage.ExtractPartialEnchant.Rank_" + nextTier.toNumerical() + "!");
-                }
-            }
-        }
-
        /* SMELTING */
        if (getBurnModifierMaxLevel() < 1) {
            reason.add("Skills.Smelting.FuelEfficiency.MaxBonusLevel should be at least 1!");
@@ -767,6 +725,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    /* REPAIR */
    public double getRepairMasteryMaxBonus() { return config.getDouble("Skills.Repair.RepairMastery.MaxBonusPercentage", 200.0D); }
    public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery.MaxBonusLevel", 1000); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage.UnlockLevel", 600); }

    /* Arcane Forging */
    public int getArcaneForgingRankLevel(ArcaneForging.Tier tier) { return config.getInt("Skills.Repair.ArcaneForging.Rank_Levels.Rank_" + tier.toNumerical()); }
@@ -777,19 +736,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.ArcaneForging.Downgrades_Enabled", true); }
    public double getArcaneForgingDowngradeChance(ArcaneForging.Tier tier) { return config.getDouble("Skills.Repair.ArcaneForging.Downgrades_Chance.Rank_" + tier.toNumerical()); }

-    /* SALVAGE */
-    public double getSalvageMaxPercentage() { return config.getDouble("Skills.Salvage.MaxPercentage", 100.0D); }
-    public int getSalvageMaxPercentageLevel() { return config.getInt("Skills.Salvage.MaxPercentageLevel", 1000); }
-
-    public int getAdvancedSalvageUnlockLevel() { return config.getInt("Skills.Salvage.AdvancedSalvage.UnlockLevel", 350); }
-
-    public boolean getArcaneSalvageEnchantDowngradeEnabled() { return config.getBoolean("Skills.Salvage.ArcaneSalvage.EnchantDowngradeEnabled", true); }
-    public boolean getArcaneSalvageEnchantLossEnabled() { return config.getBoolean("Skills.Salvage.ArcaneSalvage.EnchantLossEnabled", true); }
-
-    public int getArcaneSalvageRankLevel(Salvage.Tier tier) { return config.getInt("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical()); }
-    public double getArcaneSalvageExtractFullEnchantsChance(Salvage.Tier tier) { return config.getDouble("Skills.Salvage.ArcaneSalvage.ExtractFullEnchant.Rank_" + tier.toNumerical()); }
-    public double getArcaneSalvageExtractPartialEnchantsChance(Salvage.Tier tier) { return config.getDouble("Skills.Salvage.ArcaneSalvage.ExtractPartialEnchant.Rank_" + tier.toNumerical()); }
-
    /* SMELTING */
    public int getBurnModifierMaxLevel() { return config.getInt("Skills.Smelting.FuelEfficiency.MaxBonusLevel", 1000); }
    public double getBurnTimeMultiplier() { return config.getDouble("Skills.Smelting.FuelEfficiency.Multiplier", 3.0D); }
@@ -831,7 +777,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws.UnlockLevel", 750); }
    public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws.Bonus", 2.0D); }

-    public double getMinHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MinHorseJumpStrength", 0.7D); }
    public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }

    /* UNARMED */
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Set;

 import org.bukkit.Material;
-import org.bukkit.TreeSpecies;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;

@@ -183,40 +182,20 @@ public class Config extends AutoUpdateConfigLoader {
            reason.add("Cannot use the same item for Repair and Salvage anvils!");
        }

-        if (getTamingCOTWMaterial(EntityType.WOLF) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Item_Material is invalid!!");
+        if (getTamingCOTWWolfCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Bones_Required should be at least 1!");
        }

-        if (getTamingCOTWMaterial(EntityType.OCELOT) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Item_Material is invalid!!");
-        }
-
-        if (getTamingCOTWMaterial(EntityType.HORSE) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Item_Material is invalid!!");
-        }
-
-        if (getTamingCOTWCost(EntityType.WOLF) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWCost(EntityType.OCELOT) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWCost(EntityType.HORSE) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Summon_Amount should be greater than 0!");
+        if (getTamingCOTWOcelotCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Fish_Required should be at least 1!");
        }

        if (getTamingCOTWAmount(EntityType.OCELOT) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Summon_Amount should be greater than 0!");
+            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot_Amount should be greater than 0!");
        }

-        if (getTamingCOTWAmount(EntityType.HORSE) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Summon_Amount should be greater than 0!");
+        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf_Amount should be greater than 0!");
        }

        return noErrorsInConfig(reason);
@@ -239,6 +218,7 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
    public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
+    public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }

    public String getPartyChatPrefix() { return config.getString("Commands.partychat.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
    public boolean getPartyChatColorLeaderName() { return config.getBoolean("Commands.partychat.Gold_Leader_Name", true); }
@@ -249,7 +229,6 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.adminchat.Use_Display_Names", true); }

    public boolean getMatchOfflinePlayers() { return config.getBoolean("Commands.Generic.Match_OfflinePlayers", false); }
-    public long getDatabasePlayerCooldown() { return config.getLong("Commands.Database.Player_Cooldown", 1750); }

    public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }

@@ -266,11 +245,6 @@ public class Config extends AutoUpdateConfigLoader {
    public int getMobHealthbarTime() { return config.getInt("Mob_Healthbar.Display_Time", 3); }

    /* Scoreboards */
-    public boolean getPowerLevelTagsEnabled() { return config.getBoolean("Scoreboard.Power_Level_Tags", false); }
-    public boolean getAllowKeepBoard() { return config.getBoolean("Scoreboard.Allow_Keep", true); }
-    public boolean getShowStatsAfterLogin() { return config.getBoolean("Scoreboard.Show_Stats_After_Login", false); }
-    public boolean getScoreboardRainbows() { return config.getBoolean("Scoreboard.Rainbows", false); }
-
    public boolean getRankUseChat() { return config.getBoolean("Scoreboard.Types.Rank.Print", false); }
    public boolean getRankUseBoard() { return config.getBoolean("Scoreboard.Types.Rank.Board", true); }
    public int getRankScoreboardTime() { return config.getInt("Scoreboard.Types.Rank.Display_Time", 10); }
@@ -296,6 +270,11 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getSkillLevelUpBoard() { return config.getBoolean("Scoreboard.Types.Skill.LevelUp_Board", true); }
    public int getSkillLevelUpTime() { return config.getInt("Scoreboard.Types.Skill.LevelUp_Time", 5); }

+    public boolean getPowerLevelTagsEnabled() { return config.getBoolean("Scoreboard.Power_Level_Tags", false); }
+
+    public boolean getAllowKeepBoard() { return config.getBoolean("Scoreboard.Allow_Keep", true); }
+    public boolean getScoreboardRainbows() { return config.getBoolean("Scoreboard.Rainbows", false); }
+
    /* 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); }
@@ -444,17 +423,14 @@ public class Config extends AutoUpdateConfigLoader {

    /* Acrobatics */
    public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
-    public int getXPAfterTeleportCooldown() { return config.getInt("Skills.Acrobatics.XP_After_Teleport_Cooldown", 5); }
+    public boolean getPreventXPAfterTeleport() { return config.getBoolean("Skills.Acrobatics.Prevent_XP_After_Teleport", true); }

    /* Alchemy */
    public boolean getEnabledForHoppers() { return config.getBoolean("Skills.Alchemy.Enabled_for_Hoppers", true); }
-    public boolean getPreventHopperTransferIngredients() { return config.getBoolean("Skills.Alchemy.Prevent_Hopper_Transfer_Ingredients", false); }
-    public boolean getPreventHopperTransferBottles() { return config.getBoolean("Skills.Alchemy.Prevent_Hopper_Transfer_Bottles", false); }
+    public boolean getPreventHopperTransfer() { return config.getBoolean("Skills.Alchemy.Prevent_Hopper_Transfer", false); }

    /* Fishing */
    public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
-    public boolean getFishingOverrideTreasures() { return config.getBoolean("Skills.Fishing.Override_Vanilla_Treasures", true); }
-    public boolean getFishingExtraFish() { return config.getBoolean("Skills.Fishing.Extra_Fish", true); }

    /* Mining */
    public Material getDetonatorItem() { return Material.matchMaterial(config.getString("Skills.Mining.Detonator_Name", "FLINT_AND_STEEL")); }
@@ -464,26 +440,26 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getRepairAnvilPlaceSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Placed_Sounds", true); }
    public boolean getRepairAnvilUseSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Use_Sounds", true); }
    public Material getRepairAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Anvil_Material", "IRON_BLOCK")); }
+    public Material getSalvageAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Salvage_Anvil_Material", "GOLD_BLOCK")); }
+    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
+    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
    public boolean getRepairConfirmRequired() { return config.getBoolean("Skills.Repair.Confirm_Required", true); }

-    /* Salvage */
-    public boolean getSalvageAnvilMessagesEnabled() { return config.getBoolean("Skills.Salvage.Anvil_Messages", true); }
-    public boolean getSalvageAnvilPlaceSoundsEnabled() { return config.getBoolean("Skills.Salvage.Anvil_Placed_Sounds", true); }
-    public boolean getSalvageAnvilUseSoundsEnabled() { return config.getBoolean("Skills.Salvage.Anvil_Use_Sounds", true); }
-    public Material getSalvageAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Salvage.Anvil_Material", "GOLD_BLOCK")); }
-    public boolean getSalvageConfirmRequired() { return config.getBoolean("Skills.Salvage.Confirm_Required", true); }
-
    /* Unarmed */
    public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }

    /* Taming */
-    public Material getTamingCOTWMaterial(EntityType type) { return Material.matchMaterial(config.getString("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Material")); }
-    public int getTamingCOTWCost(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Amount"); }
-    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Summon_Amount"); }
+    public int getTamingCOTWHorseCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Apples_Required", 10); }
+    public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
+    public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
    public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40.0D); }
+    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ "_Amount"); }

    /* Woodcutting */
-    public boolean getWoodcuttingDoubleDropsEnabled(TreeSpecies species) { return config.getBoolean("Double_Drops.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); }
+    public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
+    public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
+    public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
+    public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
    public boolean getTreeFellerSoundsEnabled() { return config.getBoolean("Skills.Woodcutting.Tree_Feller_Sounds", true); }

    /* AFK Leveling */
--- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
@@ -4,16 +4,12 @@ import java.util.ArrayList;
 import java.util.List;

 import org.bukkit.Material;
-import org.bukkit.TreeSpecies;
 import org.bukkit.entity.EntityType;
-import org.bukkit.material.LongGrass;
-import org.bukkit.material.MaterialData;

 import com.gmail.nossr50.config.AutoUpdateConfigLoader;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
 import com.gmail.nossr50.util.StringUtils;

 public class ExperienceConfig extends AutoUpdateConfigLoader {
@@ -81,10 +77,8 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
         */

        /* Alchemy */
-        for (PotionStage potionStage : PotionStage.values()) {
-            if (getPotionXP(potionStage) < 0) {
-                reason.add("Experience.Alchemy.Potion_Stage_" + potionStage.toNumerical() + " should be at least 0!");
-            }
+        if (getPotionXP() <= 0) {
+            reason.add("Experience.Alchemy.Potion should be greater than 0!");
        }

        /* Combat XP Multipliers */
@@ -109,7 +103,9 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
        }

        /* Fishing */
-        // TODO: Add validation for each fish type once enum is available.
+        if (getFishingBaseXP() <= 0) {
+            reason.add("Experience.Fishing.Base should be greater than 0!");
+        }

        if (getFishingShakeXP() <= 0) {
            reason.add("Experience.Fishing.Shake should be greater than 0!");
@@ -130,12 +126,20 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
        }

        /* Woodcutting */
-        for (TreeSpecies species : TreeSpecies.values()) {
-            String key = "Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_");
+        if (getWoodcuttingXPOak() <= 0) {
+            reason.add("Experience.Woodcutting.Oak should be greater than 0!");
+        }

-            if (config.getInt(key) <= 0) {
-                reason.add(key + " should be greater than 0!");
-            }
+        if (getWoodcuttingXPBirch() <= 0) {
+            reason.add("Experience.Woodcutting.Birch should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPSpruce() <= 0) {
+            reason.add("Experience.Woodcutting.Spruce should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPJungle() <= 0) {
+            reason.add("Experience.Woodcutting.Jungle should be greater than 0!");
        }

        if (getWoodcuttingXPHugeBrownMushroom() <= 0) {
@@ -160,7 +164,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
    /* Curve values */
    public double getMultiplier(FormulaType type) { return config.getDouble("Experience_Formula." + StringUtils.getCapitalized(type.toString()) + "_Values.multiplier"); }
    public int getBase(FormulaType type) { return config.getInt("Experience_Formula." + StringUtils.getCapitalized(type.toString()) + "_Values.base"); }
-    public double getExponent(FormulaType type) { return config.getDouble("Experience_Formula." + StringUtils.getCapitalized(type.toString()) + "_Values.exponent"); }
+    public double getExponent(FormulaType type) { return config.getDouble("Experience_Formula." + StringUtils.getCapitalized(type.toString()) +"_Values.exponent"); }

    /* Global modifier */
    public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience_Formula.Multiplier.Global", 1.0); }
@@ -204,114 +208,15 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
    public double getFeatherFallXPModifier() { return config.getDouble("Experience.Acrobatics.FeatherFall_Multiplier", 2.0); }

    /* Alchemy */
-    public double getPotionXP(PotionStage stage) { return config.getDouble("Experience.Alchemy.Potion_Stage_" + stage.toNumerical(), 10D); }
+    public double getPotionXP() { return config.getDouble("Experience.Alchemy.Potion", 150D); }

    /* Fishing */
-    public int getFishXp(MaterialData data) {
-        switch (data.getData()) {
-            case 0x0:
-                return config.getInt("Experience.Fishing.Raw_Fish", 800);
-
-            case 0x1:
-                return config.getInt("Experience.Fishing.Raw_Salmon", 800);
-
-            case 0x2:
-                return config.getInt("Experience.Fishing.Clownfish", 800);
-
-            case 0x3:
-                return config.getInt("Experience.Fishing.Pufferfish", 800);
-
-            default:
-                return 0;
-        }
-    }
-
+    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
    public int getFishingShakeXP() { return config.getInt("Experience.Fishing.Shake", 50); }

-    /* Herbalism */
-    public int getFlowerAndGrassXp(MaterialData data) {
-        Material type = data.getItemType();
-
-        if (type == Material.RED_ROSE) {
-            switch (data.getData()) {
-                case 0x0:
-                    return config.getInt("Experience.Herbalism.Poppy", 100);
-
-                case 0x1:
-                    return config.getInt("Experience.Herbalism.Blue_Orchid", 150);
-
-                case 0x2:
-                    return config.getInt("Experience.Herbalism.Allium", 300);
-
-                case 0x3:
-                    return config.getInt("Experience.Herbalism.Azure_Bluet", 150);
-
-                case 0x4:
-                    return config.getInt("Experience.Herbalism.Red_Tulip", 150);
-
-                case 0x5:
-                    return config.getInt("Experience.Herbalism.Orange_Tulip", 150);
-
-                case 0x6:
-                    return config.getInt("Experience.Herbalism.White_Tulip", 150);
-
-                case 0x7:
-                    return config.getInt("Experience.Herbalism.Pink_Tulip", 150);
-
-                case 0x8:
-                    return config.getInt("Experience.Herbalism.Oxeye_Daisy", 150);
-
-                default:
-                    return 0;
-            }
-
-        }
-        else if (type == Material.LONG_GRASS) {
-            switch (((LongGrass) data).getSpecies()) {
-                case DEAD:
-                    return config.getInt("Experience.Herbalism.Dead_Bush", 30);
-
-                case FERN_LIKE:
-                    return config.getInt("Experience.Herbalism.Small_Fern", 10);
-
-                case NORMAL:
-                    return config.getInt("Experience.Herbalism.Small_Grass", 10);
-
-                default:
-                    return 0;
-            }
-        }
-        else if (type == Material.DOUBLE_PLANT) {
-            switch (data.getData()) {
-                case 0x0:
-                    return config.getInt("Experience.Herbalism.Sunflower", 50);
-
-                case 0x1:
-                    return config.getInt("Experience.Herbalism.Lilac", 50);
-
-                case 0x2:
-                    return config.getInt("Experience.Herbalism.Tall_Grass", 50);
-
-                case 0x3:
-                    return config.getInt("Experience.Herbalism.Tall_Fern", 50);
-
-                case 0x4:
-                    return config.getInt("Experience.Herbalism.Rose_Bush", 50);
-
-                case 0x5:
-                    return config.getInt("Experience.Herbalism.Peony", 50);
-
-                default:
-                    return 0;
-            }
-        }
-
-        return 0;
-    }
-
    /* Repair */
    public double getRepairXPBase() { return config.getDouble("Experience.Repair.Base", 1000.0); }
-    public double getRepairXP(MaterialType repairMaterialType) { return config.getDouble("Experience.Repair." + StringUtils.getCapitalized(repairMaterialType.toString())); }
+    public double getRepairXP(RepairMaterialType repairMaterialType) { return config.getDouble("Experience.Repair." + StringUtils.getCapitalized(repairMaterialType.toString())); }

    /* Taming */
    public int getTamingXPHorse() { return config.getInt("Experience.Taming.Animal_Taming.Horse", 1000); }
@@ -319,7 +224,10 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }

    /* Woodcutting */
-    public int getWoodcuttingTreeXP(TreeSpecies species) { return config.getInt("Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); }
+    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
+    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
+    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
+    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
 }
--- a/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java
@@ -15,7 +15,7 @@ public class ArmorConfigManager {
        ModManager modManager = mcMMO.getModManager();

        if (!vanilla.exists()) {
-            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "armor.default.yml", false);
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "armor.default.yml", false);
        }

        for (String fileName : dataFolder.list()) {
--- a/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java
@@ -15,7 +15,7 @@ public class BlockConfigManager {
        ModManager modManager = mcMMO.getModManager();

        if (!vanilla.exists()) {
-            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "blocks.default.yml", false);
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "blocks.default.yml", false);
        }

        for (String fileName : dataFolder.list()) {
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
@@ -9,11 +9,11 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
-import com.gmail.nossr50.util.skills.SkillUtils;

 public class CustomArmorConfig extends ConfigLoader {
    private boolean needsUpdate = false;
@@ -79,7 +79,7 @@ public class CustomArmorConfig extends ConfigLoader {

            if (repairable) {
                byte repairData = (byte) config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Value", -1);
-                int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(armorMaterial), repairMaterial, repairData);
+                int repairQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(armorMaterial), repairMaterial, repairData);

                if (repairQuantity == 0) {
                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Quantity", 2);
@@ -91,7 +91,7 @@ public class CustomArmorConfig extends ConfigLoader {
                    durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 70);
                }

-                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, 0, repairQuantity, durability, ItemType.ARMOR, MaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, 0, repairQuantity, durability, RepairItemType.ARMOR, RepairMaterialType.OTHER, 1.0));
            }

            materialList.add(armorMaterial);
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
@@ -11,11 +11,11 @@ import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
-import com.gmail.nossr50.util.skills.SkillUtils;

 public class CustomToolConfig extends ConfigLoader {
    private boolean needsUpdate = false;
@@ -87,7 +87,7 @@ public class CustomToolConfig extends ConfigLoader {

            if (repairable) {
                byte repairData = (byte) config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Value", -1);
-                int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(toolMaterial), repairMaterial, repairData);
+                int repairQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(toolMaterial), repairMaterial, repairData);

                if (repairQuantity == 0) {
                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Quantity", 2);
@@ -99,7 +99,7 @@ public class CustomToolConfig extends ConfigLoader {
                    durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 60);
                }

-                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairData, 0, repairQuantity, durability, ItemType.TOOL, MaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairData, 0, repairQuantity, durability, RepairItemType.TOOL, RepairMaterialType.OTHER, 1.0));
            }

            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
--- a/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java
@@ -15,7 +15,7 @@ public class EntityConfigManager {
        ModManager modManager = mcMMO.getModManager();

        if (!vanilla.exists()) {
-            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "entities.default.yml", false);
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "entities.default.yml", false);
        }

        for (String fileName : dataFolder.list()) {
--- a/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java
@@ -15,7 +15,7 @@ public class ToolConfigManager {
        ModManager modManager = mcMMO.getModManager();

        if (!vanilla.exists()) {
-            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "tools.default.yml", false);
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "tools.default.yml", false);
        }

        for (String fileName : dataFolder.list()) {
--- a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java
@@ -9,12 +9,12 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;

 public class RepairConfig extends ConfigLoader {
    private List<Repairable> repairables;
@@ -48,37 +48,37 @@ public class RepairConfig extends ConfigLoader {
            }

            // Repair Material Type
-            MaterialType repairMaterialType = MaterialType.OTHER;
+            RepairMaterialType repairMaterialType = RepairMaterialType.OTHER;
            String repairMaterialTypeString = config.getString("Repairables." + key + ".MaterialType", "OTHER");

            if (!config.contains("Repairables." + key + ".MaterialType") && itemMaterial != null) {
                ItemStack repairItem = new ItemStack(itemMaterial);

                if (ItemUtils.isWoodTool(repairItem)) {
-                    repairMaterialType = MaterialType.WOOD;
+                    repairMaterialType = RepairMaterialType.WOOD;
                }
                else if (ItemUtils.isStoneTool(repairItem)) {
-                    repairMaterialType = MaterialType.STONE;
+                    repairMaterialType = RepairMaterialType.STONE;
                }
                else if (ItemUtils.isStringTool(repairItem)) {
-                    repairMaterialType = MaterialType.STRING;
+                    repairMaterialType = RepairMaterialType.STRING;
                }
                else if (ItemUtils.isLeatherArmor(repairItem)) {
-                    repairMaterialType = MaterialType.LEATHER;
+                    repairMaterialType = RepairMaterialType.LEATHER;
                }
                else if (ItemUtils.isIronArmor(repairItem) || ItemUtils.isIronTool(repairItem)) {
-                    repairMaterialType = MaterialType.IRON;
+                    repairMaterialType = RepairMaterialType.IRON;
                }
                else if (ItemUtils.isGoldArmor(repairItem) || ItemUtils.isGoldTool(repairItem)) {
-                    repairMaterialType = MaterialType.GOLD;
+                    repairMaterialType = RepairMaterialType.GOLD;
                }
                else if (ItemUtils.isDiamondArmor(repairItem) || ItemUtils.isDiamondTool(repairItem)) {
-                    repairMaterialType = MaterialType.DIAMOND;
+                    repairMaterialType = RepairMaterialType.DIAMOND;
                }
            }
            else {
                try {
-                    repairMaterialType = MaterialType.valueOf(repairMaterialTypeString);
+                    repairMaterialType = RepairMaterialType.valueOf(repairMaterialTypeString);
                }
                catch (IllegalArgumentException ex) {
                    reason.add(key + " has an invalid MaterialType of " + repairMaterialTypeString);
@@ -87,7 +87,7 @@ public class RepairConfig extends ConfigLoader {

            // Repair Material
            String repairMaterialName = config.getString("Repairables." + key + ".RepairMaterial");
-            Material repairMaterial = (repairMaterialName == null ? repairMaterialType.getDefaultMaterial() : Material.matchMaterial(repairMaterialName));
+            Material repairMaterial = (repairMaterialName == null ? repairMaterialType.getDefaultRepairMaterial() : Material.matchMaterial(repairMaterialName));

            if (repairMaterial == null) {
                reason.add(key + " has an invalid repair material: " + repairMaterialName);
@@ -96,31 +96,27 @@ public class RepairConfig extends ConfigLoader {
            // Maximum Durability
            short maximumDurability = (itemMaterial != null ? itemMaterial.getMaxDurability() : (short) config.getInt("Repairables." + key + ".MaximumDurability"));

-            if (maximumDurability <= 0) {
-                maximumDurability = (short) config.getInt("Repairables." + key + ".MaximumDurability");
-            }
-
            if (maximumDurability <= 0) {
                reason.add("Maximum durability of " + key + " must be greater than 0!");
            }

            // Item Type
-            ItemType repairItemType = ItemType.OTHER;
+            RepairItemType repairItemType = RepairItemType.OTHER;
            String repairItemTypeString = config.getString("Repairables." + key + ".ItemType", "OTHER");

            if (!config.contains("Repairables." + key + ".ItemType") && itemMaterial != null) {
                ItemStack repairItem = new ItemStack(itemMaterial);

                if (ItemUtils.isMinecraftTool(repairItem)) {
-                    repairItemType = ItemType.TOOL;
+                    repairItemType = RepairItemType.TOOL;
                }
                else if (ItemUtils.isArmor(repairItem)) {
-                    repairItemType = ItemType.ARMOR;
+                    repairItemType = RepairItemType.ARMOR;
                }
            }
            else {
                try {
-                    repairItemType = ItemType.valueOf(repairItemTypeString);
+                    repairItemType = RepairItemType.valueOf(repairItemTypeString);
                }
                catch (IllegalArgumentException ex) {
                    reason.add(key + " has an invalid ItemType of " + repairItemTypeString);
@@ -136,7 +132,7 @@ public class RepairConfig extends ConfigLoader {
            }

            // Minimum Quantity
-            int minimumQuantity = (itemMaterial != null ? SkillUtils.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity", 2));
+            int minimumQuantity = (itemMaterial != null ? Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity", 2));

            if (minimumQuantity <= 0 && itemMaterial != null) {
                minimumQuantity = config.getInt("Repairables." + key + ".MinimumQuantity", 2);
--- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
@@ -1,165 +0,0 @@
-package com.gmail.nossr50.config.skills.salvage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
-import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
-import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-
-public class SalvageConfig extends ConfigLoader {
-    private List<Salvageable> salvageables;
-
-    public SalvageConfig(String fileName) {
-        super(fileName);
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        salvageables = new ArrayList<Salvageable>();
-
-        ConfigurationSection section = config.getConfigurationSection("Salvageables");
-        Set<String> keys = section.getKeys(false);
-
-        for (String key : keys) {
-            // Validate all the things!
-            List<String> reason = new ArrayList<String>();
-
-            // Item Material
-            Material itemMaterial = Material.matchMaterial(key);
-
-            if (itemMaterial == null) {
-                reason.add("Invalid material: " + key);
-            }
-
-            // Salvage Material Type
-            MaterialType salvageMaterialType = MaterialType.OTHER;
-            String salvageMaterialTypeString = config.getString("Salvageables." + key + ".MaterialType", "OTHER");
-
-            if (!config.contains("Salvageables." + key + ".MaterialType") && itemMaterial != null) {
-                ItemStack salvageItem = new ItemStack(itemMaterial);
-
-                if (ItemUtils.isWoodTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.WOOD;
-                }
-                else if (ItemUtils.isStoneTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.STONE;
-                }
-                else if (ItemUtils.isStringTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.STRING;
-                }
-                else if (ItemUtils.isLeatherArmor(salvageItem)) {
-                    salvageMaterialType = MaterialType.LEATHER;
-                }
-                else if (ItemUtils.isIronArmor(salvageItem) || ItemUtils.isIronTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.IRON;
-                }
-                else if (ItemUtils.isGoldArmor(salvageItem) || ItemUtils.isGoldTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.GOLD;
-                }
-                else if (ItemUtils.isDiamondArmor(salvageItem) || ItemUtils.isDiamondTool(salvageItem)) {
-                    salvageMaterialType = MaterialType.DIAMOND;
-                }
-            }
-            else {
-                try {
-                    salvageMaterialType = MaterialType.valueOf(salvageMaterialTypeString);
-                }
-                catch (IllegalArgumentException ex) {
-                    reason.add(key + " has an invalid MaterialType of " + salvageMaterialTypeString);
-                }
-            }
-
-            // Salvage Material
-            String salvageMaterialName = config.getString("Salvageables." + key + ".SalvageMaterial");
-            Material salvageMaterial = (salvageMaterialName == null ? salvageMaterialType.getDefaultMaterial() : Material.matchMaterial(salvageMaterialName));
-
-            if (salvageMaterial == null) {
-                reason.add(key + " has an invalid salvage material: " + salvageMaterialName);
-            }
-
-            // Maximum Durability
-            short maximumDurability = (itemMaterial != null ? itemMaterial.getMaxDurability() : (short) config.getInt("Salvageables." + key + ".MaximumDurability"));
-
-            // Item Type
-            ItemType salvageItemType = ItemType.OTHER;
-            String salvageItemTypeString = config.getString("Salvageables." + key + ".ItemType", "OTHER");
-
-            if (!config.contains("Salvageables." + key + ".ItemType") && itemMaterial != null) {
-                ItemStack salvageItem = new ItemStack(itemMaterial);
-
-                if (ItemUtils.isMinecraftTool(salvageItem)) {
-                    salvageItemType = ItemType.TOOL;
-                }
-                else if (ItemUtils.isArmor(salvageItem)) {
-                    salvageItemType = ItemType.ARMOR;
-                }
-            }
-            else {
-                try {
-                    salvageItemType = ItemType.valueOf(salvageItemTypeString);
-                }
-                catch (IllegalArgumentException ex) {
-                    reason.add(key + " has an invalid ItemType of " + salvageItemTypeString);
-                }
-            }
-
-            byte salvageMetadata = (byte) config.getInt("Salvageables." + key + ".SalvageMaterialMetadata", -1);
-            int minimumLevel = config.getInt("Salvageables." + key + ".MinimumLevel");
-            double xpMultiplier = config.getDouble("Salvageables." + key + ".XpMultiplier", 1);
-
-            if (minimumLevel < 0) {
-                reason.add(key + " has an invalid MinimumLevel of " + minimumLevel);
-            }
-
-            // Maximum Quantity
-            int maximumQuantity = (itemMaterial != null ? SkillUtils.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), salvageMaterial, salvageMetadata) : config.getInt("Salvageables." + key + ".MaximumQuantity", 2));
-
-            if (maximumQuantity <= 0 && itemMaterial != null) {
-                maximumQuantity = config.getInt("Salvageables." + key + ".MaximumQuantity", 2);
-            }
-
-            int configMaximumQuantity = config.getInt("Salvageables." + key + ".MaximumQuantity", -1);
-
-            if (configMaximumQuantity > 0) {
-                maximumQuantity = configMaximumQuantity;
-            }
-
-            if (maximumQuantity <= 0) {
-                reason.add("Maximum quantity of " + key + " must be greater than 0!");
-            }
-
-            if (noErrorsInSalvageable(reason)) {
-                Salvageable salvageable = SalvageableFactory.getSalvageable(itemMaterial, salvageMaterial, salvageMetadata, minimumLevel, maximumQuantity, maximumDurability, salvageItemType, salvageMaterialType, xpMultiplier);
-                salvageables.add(salvageable);
-            }
-        }
-    }
-
-    protected List<Salvageable> getLoadedSalvageables() {
-        return salvageables == null ? new ArrayList<Salvageable>() : salvageables;
-    }
-
-    private boolean noErrorsInSalvageable(List<String> issues) {
-        if (!issues.isEmpty()) {
-            plugin.getLogger().warning("Errors have been found in: " + fileName);
-            plugin.getLogger().warning("The following issues were found:");
-        }
-
-        for (String issue : issues) {
-            plugin.getLogger().warning(issue);
-        }
-
-        return issues.isEmpty();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java
@@ -1,42 +0,0 @@
-package com.gmail.nossr50.config.skills.salvage;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
-
-public class SalvageConfigManager {
-    private final List<Salvageable> salvageables = new ArrayList<Salvageable>();
-
-    public SalvageConfigManager(mcMMO plugin) {
-        Pattern pattern = Pattern.compile("salvage\\.(?:.+)\\.yml");
-        File dataFolder = plugin.getDataFolder();
-        File vanilla = new File(dataFolder, "salvage.vanilla.yml");
-
-        if (!vanilla.exists()) {
-            plugin.saveResource("salvage.vanilla.yml", false);
-        }
-
-        for (String fileName : dataFolder.list()) {
-            if (!pattern.matcher(fileName).matches()) {
-                continue;
-            }
-
-            File file = new File(dataFolder, fileName);
-
-            if (file.isDirectory()) {
-                continue;
-            }
-
-            SalvageConfig salvageConfig = new SalvageConfig(fileName);
-            salvageables.addAll(salvageConfig.getLoadedSalvageables());
-        }
-    }
-
-    public List<Salvageable> getLoadedSalvageables() {
-        return salvageables;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java
@@ -0,0 +1,75 @@
+package com.gmail.nossr50.config.spout;
+
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+
+import org.getspout.spoutapi.keyboard.Keyboard;
+
+public class SpoutConfig extends ConfigLoader {
+    private static SpoutConfig instance;
+
+    private SpoutConfig() {
+        super("spout.yml");
+    }
+
+    public static SpoutConfig getInstance() {
+        if (instance == null) {
+            instance = new SpoutConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {
+        // Setup default HUD
+    }
+
+    public HudType getDefaultHudType() {
+        try {
+            return HudType.valueOf(config.getString("Spout.HUD.Default", "STANDARD").toUpperCase().trim());
+        }
+        catch (IllegalArgumentException ex) {
+            return HudType.STANDARD;
+        }
+    }
+
+    public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
+    public Keyboard getMenuKey() { 
+        try {
+            return Keyboard.valueOf(config.getString("Menu.Key", "KEY_M").toUpperCase().trim());
+        }
+        catch (IllegalArgumentException ex) {
+            return Keyboard.KEY_M;
+        }
+    }
+
+    /* XP Bar */
+    public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
+    public void setXPBarEnabled(boolean enabled) { config.set("XP.Bar.Enabled", enabled); }
+
+    public boolean getXPBarIconEnabled() { return config.getBoolean("XP.Icon.Enabled", true); }
+    public int getXPBarXPosition() { return config.getInt("XP.Bar.X_POS", 95); }
+    public int getXPBarYPosition() { return config.getInt("XP.Bar.Y_POS", 6); }
+    public int getXPIconXPosition() { return config.getInt("XP.Icon.X_POS", 78); }
+    public int getXPIconYPosition() { return config.getInt("XP.Icon.Y_POS", 2); }
+
+    /* HUD Colors */
+    public double getRetroHUDXPBorderRed() { return config.getDouble("HUD.Retro.Colors.Border.RED", 0.0); }
+    public double getRetroHUDXPBorderGreen() { return config.getDouble("HUD.Retro.Colors.Border.GREEN", 0.0); }
+    public double getRetroHUDXPBorderBlue() { return config.getDouble("HUD.Retro.Colors.Border.BLUE", 0.0); }
+    public double getRetroHUDXPBackgroundRed() { return config.getDouble("HUD.Retro.Colors.Background.RED", 0.75); }
+    public double getRetroHUDXPBackgroundGreen() { return config.getDouble("HUD.Retro.Colors.Background.GREEN", 0.75); }
+    public double getRetroHUDXPBackgroundBlue() { return config.getDouble("HUD.Retro.Colors.Background.BLUE", 0.75); }
+
+    public double getRetroHUDRed(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
+    public double getRetroHUDGreen(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
+    public double getRetroHUDBlue(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
+
+    /* Notification Tiers */
+    public int getNotificationTier1() { return config.getInt("Notifications.Tier1", 200); }
+    public int getNotificationTier2() { return config.getInt("Notifications.Tier2", 400); }
+    public int getNotificationTier3() { return config.getInt("Notifications.Tier3", 600); }
+    public int getNotificationTier4() { return config.getInt("Notifications.Tier4", 800); }
+}
--- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
@@ -35,8 +35,6 @@ public class TreasureConfig extends ConfigLoader {
    public List<ExcavationTreasure> excavationFromMycel     = new ArrayList<ExcavationTreasure>();
    public List<ExcavationTreasure> excavationFromSoulSand  = new ArrayList<ExcavationTreasure>();
    public List<ExcavationTreasure> excavationFromSnow      = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromRedSand   = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromPodzol    = new ArrayList<ExcavationTreasure>();

    public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
    public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
@@ -160,29 +158,26 @@ public class TreasureConfig extends ConfigLoader {
            // Validate all the things!
            List<String> reason = new ArrayList<String>();

-            String[] treasureInfo = treasureName.split("[|]");
-            String materialName = treasureInfo[0];
-
            /*
             * Material, Amount, and Data
             */
            Material material;

-            if (materialName.contains("POTION")) {
+            if (treasureName.contains("POTION")) {
                material = Material.POTION;
            }
-            else if (materialName.contains("INK_SACK")) {
+            else if (treasureName.contains("INK_SACK")) {
                material = Material.INK_SACK;
            }
            else {
-                material = Material.matchMaterial(materialName);
+                material = Material.matchMaterial(treasureName);
            }

            int amount = config.getInt(type + "." + treasureName + ".Amount");
-            short data = (treasureInfo.length == 2) ? Byte.valueOf(treasureInfo[1]) : (short) config.getInt(type + "." + treasureName + ".Data");
+            int data = config.getInt(type + "." + treasureName + ".Data");

            if (material == null) {
-                reason.add("Invalid material: " + materialName);
+                reason.add("Invalid material: " + treasureName);
            }

            if (amount <= 0) {
@@ -231,8 +226,8 @@ public class TreasureConfig extends ConfigLoader {
             */
            ItemStack item = null;

-            if (materialName.contains("POTION")) {
-                String potionType = materialName.substring(7);
+            if (treasureName.contains("POTION")) {
+                String potionType = treasureName.substring(7);

                try {
                    item = new Potion(PotionType.valueOf(potionType.toUpperCase().trim())).toItemStack(amount);
@@ -241,8 +236,8 @@ public class TreasureConfig extends ConfigLoader {
                    reason.add("Invalid Potion_Type: " + potionType);
                }
            }
-            else if (materialName.contains("INK_SACK")) {
-                String color = materialName.substring(9);
+            else if (treasureName.contains("INK_SACK")) {
+                String color = treasureName.substring(9);

                try {
                    Dye dye = new Dye();
@@ -255,7 +250,7 @@ public class TreasureConfig extends ConfigLoader {
                }
            }
            else if (material != null) {
-                item = new ItemStack(material, amount, data);
+                item = new ItemStack(material, amount, (short) data);

                if (config.contains(type + "." + treasureName + ".Custom_Name")) {
                    ItemMeta itemMeta = item.getItemMeta();
@@ -376,14 +371,6 @@ public class TreasureConfig extends ConfigLoader {
                    if (dropList.contains("Snow")) {
                        excavationFromSnow.add(excavationTreasure);
                    }
-
-                    if (dropList.contains("Red_Sand")) {
-                        excavationFromRedSand.add(excavationTreasure);
-                    }
-
-                    if (dropList.contains("Podzol")) {
-                        excavationFromPodzol.add(excavationTreasure);
-                    }
                }
                else if (isHylian) {
                    HylianTreasure hylianTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);
--- a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
@@ -44,7 +44,7 @@ public interface DatabaseManager {
    /**
    * Retrieve leaderboard info.
    *
-    * @param skill The skill to retrieve info on
+    * @param skillName The skill to retrieve info on
    * @param pageNumber Which page in the leaderboards to retrieve
    * @param statsPerPage The number of stats per page
    * @return the requested leaderboard information
--- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
@@ -25,10 +25,8 @@ import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-
-import org.apache.commons.lang.ArrayUtils;

 public final class FlatfileDatabaseManager implements DatabaseManager {
    private final HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
@@ -261,7 +259,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                        writer.append((int) profile.getAbilityDATS(AbilityType.SERRATED_STRIKES)).append(":");
                        writer.append((int) profile.getAbilityDATS(AbilityType.SKULL_SPLITTER)).append(":");
                        writer.append((int) profile.getAbilityDATS(AbilityType.SUPER_BREAKER)).append(":");
-                        writer.append(":");
+                        HudType hudType = profile.getHudType();
+                        writer.append(hudType == null ? "STANDARD" : hudType.toString()).append(":");
                        writer.append(profile.getSkillLevel(SkillType.FISHING)).append(":");
                        writer.append(profile.getSkillXpLevel(SkillType.FISHING)).append(":");
                        writer.append((int) profile.getAbilityDATS(AbilityType.BLAST_MINING)).append(":");
@@ -607,7 +606,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {

                        // Length checks depend on last character being ':'
                        if (line.charAt(line.length() - 1) != ':') {
-                            line = line.concat(":");
+                            line = line + ":";
                        }
                        String[] character = line.split(":");

@@ -624,33 +623,29 @@ public final class FlatfileDatabaseManager implements DatabaseManager {

                        String oldVersion = null;

-                        if (character.length <= 33) {
-                            // Introduction of HUDType
-                            // Version 1.1.06
-                            // commit 78f79213cdd7190cd11ae54526f3b4ea42078e8a
-                            line = line.concat(" :");
-                            character = line.split(":");
-                            oldVersion = "1.1.06";
-                        }
-
                        if (!character[33].isEmpty()) {
                            // Removal of Spout Support
                            // Version 1.4.07-dev2
                            // commit 7bac0e2ca5143bce84dc160617fed97f0b1cb968
                            line = line.replace(character[33], "");
-                            if (oldVersion == null) {
-                                oldVersion = "1.4.07";
-                            }
+                            oldVersion = "1.4.07";
                        }

                        // If they're valid, rewrite them to the file.
-                        if (character.length == 41) {
+                        if (character.length > 40) {
                            writer.append(line).append("\r\n");
                            continue;
                        }

                        StringBuilder newLine = new StringBuilder(line);

+                        if (character.length <= 33) {
+                            // Introduction of HUDType
+                            // Version 1.1.06
+                            // commit 78f79213cdd7190cd11ae54526f3b4ea42078e8a
+                            newLine.append(":");
+                            oldVersion = "1.1.06";
+                        }
                        if (character.length <= 35) {
                            // Introduction of Fishing
                            // Version 1.2.00
@@ -689,7 +684,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                oldVersion = "1.4.06";
                            }
                        }
-                        if (character.length <= 39) {
+                        if (character.length <= 40) {
                            // Addition of Alchemy
                            // Version 1.4.08
                            newLine.append("0").append(":");
@@ -699,46 +694,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                            }
                        }

-                        // Remove any blanks that shouldn't be there, and validate the other fields
-                        String[] newCharacter = newLine.toString().split(":");
-                        boolean corrupted = false;
-
-                        for (int i = 0; i < newCharacter.length; i++) {
-                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33)) {
-                                corrupted = true;
-
-                                if (newCharacter.length != 41) {
-                                    newCharacter = (String[]) ArrayUtils.remove(newCharacter, i);
-                                }
-                                else {
-                                    if (i == 37) {
-                                        newCharacter[i] = String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
-                                    }
-                                    else if (i == 38) {
-                                        newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
-                                    }
-                                    else {
-                                        newCharacter[i] = "0";
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.isInt(newCharacter[i]) && i == 38) {
-                                corrupted = true;
-                                newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
-                            }
-
-                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38)) {
-                                corrupted = true;
-                                newCharacter[i] = "0";
-                            }
-                        }
-
-                        if (corrupted) {
-                            mcMMO.p.debug("Updating corrupted database line for player " + newCharacter[0]);
-                            newLine = new StringBuilder(org.apache.commons.lang.StringUtils.join(newCharacter, ":"));
-                        }
-
                        if (oldVersion != null) {
                            mcMMO.p.debug("Updating database line for player " + character[0] + " from before version " + oldVersion);
                        }
@@ -814,10 +769,11 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
        }
    }

-    private PlayerProfile loadFromLine(String[] character) {
+    private PlayerProfile loadFromLine(String[] character) throws Exception {
        Map<SkillType, Integer>   skills     = getSkillMapFromLine(character);      // Skill levels
        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+        HudType hudType;
        MobHealthbarType mobHealthbarType;

        // TODO on updates, put new values in a try{} ?
@@ -849,6 +805,13 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
        // Acrobatics - Unused
        skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(character[36]));

+        try {
+            hudType = HudType.valueOf(character[33]);
+        }
+        catch (Exception e) {
+            hudType = HudType.STANDARD; // Shouldn't happen unless database is being tampered with
+        }
+
        try {
            mobHealthbarType = MobHealthbarType.valueOf(character[38]);
        }
@@ -856,7 +819,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
            mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
        }

-        return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, mobHealthbarType);
+        return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, hudType, mobHealthbarType);
    }

    private Map<SkillType, Integer> getSkillMapFromLine(String[] character) {
--- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
@@ -22,6 +22,7 @@ import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.runnables.database.SQLDatabaseKeepaliveTask;
 import com.gmail.nossr50.runnables.database.SQLReconnectTask;
 import com.gmail.nossr50.util.Misc;
@@ -130,9 +131,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
        }
        boolean success = true;
        MobHealthbarType mobHealthbarType = profile.getMobHealthbarType();
+        HudType hudType = profile.getHudType();

        success &= saveLogin(userId, ((int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)));
-        success &= saveHuds(userId, (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()));
+        saveHuds(userId, (hudType == null ? "STANDARD" : hudType.toString()), (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()));
        success &= saveLongs(
                "UPDATE " + tablePrefix + "cooldowns SET "
                    + "  mining = ?, woodcutting = ?, unarmed = ?"
@@ -799,6 +801,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
        }

        ResultSet resultSet;
+        HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
        PreparedStatement statement = null;

        try {
@@ -810,7 +813,13 @@ public final class SQLDatabaseManager implements DatabaseManager {
            resultSet = statement.executeQuery();

            while (resultSet.next()) {
-                // No reason to do anything here... we're just trying to catch exceptions
+                ArrayList<String> column = new ArrayList<String>();
+
+                for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
+                    column.add(resultSet.getString(i));
+                }
+
+                rows.put(resultSet.getRow(), column);
            }
        }
        catch (SQLException ex) {
@@ -1157,7 +1166,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
        }
    }

-    private boolean saveHuds(int userId, String mobHealthBar) {
+    private boolean saveHuds(int userId, String hudType, String mobHealthBar) {
        PreparedStatement statement = null;

        try {
@@ -1187,6 +1196,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
        Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+        HudType hudType;
        MobHealthbarType mobHealthbarType;

        final int OFFSET_SKILLS = 0; // TODO update these numbers when the query changes (a new skill is added)
@@ -1235,6 +1245,13 @@ public final class SQLDatabaseManager implements DatabaseManager {
        // Acrobatics - Unused - result.getInt(OFFSET_DATS + 11)
        skillsDATS.put(AbilityType.BLAST_MINING, result.getInt(OFFSET_DATS + 12));

+        try {
+            hudType = HudType.valueOf(result.getString(OFFSET_OTHER + 1));
+        }
+        catch (Exception e) {
+            hudType = HudType.STANDARD; // Shouldn't happen unless database is being tampered with
+        }
+
        try {
            mobHealthbarType = MobHealthbarType.valueOf(result.getString(OFFSET_OTHER + 2));
        }
@@ -1242,7 +1259,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
            mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
        }

-        return new PlayerProfile(playerName, skills, skillsXp, skillsDATS, mobHealthbarType);
+        return new PlayerProfile(playerName, skills, skillsXp, skillsDATS, hudType, mobHealthbarType);
    }

    private void printErrors(SQLException ex) {
--- a/src/main/java/com/gmail/nossr50/datatypes/party/Party.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/party/Party.java
@@ -7,7 +7,6 @@ import java.util.List;

 import org.bukkit.ChatColor;
 import org.bukkit.Sound;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.mcMMO;
@@ -84,19 +83,6 @@ public class Party {
        return onlineMembers;
    }

-    public List<String> getOnlinePlayerNames(CommandSender sender) {
-        Player player = sender instanceof Player ? (Player) sender : null;
-        List<String> onlinePlayerNames = new ArrayList<String>();
-
-        for (Player onlinePlayer : getOnlineMembers()) {
-            if (player != null && player.canSee(onlinePlayer)) {
-                onlinePlayerNames.add(onlinePlayer.getName());
-            }
-        }
-
-        return onlinePlayerNames;
-    }
-
    public String getName() {
        return name;
    }
@@ -185,7 +171,7 @@ public class Party {

    public String getXpToLevelPercentage() {
        DecimalFormat percent = new DecimalFormat("##0.00%");
-        return percent.format(this.getXp() / getXpToLevel());
+        return percent.format( this.getXp() / getXpToLevel());
    }

    /**
@@ -351,4 +337,9 @@ public class Party {

        return this.getName().equals(other.getName());
    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }
--- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
@@ -24,7 +24,7 @@ import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.ToolType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.party.ShareHandler;
@@ -41,7 +41,6 @@ import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.skills.swords.SwordsManager;
 import com.gmail.nossr50.skills.taming.TamingManager;
@@ -54,6 +53,7 @@ import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.gmail.nossr50.util.spout.SpoutUtils;

 import org.apache.commons.lang.Validate;

@@ -81,6 +81,7 @@ public class McMMOPlayer {
    private final Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();

    private final Map<ToolType, Boolean> toolMode = new HashMap<ToolType, Boolean>();
+    private final Map<ToolType, Integer> toolATS  = new HashMap<ToolType, Integer>();

    private int recentlyHurt;
    private int respawnATS;
@@ -89,6 +90,7 @@ public class McMMOPlayer {
    private int chimeraWingLastUse;
    private Location teleportCommence;

+    private boolean isSpoutPlayer;
    private boolean isUsingUnarmed;
    private final FixedMetadataValue playerMetadata;

@@ -123,6 +125,7 @@ public class McMMOPlayer {

        for (ToolType toolType : ToolType.values()) {
            toolMode.put(toolType, false);
+            toolATS.put(toolType, 0);
        }

        if (!profile.isLoaded()) {
@@ -225,10 +228,6 @@ public class McMMOPlayer {
        return (RepairManager) skillManagers.get(SkillType.REPAIR);
    }

-    public SalvageManager getSalvageManager() {
-        return (SalvageManager) skillManagers.get(SkillType.SALVAGE);
-    }
-
    public SmeltingManager getSmeltingManager() {
        return (SmeltingManager) skillManagers.get(SkillType.SMELTING);
    }
@@ -344,6 +343,28 @@ public class McMMOPlayer {
        toolMode.put(tool, isPrepared);
    }

+    /**
+     * Get the current prep ATS of a tool.
+     *
+     * @param tool Tool to get the ATS for
+     * @return the ATS for the tool
+     */
+    public long getToolPreparationATS(ToolType tool) {
+        return toolATS.get(tool);
+    }
+
+    /**
+     * Set the current prep ATS of a tool.
+     *
+     * @param tool Tool to set the ATS for
+     * @param ATS the ATS of the tool
+     */
+    public void setToolPreparationATS(ToolType tool, long ATS) {
+        int startTime = (int) (ATS / Misc.TIME_CONVERSION_FACTOR);
+
+        toolATS.put(tool, startTime);
+    }
+
    /*
     * Recently Hurt
     */
@@ -384,6 +405,17 @@ public class McMMOPlayer {
        teleportCommence = player.getLocation();
    }

+    /*
+     * Spout support
+     */
+    public boolean isSpoutPlayer() {
+        return isSpoutPlayer;
+    }
+
+    public void setIsSpoutPlayer(boolean isSpoutPlayer) {
+        this.isSpoutPlayer = isSpoutPlayer;
+    }
+
    /*
     * Exploit Prevention
     */
@@ -459,7 +491,7 @@ public class McMMOPlayer {
     * @param skill Skill being used
     * @param xp Experience amount to process
     */
-    public void beginXpGain(SkillType skill, float xp, XPGainReason xpGainReason) {
+    public void beginXpGain(SkillType skill, float xp) {
        Validate.isTrue(xp >= 0.0, "XP gained should be greater than or equal to zero.");

        if (xp <= 0.0) {
@@ -472,7 +504,7 @@ public class McMMOPlayer {

            for (SkillType parentSkill : parentSkills) {
                if (parentSkill.getPermissions(player)) {
-                    beginXpGain(parentSkill, splitXp, xpGainReason);
+                    beginXpGain(parentSkill, splitXp);
                }
            }

@@ -480,11 +512,11 @@ public class McMMOPlayer {
        }

        // Return if the experience has been shared
-        if (party != null && ShareHandler.handleXpShare(xp, this, skill, ShareHandler.getSharedXpGainReason(xpGainReason))) {
+        if (party != null && ShareHandler.handleXpShare(xp, this, skill)) {
            return;
        }

-        beginUnsharedXpGain(skill, xp, xpGainReason);
+        beginUnsharedXpGain(skill, xp);
    }

    /**
@@ -493,8 +525,8 @@ public class McMMOPlayer {
     * @param skill Skill being used
     * @param xp Experience amount to process
     */
-    public void beginUnsharedXpGain(SkillType skill, float xp, XPGainReason xpGainReason) {
-        applyXpGain(skill, modifyXpGain(skill, xp), xpGainReason);
+    public void beginUnsharedXpGain(SkillType skill, float xp) {
+        applyXpGain(skill, modifyXpGain(skill, xp));

        if (party == null) {
            return;
@@ -511,7 +543,7 @@ public class McMMOPlayer {
     * @param skillType Skill being used
     * @param xp Experience amount to add
     */
-    public void applyXpGain(SkillType skillType, float xp, XPGainReason xpGainReason) {
+    public void applyXpGain(SkillType skillType, float xp) {
        if (!skillType.getPermissions(player)) {
            return;
        }
@@ -520,18 +552,24 @@ public class McMMOPlayer {
            Set<SkillType> parentSkills = FamilyTree.getParents(skillType);

            for (SkillType parentSkill : parentSkills) {
-                applyXpGain(parentSkill, xp / parentSkills.size(), xpGainReason);
+                applyXpGain(parentSkill, xp / parentSkills.size());
            }

            return;
        }

-        if (!EventUtils.handleXpGainEvent(player, skillType, xp, xpGainReason)) {
+        if (!EventUtils.handleXpGainEvent(player, skillType, xp)) {
            return;
        }

+        McMMOHud spoutHud = profile.getSpoutHud();
+
+        if (spoutHud != null) {
+            spoutHud.setLastGained(skillType);
+        }
+
        isUsingUnarmed = (skillType == SkillType.UNARMED);
-        checkXp(skillType, xpGainReason);
+        checkXp(skillType);
    }

    /**
@@ -539,7 +577,7 @@ public class McMMOPlayer {
     *
     * @param skillType The skill to check
     */
-    private void checkXp(SkillType skillType, XPGainReason xpGainReason) {
+    private void checkXp(SkillType skillType) {
        if (getSkillXpLevelRaw(skillType) < getXpToLevel(skillType)) {
            return;
        }
@@ -557,15 +595,24 @@ public class McMMOPlayer {
            levelsGained++;
        }

-        if (!EventUtils.handleLevelChangeEvent(player, skillType, levelsGained, xpRemoved, true, xpGainReason)) {
+        if (!EventUtils.handleLevelChangeEvent(player, skillType, levelsGained, xpRemoved, true)) {
            return;
        }

-        if (Config.getInstance().getLevelUpSoundsEnabled()) {
-            player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
+        if (this.isSpoutPlayer) {
+            SpoutUtils.processLevelup(this, skillType, levelsGained);
+        }
+        else {
+            if (Config.getInstance().getLevelUpSoundsEnabled()) {
+                player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
+            }
+
+            player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, getSkillLevel(skillType)));
        }

-        player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, getSkillLevel(skillType)));
+        if (this.isSpoutPlayer) {
+            SpoutUtils.processXpGain(player, profile);
+        }
    }

    /*
@@ -576,6 +623,10 @@ public class McMMOPlayer {
        return player;
    }

+    public void setPlayer(Player player) {
+        this.player = player;
+    }
+
    public PlayerProfile getProfile() {
        return profile;
    }
@@ -855,6 +906,7 @@ public class McMMOPlayer {
                player.sendMessage(tool.getRaiseTool());
            }

+            setToolPreparationATS(tool, System.currentTimeMillis());
            setToolPreparationMode(tool, true);
            new ToolLowerTask(this, tool).runTaskLaterAsynchronously(mcMMO.p, 4 * Misc.TICK_CONVERSION_FACTOR);
        }
@@ -923,6 +975,14 @@ public class McMMOPlayer {
        profile.resetCooldowns();
    }

+    public McMMOHud getSpoutHud() {
+        return profile.getSpoutHud();
+    }
+
+    public void setSpoutHud(McMMOHud spoutHud) {
+        profile.setSpoutHud(spoutHud);
+    }
+
    public FixedMetadataValue getPlayerMetadata() {
        return playerMetadata;
    }
--- a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
@@ -7,11 +7,13 @@ import java.util.Set;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.config.spout.SpoutConfig;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;

@@ -20,10 +22,12 @@ import com.google.common.collect.ImmutableMap;
 public class PlayerProfile {
    private final String playerName;
    private boolean loaded;
-    private volatile boolean changed;
+    private boolean changed;

    /* HUDs */
+    private HudType hudType;
    private MobHealthbarType mobHealthbarType;
+    private McMMOHud spoutHud;

    /* Skill Data */
    private final Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
@@ -33,6 +37,7 @@ public class PlayerProfile {
    public PlayerProfile(String playerName) {
        this.playerName = playerName;

+        hudType = mcMMO.isSpoutEnabled() ? SpoutConfig.getInstance().getDefaultHudType() : HudType.DISABLED;
        mobHealthbarType = Config.getInstance().getMobHealthbarDefault();

        for (AbilityType abilityType : AbilityType.values()) {
@@ -50,8 +55,10 @@ public class PlayerProfile {
        this.loaded = isLoaded;
    }

-    public PlayerProfile(String playerName, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType) {
+    public PlayerProfile(String playerName, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, HudType hudType, MobHealthbarType mobHealthbarType) {
        this.playerName = playerName;
+
+        this.hudType = hudType;
        this.mobHealthbarType = mobHealthbarType;

        skills.putAll(levelData);
@@ -61,18 +68,12 @@ public class PlayerProfile {
        loaded = true;
    }

-    public void scheduleAsyncSave() {
-        new PlayerProfileSaveTask(this).runTaskAsynchronously(mcMMO.p);
-    }
-
    public void save() {
        if (!changed || !loaded) {
            return;
        }

-        // TODO should this part be synchronized?
-        PlayerProfile profileCopy = new PlayerProfile(playerName, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType);
-        changed = !mcMMO.getDatabaseManager().saveUser(profileCopy);
+        changed = !mcMMO.getDatabaseManager().saveUser(new PlayerProfile(playerName, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), hudType, mobHealthbarType));

        if (changed) {
            mcMMO.p.getLogger().warning("PlayerProfile for " + playerName + " failed to save");
@@ -87,6 +88,26 @@ public class PlayerProfile {
        return loaded;
    }

+    /*
+     * HUD Stuff
+     */
+
+    public HudType getHudType() {
+        return hudType;
+    }
+
+    public McMMOHud getSpoutHud() {
+        return spoutHud;
+    }
+
+    public void setSpoutHud(McMMOHud spoutHud) {
+        this.spoutHud = spoutHud;
+    }
+
+    public void setHudType(HudType hudType) {
+        this.hudType = hudType;
+    }
+
    /*
     * Mob Healthbars
     */
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java
@@ -1,7 +0,0 @@
-package com.gmail.nossr50.datatypes.skills;
-
-public enum ItemType {
-    ARMOR,
-    TOOL,
-    OTHER;
-}
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java
@@ -1,43 +0,0 @@
-package com.gmail.nossr50.datatypes.skills;
-
-import org.bukkit.Material;
-
-public enum MaterialType {
-    STRING,
-    LEATHER,
-    WOOD,
-    STONE,
-    IRON,
-    GOLD,
-    DIAMOND,
-    OTHER;
-
-    public Material getDefaultMaterial() {
-        switch (this) {
-            case STRING:
-                return Material.STRING;
-
-            case LEATHER:
-                return Material.LEATHER;
-
-            case WOOD:
-                return Material.WOOD;
-
-            case STONE:
-                return Material.COBBLESTONE;
-
-            case IRON:
-                return Material.IRON_INGOT;
-
-            case GOLD:
-                return Material.GOLD_INGOT;
-
-            case DIAMOND:
-                return Material.DIAMOND;
-
-            case OTHER:
-            default:
-                return null;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SecondaryAbility.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SecondaryAbility.java
@@ -46,12 +46,9 @@ public enum SecondaryAbility {
    /* Repair */
    ARCANE_FORGING,
    REPAIR_MASTERY,
+    SALVAGE,
    SUPER_REPAIR,

-    /* Salvage */
-    ADVANCED_SALVAGE,
-    ARCANE_SALVAGE,
-
    /* Smelting */
    FLUX_MINING,
    FUEL_EFFICIENCY,
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java
@@ -23,7 +23,6 @@ import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.skills.swords.SwordsManager;
 import com.gmail.nossr50.skills.taming.TamingManager;
@@ -44,8 +43,7 @@ public enum SkillType {
    FISHING(FishingManager.class, Color.NAVY, ImmutableList.of(SecondaryAbility.FISHERMANS_DIET, SecondaryAbility.FISHING_TREASURE_HUNTER, SecondaryAbility.ICE_FISHING, SecondaryAbility.MAGIC_HUNTER, SecondaryAbility.MASTER_ANGLER, SecondaryAbility.SHAKE)),
    HERBALISM(HerbalismManager.class, Color.GREEN, AbilityType.GREEN_TERRA, ToolType.HOE, ImmutableList.of(SecondaryAbility.FARMERS_DIET, SecondaryAbility.GREEN_THUMB_PLANT, SecondaryAbility.GREEN_THUMB_BLOCK, SecondaryAbility.HERBALISM_DOUBLE_DROPS, SecondaryAbility.HYLIAN_LUCK, SecondaryAbility.SHROOM_THUMB)),
    MINING(MiningManager.class, Color.GRAY, AbilityType.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SecondaryAbility.MINING_DOUBLE_DROPS)),
-    REPAIR(RepairManager.class, Color.SILVER, ImmutableList.of(SecondaryAbility.ARCANE_FORGING, SecondaryAbility.REPAIR_MASTERY, SecondaryAbility.SUPER_REPAIR)),
-    SALVAGE(SalvageManager.class, Color.ORANGE, ImmutableList.of(SecondaryAbility.ADVANCED_SALVAGE, SecondaryAbility.ARCANE_SALVAGE)),
+    REPAIR(RepairManager.class, Color.SILVER, ImmutableList.of(SecondaryAbility.ARCANE_FORGING, SecondaryAbility.REPAIR_MASTERY, SecondaryAbility.SALVAGE, SecondaryAbility.SUPER_REPAIR)),
    SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SecondaryAbility.FLUX_MINING, SecondaryAbility.FUEL_EFFICIENCY, SecondaryAbility.SECOND_SMELT)),
    SWORDS(SwordsManager.class, Color.fromRGB(178, 34, 34), AbilityType.SERRATED_STRIKES, ToolType.SWORD, ImmutableList.of(SecondaryAbility.BLEED, SecondaryAbility.COUNTER)),
    TAMING(TamingManager.class, Color.PURPLE, ImmutableList.of(SecondaryAbility.BEAST_LORE, SecondaryAbility.CALL_OF_THE_WILD, SecondaryAbility.ENVIROMENTALLY_AWARE, SecondaryAbility.FAST_FOOD, SecondaryAbility.GORE, SecondaryAbility.HOLY_HOUND, SecondaryAbility.SHARPENED_CLAWS, SecondaryAbility.SHOCK_PROOF, SecondaryAbility.THICK_FUR)),
@@ -65,7 +63,7 @@ public enum SkillType {

    public static final List<SkillType> COMBAT_SKILLS = ImmutableList.of(ARCHERY, AXES, SWORDS, TAMING, UNARMED);
    public static final List<SkillType> GATHERING_SKILLS = ImmutableList.of(EXCAVATION, FISHING, HERBALISM, MINING, WOODCUTTING);
-    public static final List<SkillType> MISC_SKILLS = ImmutableList.of(ACROBATICS, ALCHEMY, REPAIR, SALVAGE, SMELTING);
+    public static final List<SkillType> MISC_SKILLS = ImmutableList.of(ACROBATICS, ALCHEMY, REPAIR, SMELTING);

    static {
        List<SkillType> childSkills = new ArrayList<SkillType>();
@@ -184,7 +182,6 @@ public enum SkillType {
    // TODO: This is a little "hacky", we probably need to add something to distinguish child skills in the enum, or to use another enum for them
    public boolean isChildSkill() {
        switch (this) {
-            case SALVAGE:
            case SMELTING:
                return true;

--- a/src/main/java/com/gmail/nossr50/datatypes/skills/XPGainReason.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/XPGainReason.java
@@ -1,21 +0,0 @@
-package com.gmail.nossr50.datatypes.skills;
-
-public enum XPGainReason {
-    PVP,
-    PVE,
-    VAMPIRISM,
-    SHARED_PVP,
-    SHARED_PVE,
-    COMMAND,
-    UNKNOWN;
-
-    public static XPGainReason getXPGainReason(String reason) {
-        for (XPGainReason type : values()) {
-            if (type.name().equalsIgnoreCase(reason)) {
-                return type;
-            }
-        }
-
-        return null;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
@@ -1,70 +0,0 @@
-package com.gmail.nossr50.datatypes.skills.alchemy;
-
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.Potion;
-
-public enum PotionStage {
-    FIVE(5),
-    FOUR(4),
-    THREE(3),
-    TWO(2),
-    ONE(1);
-
-    int numerical;
-
-    private PotionStage(int numerical) {
-        this.numerical = numerical;
-    }
-
-    public int toNumerical() {
-        return numerical;
-    }
-
-    private static PotionStage getPotionStageNumerical(int numerical) {
-        for (PotionStage potionStage : values()) {
-            if (numerical >= potionStage.toNumerical()) {
-                return potionStage;
-            }
-        }
-
-        return ONE;
-    }
-
-    public static PotionStage getPotionStage(AlchemyPotion input, AlchemyPotion output) {
-        PotionStage potionStage = getPotionStage(output);
-        if (getPotionStage(input) == potionStage) {
-            potionStage = PotionStage.FIVE;
-        }
-
-        return potionStage;
-    }
-
-    public static PotionStage getPotionStage(AlchemyPotion alchemyPotion) {
-        Potion potion = Potion.fromItemStack(new ItemStack(Material.POTION, 1, alchemyPotion.getDataValue()));
-
-        int stage = 1;
-
-        // Check if potion isn't awkward or mundane
-        if (potion.getType() != null) {
-            stage++;
-        }
-
-        // Check if potion has a glowstone dust amplifier
-        if (potion.getLevel() > 1) {
-            stage++;
-        }
-
-        // Check if potion has a redstone dust amplifier
-        if (potion.hasExtendedDuration()) {
-            stage++;
-        }
-
-        // Check if potion has a gunpowder amplifier
-        if (potion.isSplash()) {
-            stage++;
-        }
-
-        return PotionStage.getPotionStageNumerical(stage);
-    }
-}
--- a/src/main/java/com/gmail/nossr50/datatypes/spout/buttons/McMMOButton.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/spout/buttons/McMMOButton.java
@@ -0,0 +1,24 @@
+package com.gmail.nossr50.datatypes.spout.buttons;
+
+import org.getspout.spoutapi.gui.GenericButton;
+
+public class McMMOButton extends GenericButton {
+    private Slot slot;
+
+    public McMMOButton(String text, String toolTip) {
+        this.setText(text);
+        this.setTooltip(toolTip);
+    }
+
+    public void connect(Slot slot) {
+        this.slot = slot;
+    }
+
+    public void activate() {
+        slot.activate();
+    }
+
+    public interface Slot {
+        public void activate();
+    }
+}
--- a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/HudType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/HudType.java
@@ -0,0 +1,12 @@
+package com.gmail.nossr50.datatypes.spout.huds;
+
+public enum HudType {
+    DISABLED,
+    STANDARD,
+    SMALL,
+    RETRO;
+
+    public HudType getNext() {
+        return values()[(ordinal() + 1) % values().length];
+    }
+}
--- a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java
@@ -0,0 +1,106 @@
+package com.gmail.nossr50.datatypes.spout.huds;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu;
+import com.gmail.nossr50.datatypes.spout.popups.McMMOXpBar;
+
+import org.getspout.spoutapi.SpoutManager;
+
+public class McMMOHud {
+    private Player        player;
+    private PlayerProfile profile;
+
+    private SkillType lastGained;
+    private SkillType skillLock;
+    private boolean   xpBarLocked;
+
+    private McMMOMenu  menu;
+    private McMMOXpBar xpBar;
+
+    public McMMOHud(McMMOPlayer mcMMOPlayer) {
+        this.player = mcMMOPlayer.getPlayer();
+        this.profile = mcMMOPlayer.getProfile();
+
+        initializeXpBar();
+    }
+
+    /**
+     * Initialize the HUD.
+     */
+    public void initializeXpBar() {
+        if (SpoutConfig.getInstance().getXPBarEnabled()) {
+            if (xpBar != null) {
+                xpBar.removeWidgets();
+            }
+
+            xpBar = new McMMOXpBar(SpoutManager.getPlayer(player), profile.getHudType());
+        }
+    }
+
+    /**
+     * Update the XP bar.
+     */
+    public void updateXpBar() {
+        SkillType skillType = xpBarLocked ? skillLock : lastGained;
+
+        if (skillType == null) {
+            return;
+        }
+
+        xpBar.update(skillType, profile);
+    }
+
+    public boolean isMenuOpened() {
+        return (menu != null);
+    }
+
+    public void openMenu() {
+        menu = new McMMOMenu(SpoutManager.getPlayer(player), profile);
+    }
+
+    public void onMenuClose() {
+        menu = null;
+    }
+
+    public void removeWidgets() {
+        if (menu != null) {
+            menu.close();
+        }
+
+        SpoutManager.getPlayer(player).getMainScreen().removeWidgets(mcMMO.p);
+    }
+
+    public SkillType getLastGained() {
+        return lastGained;
+    }
+
+    public void setLastGained(SkillType type) {
+        this.lastGained = type;
+    }
+
+    public boolean getXpBarLocked() {
+        return xpBarLocked;
+    }
+
+    public void setXpBarLocked(boolean locked) {
+        this.xpBarLocked = locked;
+    }
+
+    public void toggleXpBarLocked() {
+        xpBarLocked = !xpBarLocked;
+    }
+
+    public SkillType getSkillLock() {
+        return skillLock;
+    }
+
+    public void setSkillLock(SkillType type) {
+        this.skillLock = type;
+    }
+}
--- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java
@@ -0,0 +1,82 @@
+package com.gmail.nossr50.datatypes.spout.popups;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton;
+import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton.Slot;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import org.getspout.spoutapi.gui.GenericLabel;
+import org.getspout.spoutapi.gui.GenericPopup;
+import org.getspout.spoutapi.gui.InGameHUD;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+public class McMMOMenu extends GenericPopup {
+    private McMMOButton hudButton;
+    private McMMOButton escapeButton;
+
+    private GenericLabel titleLabel  = new GenericLabel();
+    private GenericLabel escapeLabel = new GenericLabel();
+
+    private static int centerX = 427 / 2;
+    private static int centerY = 240 / 2;
+
+    public McMMOMenu(final SpoutPlayer spoutPlayer, final PlayerProfile playerProfile) {
+        // 240, 427 are the bottom right
+        titleLabel.setText(LocaleLoader.getString("Spout.Menu.Title"));
+        titleLabel.setWidth(100);
+        titleLabel.setHeight(100);
+        titleLabel.setX(centerX - 35);
+        titleLabel.setY((centerY / 2) - 20);
+
+        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(LocaleLoader.getString("Spout.Menu.HudButton.1", playerProfile.getHudType().toString()), LocaleLoader.getString("Spout.Menu.HudButton.2"));
+        hudButton.setWidth(120);
+        hudButton.setHeight(20);
+        hudButton.setX(centerX - (hudButton.getWidth() / 2));
+        hudButton.setY(centerY / 2);
+        hudButton.connect(new Slot() {
+            @Override
+            public void activate() {
+                HudType  nextHudType = playerProfile.getHudType().getNext();
+                McMMOHud spoutHud    = playerProfile.getSpoutHud();
+
+                playerProfile.setHudType(nextHudType);
+                spoutHud.initializeXpBar();
+                spoutHud.updateXpBar();
+
+                hudButton.setText("HUD Type: " + nextHudType.toString());
+                hudButton.setDirty(true);
+            }
+        });
+
+        escapeButton = new McMMOButton(LocaleLoader.getString("Spout.Menu.ExitButton"), null);
+        escapeButton.setWidth(60);
+        escapeButton.setHeight(20);
+        escapeButton.setX(centerX - (escapeButton.getWidth() / 2));
+        escapeButton.setY((centerY / 2) + (escapeButton.getHeight() * 2) + 5);
+        escapeButton.connect(new Slot() {
+            @Override
+            public void activate() {
+                spoutPlayer.getMainScreen().closePopup();
+            }
+        });
+
+        attachWidget(mcMMO.p, hudButton);
+        attachWidget(mcMMO.p, titleLabel);
+        attachWidget(mcMMO.p, escapeLabel);
+        attachWidget(mcMMO.p, escapeButton);
+
+        InGameHUD inGameHud = spoutPlayer.getMainScreen();
+
+        inGameHud.attachPopupScreen(this);
+        inGameHud.setDirty(true);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java
@@ -0,0 +1,305 @@
+package com.gmail.nossr50.datatypes.spout.popups;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.StringUtils;
+
+import org.getspout.spoutapi.gui.Color;
+import org.getspout.spoutapi.gui.GenericGradient;
+import org.getspout.spoutapi.gui.GenericTexture;
+import org.getspout.spoutapi.gui.InGameHUD;
+import org.getspout.spoutapi.gui.RenderPriority;
+import org.getspout.spoutapi.gui.Widget;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+public class McMMOXpBar {
+    private SpoutPlayer spoutPlayer;
+    private Widget xpBar;
+
+    private GenericGradient xpFill;
+    private GenericGradient xpBackground;
+    private GenericGradient xpIconBackground;
+    private GenericGradient xpIconBorder;
+    private GenericTexture  xpIcon;
+
+    public McMMOXpBar(SpoutPlayer spoutPlayer, HudType hudType) {
+        this.spoutPlayer = spoutPlayer;
+
+        switch (hudType) {
+            case RETRO:
+                initializeXpBarRetro();
+                break;
+
+            case STANDARD:
+                initializeXpBarStandard();
+                break;
+
+            case SMALL:
+                initializeXpBarSmall();
+                break;
+
+            case DISABLED:
+                break;
+
+            default:
+                break;
+        }
+
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    public void removeWidgets() {
+        InGameHUD inGameHud = spoutPlayer.getMainScreen();
+
+        if (xpBar != null) {
+            inGameHud.removeWidget(xpBar);
+        }
+
+        if (xpFill != null) {
+            inGameHud.removeWidget(xpFill);
+        }
+
+        if (xpBackground != null) {
+            inGameHud.removeWidget(xpBackground);
+        }
+
+        if (xpIconBackground != null) {
+            inGameHud.removeWidget(xpIconBackground);
+        }
+
+        if (xpIconBorder != null) {
+            inGameHud.removeWidget(xpIconBorder);
+        }
+
+        if (xpIcon != null) {
+            inGameHud.removeWidget(xpIcon);
+        }
+    }
+
+    /**
+     * Initialize Retro XP bar.
+     */
+    private void initializeXpBarRetro() {
+        Color border     = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBorderRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderBlue(), 1f);
+        Color green      = new Color(0f, 1f, 0f, 1f);
+        Color background = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBackgroundRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundBlue(), 1f);
+
+        xpBar        = new GenericGradient();
+        xpFill       = new GenericGradient();
+        xpBackground = new GenericGradient();
+
+        xpBar.setWidth(128);
+        xpBar.setHeight(4);
+        xpBar.setX(149);
+        xpBar.setY(10);
+        ((GenericGradient) xpBar).setBottomColor(border);
+        ((GenericGradient) xpBar).setTopColor(border);
+        xpBar.setPriority(RenderPriority.Highest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        xpFill.setWidth(0);
+        xpFill.setHeight(2);
+        xpFill.setX(150);
+        xpFill.setY(11);
+        xpFill.setBottomColor(green);
+        xpFill.setTopColor(green);
+        xpFill.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpFill);
+
+        xpBackground.setWidth(126);
+        xpBackground.setHeight(2);
+        xpBackground.setX(150);
+        xpBackground.setY(11);
+        xpBackground.setBottomColor(background);
+        xpBackground.setTopColor(background);
+        xpBackground.setPriority(RenderPriority.Low);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBackground);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
+
+            xpIconBackground = new GenericGradient();
+            xpIconBorder     = new GenericGradient();
+            xpIcon           = new GenericTexture();
+
+            xpIconBackground.setBottomColor(darkbg);
+            xpIconBackground.setTopColor(darkbg);
+            xpIconBackground.setWidth(4);
+            xpIconBackground.setHeight(4);
+            xpIconBackground.setPriority(RenderPriority.High);
+            xpIconBackground.setX(142);
+            xpIconBackground.setY(10);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBackground);
+
+            xpIconBorder.setBottomColor(border);
+            xpIconBorder.setTopColor(border);
+            xpIconBorder.setWidth(6);
+            xpIconBorder.setHeight(6);
+            xpIconBorder.setPriority(RenderPriority.Highest);
+            xpIconBorder.setX(141);
+            xpIconBorder.setY(9);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBorder);
+
+            xpIcon.setWidth(6);
+            xpIcon.setHeight(6);
+            xpIcon.setX(141);
+            xpIcon.setY(9);
+            xpIcon.setPriority(RenderPriority.Normal);
+            xpIcon.setUrl("Icon_r.png");
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Initialize Standard XP bar.
+     */
+    private void initializeXpBarStandard() {
+        xpBar = new GenericTexture();
+
+        ((GenericTexture) xpBar).setUrl("xpbar_inc000.png");
+        xpBar.setX(SpoutConfig.getInstance().getXPBarXPosition());
+        xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+        xpBar.setHeight(8);
+        xpBar.setWidth(256);
+        xpBar.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            xpIcon = new GenericTexture();
+
+            xpIcon.setUrl("Icon.png");
+            xpIcon.setHeight(16);
+            xpIcon.setWidth(32);
+            xpIcon.setX(SpoutConfig.getInstance().getXPIconXPosition());
+            xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition());
+            xpIcon.setPriority(RenderPriority.High);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Initialize Small XP bar.
+     */
+    private void initializeXpBarSmall() {
+        xpBar = new GenericTexture();
+
+        ((GenericTexture) xpBar).setUrl("xpbar_inc000.png");
+        xpBar.setX(427 / 2 - 64);
+        xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+        xpBar.setHeight(4);
+        xpBar.setWidth(128);
+        xpBar.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            xpIcon = new GenericTexture();
+
+            xpIcon.setUrl("Icon.png");
+            xpIcon.setHeight(8);
+            xpIcon.setWidth(16);
+            xpIcon.setX(427 / 2 - (8 + 64));
+            xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition() + 2);
+            xpIcon.setPriority(RenderPriority.High);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Update the XP bar.
+     *
+     * @param skillType The skill last used
+     * @param playerProfile The profile of the player whose XP bar should be updated
+     */
+    public void update(SkillType skillType, PlayerProfile playerProfile) {
+        switch (playerProfile.getHudType()) {
+            case RETRO:
+                updateXpBarRetro(skillType, playerProfile);
+                break;
+
+            case STANDARD:
+            case SMALL:
+                updateXpBarStandard(skillType, playerProfile);
+                break;
+
+            case DISABLED:
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Update XP bar for Standard & Small styles.
+     *
+     * @param skillType The skill last used
+     * @param playerProfile The profile of the player whose XP bar should be updated
+     */
+    private void updateXpBarStandard(SkillType skillType, PlayerProfile playerProfile) {
+        xpIcon.setUrl(StringUtils.getCapitalized(skillType.toString()) + ".png");
+
+        ((GenericTexture) xpBar).setUrl(getUrlBar(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.STANDARD)));
+
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Update XP bar for Retro styles.
+     *
+     * @param skillType The skill last used
+     * @param playerProfile The profile of the player whose XP bar should be updated
+     */
+    private void updateXpBarRetro(SkillType skillType, PlayerProfile playerProfile) {
+        Color color = getRetroColor(skillType);
+
+        xpIcon.setUrl(StringUtils.getCapitalized(skillType.toString()) + "_r.png");
+
+        xpFill.setBottomColor(color);
+        xpFill.setTopColor(color);
+        xpFill.setWidth(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.RETRO));
+
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    private static Color getRetroColor(SkillType type) {
+        return new Color((float) SpoutConfig.getInstance().getRetroHUDRed(type), (float) SpoutConfig.getInstance().getRetroHUDGreen(type), (float) SpoutConfig.getInstance().getRetroHUDBlue(type), 1f);
+    }
+
+    private static String getUrlBar(Integer number) {
+        char[] num = number.toString().toCharArray();
+
+        switch (num.length) {
+            case 1:
+                return "xpbar_inc00" + number + ".png";
+
+            case 2:
+                return "xpbar_inc0" + number + ".png";
+
+            default:
+                return "xpbar_inc" + number + ".png";
+        }
+    }
+
+    private static Integer getXpInc(int skillXp, int xpToLevel, HudType hudType) {
+        double percentage = (double) skillXp / xpToLevel;
+        double inc;
+
+        switch (hudType) {
+            case RETRO:
+                inc = 0.0079365079365079;
+                break;
+
+            case STANDARD:
+                inc = 0.0039370078740157;
+                break;
+
+            default:
+                return 1;
+        }
+
+        return (int) (percentage / inc);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
@@ -6,7 +6,6 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;

 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.util.player.UserManager;

 /**
@@ -16,21 +15,11 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements
    private boolean cancelled;
    protected SkillType skill;
    protected int skillLevel;
-    protected XPGainReason xpGainReason;

-    @Deprecated
    protected McMMOPlayerExperienceEvent(Player player, SkillType skill) {
        super(player);
        this.skill = skill;
        this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill);
-        this.xpGainReason = XPGainReason.UNKNOWN;
-    }
-
-    protected McMMOPlayerExperienceEvent(Player player, SkillType skill, XPGainReason xpGainReason) {
-        super(player);
-        this.skill = skill;
-        this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill);
-        this.xpGainReason = xpGainReason;
    }

    /**
@@ -47,13 +36,6 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements
        return skillLevel;
    }

-    /**
-     * @return The combat type involved in this event
-     */
-    public XPGainReason getXpGainReason() {
-        return xpGainReason;
-    }
-
    /** Following are required for Cancellable **/
    @Override
    public boolean isCancelled() {
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java
@@ -3,18 +3,12 @@ package com.gmail.nossr50.events.experience;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;

 /**
 * Called when a user levels change
 */
 public abstract class McMMOPlayerLevelChangeEvent extends McMMOPlayerExperienceEvent {
-    @Deprecated
    public McMMOPlayerLevelChangeEvent(Player player, SkillType skill) {
-        super(player, skill, XPGainReason.UNKNOWN);
-    }
-
-    public McMMOPlayerLevelChangeEvent(Player player, SkillType skill, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
+        super(player, skill);
    }
 }
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.events.experience;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;

 /**
 * Called when a user loses levels in a skill
@@ -11,25 +10,13 @@ import com.gmail.nossr50.datatypes.skills.XPGainReason;
 public class McMMOPlayerLevelDownEvent extends McMMOPlayerLevelChangeEvent {
    private int levelsLost;

-    @Deprecated
    public McMMOPlayerLevelDownEvent(Player player, SkillType skill) {
-        super(player, skill, XPGainReason.UNKNOWN);
+        super(player, skill);
        this.levelsLost = 1;
    }

-    @Deprecated
    public McMMOPlayerLevelDownEvent(Player player, SkillType skill, int levelsLost) {
-        super(player, skill, XPGainReason.UNKNOWN);
-        this.levelsLost = levelsLost;
-    }
-
-    public McMMOPlayerLevelDownEvent(Player player, SkillType skill, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
-        this.levelsLost = 1;
-    }
-
-    public McMMOPlayerLevelDownEvent(Player player, SkillType skill, int levelsLost, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
+        super(player, skill);
        this.levelsLost = levelsLost;
    }

--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.events.experience;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;

 /**
 * Called when a user levels up in a skill
@@ -11,25 +10,13 @@ import com.gmail.nossr50.datatypes.skills.XPGainReason;
 public class McMMOPlayerLevelUpEvent extends McMMOPlayerLevelChangeEvent {
    private int levelsGained;

-    @Deprecated
    public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
-        super(player, skill, XPGainReason.UNKNOWN);
+        super(player, skill);
        this.levelsGained = 1;
    }

-    @Deprecated
    public McMMOPlayerLevelUpEvent(Player player, SkillType skill, int levelsGained) {
-        super(player, skill, XPGainReason.UNKNOWN);
-        this.levelsGained = levelsGained;
-    }
-
-    public McMMOPlayerLevelUpEvent(Player player, SkillType skill, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
-        this.levelsGained = 1;
-    }
-
-    public McMMOPlayerLevelUpEvent(Player player, SkillType skill, int levelsGained, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
+        super(player, skill);
        this.levelsGained = levelsGained;
    }

--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.events.experience;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;

 /**
 * Called when a player gains XP in a skill
@@ -11,14 +10,8 @@ import com.gmail.nossr50.datatypes.skills.XPGainReason;
 public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
    private float xpGained;

-    @Deprecated
    public McMMOPlayerXpGainEvent(Player player, SkillType skill, float xpGained) {
-        super(player, skill, XPGainReason.UNKNOWN);
-        this.xpGained = xpGained;
-    }
-
-    public McMMOPlayerXpGainEvent(Player player, SkillType skill, float xpGained, XPGainReason xpGainReason) {
-        super(player, skill, xpGainReason);
+        super(player, skill);
        this.xpGained = xpGained;
    }

--- a/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java
@@ -1,14 +0,0 @@
-package com.gmail.nossr50.events.fake;
-
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.entity.EntityTameEvent;
-
-/**
- * Called when mcMMO tames an animal via Call of the Wild
- */
-public class FakeEntityTameEvent extends EntityTameEvent {
-    public FakeEntityTameEvent(LivingEntity entity, AnimalTamer owner) {
-        super(entity, owner);
-    }
-}
--- a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SecondaryAbilityWeightedActivationCheckEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SecondaryAbilityWeightedActivationCheckEvent.java
@@ -15,7 +15,6 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Gets the activation chance of the ability 0D being no chance,  1.0D being 100% chance
-     *
     * @return The activation chance of the ability
     */
    public double getChance() {
@@ -24,8 +23,7 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Sets the activation chance of the ability [0D-1.0D]
-     *
-     * @param chance The activation chance of the ability
+     * @param The activation chance of the ability
     */
    public void setChance(double chance) {
        this.chance = chance;
@@ -33,8 +31,7 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Sets the activation chance of the ability to 100% or 0%
-     *
-     * @param success whether it should be successful or not
+     * @param whether it should be successful or not
     */
    public void setSuccessful(boolean success) {
        this.chance = success ? 1.0D : 0D;
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.listeners;
 import java.util.List;

 import org.bukkit.GameMode;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -34,11 +33,8 @@ import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
 import com.gmail.nossr50.runnables.StickyPistonTrackerTask;
 import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.excavation.ExcavationManager;
-import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
 import com.gmail.nossr50.util.BlockUtils;
@@ -70,7 +66,7 @@ public class BlockListener implements Listener {
        for (Block b : blocks) {
            if (BlockUtils.shouldBeWatched(b.getState()) && mcMMO.getPlaceStore().isTrue(b)) {
                b.getRelative(direction).setMetadata(mcMMO.blockMetadataKey, mcMMO.metadataValue);
-                if (b.equals(futureEmptyBlock) && futureEmptyBlock.getType() == Material.AIR) {
+                if (b.equals(futureEmptyBlock)) {
                    mcMMO.getPlaceStore().setFalse(b);
                }
            }
@@ -93,14 +89,10 @@ public class BlockListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        if (!event.isSticky()) {
-            return;
+        if (event.isSticky()) {
+            // Needed only because under some circumstances Minecraft doesn't move the block
+            new StickyPistonTrackerTask(event.getDirection(), event.getBlock()).runTaskLater(plugin, 2);
        }
-
-        Block movedBlock = event.getRetractLocation().getBlock();
-
-        // Needed only because under some circumstances Minecraft doesn't move the block
-        new StickyPistonTrackerTask(event.getDirection(), event.getBlock(), movedBlock).runTaskLater(plugin, 2);
    }

    /**
@@ -123,13 +115,8 @@ public class BlockListener implements Listener {
            mcMMO.getPlaceStore().setTrue(blockState);
        }

-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (blockState.getType() == Repair.anvilMaterial && SkillType.REPAIR.getPermissions(player)) {
-            mcMMOPlayer.getRepairManager().placedAnvilCheck();
-        }
-        else if (blockState.getType() == Salvage.anvilMaterial && SkillType.SALVAGE.getPermissions(player)) {
-            mcMMOPlayer.getSalvageManager().placedAnvilCheck();
+        if (BlockUtils.isMcMMOAnvil(blockState)) {
+            UserManager.getPlayer(player).getRepairManager().placedAnvilCheck(blockState.getType());
        }
    }

@@ -145,15 +132,14 @@ public class BlockListener implements Listener {
        }

        BlockState blockState = event.getBlock().getState();
-        Location location = blockState.getLocation();

        if (!BlockUtils.shouldBeWatched(blockState)) {
            return;
        }

        /* ALCHEMY - Cancel any brew in progress for that BrewingStand */
-        if (blockState instanceof BrewingStand && Alchemy.brewingStandMap.containsKey(location)) {
-            Alchemy.brewingStandMap.get(location).cancelBrew();
+        if (blockState instanceof BrewingStand && Alchemy.brewingStandMap.containsKey(event.getBlock())) {
+            Alchemy.brewingStandMap.get(event.getBlock()).cancelBrew();
        }

        Player player = event.getPlayer();
@@ -190,7 +176,7 @@ public class BlockListener implements Listener {
        }

        /* WOOD CUTTING */
-        else if (BlockUtils.isLog(blockState) && ItemUtils.isAxe(heldItem) && SkillType.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) {
+        else if (BlockUtils.isLog(blockState) && SkillType.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) {
            WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager();

            if (woodcuttingManager.canUseTreeFeller(heldItem)) {
@@ -235,11 +221,6 @@ public class BlockListener implements Listener {
        BlockState blockState = event.getBlock().getState();
        ItemStack heldItem = player.getItemInHand();

-        if (Herbalism.isRecentlyRegrown(blockState)) {
-            event.setCancelled(true);
-            return;
-        }
-
        if (ItemUtils.isSword(heldItem)) {
            HerbalismManager herbalismManager = UserManager.getPlayer(player).getHerbalismManager();

--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -1,12 +1,10 @@
 package com.gmail.nossr50.listeners;

-import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.LivingEntity;
@@ -36,8 +34,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.projectiles.ProjectileSource;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
@@ -46,7 +42,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.events.fake.FakeEntityTameEvent;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
@@ -56,7 +51,6 @@ import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.taming.Taming;
 import com.gmail.nossr50.skills.taming.TamingManager;
-import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -85,7 +79,7 @@ public class EntityListener implements Listener {
        }

        projectile.setMetadata(mcMMO.bowForceKey, new FixedMetadataValue(plugin, Math.min(event.getForce() * AdvancedConfig.getInstance().getForceMultiplier(), 1.0)));
-        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation()));
+        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, Archery.locationToString(projectile.getLocation())));
    }

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -97,7 +91,7 @@ public class EntityListener implements Listener {
        }

        projectile.setMetadata(mcMMO.bowForceKey, new FixedMetadataValue(plugin, 1.0));
-        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation()));
+        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, Archery.locationToString(projectile.getLocation())));
    }

    /**
@@ -107,32 +101,21 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
-        Block block = event.getBlock();
-
-        if (!BlockUtils.shouldBeWatched(block.getState())) {
-            return;
-        }
-
        Entity entity = event.getEntity();

-        if (entity instanceof FallingBlock || entity instanceof Enderman) {
-            boolean isTracked = entity.hasMetadata(mcMMO.entityMetadataKey);
-
-            if (mcMMO.getPlaceStore().isTrue(block) && !isTracked) {
-                mcMMO.getPlaceStore().setFalse(block);
-                entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
-            }
-            else if (isTracked) {
-                mcMMO.getPlaceStore().setTrue(block);
-            }
-        }
-        else if ((block.getType() == Material.REDSTONE_ORE || block.getType() == Material.GLOWING_REDSTONE_ORE) && (event.getTo() == Material.REDSTONE_ORE || event.getTo() == Material.GLOWING_REDSTONE_ORE)) {
+        if (!(entity instanceof FallingBlock)) {
            return;
        }
-        else {
-            if (mcMMO.getPlaceStore().isTrue(block)) {
-                mcMMO.getPlaceStore().setFalse(block);
-            }
+
+        Block block = event.getBlock();
+        boolean isTracked = entity.hasMetadata(mcMMO.entityMetadataKey);
+
+        if (mcMMO.getPlaceStore().isTrue(block) && !isTracked) {
+            mcMMO.getPlaceStore().setFalse(block);
+            entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
+        }
+        else if (isTracked) {
+            mcMMO.getPlaceStore().setTrue(block);
        }
    }

@@ -160,7 +143,7 @@ public class EntityListener implements Listener {
            return;
        }

-        if (Misc.isNPCEntity(defender) || !defender.isValid() || !(defender instanceof LivingEntity)) {
+        if (!UserManager.hasPlayerDataKey(defender) || !defender.isValid() || !(defender instanceof LivingEntity)) {
            return;
        }

@@ -177,11 +160,7 @@ public class EntityListener implements Listener {
        }

        if (attacker instanceof Projectile) {
-            ProjectileSource projectileSource = ((Projectile) attacker).getShooter();
-
-            if (projectileSource instanceof LivingEntity) {
-                attacker = (LivingEntity) projectileSource;
-            }
+            attacker = ((Projectile) attacker).getShooter();
        }
        else if (attacker instanceof Tameable) {
            AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
@@ -195,10 +174,6 @@ public class EntityListener implements Listener {
            Player defendingPlayer = (Player) defender;
            Player attackingPlayer = (Player) attacker;

-            if (!UserManager.hasPlayerDataKey(defendingPlayer) || !UserManager.hasPlayerDataKey(attackingPlayer)) {
-                return;
-            }
-
            // We want to make sure we're not gaining XP or applying abilities when we hit ourselves
            if (defendingPlayer.equals(attackingPlayer)) {
                return;
@@ -211,7 +186,6 @@ public class EntityListener implements Listener {
        }

        CombatUtils.processCombatAttack(event, attacker, target);
-        CombatUtils.handleHealthbars(attacker, target, event.getDamage());
    }

    /**
@@ -252,11 +226,6 @@ public class EntityListener implements Listener {

        if (livingEntity instanceof Player) {
            Player player = (Player) entity;
-
-            if (!UserManager.hasPlayerDataKey(player)) {
-                return;
-            }
-
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

            /* Check for invincibility */
@@ -267,7 +236,7 @@ public class EntityListener implements Listener {

            switch (cause) {
                case FALL:
-                    if (!SkillUtils.cooldownExpired((long) mcMMOPlayer.getTeleportATS(), Config.getInstance().getXPAfterTeleportCooldown())) {
+                    if (Config.getInstance().getPreventXPAfterTeleport() && SkillUtils.calculateTimeLeft((long) mcMMOPlayer.getTeleportATS() * Misc.TIME_CONVERSION_FACTOR, 5, player) > 0) {
                        return;
                    }

@@ -588,10 +557,6 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onEntityTame(EntityTameEvent event) {
-        if (event instanceof FakeEntityTameEvent) {
-            return;
-        }
-
        Player player = (Player) event.getOwner();
        LivingEntity entity = event.getEntity();

@@ -638,8 +603,9 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onPotionSplash(PotionSplashEvent event) {
-        for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) {
-            if (!effect.getType().equals(PotionEffectType.SATURATION)) {
+        for (PotionEffect effect : ((PotionMeta) event.getEntity().getItem().getItemMeta()).getCustomEffects()) {
+            // (effect.getType() != PotionEffectType.SATURATION) is seemingly broken, so we use deprecated method for now.
+            if (effect.getType().getId() != 23) {
                return;
            }

--- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -34,7 +34,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask;
+import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 import com.gmail.nossr50.util.ItemUtils;
@@ -51,7 +51,7 @@ public class InventoryListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onInventoryOpen(InventoryOpenEvent event) {
-        Block furnaceBlock = processInventoryOpenOrCloseEvent(event.getInventory());
+        Block furnaceBlock = processInventoryOpenorCloseEvent(event.getInventory());

        if (furnaceBlock == null || furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey)) {
            return;
@@ -68,7 +68,7 @@ public class InventoryListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onInventoryClose(InventoryCloseEvent event) {
-        Block furnaceBlock = processInventoryOpenOrCloseEvent(event.getInventory());
+        Block furnaceBlock = processInventoryOpenorCloseEvent(event.getInventory());

        if (furnaceBlock == null || furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey)) {
            return;
@@ -183,10 +183,7 @@ public class InventoryListener implements Listener {
                        return;
                    }

-                    if (!AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), click)) {
-                        return;
-                    }
-
+                    AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), Alchemy.INGREDIENT_SLOT, click);
                    event.setCancelled(true);
                    AlchemyPotionBrewer.scheduleUpdate(inventory);
                    AlchemyPotionBrewer.scheduleCheck(player, stand);
@@ -295,12 +292,7 @@ public class InventoryListener implements Listener {

        ItemStack item = event.getItem();

-        if (Config.getInstance().getPreventHopperTransferIngredients() && item.getType() != Material.POTION) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (Config.getInstance().getPreventHopperTransferBottles() && item.getType() == Material.POTION) {
+        if (Config.getInstance().getPreventHopperTransfer() && item.getType() != Material.POTION) {
            event.setCancelled(true);
            return;
        }
@@ -332,7 +324,7 @@ public class InventoryListener implements Listener {
        new PlayerUpdateInventoryTask((Player) whoClicked).runTaskLater(plugin, 0);
    }

-    private Block processInventoryOpenOrCloseEvent(Inventory inventory) {
+    private Block processInventoryOpenorCloseEvent(Inventory inventory) {
        if (!(inventory instanceof FurnaceInventory)) {
            return null;
        }
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -6,7 +6,6 @@ import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -24,7 +23,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerStatisticIncrementEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;

@@ -38,18 +36,16 @@ import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.salvage.Salvage;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
 import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.skills.unarmed.Unarmed;
 import com.gmail.nossr50.util.BlockUtils;
@@ -85,7 +81,7 @@ public class PlayerListener implements Listener {
    public void onPlayerTeleport(PlayerTeleportEvent event) {
        Player player = event.getPlayer();

-        if (!UserManager.hasPlayerDataKey(player) || Config.getInstance().getXPAfterTeleportCooldown() <= 0 || event.getFrom().equals(event.getTo())) {
+        if (!UserManager.hasPlayerDataKey(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
            return;
        }

@@ -226,13 +222,6 @@ public class PlayerListener implements Listener {
                return;

            case CAUGHT_FISH:
-                //TODO Update to new API once available! Waiting for case CAUGHT_TREASURE:
-                Item fishingCatch = (Item) event.getCaught();
-
-                if (Config.getInstance().getFishingOverrideTreasures() && fishingCatch.getItemStack().getType() != Material.RAW_FISH) {
-                    fishingCatch.setItemStack(new ItemStack(Material.RAW_FISH, 1));
-                }
-
                if (Permissions.vanillaXpBoost(player, SkillType.FISHING)) {
                    event.setExpToDrop(fishingManager.handleVanillaXpBoost(event.getExpToDrop()));
                }
@@ -315,7 +304,7 @@ public class PlayerListener implements Listener {
        ItemStack dropStack = drop.getItemStack();

        if (drop.hasMetadata(mcMMO.disarmedItemKey)) {
-            if (!player.getName().equals(drop.getMetadata(mcMMO.disarmedItemKey).get(0).asString())) {
+            if (!player.getName().equals(drop.getMetadata(mcMMO.disarmedItemKey).get(0).value())) {
                event.setCancelled(true);
            }

@@ -363,7 +352,7 @@ public class PlayerListener implements Listener {

        mcMMOPlayer.resetAbilityMode();
        BleedTimerTask.bleedOut(player);
-        mcMMOPlayer.getProfile().scheduleAsyncSave();
+        mcMMOPlayer.getProfile().save();
        UserManager.remove(player);
        ScoreboardManager.teardownPlayer(player);
    }
@@ -401,11 +390,6 @@ public class PlayerListener implements Listener {
            player.sendMessage(LocaleLoader.getString("UpdateChecker.Outdated"));
            player.sendMessage(LocaleLoader.getString("UpdateChecker.NewAvailable"));
        }
-
-        if (Config.getInstance().getShowStatsAfterLogin()) {
-            ScoreboardManager.enablePlayerStatsScoreboard(player);
-            new McScoreboardKeepTask(player).runTaskLater(mcMMO.p, 1 * Misc.TICK_CONVERSION_FACTOR);
-        }
    }

    /**
@@ -452,24 +436,24 @@ public class PlayerListener implements Listener {

                if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) {
                    /* REPAIR CHECKS */
-                    if (type == Repair.anvilMaterial && SkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
+                    if (type == Repair.repairAnvilMaterial && SkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
                        RepairManager repairManager = mcMMOPlayer.getRepairManager();
                        event.setCancelled(true);

                        // Make sure the player knows what he's doing when trying to repair an enchanted item
-                        if (!(heldItem.getEnchantments().size() > 0) || repairManager.checkConfirmation(true)) {
+                        if (!(heldItem.getEnchantments().size() > 0) || repairManager.checkConfirmation(type, true)) {
                            repairManager.handleRepair(heldItem);
                            player.updateInventory();
                        }
                    }
                    /* SALVAGE CHECKS */
-                    else if (type == Salvage.anvilMaterial && SkillType.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) {
-                        SalvageManager salvageManager = UserManager.getPlayer(player).getSalvageManager();
+                    else if (type == Repair.salvageAnvilMaterial && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SALVAGE) && Repair.isSalvageable(heldItem)) {
+                        RepairManager repairManager = mcMMOPlayer.getRepairManager();
                        event.setCancelled(true);

                        // Make sure the player knows what he's doing when trying to salvage an enchanted item
-                        if (!(heldItem.getEnchantments().size() > 0) || salvageManager.checkConfirmation(true)) {
-                            salvageManager.handleSalvage(block.getLocation(), heldItem);
+                        if (!(heldItem.getEnchantments().size() > 0) || repairManager.checkConfirmation(type, true)) {
+                            repairManager.handleSalvage(block.getLocation(), heldItem);
                            player.updateInventory();
                        }
                    }
@@ -491,22 +475,22 @@ public class PlayerListener implements Listener {

                if ((Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() && player.isSneaking()) || !Config.getInstance().getAbilitiesOnlyActivateWhenSneaking()) {
                    /* REPAIR CHECKS */
-                    if (type == Repair.anvilMaterial && SkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
+                    if (type == Repair.repairAnvilMaterial && SkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
                        RepairManager repairManager = mcMMOPlayer.getRepairManager();

                        // Cancel repairing an enchanted item
-                        if (repairManager.checkConfirmation(false)) {
-                            repairManager.setLastAnvilUse(0);
+                        if (repairManager.checkConfirmation(type, false) && Config.getInstance().getRepairConfirmRequired()) {
+                            repairManager.setLastAnvilUse(Repair.repairAnvilMaterial, 0);
                            player.sendMessage(LocaleLoader.getString("Skills.Cancelled", LocaleLoader.getString("Repair.Pretty.Name")));
                        }
                    }
                    /* SALVAGE CHECKS */
-                    else if (type == Salvage.anvilMaterial && SkillType.SALVAGE.getPermissions(player) && mcMMO.getSalvageableManager().isSalvageable(heldItem)) {
-                        SalvageManager salvageManager = mcMMOPlayer.getSalvageManager();
+                    else if (type == Repair.salvageAnvilMaterial && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SALVAGE) && Repair.isSalvageable(heldItem)) {
+                        RepairManager repairManager = mcMMOPlayer.getRepairManager();

                        // Cancel salvaging an enchanted item
-                        if (salvageManager.checkConfirmation(false)) {
-                            salvageManager.setLastAnvilUse(0);
+                        if (repairManager.checkConfirmation(type, false) && Config.getInstance().getRepairConfirmRequired()) {
+                            repairManager.setLastAnvilUse(Repair.salvageAnvilMaterial, 0);
                            player.sendMessage(LocaleLoader.getString("Skills.Cancelled", LocaleLoader.getString("Salvage.Pretty.Name")));
                        }
                    }
@@ -612,14 +596,21 @@ public class PlayerListener implements Listener {
                Material type = heldItem.getType();
                TamingManager tamingManager = mcMMOPlayer.getTamingManager();

-                if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.WOLF)) {
-                    tamingManager.summonWolf();
-                }
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT)) {
-                    tamingManager.summonOcelot();
-                }
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.HORSE)) {
-                    tamingManager.summonHorse();
+                switch (type) {
+                    case APPLE:
+                        tamingManager.summonHorse();
+                        break;
+
+                    case BONE:
+                        tamingManager.summonWolf();
+                        break;
+
+                    case RAW_FISH:
+                        tamingManager.summonOcelot();
+                        break;
+
+                    default:
+                        break;
                }

                break;
@@ -638,11 +629,11 @@ public class PlayerListener implements Listener {
    public void onPlayerChat(AsyncPlayerChatEvent event) {
        Player player = event.getPlayer();

-        if (Misc.isNPCEntity(player) || !UserManager.hasPlayerDataKey(player)) {
+        if (Misc.isNPCEntity(player)) {
            return;
        }

-        McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(player);
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player, true);

        if (mcMMOPlayer == null) {
            mcMMO.p.debug(player.getName() + "is chatting, but is currently not logged in to the server.");
@@ -702,13 +693,4 @@ public class PlayerListener implements Listener {
            }
        }
    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerStatisticIncrementEvent(PlayerStatisticIncrementEvent event) {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            return;
-        }
-
-        mcMMO.getHolidayManager().handleStatisticEvent(event);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java
@@ -0,0 +1,95 @@
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
+import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+import org.getspout.spoutapi.event.input.KeyPressedEvent;
+import org.getspout.spoutapi.event.screen.ButtonClickEvent;
+import org.getspout.spoutapi.event.screen.ScreenCloseEvent;
+import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
+import org.getspout.spoutapi.gui.Button;
+import org.getspout.spoutapi.gui.ScreenType;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+public class SpoutListener implements Listener {
+
+    /**
+     * Monitor SpoutCraftEnable events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
+        SpoutPlayer spoutPlayer = event.getPlayer();
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(spoutPlayer);
+
+        mcMMOPlayer.setIsSpoutPlayer(true);
+
+        // TODO: Add custom titles based on skills
+        if (SpoutConfig.getInstance().getShowPowerLevel()) {
+            spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getTitle(), mcMMOPlayer.getPowerLevel()));
+        }
+
+        mcMMOPlayer.setSpoutHud(new McMMOHud(mcMMOPlayer)); // Setup Party HUD stuff
+    }
+
+    /**
+     * Monitor Spout ButtonClick events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onButtonClick(ButtonClickEvent event) {
+        Button button = event.getButton();
+
+        if (button instanceof McMMOButton) {
+            ((McMMOButton) button).activate();
+        }
+    }
+
+    /**
+     * Monitor Spout ScreenClose events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onScreenClose(ScreenCloseEvent event) {
+        if (event.getScreen() instanceof McMMOMenu) {
+            SpoutPlayer spoutPlayer = event.getPlayer();
+
+            UserManager.getPlayer(spoutPlayer).getSpoutHud().onMenuClose();
+            spoutPlayer.getMainScreen().setDirty(true);
+        }
+    }
+
+    /**
+     * Monitor Spout KeyPressed events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onKeyPressed(KeyPressedEvent event) {
+        SpoutPlayer spoutPlayer = event.getPlayer();
+
+        if (spoutPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
+            return;
+        }
+
+        if (event.getKey() == SpoutConfig.getInstance().getMenuKey()) {
+            McMMOHud spoutHud = UserManager.getPlayer(spoutPlayer).getSpoutHud();
+
+            if (!spoutHud.isMenuOpened()) {
+                spoutHud.openMenu();
+            }
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
@@ -1,6 +1,7 @@
 package com.gmail.nossr50.listeners;

 import java.io.File;
+import java.util.ArrayList;

 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -17,6 +18,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionMain;

 public class WorldListener implements Listener {
+    private final ArrayList<BlockStoreConversionMain> converters = new ArrayList<BlockStoreConversionMain>();
    private final mcMMO plugin;

    public WorldListener(final mcMMO plugin) {
@@ -54,7 +56,9 @@ public class WorldListener implements Listener {

        plugin.getLogger().info("Converting block storage for " + world.getName() + " to a new format.");

-        new BlockStoreConversionMain(world).run();
+        BlockStoreConversionMain converter = new BlockStoreConversionMain(world);
+        converter.run();
+        converters.add(converter);
    }

    /**
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -20,7 +20,7 @@ import com.gmail.nossr50.config.mods.EntityConfigManager;
 import com.gmail.nossr50.config.mods.ToolConfigManager;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
-import com.gmail.nossr50.config.skills.salvage.SalvageConfigManager;
+import com.gmail.nossr50.config.spout.SpoutConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
@@ -29,12 +29,12 @@ import com.gmail.nossr50.listeners.EntityListener;
 import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.listeners.SelfListener;
+import com.gmail.nossr50.listeners.SpoutListener;
 import com.gmail.nossr50.listeners.WorldListener;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.metrics.MetricsManager;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.runnables.CheckDateTask;
 import com.gmail.nossr50.runnables.SaveTimerTask;
-import com.gmail.nossr50.runnables.UpdaterResultAsyncTask;
 import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
 import com.gmail.nossr50.runnables.database.UserPurgeTask;
 import com.gmail.nossr50.runnables.party.PartyAutoKickTask;
@@ -45,9 +45,6 @@ import com.gmail.nossr50.skills.child.ChildConfig;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableManager;
 import com.gmail.nossr50.skills.repair.repairables.SimpleRepairableManager;
-import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
-import com.gmail.nossr50.skills.salvage.salvageables.SalvageableManager;
-import com.gmail.nossr50.skills.salvage.salvageables.SimpleSalvageableManager;
 import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.HolidayManager;
 import com.gmail.nossr50.util.LogFilter;
@@ -60,18 +57,21 @@ import com.gmail.nossr50.util.commands.CommandRegistrationManager;
 import com.gmail.nossr50.util.experience.FormulaManager;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.util.spout.SpoutUtils;

+import net.gravitydevelopment.updater.mcmmo.Updater;
+import net.gravitydevelopment.updater.mcmmo.Updater.UpdateResult;
+import net.gravitydevelopment.updater.mcmmo.Updater.UpdateType;
 import net.shatteredlands.shatt.backup.ZipLibrary;

 public class mcMMO extends JavaPlugin {
    /* Managers */
-    private static ChunkManager       placeStore;
-    private static RepairableManager  repairableManager;
-    private static SalvageableManager salvageableManager;
-    private static ModManager         modManager;
-    private static DatabaseManager    databaseManager;
-    private static FormulaManager     formulaManager;
-    private static HolidayManager     holidayManager;
+    private static ChunkManager      placeStore;
+    private static RepairableManager repairableManager;
+    private static ModManager        modManager;
+    private static DatabaseManager   databaseManager;
+    private static FormulaManager    formulaManager;
+    private static HolidayManager    holidayManager;

    /* File Paths */
    private static String mainDirectory;
@@ -88,7 +88,12 @@ public class mcMMO extends JavaPlugin {
    private boolean updateAvailable;

    /* Plugin Checks */
+    private static boolean spoutEnabled;
+    private static boolean combatTagEnabled;
    private static boolean healthBarPluginEnabled;
+    private static boolean noCheatPlusPluginEnabled;
+    private static boolean compatNoCheatPlusPluginEnabled;
+    private static boolean mcpcEnabled;

    // Config Validation Check
    public boolean noErrorsInConfigFiles = true;
@@ -111,7 +116,6 @@ public class mcMMO extends JavaPlugin {
    public final static String customDamageKey     = "mcMMO: Custom Damage";
    public final static String disarmedItemKey     = "mcMMO: Disarmed Item";
    public final static String playerDataKey       = "mcMMO: Player Data";
-    public final static String greenThumbDataKey   = "mcMMO: Green Thumb";

    public static FixedMetadataValue metadataValue;

@@ -125,11 +129,19 @@ public class mcMMO extends JavaPlugin {
            getLogger().setFilter(new LogFilter(this));
            metadataValue = new FixedMetadataValue(this, true);

-            PluginManager pluginManager = getServer().getPluginManager();
-            healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null;
+            spoutEnabled = getServer().getPluginManager().getPlugin("Spout") != null;
+            mcpcEnabled = getServer().getName().equals("MCPC+");
+            combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null;
+            healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null;
+            noCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("NoCheatPlus") != null;
+            compatNoCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("CompatNoCheatPlus") != null;

            setupFilePaths();

+            if (spoutEnabled) {
+                setupSpout();
+            }
+
            modManager = new ModManager();

            loadConfigFiles();
@@ -138,7 +150,7 @@ public class mcMMO extends JavaPlugin {
                return;
            }

-            if (getServer().getName().equals("MCPC+")) {
+            if (mcpcEnabled) {
                checkModConfigs();
            }

@@ -146,7 +158,7 @@ public class mcMMO extends JavaPlugin {
                getLogger().info("HealthBar plugin found, mcMMO's healthbars are automatically disabled.");
            }

-            if (pluginManager.getPlugin("NoCheatPlus") != null && pluginManager.getPlugin("CompatNoCheatPlus") == null) {
+            if (noCheatPlusPluginEnabled && !compatNoCheatPlusPluginEnabled) {
                getLogger().warning("NoCheatPlus plugin found, but CompatNoCheatPlus was not found!");
                getLogger().warning("mcMMO will not work properly alongside NoCheatPlus without CompatNoCheatPlus");
            }
@@ -203,7 +215,6 @@ public class mcMMO extends JavaPlugin {
        try {
            Alchemy.finishAllBrews();   // Finish all partially complete AlchemyBrewTasks to prevent vanilla brewing continuation on restart
            UserManager.saveAll();      // Make sure to save player information if the server shuts down
-            UserManager.clearAll();
            PartyManager.saveParties(); // Save our parties
            ScoreboardManager.teardownAll();
            formulaManager.saveFormula();
@@ -260,10 +271,6 @@ public class mcMMO extends JavaPlugin {
        return updateAvailable;
    }

-    public void setUpdateAvailable(boolean available) {
-        this.updateAvailable = available;
-    }
-
    public boolean isXPEventEnabled() {
        return xpEventEnabled;
    }
@@ -296,10 +303,6 @@ public class mcMMO extends JavaPlugin {
        return repairableManager;
    }

-    public static SalvageableManager getSalvageableManager() {
-        return salvageableManager;
-    }
-
    public static DatabaseManager getDatabaseManager() {
        return databaseManager;
    }
@@ -313,10 +316,22 @@ public class mcMMO extends JavaPlugin {
        mcMMO.databaseManager = databaseManager;
    }

+    public static boolean isSpoutEnabled() {
+        return spoutEnabled;
+    }
+
+    public static boolean isCombatTagEnabled() {
+        return combatTagEnabled;
+    }
+
    public static boolean isHealthBarPluginEnabled() {
        return healthBarPluginEnabled;
    }

+    public static boolean isMCPCEnabled() {
+        return mcpcEnabled;
+    }
+
    /**
     * Setup the various storage file paths
     */
@@ -383,7 +398,21 @@ public class mcMMO extends JavaPlugin {
            return;
        }

-        new UpdaterResultAsyncTask(this).runTaskAsynchronously(mcMMO.p);
+        Updater updater = new Updater(this, 31030, mcmmo, UpdateType.NO_DOWNLOAD, false);
+
+        if (updater.getResult() != UpdateResult.UPDATE_AVAILABLE) {
+            this.updateAvailable = false;
+            return;
+        }
+
+        if (updater.getLatestType().equals("beta") && !Config.getInstance().getPreferBeta()) {
+            this.updateAvailable = false;
+            return;
+        }
+
+        this.updateAvailable = true;
+        getLogger().info(LocaleLoader.getString("UpdateChecker.Outdated"));
+        getLogger().info(LocaleLoader.getString("UpdateChecker.NewAvailable"));
    }

    private void loadConfigFiles() {
@@ -395,7 +424,6 @@ public class mcMMO extends JavaPlugin {
        new ChildConfig();

        List<Repairable> repairables = new ArrayList<Repairable>();
-        List<Salvageable> salvageables = new ArrayList<Salvageable>();

        if (Config.getInstance().getToolModsEnabled()) {
            new ToolConfigManager(this);
@@ -418,12 +446,13 @@ public class mcMMO extends JavaPlugin {
        repairables.addAll(modManager.getLoadedRepairables());
        repairableManager = new SimpleRepairableManager(repairables.size());
        repairableManager.registerRepairables(repairables);
+    }

-        // Load salvage configs, make manager and register them at this time
-        SalvageConfigManager sManager = new SalvageConfigManager(this);
-        salvageables.addAll(sManager.getLoadedSalvageables());
-        salvageableManager = new SimpleSalvageableManager(salvageables.size());
-        salvageableManager.registerSalvageables(salvageables);
+    private void setupSpout() {
+        SpoutConfig.getInstance();
+        getServer().getPluginManager().registerEvents(new SpoutListener(), this);
+        SpoutUtils.preCacheFiles();
+        SpoutUtils.reloadSpoutPlayers(); // Handle spout players after a /reload
    }

    private void registerEvents() {
@@ -477,10 +506,6 @@ public class mcMMO extends JavaPlugin {

        // Update power level tag scoreboards
        new PowerLevelUpdatingTask().runTaskTimer(this, 2 * Misc.TICK_CONVERSION_FACTOR, 2 * Misc.TICK_CONVERSION_FACTOR);
-
-        if (getHolidayManager().nearingAprilFirst()) {
-            new CheckDateTask().runTaskTimer(this, 10L * Misc.TICK_CONVERSION_FACTOR, 1L * 60L * 60L * Misc.TICK_CONVERSION_FACTOR);
-        }
    }

    private void checkModConfigs() {
--- a/src/main/java/com/gmail/nossr50/party/PartyManager.java
+++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -260,11 +260,6 @@ public final class PartyManager {
            processPartyLeaving(UserManager.getPlayer(member));
        }

-        // Disband the alliance between the disbanded party and it's ally
-        if (party.getAlly() != null) {
-            party.getAlly().setAlly(null);
-        }
-
        parties.remove(party);
    }

@@ -464,6 +459,16 @@ public final class PartyManager {
        return !party.isLocked() || party.getLeader().equalsIgnoreCase(mcMMOPlayer.getPlayer().getName());
    }

+    /**
+     * Check if a string is a valid party name.
+     *
+     * @param partyName The party name to check
+     * @return true if this is a valid party, false otherwise
+     */
+    public static boolean isParty(String partyName) {
+        return getParty(partyName) != null;
+    }
+
    /**
     * Load party file.
     */
--- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java
+++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java
@@ -13,7 +13,6 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.UserManager;

@@ -28,7 +27,7 @@ public final class ShareHandler {
     * @param skillType Skill being used
     * @return True is the xp has been shared
     */
-    public static boolean handleXpShare(float xp, McMMOPlayer mcMMOPlayer, SkillType skillType, XPGainReason xpGainReason) {
+    public static boolean handleXpShare(float xp, McMMOPlayer mcMMOPlayer, SkillType skillType) {
        Party party = mcMMOPlayer.getParty();

        if (party.getXpShareMode() != ShareMode.EQUAL) {
@@ -48,7 +47,7 @@ public final class ShareHandler {
        float splitXp = (float) (xp / partySize * shareBonus);

        for (Player member : nearMembers) {
-            UserManager.getPlayer(member).beginUnsharedXpGain(skillType, splitXp, xpGainReason);
+            UserManager.getPlayer(member).beginUnsharedXpGain(skillType, splitXp);
        }

        return true;
@@ -143,18 +142,6 @@ public final class ShareHandler {
        }
    }

-    public static XPGainReason getSharedXpGainReason(XPGainReason xpGainReason) {
-        if (xpGainReason == XPGainReason.PVE) {
-            return XPGainReason.SHARED_PVE;
-        }
-        else if (xpGainReason == XPGainReason.PVP) {
-            return XPGainReason.SHARED_PVP;
-        }
-        else {
-            return xpGainReason;
-        }
-    }
-
    private static void awardDrop(Player winningPlayer, ItemStack drop) {
        if (winningPlayer.getInventory().addItem(drop).size() != 0) {
            winningPlayer.getWorld().dropItemNaturally(winningPlayer.getLocation(), drop);
--- a/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java
@@ -1,24 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.skills.AprilTask;
-import com.gmail.nossr50.util.Misc;
-
-public class CheckDateTask extends BukkitRunnable {
-
-    @Override
-    public void run() {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            return;
-        }
-
-        // Set up jokes
-        new AprilTask().runTaskTimer(mcMMO.p, 1L * 60L * Misc.TICK_CONVERSION_FACTOR, 10L * 60L * Misc.TICK_CONVERSION_FACTOR);
-        mcMMO.getHolidayManager().registerAprilCommand();
-
-        // Jokes deployed.
-        this.cancel();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.runnables.player;
+package com.gmail.nossr50.runnables;

 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
--- a/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java
@@ -1,31 +1,31 @@
 package com.gmail.nossr50.runnables;

+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.PistonMoveReaction;
 import org.bukkit.scheduler.BukkitRunnable;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.BlockUtils;

 public class StickyPistonTrackerTask extends BukkitRunnable {
    private BlockFace direction;
    private Block block;
-    private Block movedBlock;

-    public StickyPistonTrackerTask(BlockFace direction, Block block, Block movedBlock) {
+    public StickyPistonTrackerTask(BlockFace direction, Block block) {
        this.direction = direction;
        this.block = block;
-        this.movedBlock = movedBlock;
    }

    @Override
    public void run() {
-        if (!BlockUtils.shouldBeWatched(movedBlock.getState()) || movedBlock.getPistonMoveReaction() != PistonMoveReaction.MOVE || !mcMMO.getPlaceStore().isTrue(movedBlock)) {
+        Block newBlock = block.getRelative(direction);
+        Block originalBlock = newBlock.getRelative(direction);
+
+        if (originalBlock.getType() != Material.AIR || !mcMMO.getPlaceStore().isTrue(originalBlock)) {
            return;
        }

-        mcMMO.getPlaceStore().setFalse(movedBlock);
-        mcMMO.getPlaceStore().setTrue(block.getRelative(direction));
+        mcMMO.getPlaceStore().setFalse(originalBlock);
+        mcMMO.getPlaceStore().setTrue(newBlock);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/UpdaterResultAsyncTask.java
@@ -1,36 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-import net.gravitydevelopment.updater.mcmmo.Updater;
-
-public class UpdaterResultAsyncTask extends BukkitRunnable {
-    private mcMMO plugin;
-
-    public UpdaterResultAsyncTask(mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void run() {
-        Updater updater = new Updater(plugin, 31030, plugin.mcmmo, Updater.UpdateType.NO_DOWNLOAD, false);
-
-        if (updater.getResult() != Updater.UpdateResult.UPDATE_AVAILABLE) {
-            plugin.setUpdateAvailable(false);
-            return;
-        }
-
-        if (updater.getLatestType().equals("beta") && !Config.getInstance().getPreferBeta()) {
-            plugin.setUpdateAvailable(false);
-            return;
-        }
-
-        plugin.setUpdateAvailable(true);
-        plugin.getLogger().info(LocaleLoader.getString("UpdateChecker.Outdated"));
-        plugin.getLogger().info(LocaleLoader.getString("UpdateChecker.NewAvailable"));
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java
@@ -1,21 +0,0 @@
-package com.gmail.nossr50.runnables.commands;
-
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-public class McScoreboardKeepTask extends BukkitRunnable {
-    private Player player;
-
-    public McScoreboardKeepTask(Player player) {
-        this.player = player;
-    }
-
-    @Override
-    public void run() {
-        if (player.isValid() && ScoreboardManager.isBoardShown(player.getName())) {
-            ScoreboardManager.keepBoard(player.getName());
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java
@@ -34,7 +34,7 @@ public class McrankCommandDisplayTask extends BukkitRunnable {
            displayBoard();
        }

-        if (useChat) {
+        if (useChat){
            displayChat();
        }
    }
--- a/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java
@@ -28,5 +28,5 @@ public class DatabaseConversionTask extends BukkitRunnable {
                sender.sendMessage(message);
            }
        });
-    }
+   }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
@@ -28,7 +28,7 @@ public class FormulaConversionTask extends BukkitRunnable {
        int convertedUsers = 0;
        long startMillis = System.currentTimeMillis();
        for (String playerName : mcMMO.getDatabaseManager().getStoredUsers()) {
-            McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
            PlayerProfile profile;

            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
@@ -41,8 +41,7 @@ public class FormulaConversionTask extends BukkitRunnable {
                }

                editValues(profile);
-                // Since this is a temporary profile, we save it here.
-                profile.scheduleAsyncSave();
+                profile.save(); // Since this is a temporary profile, we save it here.
            }
            else {
                profile = mcMMOPlayer.getProfile();
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java
@@ -1,56 +0,0 @@
-package com.gmail.nossr50.runnables.skills;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Sound;
-import org.bukkit.Statistic;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.HolidayManager;
-import com.gmail.nossr50.util.Misc;
-
-public class AprilTask extends BukkitRunnable {
-
-    @Override
-    public void run() {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            this.cancel();
-            return;
-        }
-
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            int random = Misc.getRandom().nextInt(40) + 11;
-            int betterRandom = Misc.getRandom().nextInt(2000);
-            if (betterRandom == 0) {
-                player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
-                player.sendMessage(unknown("superskill") + " skill increased by 1. Total (" + unknown("12") + ")");
-                fireworksShow(player);
-            }
-
-            for (Statistic statistic : mcMMO.getHolidayManager().movementStatistics) {
-                if (player.getStatistic(statistic) > 0 && player.getStatistic(statistic) % random == 0) {
-                    mcMMO.getHolidayManager().levelUpApril(player, HolidayManager.FakeSkillType.getByStatistic(statistic));
-                    break;
-                }
-            }
-        }
-    }
-
-    private void fireworksShow(final Player player) {
-        final int firework_amount = 10;
-        for (int i = 0; i < firework_amount; i++) {
-            int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4;
-            mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
-                @Override
-                public void run() {
-                    mcMMO.getHolidayManager().spawnFireworks(player);
-                }
-            }, delay);
-        }
-    }
-
-    private String unknown(String string) {
-        return ChatColor.MAGIC + string + ChatColor.RESET + ChatColor.YELLOW;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java
@@ -5,22 +5,19 @@ import org.bukkit.scheduler.BukkitRunnable;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;

 public class AwardCombatXpTask extends BukkitRunnable {
    private McMMOPlayer mcMMOPlayer;
    private double baseXp;
    private SkillType skillType;
    private LivingEntity target;
-    private XPGainReason xpGainReason;
    private double baseHealth;

-    public AwardCombatXpTask(McMMOPlayer mcMMOPlayer, SkillType skillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) {
+    public AwardCombatXpTask(McMMOPlayer mcMMOPlayer, SkillType skillType, double baseXp, LivingEntity target) {
        this.mcMMOPlayer = mcMMOPlayer;
        this.skillType = skillType;
        this.baseXp = baseXp;
        this.target = target;
-        this.xpGainReason = xpGainReason;
        baseHealth = target.getHealth();
    }

@@ -39,6 +36,6 @@ public class AwardCombatXpTask extends BukkitRunnable {
            damage += health;
        }

-        mcMMOPlayer.beginXpGain(skillType, (int) (damage * baseXp), xpGainReason);
+        mcMMOPlayer.beginXpGain(skillType, (int) (damage * baseXp));
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
@@ -19,7 +19,7 @@ public class BleedTimerTask extends BukkitRunnable {

    @Override
    public void run() {
-        for (Iterator<Entry<LivingEntity, Integer>> bleedIterator = bleedList.entrySet().iterator(); bleedIterator.hasNext(); ) {
+        for (Iterator<Entry<LivingEntity, Integer>> bleedIterator = bleedList.entrySet().iterator(); bleedIterator.hasNext();) {
            Entry<LivingEntity, Integer> entry = bleedIterator.next();
            LivingEntity entity = entry.getKey();

@@ -107,8 +107,4 @@ public class BleedTimerTask extends BukkitRunnable {
            bleedList.put(entity, Math.min(newTicks, MAX_BLEED_TICKS));
        }
    }
-
-    public static boolean isBleeding(LivingEntity entity) {
-        return bleedList.containsKey(entity);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java
@@ -1,12 +1,9 @@
 package com.gmail.nossr50.skills;

-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.util.skills.PerksUtils;

 public abstract class SkillManager {
@@ -20,6 +17,10 @@ public abstract class SkillManager {
        this.skill = skill;
    }

+    public McMMOPlayer getMcMMOPlayer() {
+        return mcMMOPlayer;
+    }
+
    public Player getPlayer() {
        return mcMMOPlayer.getPlayer();
    }
@@ -28,11 +29,7 @@ public abstract class SkillManager {
        return mcMMOPlayer.getSkillLevel(skill);
    }

-    public void applyXpGain(float xp, XPGainReason xpGainReason) {
-        mcMMOPlayer.beginXpGain(skill, xp, xpGainReason);
-    }
-
-    public XPGainReason getXPGainReason(LivingEntity target, Entity damager) {
-        return (damager instanceof Player && target instanceof Player) ? XPGainReason.PVP : XPGainReason.PVE;
+    public void applyXpGain(float xp) {
+        mcMMOPlayer.beginXpGain(skill, xp);
    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
@@ -12,7 +12,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.Misc;
@@ -63,7 +62,7 @@ public class AcrobaticsManager extends SkillManager {

            // Why do we check respawn cooldown here?
            if (SkillUtils.cooldownExpired(mcMMOPlayer.getRespawnATS(), Misc.PLAYER_RESPAWN_COOLDOWN_SECONDS)) {
-                applyXpGain((float) (damage * Acrobatics.dodgeXpModifier), XPGainReason.PVP);
+                applyXpGain((float) (damage * Acrobatics.dodgeXpModifier));
            }

            return modifiedDamage;
@@ -89,12 +88,12 @@ public class AcrobaticsManager extends SkillManager {

        if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.ROLL, player, getSkillLevel(), activationChance)) {
            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text"));
-            applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
+            applyXpGain(calculateRollXP(damage, true));

            return modifiedDamage;
        }
        else if (!isFatal(damage)) {
-            applyXpGain(calculateRollXP(damage, false), XPGainReason.PVE);
+            applyXpGain(calculateRollXP(damage, false));
        }

        lastFallLocation = player.getLocation();
@@ -113,12 +112,12 @@ public class AcrobaticsManager extends SkillManager {

        if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.GRACEFUL_ROLL, getPlayer(), getSkillLevel(), activationChance)) {
            getPlayer().sendMessage(LocaleLoader.getString("Acrobatics.Ability.Proc"));
-            applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
+            applyXpGain(calculateRollXP(damage, true));

            return modifiedDamage;
        }
        else if (!isFatal(damage)) {
-            applyXpGain(calculateRollXP(damage, false), XPGainReason.PVE);
+            applyXpGain(calculateRollXP(damage, false));
        }

        return damage;
--- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java
@@ -8,8 +8,6 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
-import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.StringUtils;

@@ -65,7 +63,7 @@ public class AlchemyManager extends SkillManager {
        return Math.min(Alchemy.catalysisMaxSpeed, Alchemy.catalysisMinSpeed + (Alchemy.catalysisMaxSpeed - Alchemy.catalysisMinSpeed) * (skillLevel - Alchemy.catalysisUnlockLevel) / (Alchemy.catalysisMaxBonusLevel - Alchemy.catalysisUnlockLevel)) * (isLucky ? LUCKY_MODIFIER : 1.0);
    }

-    public void handlePotionBrewSuccesses(PotionStage potionStage, int amount) {
-        applyXpGain((float) (ExperienceConfig.getInstance().getPotionXP(potionStage) * amount), XPGainReason.PVE);
+    public void handlePotionBrewSuccesses(int amount) {
+        applyXpGain((float) (ExperienceConfig.getInstance().getPotionXP() * amount));
    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java
+++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java
@@ -17,8 +17,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
-import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
-import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask;
+import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -55,7 +54,7 @@ public final class AlchemyPotionBrewer {
    }

    private static boolean removeIngredient(BrewerInventory inventory, Player player) {
-        ItemStack ingredient = inventory.getIngredient() == null ? null : inventory.getIngredient().clone();
+        ItemStack ingredient = inventory.getIngredient().clone();

        if (isEmpty(ingredient) || !isValidIngredient(player, ingredient)) {
            return false;
@@ -102,7 +101,7 @@ public final class AlchemyPotionBrewer {
        }

        for (int i = 0; i < 3; i++) {
-            ItemStack item = inventory.getItem(i);
+            ItemStack item = inventory.getItem(i).clone();

            if (isEmpty(item) || item.getType() == Material.GLASS_BOTTLE || !PotionConfig.getInstance().isValidPotion(item)) {
                continue;
@@ -115,8 +114,7 @@ public final class AlchemyPotionBrewer {
                inventory.setItem(i, output.toItemStack(item.getAmount()).clone());

                if (player != null) {
-                    PotionStage potionStage = PotionStage.getPotionStage(input, output);
-                    UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(potionStage, 1);
+                    UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(1);
                }
            }
        }
@@ -126,24 +124,25 @@ public final class AlchemyPotionBrewer {
        }
    }

-    public static boolean transferItems(InventoryView view, int fromSlot, ClickType click) {
+    public static boolean transferItems(InventoryView view, int fromSlot, int toSlot, ClickType click) {
        boolean success = false;

        if (click.isLeftClick()) {
-            success = transferItems(view, fromSlot);
+            success = transferItems(view, fromSlot, toSlot);
        }
        else if (click.isRightClick()) {
-            success = transferOneItem(view, fromSlot);
+            success = transferOneItem(view, fromSlot, toSlot);
        }

        return success;
    }

-    private static boolean transferOneItem(InventoryView view, int fromSlot) {
+    private static boolean transferOneItem(InventoryView view, int fromSlot, int toSlot) {
        ItemStack from = view.getItem(fromSlot).clone();
-        ItemStack to = view.getItem(Alchemy.INGREDIENT_SLOT).clone();
+        ItemStack to = view.getItem(toSlot).clone();
+        boolean emptyFrom = isEmpty(from);

-        if (isEmpty(from)) {
+        if (emptyFrom) {
            return false;
        }

@@ -163,8 +162,8 @@ public final class AlchemyPotionBrewer {
            }

            from.setAmount(fromAmount - 1);
-            view.setItem(Alchemy.INGREDIENT_SLOT, to);
-            view.setItem(fromSlot, from);
+            view.setItem(toSlot, emptyTo ? null : to);
+            view.setItem(fromSlot, emptyFrom ? null : from);

            return true;
        }
@@ -175,15 +174,15 @@ public final class AlchemyPotionBrewer {
    /**
     * Transfer items between two ItemStacks, returning the leftover status
     */
-    private static boolean transferItems(InventoryView view, int fromSlot) {
+    private static boolean transferItems(InventoryView view, int fromSlot, int toSlot) {
        ItemStack from = view.getItem(fromSlot).clone();
-        ItemStack to = view.getItem(Alchemy.INGREDIENT_SLOT).clone();
+        ItemStack to = view.getItem(toSlot).clone();

        if (isEmpty(from)) {
            return false;
        }
        else if (isEmpty(to)) {
-            view.setItem(Alchemy.INGREDIENT_SLOT, from);
+            view.setItem(toSlot, from);
            view.setItem(fromSlot, null);

            return true;
@@ -197,7 +196,7 @@ public final class AlchemyPotionBrewer {
                int left = fromAmount + toAmount - maxSize;

                to.setAmount(maxSize);
-                view.setItem(Alchemy.INGREDIENT_SLOT, to);
+                view.setItem(toSlot, to);

                from.setAmount(left);
                view.setItem(fromSlot, from);
@@ -207,7 +206,7 @@ public final class AlchemyPotionBrewer {

            to.setAmount(fromAmount + toAmount);
            view.setItem(fromSlot, null);
-            view.setItem(Alchemy.INGREDIENT_SLOT, to);
+            view.setItem(toSlot, to);

            return true;
        }
--- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.util.Misc;

@@ -61,4 +63,14 @@ public class Archery {
            }
        }
    }
+
+    public static Location stringToLocation(String location) {
+        String[] values = location.split(",");
+
+        return new Location(mcMMO.p.getServer().getWorld(values[0]), Double.parseDouble(values[1]), Double.parseDouble(values[2]), Double.parseDouble(values[3]), Float.parseFloat(values[4]), Float.parseFloat(values[5]));
+    }
+
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + "," + location.getX() + "," + location.getY() + "," + location.getZ() + "," + location.getYaw() + "," + location.getPitch();
+    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
@@ -45,14 +45,14 @@ public class ArcheryManager extends SkillManager {
     * @param damager The {@link Entity} who shot the arrow
     */
    public void distanceXpBonus(LivingEntity target, Entity damager) {
-        Location firedLocation = (Location) damager.getMetadata(mcMMO.arrowDistanceKey).get(0).value();
+        Location firedLocation = Archery.stringToLocation(damager.getMetadata(mcMMO.arrowDistanceKey).get(0).asString());
        Location targetLocation = target.getLocation();

        if (firedLocation.getWorld() != targetLocation.getWorld()) {
            return;
        }

-        applyXpGain((int) (firedLocation.distanceSquared(targetLocation) * Archery.DISTANCE_XP_MULTIPLIER), getXPGainReason(target, damager));
+        applyXpGain((int) (firedLocation.distanceSquared(targetLocation) * Archery.DISTANCE_XP_MULTIPLIER));
    }

    /**
--- a/Show More
+++ b/Show More