Spout support cleanup

This reverts commit 7bac0e2ca5.

Conflicts:
	Changelog.txt
	src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
	src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
	src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
	src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
	src/main/java/com/gmail/nossr50/mcMMO.java
	src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
	src/main/java/com/gmail/nossr50/util/ItemUtils.java
	src/main/java/com/gmail/nossr50/util/Misc.java
	src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
	src/main/resources/plugin.yml

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
 
@@ -47,5 +47,6 @@ Required Libraries:
 * JUnit
 * EMetrics
 * Bukkit
+* SpoutPlugin API
 
 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

pom.xml

@@ -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>RELEASE</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>

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);
+    }
+}

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;
+        }
+    }
+}

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,8 +28,13 @@ public class McmmoCommand implements CommandExecutor {
                 sender.sendMessage(mcSplit);
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                    if (mcMMO.isSpoutEnabled() && sender instanceof Player) {
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                        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()));

src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -9,12 +9,12 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;

src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -4,8 +4,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
@@ -28,6 +30,11 @@ public class PartyChatCommand extends ChatCommand {
                 return;
             }
 
+            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
+                return;
+            }
+
             message = buildChatMessage(args, 0);
         }
         else {

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

@@ -1,6 +1,10 @@
 package com.gmail.nossr50.commands.party;
 
-import java.util.*;
+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;
@@ -217,7 +221,7 @@ public class PartyCommand implements TabExecutor {
     }
 
     private String[] extractArgs(String[] args) {
-        return Arrays.copyOfRange(args, 1, args.length - 1);
+        return Arrays.copyOfRange(args, 1, args.length);
     }
 
     private boolean isItemShareCategory(String category) {

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

@@ -20,7 +20,7 @@ public class PartyHelpCommand implements CommandExecutor {
                 sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
-                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party xpshare"));
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java

@@ -23,6 +23,11 @@ public class PartyAllianceAcceptCommand implements CommandExecutor {
                     return true;
                 }
 
+                if (mcMMOPlayer.getParty().getAlly() != null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
                 PartyManager.acceptAllianceInvite(mcMMOPlayer);
                 return true;
 

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

@@ -11,10 +11,10 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;

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

@@ -33,8 +33,8 @@ public class AlchemyCommand extends SkillCommand {
         AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
         String[] displayValues = new String[2];
 
-        displayValues[0] = decimal.format(alchemyManager.getBrewSpeed()) + "x";
+        displayValues[0] = decimal.format(alchemyManager.calculateBrewSpeed(false)) + "x";
-        displayValues[1] = isLucky ? decimal.format(alchemyManager.getBrewSpeedLucky()) + "x" : null;
+        displayValues[1] = isLucky ? decimal.format(alchemyManager.calculateBrewSpeed(true)) + "x" : null;
 
         return displayValues;
     }

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

@@ -4,7 +4,6 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;
 
-import com.gmail.nossr50.util.Motd;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -18,6 +17,7 @@ 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.child.FamilyTree;
+import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;

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;
+        }
+    }
+}

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);
+}

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"));
+    }
+}

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

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class ArmorConfigManager {
     public ArmorConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("armor\\.(?:.+)\\.yml");

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

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class BlockConfigManager {
     public BlockConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("blocks\\.(?:.+)\\.yml");

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

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class EntityConfigManager {
     public EntityConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("entities\\.(?:.+)\\.yml");

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

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class ToolConfigManager {
     public ToolConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("tools\\.(?:.+)\\.yml");

src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java

@@ -18,16 +18,16 @@ import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 public class PotionConfig extends ConfigLoader {
     private static PotionConfig instance;
 
-    public List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
 
-    public Map<Short, AlchemyPotion> potionMap = new HashMap<Short, AlchemyPotion>();
+    private Map<Short, AlchemyPotion> potionMap = new HashMap<Short, AlchemyPotion>();
 
     private PotionConfig() {
         super("potions.yml");
@@ -189,4 +189,34 @@ public class PotionConfig extends ConfigLoader {
 
         return null;
     }
+
+    public List<ItemStack> getIngredients(int tier) {
+        switch (tier) {
+            case 8:
+                return concoctionsIngredientsTierEight;
+            case 7:
+                return concoctionsIngredientsTierSeven;
+            case 6:
+                return concoctionsIngredientsTierSix;
+            case 5:
+                return concoctionsIngredientsTierFive;
+            case 4:
+                return concoctionsIngredientsTierFour;
+            case 3:
+                return concoctionsIngredientsTierThree;
+            case 2:
+                return concoctionsIngredientsTierTwo;
+            case 1:
+            default:
+                return concoctionsIngredientsTierOne;
+        }
+    }
+
+    public boolean isValidPotion(ItemStack item) {
+        return potionMap.containsKey(item.getDurability());
+    }
+
+    public AlchemyPotion getPotion(short durability) {
+        return potionMap.get(durability);
+    }
 }

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); }
+}

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -25,6 +25,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.util.Misc;
 
 public final class FlatfileDatabaseManager implements DatabaseManager {
@@ -258,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(":");
@@ -771,6 +773,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         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{} ?
@@ -802,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]);
         }
@@ -809,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) {

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 = ?"
@@ -1164,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 {
@@ -1194,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)
@@ -1242,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));
         }
@@ -1249,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) {

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

@@ -24,6 +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.spout.huds.McMMOHud;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.party.ShareHandler;
@@ -52,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;
 
@@ -88,6 +90,7 @@ public class McMMOPlayer {
     private int chimeraWingLastUse;
     private Location teleportCommence;
 
+    private boolean isSpoutPlayer;
     private boolean isUsingUnarmed;
     private final FixedMetadataValue playerMetadata;
 
@@ -402,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
      */
@@ -548,6 +562,12 @@ public class McMMOPlayer {
             return;
         }
 
+        McMMOHud spoutHud = profile.getSpoutHud();
+
+        if (spoutHud != null) {
+            spoutHud.setLastGained(skillType);
+        }
+
         isUsingUnarmed = (skillType == SkillType.UNARMED);
         checkXp(skillType);
     }
@@ -579,11 +599,20 @@ public class McMMOPlayer {
             return;
         }
 
-        if (Config.getInstance().getLevelUpSoundsEnabled()) {
+        if (this.isSpoutPlayer) {
-            player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
+            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);
+        }
     }
 
     /*
@@ -946,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;
     }

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

@@ -7,10 +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.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;
 
@@ -22,7 +25,9 @@ public class PlayerProfile {
     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
@@ -32,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()) {
@@ -49,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);
@@ -65,7 +73,7 @@ public class PlayerProfile {
             return;
         }
 
-        changed = !mcMMO.getDatabaseManager().saveUser(new PlayerProfile(playerName, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType));
+        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");
@@ -80,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
      */

src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java

@@ -25,25 +25,27 @@ public class AlchemyPotion {
     }
 
     public String toString() {
-        return "AlchemyPotion{" + dataValue + "," + name + ",Effects[" + effects.size() + "], Children[" + children.size() + "]}";
+        return "AlchemyPotion{" + dataValue + ", " + name + ", Effects[" + effects.size() + "], Children[" + children.size() + "]}";
-    }
-
-    public ItemStack toItemStack() {
-        return toItemStack(1);
     }
 
     public ItemStack toItemStack(int amount) {
         ItemStack potion = new ItemStack(Material.POTION, amount, this.getDataValue());
         PotionMeta meta = (PotionMeta) potion.getItemMeta();
-        meta.setDisplayName(this.getName());
+
+        if (this.getName() != null) {
+            meta.setDisplayName(this.getName());
+        }
+
         if (this.getLore() != null && !this.getLore().isEmpty()) {
             meta.setLore(this.getLore());
         }
+
         if (!this.getEffects().isEmpty()) {
             for (PotionEffect effect : this.getEffects()) {
                 meta.addCustomEffect(effect, true);
             }
         }
+
         potion.setItemMeta(meta);
         return potion;
     }

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();
+    }
+}

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];
+    }
+}

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;
+    }
+}

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);
+    }
+}

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);
+    }
+}

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

@@ -104,7 +104,7 @@ public class BlockListener implements Listener {
     public void onBlockPlace(BlockPlaceEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -144,7 +144,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -214,7 +214,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -261,7 +261,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -327,7 +327,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 

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

@@ -143,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;
         }
 
@@ -424,7 +424,7 @@ public class EntityListener implements Listener {
         // We can make this assumption because we (should) be the only ones using this exact metadata
         Player player = plugin.getServer().getPlayerExact(entity.getMetadata(mcMMO.tntMetadataKey).get(0).asString());
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -451,7 +451,7 @@ public class EntityListener implements Listener {
         // We can make this assumption because we (should) be the only ones using this exact metadata
         Player player = plugin.getServer().getPlayerExact(entity.getMetadata(mcMMO.tntMetadataKey).get(0).asString());
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -494,7 +494,7 @@ public class EntityListener implements Listener {
 
         Player player = (Player) entity;
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -560,7 +560,7 @@ public class EntityListener implements Listener {
         Player player = (Player) event.getOwner();
         LivingEntity entity = event.getEntity();
 
-        if (Misc.isNPCEntity(player) || Misc.isNPCEntity(entity) || entity.hasMetadata(mcMMO.entityMetadataKey)) {
+        if (!UserManager.hasPlayerDataKey(player) || Misc.isNPCEntity(entity) || entity.hasMetadata(mcMMO.entityMetadataKey)) {
             return;
         }
 

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

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.event.inventory.FurnaceBurnEvent;
 import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -22,8 +23,10 @@ import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.FurnaceInventory;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.MetadataValue;
 
@@ -32,9 +35,9 @@ 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.PlayerUpdateInventoryTask;
+import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -56,7 +59,7 @@ public class InventoryListener implements Listener {
 
         HumanEntity player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -73,7 +76,7 @@ public class InventoryListener implements Listener {
 
         HumanEntity player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -92,7 +95,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY)) {
+        if (!UserManager.hasPlayerDataKey(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY)) {
             return;
         }
 
@@ -110,7 +113,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !SkillType.SMELTING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.SMELTING.getPermissions(player)) {
             return;
         }
 
@@ -129,7 +132,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !Permissions.vanillaXpBoost(player, SkillType.SMELTING)) {
+        if (!UserManager.hasPlayerDataKey(player) || !Permissions.vanillaXpBoost(player, SkillType.SMELTING)) {
             return;
         }
 
@@ -138,43 +141,164 @@ public class InventoryListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryClickEventNormal(InventoryClickEvent event) {
-        if (event.getInventory().getType() != InventoryType.BREWING || !(event.getInventory().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getInventory();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (!(event.getWhoClicked() instanceof Player) || Misc.isNPCEntity(event.getWhoClicked()) || !Permissions.concoctions(event.getWhoClicked())) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
             return;
         }
 
-        AlchemyPotionBrewer.handleInventoryClick(event);
+        HumanEntity whoClicked = event.getWhoClicked();
+
+        if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
+            return;
+        }
+
+        Player player = (Player) whoClicked;
+        BrewingStand stand = (BrewingStand) holder;
+        ItemStack clicked = event.getCurrentItem();
+        ItemStack cursor = event.getCursor();
+
+        if ((clicked != null && clicked.getType() == Material.POTION) || (cursor != null && cursor.getType() == Material.POTION)) {
+            AlchemyPotionBrewer.scheduleCheck(player, stand);
+            return;
+        }
+
+        ClickType click = event.getClick();
+        InventoryType.SlotType slot = event.getSlotType();
+
+        if (click.isShiftClick()) {
+            switch (slot) {
+                case FUEL:
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                case CONTAINER:
+                case QUICKBAR:
+                    if (!AlchemyPotionBrewer.isValidIngredient(player, clicked)) {
+                        return;
+                    }
+
+                    AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), Alchemy.INGREDIENT_SLOT, click);
+                    event.setCancelled(true);
+                    AlchemyPotionBrewer.scheduleUpdate(inventory);
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                default:
+                    return;
+            }
+        }
+        else if (slot == InventoryType.SlotType.FUEL) {
+            boolean emptyClicked = AlchemyPotionBrewer.isEmpty(clicked);
+
+            if (AlchemyPotionBrewer.isEmpty(cursor)) {
+                if (emptyClicked && click == ClickType.NUMBER_KEY) {
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                }
+
+                AlchemyPotionBrewer.scheduleCheck(player, stand);
+            }
+            else if (emptyClicked) {
+                if (AlchemyPotionBrewer.isValidIngredient(player, cursor)) {
+                    int amount = cursor.getAmount();
+
+                    if (click == ClickType.LEFT || (click == ClickType.RIGHT && amount == 1)) {
+                        event.setCancelled(true);
+                        event.setCurrentItem(cursor.clone());
+                        event.setCursor(null);
+
+                        AlchemyPotionBrewer.scheduleUpdate(inventory);
+                        AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    }
+                    else if (click == ClickType.RIGHT) {
+                        event.setCancelled(true);
+
+                        ItemStack one = cursor.clone();
+                        one.setAmount(1);
+
+                        ItemStack rest = cursor.clone();
+                        rest.setAmount(amount - 1);
+
+                        event.setCurrentItem(one);
+                        event.setCursor(rest);
+
+                        AlchemyPotionBrewer.scheduleUpdate(inventory);
+                        AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    }
+                }
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryDragEvent(InventoryDragEvent event) {
-        if (event.getInventory().getType() != InventoryType.BREWING || !(event.getInventory().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getInventory();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (!(event.getWhoClicked() instanceof Player) || Misc.isNPCEntity(event.getWhoClicked()) || !Permissions.concoctions(event.getWhoClicked())) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
             return;
         }
 
-        AlchemyPotionBrewer.handleInventoryDrag(event);
+        HumanEntity whoClicked = event.getWhoClicked();
+
+        if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
+            return;
+        }
+
+        if (!event.getInventorySlots().contains(Alchemy.INGREDIENT_SLOT)) {
+            return;
+        }
+
+        ItemStack cursor = event.getCursor();
+        ItemStack ingredient = ((BrewerInventory) inventory).getIngredient();
+
+        if (AlchemyPotionBrewer.isEmpty(ingredient) || ingredient.isSimilar(cursor)) {
+            Player player = (Player) whoClicked;
+
+            if (AlchemyPotionBrewer.isValidIngredient(player, cursor)) {
+                // Not handled: dragging custom ingredients over ingredient slot (does not trigger any event)
+                AlchemyPotionBrewer.scheduleCheck(player, (BrewingStand) holder);
+                return;
+            }
+
+            event.setCancelled(true);
+            AlchemyPotionBrewer.scheduleUpdate(inventory);
+        }
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
-        if (event.getDestination().getType() != InventoryType.BREWING || !(event.getDestination().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getDestination();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (Config.getInstance().getPreventHopperTransfer() && event.getItem() != null && event.getItem().getType() != Material.POTION) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
+            return;
+        }
+
+        ItemStack item = event.getItem();
+
+        if (Config.getInstance().getPreventHopperTransfer() && item.getType() != Material.POTION) {
             event.setCancelled(true);
             return;
         }
 
-        if (Config.getInstance().getEnabledForHoppers()) {
+        if (Config.getInstance().getEnabledForHoppers() && AlchemyPotionBrewer.isValidIngredient(null, item)) {
-            AlchemyPotionBrewer.handleInventoryMoveItem(event);
+            AlchemyPotionBrewer.scheduleCheck(null, (BrewingStand) holder);
         }
     }
 
@@ -187,7 +311,7 @@ public class InventoryListener implements Listener {
     public void onCraftItem(CraftItemEvent event) {
         final HumanEntity whoClicked = event.getWhoClicked();
 
-        if (Misc.isNPCEntity(whoClicked) || !(whoClicked instanceof Player)) {
+        if (!whoClicked.hasMetadata(mcMMO.playerDataKey)) {
             return;
         }
 

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -59,6 +58,7 @@ import com.gmail.nossr50.util.MobHealthbarUtils;
 import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class PlayerListener implements Listener {
@@ -81,7 +81,7 @@ public class PlayerListener implements Listener {
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
+        if (!UserManager.hasPlayerDataKey(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
             return;
         }
 
@@ -130,7 +130,7 @@ public class PlayerListener implements Listener {
 
         Player killedPlayer = event.getEntity();
 
-        if (Misc.isNPCEntity(killedPlayer) || Permissions.hardcoreBypass(killedPlayer)) {
+        if (!killedPlayer.hasMetadata(mcMMO.playerDataKey) || Permissions.hardcoreBypass(killedPlayer)) {
             return;
         }
 
@@ -165,7 +165,7 @@ public class PlayerListener implements Listener {
     public void onPlayerWorldChange(PlayerChangedWorldEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -208,7 +208,7 @@ public class PlayerListener implements Listener {
     public void onPlayerFishHighest(PlayerFishEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !SkillType.FISHING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.FISHING.getPermissions(player)) {
             return;
         }
 
@@ -253,7 +253,7 @@ public class PlayerListener implements Listener {
     public void onPlayerFishMonitor(PlayerFishEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !SkillType.FISHING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.FISHING.getPermissions(player)) {
             return;
         }
 
@@ -294,7 +294,7 @@ public class PlayerListener implements Listener {
     public void onPlayerPickupItem(PlayerPickupItemEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -344,7 +344,7 @@ public class PlayerListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -353,7 +353,7 @@ public class PlayerListener implements Listener {
         mcMMOPlayer.resetAbilityMode();
         BleedTimerTask.bleedOut(player);
         mcMMOPlayer.getProfile().save();
-        UserManager.remove(player.getName());
+        UserManager.remove(player);
         ScoreboardManager.teardownPlayer(player);
     }
 
@@ -374,7 +374,8 @@ public class PlayerListener implements Listener {
             return;
         }
 
-        UserManager.addUser(player).actualizeRespawnATS();
+        McMMOPlayer mcMMOPlayer = UserManager.addUser(player);
+        mcMMOPlayer.actualizeRespawnATS();
         ScoreboardManager.setupPlayer(player);
 
         if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
@@ -404,7 +405,7 @@ public class PlayerListener implements Listener {
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -420,7 +421,7 @@ public class PlayerListener implements Listener {
     public void onPlayerInteractLowest(PlayerInteractEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -511,7 +512,7 @@ public class PlayerListener implements Listener {
     public void onPlayerInteractMonitor(PlayerInteractEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 

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

@@ -1,16 +1,16 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 
 public class SelfListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)

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();
+            }
+        }
+    }
+}

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

@@ -5,11 +5,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.config.mods.ArmorConfigManager;
-import com.gmail.nossr50.config.mods.BlockConfigManager;
-import com.gmail.nossr50.config.mods.EntityConfigManager;
-import com.gmail.nossr50.config.mods.ToolConfigManager;
-import com.gmail.nossr50.util.ModManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -19,8 +14,13 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
+import com.gmail.nossr50.config.mods.ArmorConfigManager;
+import com.gmail.nossr50.config.mods.BlockConfigManager;
+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.spout.SpoutConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
@@ -29,6 +29,7 @@ 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;
@@ -48,6 +49,7 @@ import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.HolidayManager;
 import com.gmail.nossr50.util.LogFilter;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.ModManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
@@ -55,6 +57,7 @@ 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;
@@ -85,6 +88,7 @@ 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;
@@ -111,6 +115,7 @@ public class mcMMO extends JavaPlugin {
     public final static String arrowDistanceKey    = "mcMMO: Arrow Distance";
     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 static FixedMetadataValue metadataValue;
 
@@ -124,6 +129,7 @@ public class mcMMO extends JavaPlugin {
             getLogger().setFilter(new LogFilter(this));
             metadataValue = new FixedMetadataValue(this, true);
 
+            spoutEnabled = getServer().getPluginManager().getPlugin("Spout") != null;
             mcpcEnabled = getServer().getName().equals("MCPC+");
             combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null;
             healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null;
@@ -132,6 +138,10 @@ public class mcMMO extends JavaPlugin {
 
             setupFilePaths();
 
+            if (spoutEnabled) {
+                setupSpout();
+            }
+
             modManager = new ModManager();
 
             loadConfigFiles();
@@ -306,6 +316,10 @@ public class mcMMO extends JavaPlugin {
         mcMMO.databaseManager = databaseManager;
     }
 
+    public static boolean isSpoutEnabled() {
+        return spoutEnabled;
+    }
+
     public static boolean isCombatTagEnabled() {
         return combatTagEnabled;
     }
@@ -374,6 +388,9 @@ public class mcMMO extends JavaPlugin {
                 getLogger().warning("Failed to rename tools.yml to tools.default.yml!");
             }
         }
+
+        File currentFlatfilePath = new File(flatFileDirectory);
+        currentFlatfilePath.mkdirs();
     }
 
     private void checkForUpdates() {
@@ -431,6 +448,13 @@ public class mcMMO extends JavaPlugin {
         repairableManager.registerRepairables(repairables);
     }
 
+    private void setupSpout() {
+        SpoutConfig.getInstance();
+        getServer().getPluginManager().registerEvents(new SpoutListener(), this);
+        SpoutUtils.preCacheFiles();
+        SpoutUtils.reloadSpoutPlayers(); // Handle spout players after a /reload
+    }
+
     private void registerEvents() {
         PluginManager pluginManager = getServer().getPluginManager();
 

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

@@ -170,7 +170,7 @@ public final class PartyManager {
      */
     public static Party getParty(String partyName) {
         for (Party party : parties) {
-            if (party.getName().equals(partyName)) {
+            if (party.getName().equalsIgnoreCase(partyName)) {
                 return party;
             }
         }

src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java

@@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables.skills;
 
 import java.util.Arrays;
 
-import org.bukkit.block.Block;
+import org.bukkit.Location;
 import org.bukkit.block.BrewingStand;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -12,8 +12,6 @@ import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 
 public class AlchemyBrewCheckTask extends BukkitRunnable {
-    private final static int INGREDIENT_SLOT = 3;
-
     private Player player;
     private BrewingStand brewingStand;
     private ItemStack[] oldInventory;
@@ -26,18 +24,17 @@ public class AlchemyBrewCheckTask extends BukkitRunnable {
 
     @Override
     public void run() {
-        Block block = brewingStand.getBlock();
+        Location location = brewingStand.getLocation();
-        ItemStack[] newInventory = Arrays.copyOfRange(((BrewingStand) block.getState()).getInventory().getContents(), 0, 4);
+        ItemStack[] newInventory = Arrays.copyOfRange(brewingStand.getInventory().getContents(), 0, 4);
+        boolean validBrew = AlchemyPotionBrewer.isValidBrew(player, newInventory);
 
-        if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
+        if (Alchemy.brewingStandMap.containsKey(location)) {
-            if (oldInventory[INGREDIENT_SLOT] == null || newInventory[INGREDIENT_SLOT] == null || !oldInventory[INGREDIENT_SLOT].isSimilar(newInventory[INGREDIENT_SLOT]) || !AlchemyPotionBrewer.isValidBrew(player, newInventory)) {
+            if (oldInventory[Alchemy.INGREDIENT_SLOT] == null || newInventory[Alchemy.INGREDIENT_SLOT] == null || !oldInventory[Alchemy.INGREDIENT_SLOT].isSimilar(newInventory[Alchemy.INGREDIENT_SLOT]) || !validBrew) {
-                Alchemy.brewingStandMap.get(brewingStand).cancelBrew();
+                Alchemy.brewingStandMap.get(location).cancelBrew();
             }
         }
-
+        else if (validBrew) {
-        if (!Alchemy.brewingStandMap.containsKey(brewingStand) && AlchemyPotionBrewer.isValidBrew(player, newInventory)) {
+            Alchemy.brewingStandMap.put(location, new AlchemyBrewTask(brewingStand, player));
-            Alchemy.brewingStandMap.put(brewingStand, new AlchemyBrewTask(brewingStand, player));
         }
     }
-
 }

src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.runnables.skills;
 
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.BrewingStand;
@@ -22,44 +23,43 @@ public class AlchemyBrewTask extends BukkitRunnable {
     private static int    DEFAULT_BREW_TICKS = 400;
 
     private BlockState brewingStand;
+    private Location location;
     private double brewSpeed;
     private double brewTimer;
     private Player player;
 
     public AlchemyBrewTask(BlockState brewingStand, Player player) {
         this.brewingStand = brewingStand;
+        this.location = brewingStand.getLocation();
         this.player = player;
 
         brewSpeed = DEFAULT_BREW_SPEED;
         brewTimer = DEFAULT_BREW_TICKS;
 
         if (player != null && !Misc.isNPCEntity(player) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS)) {
-            double catalysis = UserManager.getPlayer(player).getAlchemyManager().getBrewSpeed();
+            double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, SkillType.ALCHEMY));
-
-            if (Permissions.lucky(player, SkillType.ALCHEMY)) {
-                catalysis = UserManager.getPlayer(player).getAlchemyManager().getBrewSpeedLucky();
-            }
 
             McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
             mcMMO.p.getServer().getPluginManager().callEvent(event);
+
             if (!event.isCancelled()) {
                 brewSpeed = catalysis;
             }
         }
 
-        if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
+        if (Alchemy.brewingStandMap.containsKey(location)) {
-            Alchemy.brewingStandMap.get(brewingStand).cancel();
+            Alchemy.brewingStandMap.get(location).cancel();
         }
 
-        Alchemy.brewingStandMap.put(brewingStand, this);
+        Alchemy.brewingStandMap.put(location, this);
         this.runTaskTimer(mcMMO.p, 1, 1);
     }
 
     @Override
     public void run() {
         if (player == null || !player.isValid() || brewingStand == null || brewingStand.getType() != Material.BREWING_STAND) {
-            if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
+            if (Alchemy.brewingStandMap.containsKey(location)) {
-                Alchemy.brewingStandMap.remove(brewingStand);
+                Alchemy.brewingStandMap.remove(location);
             }
 
             this.cancel();
@@ -87,20 +87,20 @@ public class AlchemyBrewTask extends BukkitRunnable {
             AlchemyPotionBrewer.finishBrewing(brewingStand, player, false);
         }
 
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 
     public void finishImmediately() {
         this.cancel();
 
         AlchemyPotionBrewer.finishBrewing(brewingStand, player, true);
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 
     public void cancelBrew() {
         this.cancel();
 
         ((BrewingStand) brewingStand).setBrewingTime(-1);
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 }

src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java

@@ -1,9 +1,11 @@
 package com.gmail.nossr50.skills.alchemy;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-import org.bukkit.block.BlockState;
+import org.bukkit.Location;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
@@ -44,36 +46,30 @@ public final class Alchemy {
         }
     }
 
+    public static final int INGREDIENT_SLOT = 3;
+
     public static int    catalysisUnlockLevel   = AdvancedConfig.getInstance().getCatalysisUnlockLevel();
     public static int    catalysisMaxBonusLevel = AdvancedConfig.getInstance().getCatalysisMaxBonusLevel();
     public static double catalysisMinSpeed      = AdvancedConfig.getInstance().getCatalysisMinSpeed();
     public static double catalysisMaxSpeed      = AdvancedConfig.getInstance().getCatalysisMaxSpeed();
 
-    public static Map<BlockState, AlchemyBrewTask> brewingStandMap = new HashMap<BlockState, AlchemyBrewTask>();
+    public static Map<Location, AlchemyBrewTask> brewingStandMap = new HashMap<Location, AlchemyBrewTask>();
 
     private Alchemy() {}
 
-    /**
-     * Calculate base brewing speed, given a skill level and ignoring all perks.
-     *
-     * @param skillLevel Skill level used for calculation.
-     *
-     * @return Base brewing speed for the level.
-     */
-    public static double calculateBrewSpeed(int skillLevel) {
-        if (skillLevel < catalysisUnlockLevel) {
-            return catalysisMinSpeed;
-        }
-
-        return Math.min(catalysisMaxSpeed, catalysisMinSpeed + (catalysisMaxSpeed - catalysisMinSpeed) * (skillLevel - catalysisUnlockLevel) / (catalysisMaxBonusLevel - catalysisUnlockLevel));
-    }
-
     /**
      * Finish all active brews.  Used upon Disable to prevent vanilla potions from being brewed upon next Enable.
      */
     public static void finishAllBrews() {
         mcMMO.p.debug("Completing " + brewingStandMap.size() + " unfinished Alchemy brews.");
+
+        List<AlchemyBrewTask> toFinish = new ArrayList<AlchemyBrewTask>();
+
         for (AlchemyBrewTask alchemyBrewTask : brewingStandMap.values()) {
+            toFinish.add(alchemyBrewTask);
+        }
+
+        for (AlchemyBrewTask alchemyBrewTask : toFinish) {
             alchemyBrewTask.finishImmediately();
         }
     }

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -7,10 +7,8 @@ import org.bukkit.inventory.ItemStack;
 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.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.skills.SkillManager;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 
 public class AlchemyManager extends SkillManager {
@@ -20,23 +18,6 @@ public class AlchemyManager extends SkillManager {
         super(mcMMOPlayer, SkillType.ALCHEMY);
     }
 
-    public boolean canCatalysis() {
-        return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.CATALYSIS);
-    }
-
-    public boolean canConcoctions() {
-        return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.CONCOCTIONS);
-    }
-
-    public boolean canUseIngredient(ItemStack item) {
-        for (ItemStack ingredient : getIngredients()) {
-            if (item.isSimilar(ingredient)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public int getTier() {
         for (Alchemy.Tier tier : Alchemy.Tier.values()) {
             if (getSkillLevel() >= tier.getLevel()) {
@@ -48,31 +29,17 @@ public class AlchemyManager extends SkillManager {
     }
 
     public List<ItemStack> getIngredients() {
-        switch (Alchemy.Tier.fromNumerical(getTier())) {
+        return PotionConfig.getInstance().getIngredients(getTier());
-            case EIGHT:
-                return PotionConfig.getInstance().concoctionsIngredientsTierEight;
-            case SEVEN:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSeven;
-            case SIX:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSix;
-            case FIVE:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFive;
-            case FOUR:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFour;
-            case THREE:
-                return PotionConfig.getInstance().concoctionsIngredientsTierThree;
-            case TWO:
-                return PotionConfig.getInstance().concoctionsIngredientsTierTwo;
-            default:
-                return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
     }
 
     public String getIngredientList() {
         StringBuilder list = new StringBuilder();
 
         for (ItemStack ingredient : getIngredients()) {
-            String string = StringUtils.getPrettyItemString(ingredient.getType()) + (ingredient.getDurability() != 0 ? ":" + ingredient.getDurability() : "");
+            short durability = ingredient.getDurability();
+
+            String string = StringUtils.getPrettyItemString(ingredient.getType()) + (durability != 0 ? ":" + durability : "");
+
             if (string.equals("Long Grass:2")) {
                 string = "Fern";
             }
@@ -80,17 +47,20 @@ public class AlchemyManager extends SkillManager {
                 string = "Pufferfish";
             }
 
-            list.append(", " + string);
+            list.append(", ").append(string);
         }
+
         return list.substring(2);
     }
 
-    public double getBrewSpeed() {
+    public double calculateBrewSpeed(boolean isLucky) {
-        return Alchemy.calculateBrewSpeed(getSkillLevel());
+        int skillLevel = getSkillLevel();
-    }
 
-    public double getBrewSpeedLucky() {
+        if (skillLevel < Alchemy.catalysisUnlockLevel) {
-        return LUCKY_MODIFIER * Alchemy.calculateBrewSpeed(getSkillLevel());
+            return Alchemy.catalysisMinSpeed;
+        }
+
+        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(int amount) {

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -8,10 +8,6 @@ import org.bukkit.block.BrewingStand;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryMoveItemEvent;
-import org.bukkit.event.inventory.InventoryType.SlotType;
 import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
@@ -19,68 +15,62 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
-import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 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;
 
 public final class AlchemyPotionBrewer {
-    private final static int[] BOTTLE_SLOTS = new int[]{0, 1, 2};
-    private final static int INGREDIENT_SLOT = 3;
-
     public static boolean isValidBrew(Player player, ItemStack[] contents) {
-        if (!isValidIngredient(player, contents[INGREDIENT_SLOT])) {
+        if (!isValidIngredient(player, contents[Alchemy.INGREDIENT_SLOT])) {
             return false;
         }
 
-        for (int bottle : BOTTLE_SLOTS) {
+        for (int i = 0; i < 3; i++) {
-            if (contents[bottle] != null && contents[bottle].getType() == Material.POTION) {
+            if (contents[i] == null || contents[i].getType() != Material.POTION) {
-                AlchemyPotion potion = PotionConfig.getInstance().potionMap.get(contents[bottle].getDurability());
+                continue;
+            }
 
-                if (getChildPotion(potion, contents[INGREDIENT_SLOT]) != null) {
+            if (getChildPotion(PotionConfig.getInstance().getPotion(contents[i].getDurability()), contents[Alchemy.INGREDIENT_SLOT]) != null) {
-                    return true;
+                return true;
-                }
             }
         }
 
         return false;
-
     }
 
     private static AlchemyPotion getChildPotion(AlchemyPotion potion, ItemStack ingredient) {
         if (potion != null && potion.getChildDataValue(ingredient) != -1) {
-            return PotionConfig.getInstance().potionMap.get(potion.getChildDataValue(ingredient));
+            return PotionConfig.getInstance().getPotion(potion.getChildDataValue(ingredient));
         }
 
         return null;
     }
 
-    private static boolean isEmpty(ItemStack item) {
+    public static boolean isEmpty(ItemStack item) {
         return item == null || item.getType() == Material.AIR || item.getAmount() == 0;
     }
 
     private static boolean removeIngredient(BrewerInventory inventory, Player player) {
-        ItemStack ingredient = inventory.getIngredient();
+        ItemStack ingredient = inventory.getIngredient().clone();
 
         if (isEmpty(ingredient) || !isValidIngredient(player, ingredient)) {
             return false;
         }
         else if (ingredient.getAmount() <= 1) {
-            inventory.setItem(INGREDIENT_SLOT, null);
+            inventory.setIngredient(null);
-
             return true;
         }
         else {
             ingredient.setAmount(ingredient.getAmount() - 1);
-            inventory.setItem(INGREDIENT_SLOT, ingredient);
+            inventory.setIngredient(ingredient);
-
             return true;
         }
     }
 
-    private static boolean isValidIngredient(Player player, ItemStack item) {
+    public static boolean isValidIngredient(Player player, ItemStack item) {
         if (isEmpty(item)) {
             return false;
         }
@@ -95,28 +85,7 @@ public final class AlchemyPotionBrewer {
     }
 
     private static List<ItemStack> getValidIngredients(Player player) {
-        if (player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) {
+        return PotionConfig.getInstance().getIngredients((player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
-            return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
-
-        switch (UserManager.getPlayer(player).getAlchemyManager().getTier()) {
-            case 8:
-                return PotionConfig.getInstance().concoctionsIngredientsTierEight;
-            case 7:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSeven;
-            case 6:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSix;
-            case 5:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFive;
-            case 4:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFour;
-            case 3:
-                return PotionConfig.getInstance().concoctionsIngredientsTierThree;
-            case 2:
-                return PotionConfig.getInstance().concoctionsIngredientsTierTwo;
-            default:
-                return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
     }
 
     public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
@@ -131,17 +100,21 @@ public final class AlchemyPotionBrewer {
             return;
         }
 
-        for (int bottle : BOTTLE_SLOTS) {
+        for (int i = 0; i < 3; i++) {
-            if (!isEmpty(inventory.getItem(bottle)) && PotionConfig.getInstance().potionMap.containsKey(inventory.getItem(bottle).getDurability())) {
+            ItemStack item = inventory.getItem(i).clone();
-                AlchemyPotion input = PotionConfig.getInstance().potionMap.get(inventory.getItem(bottle).getDurability());
-                AlchemyPotion output = PotionConfig.getInstance().potionMap.get(input.getChildDataValue(ingredient));
 
-                if (output != null) {
+            if (isEmpty(item) || item.getType() == Material.GLASS_BOTTLE || !PotionConfig.getInstance().isValidPotion(item)) {
-                    inventory.setItem(bottle, output.toItemStack(inventory.getItem(bottle).getAmount()).clone());
+                continue;
+            }
 
-                    if (player != null) {
+            AlchemyPotion input = PotionConfig.getInstance().getPotion(item.getDurability());
-                        UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(1);
+            AlchemyPotion output = PotionConfig.getInstance().getPotion(input.getChildDataValue(ingredient));
-                    }
+
+            if (output != null) {
+                inventory.setItem(i, output.toItemStack(item.getAmount()).clone());
+
+                if (player != null) {
+                    UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(1);
                 }
             }
         }
@@ -151,18 +124,36 @@ public final class AlchemyPotionBrewer {
         }
     }
 
+    public static boolean transferItems(InventoryView view, int fromSlot, int toSlot, ClickType click) {
+        boolean success = false;
+
+        if (click.isLeftClick()) {
+            success = transferItems(view, fromSlot, toSlot);
+        }
+        else if (click.isRightClick()) {
+            success = transferOneItem(view, fromSlot, toSlot);
+        }
+
+        return success;
+    }
+
     private static boolean transferOneItem(InventoryView view, int fromSlot, int toSlot) {
         ItemStack from = view.getItem(fromSlot).clone();
         ItemStack to = view.getItem(toSlot).clone();
+        boolean emptyFrom = isEmpty(from);
 
-        if (isEmpty(from)) {
+        if (emptyFrom) {
             return false;
         }
-        else if (!isEmpty(to) && from.getAmount() >= from.getType().getMaxStackSize()) {
+
+        boolean emptyTo = isEmpty(to);
+        int fromAmount = from.getAmount();
+
+        if (!emptyTo && fromAmount >= from.getType().getMaxStackSize()) {
             return false;
         }
-        else if (isEmpty(to) || from.isSimilar(to)) {
+        else if (emptyTo || from.isSimilar(to)) {
-            if (isEmpty(to)) {
+            if (emptyTo) {
                 to = from.clone();
                 to.setAmount(1);
             }
@@ -170,9 +161,9 @@ public final class AlchemyPotionBrewer {
                 to.setAmount(to.getAmount() + 1);
             }
 
-            from.setAmount(from.getAmount() - 1);
+            from.setAmount(fromAmount - 1);
-            view.setItem(toSlot, isEmpty(to) ? null : to);
+            view.setItem(toSlot, emptyTo ? null : to);
-            view.setItem(fromSlot, isEmpty(from) ? null : from);
+            view.setItem(fromSlot, emptyFrom ? null : from);
 
             return true;
         }
@@ -184,171 +175,50 @@ public final class AlchemyPotionBrewer {
      * Transfer items between two ItemStacks, returning the leftover status
      */
     private static boolean transferItems(InventoryView view, int fromSlot, int toSlot) {
-        if (isEmpty(view.getItem(fromSlot))) {
+        ItemStack from = view.getItem(fromSlot).clone();
+        ItemStack to = view.getItem(toSlot).clone();
+
+        if (isEmpty(from)) {
             return false;
         }
-        else if (isEmpty(view.getItem(toSlot))) {
+        else if (isEmpty(to)) {
-            view.setItem(toSlot, view.getItem(fromSlot).clone());
+            view.setItem(toSlot, from);
             view.setItem(fromSlot, null);
 
             return true;
         }
-        else if (view.getItem(fromSlot).isSimilar(view.getItem(toSlot))) {
+        else if (from.isSimilar(to)) {
-            if (view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount() > view.getItem(toSlot).getType().getMaxStackSize()) {
+            int fromAmount = from.getAmount();
-                int left = view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount() - view.getItem(toSlot).getType().getMaxStackSize();
+            int toAmount = to.getAmount();
+            int maxSize = to.getType().getMaxStackSize();
 
-                ItemStack to = new ItemStack(view.getItem(toSlot));
+            if (fromAmount + toAmount > maxSize) {
-                to.setAmount(to.getType().getMaxStackSize());
+                int left = fromAmount + toAmount - maxSize;
+
+                to.setAmount(maxSize);
                 view.setItem(toSlot, to);
 
-                ItemStack from = new ItemStack(view.getItem(fromSlot));
                 from.setAmount(left);
                 view.setItem(fromSlot, from);
 
                 return true;
             }
 
-            ItemStack to = new ItemStack(view.getItem(toSlot));
+            to.setAmount(fromAmount + toAmount);
-            to.setAmount(view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount());
             view.setItem(fromSlot, null);
             view.setItem(toSlot, to);
 
             return true;
         }
+
         return false;
     }
 
-    public static void handleInventoryClick(InventoryClickEvent event) {
+    public static void scheduleCheck(Player player, BrewingStand brewingStand) {
-        Player player = event.getWhoClicked() instanceof Player ? (Player) event.getWhoClicked() : null;
-        BrewingStand brewingStand = (BrewingStand) event.getInventory().getHolder();
-
-        ItemStack cursor = event.getCursor();
-        ItemStack clicked = event.getCurrentItem();
-
-        if (clicked != null && clicked.getType() == Material.POTION) {
-            scheduleCheck(player, brewingStand);
-
-            return;
-        }
-
-        if (event.isShiftClick()) {
-            if (event.getSlotType() == SlotType.FUEL) {
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else if (event.getSlotType() == SlotType.CONTAINER || event.getSlotType() == SlotType.QUICKBAR) {
-                if (isValidIngredient(player, clicked)) {
-                    if (event.isLeftClick()) {
-                        transferItems(event.getView(), event.getRawSlot(), INGREDIENT_SLOT);
-                    }
-                    else if (event.isRightClick()) {
-                        transferOneItem(event.getView(), event.getRawSlot(), INGREDIENT_SLOT);
-                    }
-
-                    event.setCancelled(true);
-
-                    scheduleUpdate(brewingStand.getInventory());
-                    scheduleCheck(player, brewingStand);
-
-                    return;
-                }
-            }
-        }
-        else if (event.getRawSlot() == INGREDIENT_SLOT) {
-            if (isEmpty(cursor) && isEmpty(clicked)) {
-                if (event.getClick() == ClickType.NUMBER_KEY) {
-                    scheduleCheck(player, brewingStand);
-                    return;
-                }
-                return;
-            }
-            else if (isEmpty(cursor)) {
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else if (isEmpty(clicked)) {
-                if (isValidIngredient(player, event.getCursor())) {
-                    if (event.getClick() == ClickType.LEFT || (event.getClick() == ClickType.RIGHT && event.getCursor().getAmount() == 1)) {
-                        event.setCancelled(true);
-
-                        event.setCurrentItem(event.getCursor().clone());
-                        event.setCursor(null);
-
-                        scheduleUpdate(brewingStand.getInventory());
-                        scheduleCheck(player, brewingStand);
-
-                        return;
-                    }
-                    else if (event.getClick() == ClickType.RIGHT) {
-                        event.setCancelled(true);
-
-                        ItemStack one = event.getCursor().clone();
-                        one.setAmount(1);
-
-                        ItemStack rest = event.getCursor().clone();
-                        rest.setAmount(event.getCursor().getAmount() - 1);
-
-                        event.setCurrentItem(one);
-                        event.setCursor(rest);
-
-                        scheduleUpdate(brewingStand.getInventory());
-                        scheduleCheck(player, brewingStand);
-
-                        return;
-                    }
-                }
-                return;
-            }
-        }
-    }
-
-    public static void handleInventoryDrag(InventoryDragEvent event) {
-        Player player = event.getWhoClicked() instanceof Player ? (Player) event.getWhoClicked() : null;
-        BrewingStand brewingStand = (BrewingStand) event.getInventory().getHolder();
-
-        ItemStack cursor = event.getCursor();
-        ItemStack ingredient = brewingStand.getInventory().getIngredient();
-
-        if (!event.getInventorySlots().contains(INGREDIENT_SLOT)) {
-            return;
-        }
-
-        if (isEmpty(ingredient) || ingredient.isSimilar(cursor)) {
-            if (isValidIngredient(player, cursor)) {
-                // Not handled: dragging custom ingredients over ingredient slot (does not trigger any event)
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else {
-                event.setCancelled(true);
-
-                scheduleUpdate(brewingStand.getInventory());
-
-                return;
-            }
-        }
-
-    }
-
-    public static void handleInventoryMoveItem(InventoryMoveItemEvent event) {
-        Player player = null;
-        BrewingStand brewingStand = (BrewingStand) event.getDestination().getHolder();
-
-        if (isValidIngredient(player, event.getItem())) {
-            scheduleCheck(player, brewingStand);
-
-            return;
-        }
-    }
-
-    private static void scheduleCheck(Player player, BrewingStand brewingStand) {
         new AlchemyBrewCheckTask(player, brewingStand).runTask(mcMMO.p);
     }
 
-    private static void scheduleUpdate(Inventory inventory) {
+    public static void scheduleUpdate(Inventory inventory) {
         for (HumanEntity humanEntity : inventory.getViewers()) {
             if (humanEntity instanceof Player) {
                 new PlayerUpdateInventoryTask((Player) humanEntity).runTask(mcMMO.p);

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

@@ -3,9 +3,9 @@ package com.gmail.nossr50.skills.excavation;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.block.BlockState;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;

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

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.skills.mining;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;

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

@@ -48,6 +48,18 @@ public class Repair {
         return "";
     }
 
+    public static String[] getSpoutAnvilMessages(Material type) {
+        if (type == repairAnvilMaterial) {
+            return new String[]{LocaleLoader.getString("Repair.AnvilPlaced.Spout1"), LocaleLoader.getString("Repair.AnvilPlaced.Spout2")};
+        }
+
+        if (type == salvageAnvilMaterial) {
+            return new String[]{"[mcMMO] Anvil Placed", "Right click to salvage!"};
+        }
+
+        return new String[]{"", ""};
+    }
+
     protected static Material getRepairAndSalvageItem(ItemStack inHand) {
         if (ItemUtils.isDiamondTool(inHand) || ItemUtils.isDiamondArmor(inHand)) {
             return Material.DIAMOND;

src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -27,6 +27,7 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.gmail.nossr50.util.spout.SpoutUtils;
 
 public class RepairManager extends SkillManager {
     private boolean placedRepairAnvil;
@@ -51,7 +52,12 @@ public class RepairManager extends SkillManager {
         }
 
         if (Repair.anvilMessagesEnabled) {
-            player.sendMessage(Repair.getAnvilMessage(anvilType));
+            if (mcMMOPlayer.isSpoutPlayer()) {
+                SpoutUtils.sendRepairNotifications(player, anvilType);
+            }
+            else {
+                player.sendMessage(Repair.getAnvilMessage(anvilType));
+            }
         }
 
         if (Config.getInstance().getRepairAnvilPlaceSoundsEnabled()) {

src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.skills.smelting;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;

src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.woodcutting;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -12,6 +11,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Tree;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;

src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.util;
 
 import java.util.HashSet;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.CropState;
 import org.bukkit.Material;
 import org.bukkit.NetherWartsState;
@@ -13,6 +12,7 @@ import org.bukkit.material.Crops;
 import org.bukkit.material.NetherWarts;
 import org.bukkit.material.SmoothBrick;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.Repair;
 
 public final class BlockUtils {

src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -10,7 +10,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.Dye;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.api.SpoutToolsAPI;
 import com.gmail.nossr50.config.party.ItemWeightConfig;
+import com.gmail.nossr50.datatypes.skills.ToolType;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public final class ItemUtils {
@@ -52,7 +54,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return mcMMO.getModManager().isCustomSword(type);
+                return mcMMO.getModManager().isCustomSword(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.SWORD);
         }
     }
 
@@ -74,7 +76,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return mcMMO.getModManager().isCustomHoe(type);
+                return mcMMO.getModManager().isCustomHoe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.HOE);
         }
     }
 
@@ -96,7 +98,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return mcMMO.getModManager().isCustomShovel(type);
+                    return mcMMO.getModManager().isCustomShovel(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.SHOVEL);
         }
     }
 
@@ -118,7 +120,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return mcMMO.getModManager().isCustomAxe(type);
+                return mcMMO.getModManager().isCustomAxe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.AXE);
         }
     }
 
@@ -140,7 +142,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return mcMMO.getModManager().isCustomPickaxe(type);
+                return mcMMO.getModManager().isCustomPickaxe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.PICKAXE);
         }
     }
 

src/main/java/com/gmail/nossr50/util/MaterialUtils.java

@@ -1,8 +1,9 @@
 package com.gmail.nossr50.util;
 
-import com.gmail.nossr50.mcMMO;
 import org.bukkit.material.MaterialData;
 
+import com.gmail.nossr50.mcMMO;
+
 public final class MaterialUtils {
     private MaterialUtils() {}
 

src/main/java/com/gmail/nossr50/util/Misc.java

@@ -13,8 +13,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.events.items.McMMOItemSpawnEvent;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.spout.SpoutUtils;
 
 public final class Misc {
     private static Random random = new Random();
@@ -149,12 +151,20 @@ public final class Misc {
     }
 
     public static void profileCleanup(String playerName) {
-        UserManager.remove(playerName);
-
         Player player = mcMMO.p.getServer().getPlayerExact(playerName);
+        McMMOHud spoutHud = UserManager.getPlayer(player).getSpoutHud();
+
+        if (spoutHud != null) {
+            spoutHud.removeWidgets();
+        }
 
         if (player != null) {
+            UserManager.remove(player);
             UserManager.addUser(player);
+
+            if (mcMMO.isSpoutEnabled()) {
+                SpoutUtils.reloadSpoutPlayer(player);
+            }
         }
     }
 

src/main/java/com/gmail/nossr50/util/ModManager.java

@@ -1,5 +1,18 @@
 package com.gmail.nossr50.util;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
+
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.mods.CustomArmorConfig;
 import com.gmail.nossr50.config.mods.CustomBlockConfig;
@@ -8,19 +21,7 @@ import com.gmail.nossr50.config.mods.CustomToolConfig;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.datatypes.mods.CustomEntity;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 public class ModManager {
     private List<Repairable> repairables = new ArrayList<Repairable>();

src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java

@@ -48,6 +48,8 @@ import com.gmail.nossr50.commands.skills.SwordsCommand;
 import com.gmail.nossr50.commands.skills.TamingCommand;
 import com.gmail.nossr50.commands.skills.UnarmedCommand;
 import com.gmail.nossr50.commands.skills.WoodcuttingCommand;
+import com.gmail.nossr50.commands.spout.MchudCommand;
+import com.gmail.nossr50.commands.spout.XplockCommand;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -326,6 +328,26 @@ public final class CommandRegistrationManager {
         command.setExecutor(new PartyChatCommand());
     }
 
+    private static void registerMchudCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mchud");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mchud"));
+        command.setPermission("mcmmo.commands.mchud");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mchud", "<DISABLED | STANDARD | SMALL | RETRO>"));
+        command.setExecutor(new MchudCommand());
+    }
+
+    private static void registerXplockCommand() {
+        PluginCommand command = mcMMO.p.getCommand("xplock");
+        command.setDescription(LocaleLoader.getString("Commands.Description.xplock"));
+        command.setPermission("mcmmo.commands.xplock");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "xplock"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "<on|off>"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">"));
+        command.setExecutor(new XplockCommand());
+    }
+
     private static void registerPartyCommand() {
         PluginCommand command = mcMMO.p.getCommand("party");
         command.setDescription(LocaleLoader.getString("Commands.Description.party"));
@@ -449,5 +471,9 @@ public final class CommandRegistrationManager {
 
         // Skill Commands
         registerSkillCommands();
+
+        // Spout Commands
+        registerXplockCommand();
+        registerMchudCommand();
     }
 }

src/main/java/com/gmail/nossr50/util/player/UserManager.java

@@ -1,18 +1,19 @@
 package com.gmail.nossr50.util.player;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 
 public final class UserManager {
-    private final static Map<String, McMMOPlayer> players = new HashMap<String, McMMOPlayer>();
 
     private UserManager() {}
 
@@ -23,16 +24,8 @@ public final class UserManager {
      * @return the player's {@link McMMOPlayer} object
      */
     public static McMMOPlayer addUser(Player player) {
-        String playerName = player.getName();
+        McMMOPlayer mcMMOPlayer = new McMMOPlayer(player);
-        McMMOPlayer mcMMOPlayer = players.get(playerName);
+        player.setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
-
-        if (mcMMOPlayer != null) {
-            mcMMOPlayer.setPlayer(player); // The player object is different on each reconnection and must be updated
-        }
-        else {
-            mcMMOPlayer = new McMMOPlayer(player);
-            players.put(playerName, mcMMOPlayer);
-        }
 
         return mcMMOPlayer;
     }
@@ -40,35 +33,51 @@ public final class UserManager {
     /**
      * Remove a user.
      *
-     * @param playerName The name of the player to remove
+     * @param player The Player object
      */
-    public static void remove(String playerName) {
+    public static void remove(Player player) {
-        players.remove(playerName);
+        player.removeMetadata(mcMMO.playerDataKey, mcMMO.p);
     }
 
     /**
      * Clear all users.
      */
     public static void clearAll() {
-        players.clear();
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            remove(player);
+        }
     }
 
     /**
      * Save all users.
      */
     public static void saveAll() {
-        mcMMO.p.debug("Saving mcMMOPlayers... (" + players.size() + ")");
+        Player[] onlinePlayers = mcMMO.p.getServer().getOnlinePlayers();
-        for (McMMOPlayer mcMMOPlayer : players.values()) {
+        mcMMO.p.debug("Saving mcMMOPlayers... (" + onlinePlayers.length + ")");
-            mcMMOPlayer.getProfile().save();
+
+        for (Player player : onlinePlayers) {
+            getPlayer(player).getProfile().save();
         }
     }
 
     public static Set<String> getPlayerNames() {
-        return players.keySet();
+        Set<String> playerNames = new HashSet<String>();
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            playerNames.add(player.getName());
+        }
+
+        return playerNames;
     }
 
     public static Collection<McMMOPlayer> getPlayers() {
-        return players.values();
+        Collection<McMMOPlayer> playerCollection  = new ArrayList<McMMOPlayer>();
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            playerCollection.add(getPlayer(player));
+        }
+
+        return playerCollection;
     }
 
     /**
@@ -88,10 +97,16 @@ public final class UserManager {
      * @return the player's McMMOPlayer object
      */
     public static McMMOPlayer getPlayer(OfflinePlayer player) {
+        if (player instanceof Player) {
+            return getPlayer((Player) player);
+        }
         return retrieveMcMMOPlayer(player.getName(), false);
     }
 
     public static McMMOPlayer getPlayer(OfflinePlayer player, boolean offlineValid) {
+        if (player instanceof Player) {
+            return getPlayer((Player) player);
+        }
         return retrieveMcMMOPlayer(player.getName(), offlineValid);
     }
 
@@ -99,24 +114,29 @@ public final class UserManager {
         return retrieveMcMMOPlayer(playerName, offlineValid);
     }
 
+    public static McMMOPlayer getPlayer(Player player) {
+        return (McMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value();
+    }
+
     private static McMMOPlayer retrieveMcMMOPlayer(String playerName, boolean offlineValid) {
-        McMMOPlayer mcMMOPlayer = players.get(playerName);
+        Player player = mcMMO.p.getServer().getPlayerExact(playerName);
 
-        if (mcMMOPlayer == null) {
+        if (player == null) {
-            Player player = mcMMO.p.getServer().getPlayerExact(playerName);
+            if (!offlineValid) {
-
+                mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + ".");
-            if (player == null) {
-                if (!offlineValid) {
-                    mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + ".");
-                }
-
-                return null;
             }
 
-            mcMMOPlayer = new McMMOPlayer(player);
+            return null;
-            players.put(playerName, mcMMOPlayer);
         }
 
-        return mcMMOPlayer;
+        return getPlayer(player);
+    }
+
+    public static boolean hasPlayerDataKey(Entity entity) {
+        if (entity == null) {
+            return false;
+        }
+
+        return entity.hasMetadata(mcMMO.playerDataKey);
     }
 }

src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java

@@ -0,0 +1,474 @@
+package com.gmail.nossr50.util.spout;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.jar.JarFile;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
+
+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.locale.LocaleLoader;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import org.getspout.spoutapi.SpoutManager;
+import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+public class SpoutUtils {
+    // The order of the values is extremely important, a few methods depend on it to work properly
+    protected enum Tier {
+        FOUR(4) {
+            @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier4(); }
+            @Override protected Material getAcrobaticsNotificationItem() { return Material.DIAMOND_BOOTS; }
+            @Override protected Material getArcheryNotificationItem() { return Material.BOW; }
+            @Override protected Material getAxesNotificationItem() { return Material.DIAMOND_AXE; }
+            @Override protected Material getExcavationNotificationItem() { return Material.CLAY; }
+            @Override protected Material getFishingNotificationItem() { return Material.FISHING_ROD; }
+            @Override protected Material getHerbalismNotificationItem() { return Material.WATER_LILY; }
+            @Override protected Material getMiningNotificationItem() { return Material.EMERALD_ORE; }
+            @Override protected Material getSwordsNotificationItem() { return Material.DIAMOND_SWORD; }
+            @Override protected Material getTamingNotificationItem() { return Material.BONE; }
+            @Override protected Material getUnarmedNotificationItem() { return Material.DIAMOND_HELMET; }
+            @Override protected Material getWoodcuttingNotificationItem() { return Material.LOG; }},
+        THREE(3) {
+            @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier3(); }
+            @Override protected Material getAcrobaticsNotificationItem() { return Material.GOLD_BOOTS; }
+            @Override protected Material getArcheryNotificationItem() { return Material.ARROW; }
+            @Override protected Material getAxesNotificationItem() { return Material.GOLD_AXE; }
+            @Override protected Material getExcavationNotificationItem() { return Material.SAND; }
+            @Override protected Material getFishingNotificationItem() { return Material.COOKED_FISH; }
+            @Override protected Material getHerbalismNotificationItem() { return Material.RED_ROSE; }
+            @Override protected Material getMiningNotificationItem() { return Material.DIAMOND_ORE; }
+            @Override protected Material getSwordsNotificationItem() { return Material.GOLD_SWORD; }
+            @Override protected Material getTamingNotificationItem() { return Material.GRILLED_PORK; }
+            @Override protected Material getUnarmedNotificationItem() { return Material.GOLD_HELMET; }
+            @Override protected Material getWoodcuttingNotificationItem() { return Material.WOOD; }},
+        TWO(2) {
+            @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier2(); }
+            @Override protected Material getAcrobaticsNotificationItem() { return Material.IRON_BOOTS; }
+            @Override protected Material getArcheryNotificationItem() { return Material.ARROW; }
+            @Override protected Material getAxesNotificationItem() { return Material.IRON_AXE; }
+            @Override protected Material getExcavationNotificationItem() { return Material.GRAVEL; }
+            @Override protected Material getFishingNotificationItem() { return Material.COOKED_FISH; }
+            @Override protected Material getHerbalismNotificationItem() { return Material.YELLOW_FLOWER; }
+            @Override protected Material getMiningNotificationItem() { return Material.GOLD_ORE; }
+            @Override protected Material getSwordsNotificationItem() { return Material.IRON_SWORD; }
+            @Override protected Material getTamingNotificationItem() { return Material.GRILLED_PORK; }
+            @Override protected Material getUnarmedNotificationItem() { return Material.IRON_HELMET; }
+            @Override protected Material getWoodcuttingNotificationItem() { return Material.LEAVES; }},
+        ONE(1) {
+            @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier1(); }
+            @Override protected Material getAcrobaticsNotificationItem() { return Material.CHAINMAIL_BOOTS; }
+            @Override protected Material getArcheryNotificationItem() { return Material.FLINT; }
+            @Override protected Material getAxesNotificationItem() { return Material.STONE_AXE; }
+            @Override protected Material getExcavationNotificationItem() { return Material.GRASS; }
+            @Override protected Material getFishingNotificationItem() { return Material.RAW_FISH; }
+            @Override protected Material getHerbalismNotificationItem() { return Material.CACTUS; }
+            @Override protected Material getMiningNotificationItem() { return Material.IRON_ORE; }
+            @Override protected Material getSwordsNotificationItem() { return Material.STONE_SWORD; }
+            @Override protected Material getTamingNotificationItem() { return Material.PORK; }
+            @Override protected Material getUnarmedNotificationItem() { return Material.CHAINMAIL_HELMET; }
+            @Override protected Material getWoodcuttingNotificationItem() { return Material.SAPLING; }};
+
+        int numerical;
+
+        private Tier(int numerical) {
+            this.numerical = numerical;
+        }
+
+        public int toNumerical() {
+            return numerical;
+        }
+
+        abstract protected int getLevel();
+        abstract protected Material getAcrobaticsNotificationItem();
+        abstract protected Material getArcheryNotificationItem();
+        abstract protected Material getAxesNotificationItem();
+        abstract protected Material getExcavationNotificationItem();
+        abstract protected Material getFishingNotificationItem();
+        abstract protected Material getHerbalismNotificationItem();
+        abstract protected Material getMiningNotificationItem();
+        abstract protected Material getSwordsNotificationItem();
+        abstract protected Material getTamingNotificationItem();
+        abstract protected Material getUnarmedNotificationItem();
+        abstract protected Material getWoodcuttingNotificationItem();
+    }
+
+    private final static String spoutDirectory = mcMMO.getMainDirectory() + "Resources" + File.separator;
+    private final static String hudDirectory = spoutDirectory + "HUD" + File.separator;
+    private final static String hudStandardDirectory = hudDirectory + "Standard" + File.separator;
+    private final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator;
+    private final static String soundDirectory = spoutDirectory + "Sound" + File.separator;
+
+    /**
+     * Write file to disk.
+     *
+     * @param fileName The name of the file
+     * @param filePath The name of the file path
+     */
+    private static File writeFile(String fileName, String filePath) {
+        File currentFile = new File(filePath + fileName);
+        BufferedOutputStream os = null;
+        JarFile jar = null;
+
+        // No point in writing the file again if it already exists.
+        if (currentFile.exists()) {
+            return currentFile;
+        }
+
+        try {
+            jar = new JarFile(mcMMO.mcmmo);
+
+            @SuppressWarnings("resource")
+            InputStream is = jar.getInputStream(jar.getJarEntry("resources/" + fileName));
+
+            byte[] buf = new byte[2048];
+            int nbRead;
+
+            os = new BufferedOutputStream(new FileOutputStream(currentFile));
+
+            while ((nbRead = is.read(buf)) != -1) {
+                os.write(buf, 0, nbRead);
+            }
+        }
+        catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        finally {
+            if (jar != null) {
+                try {
+                    jar.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+            if (os != null) {
+                try {
+                    os.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+
+        return currentFile;
+    }
+
+    /**
+     * Extract Spout files to the Resources directory.
+     */
+    public static ArrayList<File> extractFiles() {
+        ArrayList<File> files = new ArrayList<File>();
+
+        // Setup directories
+        new File(spoutDirectory).mkdir();
+        new File(hudDirectory).mkdir();
+        new File(hudStandardDirectory).mkdir();
+        new File(hudRetroDirectory).mkdir();
+        new File(soundDirectory).mkdir();
+
+        // XP Bar images
+        for (int x = 0; x < 255; x++) {
+            String fileName;
+
+            if (x < 10) {
+                fileName = "xpbar_inc00" + x + ".png";
+            }
+            else if (x < 100) {
+                fileName = "xpbar_inc0" + x + ".png";
+            }
+            else {
+                fileName = "xpbar_inc" + x + ".png";
+            }
+
+            files.add(writeFile(fileName, hudStandardDirectory));
+        }
+
+        // Standard XP Icons
+        for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+            String skillName = StringUtils.getCapitalized(skillType.toString());
+
+            files.add(writeFile(skillName + ".png", hudStandardDirectory));
+            files.add(writeFile(skillName + "_r.png", hudRetroDirectory));
+        }
+
+        // Blank icons
+        files.add(writeFile("Icon.png", hudStandardDirectory));
+        files.add(writeFile("Icon_r.png", hudRetroDirectory));
+
+        // Sound FX
+        files.add(writeFile("level.wav", soundDirectory));
+
+        return files;
+    }
+
+    /**
+     * Handle level-up notifications through Spout.
+     *
+     * @param skillType The skill that leveled up
+     * @param spoutPlayer The player that leveled up
+     */
+    public static void levelUpNotification(SkillType skillType, SpoutPlayer spoutPlayer) {
+        PlayerProfile profile = UserManager.getPlayer(spoutPlayer).getProfile();
+        int skillLevel = profile.getSkillLevel(skillType);
+        Material notificationItem;
+
+        switch (skillType) {
+            case ACROBATICS:
+                notificationItem = getAcrobaticsNotificationItem(skillLevel);
+                break;
+
+            case ARCHERY:
+                notificationItem = getArcheryNotificationItem(skillLevel);
+                break;
+
+            case AXES:
+                notificationItem = getAxesNotificationItem(skillLevel);
+                break;
+
+            case EXCAVATION:
+                notificationItem = getExcavationNotificationItem(skillLevel);
+                break;
+
+            case FISHING:
+                notificationItem = getFishingNotificationItem(skillLevel);
+                break;
+
+            case HERBALISM:
+                notificationItem = getHerbalismNotificationItem(skillLevel);
+                break;
+
+            case MINING:
+                notificationItem = getMiningNotificationItem(skillLevel);
+                break;
+
+            case REPAIR:
+                notificationItem = Material.ANVIL;
+                break;
+
+            case SWORDS:
+                notificationItem = getSwordsNotificationItem(skillLevel);
+                break;
+
+            case TAMING:
+                notificationItem = getTamingNotificationItem(skillLevel);
+                break;
+
+            case UNARMED:
+                notificationItem = getUnarmedNotificationItem(skillLevel);
+                break;
+
+            case WOODCUTTING:
+                notificationItem = getWoodcuttingNotificationItem(skillLevel);
+                break;
+
+            default:
+                notificationItem = Material.MAP;
+                break;
+        }
+
+        spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", skillType.getName(), skillLevel), notificationItem);
+        SpoutManager.getSoundManager().playCustomSoundEffect(mcMMO.p, spoutPlayer, "level.wav", false);
+    }
+
+    private static Material getAcrobaticsNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getAcrobaticsNotificationItem();
+            }
+        }
+
+        return Material.LEATHER_BOOTS;
+    }
+
+    private static Material getArcheryNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getArcheryNotificationItem();
+            }
+        }
+
+        return Material.FEATHER;
+    }
+
+    private static Material getAxesNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getAxesNotificationItem();
+            }
+        }
+
+        return Material.WOOD_AXE;
+    }
+
+    private static Material getExcavationNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getExcavationNotificationItem();
+            }
+        }
+
+        return Material.DIRT;
+    }
+
+    private static Material getFishingNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getFishingNotificationItem();
+            }
+        }
+
+        return Material.RAW_FISH;
+    }
+
+    private static Material getHerbalismNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getHerbalismNotificationItem();
+            }
+        }
+
+        return Material.VINE;
+    }
+
+    private static Material getMiningNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getMiningNotificationItem();
+            }
+        }
+
+        return Material.COAL_ORE;
+    }
+
+    private static Material getSwordsNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getSwordsNotificationItem();
+            }
+        }
+
+        return Material.WOOD_SWORD;
+    }
+
+    private static Material getTamingNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getTamingNotificationItem();
+            }
+        }
+
+        return Material.PORK;
+    }
+
+    private static Material getUnarmedNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getUnarmedNotificationItem();
+            }
+        }
+
+        return Material.LEATHER_HELMET;
+    }
+
+    private static Material getWoodcuttingNotificationItem(int skillLevel) {
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getWoodcuttingNotificationItem();
+            }
+        }
+
+        return Material.STICK;
+    }
+
+    /**
+     * Re-enable SpoutCraft for players after a /reload
+     */
+    public static void reloadSpoutPlayers() {
+        PluginManager pluginManager = mcMMO.p.getServer().getPluginManager();
+
+        for (SpoutPlayer spoutPlayer : SpoutManager.getPlayerChunkMap().getOnlinePlayers()) {
+            pluginManager.callEvent(new SpoutCraftEnableEvent(spoutPlayer));
+        }
+    }
+
+    public static void reloadSpoutPlayer(Player player) {
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+        if (spoutPlayer != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new SpoutCraftEnableEvent(spoutPlayer));
+        }
+    }
+
+    public static void preCacheFiles() {
+        SpoutManager.getFileManager().addToPreLoginCache(mcMMO.p, extractFiles());
+    }
+
+    public static void processLevelup(McMMOPlayer mcMMOPlayer, SkillType skillType, int levelsGained) {
+        Player player = mcMMOPlayer.getPlayer();
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+        if (spoutPlayer.isSpoutCraftEnabled()) {
+            levelUpNotification(skillType, spoutPlayer);
+
+            /* Update custom titles */
+            if (SpoutConfig.getInstance().getShowPowerLevel()) {
+                spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()));
+            }
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, mcMMOPlayer.getProfile().getSkillLevel(skillType)));
+        }
+    }
+
+    public static void processXpGain(Player player, PlayerProfile profile) {
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+        if (spoutPlayer.isSpoutCraftEnabled() && SpoutConfig.getInstance().getXPBarEnabled()) {
+            profile.getSpoutHud().updateXpBar();
+        }
+    }
+
+    public static void sendRepairNotifications(Player player, Material anvilType) {
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+        if (spoutPlayer.isSpoutCraftEnabled()) {
+            String[] spoutMessages = Repair.getSpoutAnvilMessages(anvilType);
+            spoutPlayer.sendNotification(spoutMessages[0], spoutMessages[1], anvilType);
+        }
+        else {
+            player.sendMessage(Repair.getAnvilMessage(anvilType));
+        }
+    }
+
+    public static void sendDonationNotification(Player player) {
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+        if (spoutPlayer.isSpoutCraftEnabled()) {
+            spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+            player.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+        }
+    }
+}

src/main/resources/locale/locale_en_US.properties

@@ -523,7 +523,7 @@ Commands.Party.Alliance.Invite.0=[[RED]]ALERT: [[GREEN]]You have received a part
 Commands.Party.Alliance.Invite.1=[[YELLOW]]Type [[GREEN]]/party alliance accept[[YELLOW]] to accept the invite
 Commands.Party.Alliance.Invite.Accepted=[[GREEN]]Alliance invite Accepted.
 Commands.Party.Alliance.None=[[RED]]Your does not have an ally.
-Commands.Party.Alliance.AlreadyAllies=[[RED]]Your party already has an ally.
+Commands.Party.Alliance.AlreadyAllies=[[RED]]Your party already has an ally. Disband with [[DARK_AQUA]]/party alliance disband
 Commands.Party.Alliance.Help.0=[[RED]]This party hasn't formed an alliance. Invite a party leader
 Commands.Party.Alliance.Help.1=[[RED]] to an alliance with [[DARK_AQUA]]/party alliance invite <player>[[RED]].
 Commands.ptp.Enabled=Party teleporting [[GREEN]]enabled

src/main/resources/plugin.yml

@@ -1,24 +1,30 @@
 name: mcMMO
 version: ${project.version}-b${BUILD_NUMBER}
 description: >
-  The goal of mcMMO is to take core Minecraft game mechanics and expand them into
+  mcMMO takes core Minecraft game mechanics and expands them to add an extensive
-  add an extensive and quality RPG experience. Everything in mcMMO has been carefully
+  RPG experience, the goal of the project has always been a quality RPG
-  thought out and is constantly being improved upon. Currently, mcMMO adds thirteen
+  experience. Everything in mcMMO is carefully thought out and is constantly
-  unique skills to train and level in. Each of these skills is highly customizable
+  improving. mcMMO adds eleven skills to train in and level in, while also
-  through our configuration files, allowing server admins to tweak mcMMO to best suit
+  offering a high level of customization for server admins. There are countless
-  the needs of his or her server. Know that the mcMMO team is dedicated to providing
+  features, including custom sounds, graphical elements, and more added when
-  an ever-evolving experience, and that we carefully read all feedback and bug reports
+  running mcMMO in conjunction with Spout. I carefully read feedback and
-  in order to evaluate and balance the mechanics of mcMMO in every update.
+  evaluate the mechanics of mcMMO in every update to provide an ever-evolving
+  experience.
 
 author: nossr50
 authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1, Riking]
 website: http://dev.bukkit.org/server-mods/mcmmo/
 
 main: com.gmail.nossr50.mcMMO
-softdepend: [CombatTag, HealthBar]
+softdepend: [Spout, CombatTag, HealthBar]
 load: STARTUP
 
 commands:
+    mchud:
+        description: Change your HUD
+    xplock:
+        aliases: [mcxplock]
+        description: Lock your mcMMO XP bar
     xprate:
         aliases: [mcxprate]
         description: Modify the xp rate or start an event
@@ -652,6 +658,7 @@ permissions:
             mcmmo.commands.inspect: true
             mcmmo.commands.mcability: true
             mcmmo.commands.mccooldown: true
+            mcmmo.commands.mchud: true
             mcmmo.commands.mcmmo.all: true
             mcmmo.commands.mcnotify: true
             mcmmo.commands.mcrank: true
@@ -668,6 +675,7 @@ permissions:
             mcmmo.commands.taming: true
             mcmmo.commands.unarmed: true
             mcmmo.commands.woodcutting: true
+            mcmmo.commands.xplock.all: true
     mcmmo.commands.defaultsop:
         description: Implies all default op mcmmo.commands permissions.
         children:
@@ -796,6 +804,8 @@ permissions:
         description: Allows access to the mcgod command
     mcmmo.commands.mcgod.others:
         description: Allows access to the mcgod command for other players
+    mcmmo.commands.mchud:
+        description: Allows access to the mchud command
     mcmmo.commands.mcmmo.*:
         default: false
         description: Implies access to all mcmmo.commands.mcmmo permissions
@@ -1151,6 +1161,56 @@ permissions:
         description: Allows access to the vampirism command to toggle vampirism on/off
     mcmmo.commands.woodcutting:
         description: Allows access to the woodcutting command
+    mcmmo.commands.xplock.*:
+        default: false
+        description: Implies access to all mcmmo.commands.xplock permissions
+        children:
+            mcmmo.commands.xplock.all: true
+    mcmmo.commands.xplock.all:
+        description: Implies access to all mcmmo.commands.xplock permissions
+        children:
+            mcmmo.commands.xplock: true
+            mcmmo.commands.xplock.acrobatics: true
+            mcmmo.commands.xplock.archery: true
+            mcmmo.commands.xplock.axes: true
+            mcmmo.commands.xplock.excavation: true
+            mcmmo.commands.xplock.fishing: true
+            mcmmo.commands.xplock.herbalism: true
+            mcmmo.commands.xplock.mining: true
+            mcmmo.commands.xplock.repair: true
+            mcmmo.commands.xplock.smelting: true
+            mcmmo.commands.xplock.swords: true
+            mcmmo.commands.xplock.taming: true
+            mcmmo.commands.xplock.unarmed: true
+            mcmmo.commands.xplock.woodcutting: true
+    mcmmo.commands.xplock:
+        description: Allows access to the xplock command
+    mcmmo.commands.xplock.acrobatics:
+        description: Allows access to the xplock command for acrobatics
+    mcmmo.commands.xplock.archery:
+        description: Allows access to the xplock command for archery
+    mcmmo.commands.xplock.axes:
+        description: Allows access to the xplock command for axes
+    mcmmo.commands.xplock.excavation:
+        description: Allows access to the xplock command for excavation
+    mcmmo.commands.xplock.fishing:
+        description: Allows access to the xplock command for fishing
+    mcmmo.commands.xplock.herbalism:
+        description: Allows access to the xplock command for herbalism
+    mcmmo.commands.xplock.mining:
+        description: Allows access to the xplock command for mining
+    mcmmo.commands.xplock.repair:
+        description: Allows access to the xplock command for repair
+    mcmmo.commands.xplock.smelting:
+        description: Allows access to the xplock command for smelting
+    mcmmo.commands.xplock.swords:
+        description: Allows access to the xplock command for swords
+    mcmmo.commands.xplock.taming:
+        description: Allows access to the xplock command for taming
+    mcmmo.commands.xplock.unarmed:
+        description: Allows access to the xplock command for unarmed
+    mcmmo.commands.xplock.woodcutting:
+        description: Allows access to the xplock command for woodcutting
     mcmmo.commands.xprate.*:
         default: false
         description: Implies access to all mcmmo.commands.xprate permissions
@@ -1872,71 +1932,87 @@ permissions:
         children:
             mcmmo.ability.acrobatics.all: true
             mcmmo.commands.acrobatics: true
+<<<<<<< HEAD
     mcmmo.skills.alchemy:
         description: Allows access to the Alchemy skill
         children:
             mcmmo.ability.alchemy.all: true
             mcmmo.commands.alchemy: true
+=======
+            mcmmo.commands.xplock.acrobatics: true
+>>>>>>> Revert "Dropped SpoutPlugin support"
     mcmmo.skills.archery:
         description: Allows access to the Archery skill
         children:
             mcmmo.ability.archery.all: true
             mcmmo.commands.archery: true
+            mcmmo.commands.xplock.archery: true
     mcmmo.skills.axes:
         description: Allows access to the Axes skill
         children:
             mcmmo.ability.axes.all: true
             mcmmo.commands.axes: true
+            mcmmo.commands.xplock.axes: true
     mcmmo.skills.excavation:
         description: Allows access to the Excavation skill
         children:
             mcmmo.ability.excavation.all: true
             mcmmo.commands.excavation: true
+            mcmmo.commands.xplock.excavation: true
     mcmmo.skills.fishing:
         description: Allows access to the Fishing skill
         children:
             mcmmo.ability.fishing.all: true
             mcmmo.commands.fishing: true
+            mcmmo.commands.xplock.fishing: true
     mcmmo.skills.herbalism:
         description: Allows access to the Herbalism skill
         children:
             mcmmo.ability.herbalism.all: true
             mcmmo.commands.herbalism: true
+            mcmmo.commands.xplock.herbalism: true
     mcmmo.skills.mining:
         description: Allows access to the Mining skill
         children:
             mcmmo.ability.mining.all: true
             mcmmo.commands.mining: true
+            mcmmo.commands.xplock.mining: true
     mcmmo.skills.repair:
         description: Allows access to the Repair skill
         children:
             mcmmo.ability.repair.all: true
             mcmmo.commands.repair: true
+            mcmmo.commands.xplock.repair: true
     mcmmo.skills.smelting:
         description: Allows access to the Smelting skill
         children:
             mcmmo.ability.smelting.all: true
             mcmmo.commands.smelting: true
+            mcmmo.commands.xplock.smelting: true
     mcmmo.skills.swords:
         description: Allows access to the Swords skill
         children:
             mcmmo.ability.swords.all: true
             mcmmo.commands.swords: true
+            mcmmo.commands.xplock.swords: true
     mcmmo.skills.taming:
         description: Allows access to the Taming skill
         children:
             mcmmo.ability.taming.all: true
             mcmmo.commands.taming: true
+            mcmmo.commands.xplock.taming: true
     mcmmo.skills.unarmed:
         description: Allows access to the Unarmed skill
         children:
             mcmmo.ability.unarmed.all: true
             mcmmo.commands.unarmed: true
+            mcmmo.commands.xplock.unarmed: true
     mcmmo.skills.woodcutting:
         description: Allows access to the Woodcutting skill
         children:
             mcmmo.ability.woodcutting.all: true
             mcmmo.commands.woodcutting: true
+            mcmmo.commands.xplock.woodcutting: true
     mcmmo.tools.*:
         default: false
         description: Implies all mcmmo.tools permissions.

src/main/resources/potions.yml

@@ -116,32 +116,27 @@ Potions:
     ### DRINKABLE POTIONS ######################################################
 
     8194: # Potion of Swiftness
-        Effects: ["SPEED 0 3600"]        
         Children:
             FERMENTED_SPIDER_EYE: 8202
             GLOWSTONE_DUST: 8226
             REDSTONE: 8258
             SULPHUR: 16386
     8226: # Potion of Swiftness II
-        Effects: ["SPEED 1 1800"]        
         Children:
             FERMENTED_SPIDER_EYE: 8266
             REDSTONE: 8258
             SULPHUR: 16418
     8258: # Potion of Swiftness Extended
-        Effects: ["SPEED 0 9600"]        
         Children:
             FERMENTED_SPIDER_EYE: 8202
             GLOWSTONE_DUST: 8226
             SULPHUR: 16450
 
     8202: # Potion of Slowness
-        Effects: ["SLOW 0 1800"]        
         Children:
             REDSTONE: 8266
             SULPHUR: 16394
     8266: # Potion of Slowness Extended
-        Effects: ["SLOW 0 4800"]        
         Children:
             GLOWSTONE_DUST: 8202
             SULPHUR: 16458
@@ -183,45 +178,38 @@ Potions:
             SULPHUR: 17472
 
     8201: # Potion of Strength
-        Effects: ["INCREASE_DAMAGE 0 3600"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             GLOWSTONE_DUST: 8233
             REDSTONE: 8265
             SULPHUR: 16393
     8233: # Potion of Strength II
-        Effects: ["INCREASE_DAMAGE 1 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             REDSTONE: 8265
             SULPHUR: 16425
     8265: # Potion of Strength Extended
-        Effects: ["INCREASE_DAMAGE 0 9600"]
         Children:
             FERMENTED_SPIDER_EYE: 8264
             GLOWSTONE_DUST: 8233
             SULPHUR: 16457
 
     8197: # Potion of Healing
-        Effects: ["HEAL 0"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8229
             SULPHUR: 16389
     8229: # Potion of Healing II
-        Effects: ["HEAL 1"]
         Children:
             FERMENTED_SPIDER_EYE: 8236
             REDSTONE: 8197
             SULPHUR: 16421
 
     8204: # Potion of Harming
-        Effects: ["HARM 0"]
         Children:
             GLOWSTONE_DUST: 8236
             SULPHUR: 16396
     8236: # Potion of Harming II
-        Effects: ["HARM 1"]
         Children:
             REDSTONE: 8204
             SULPHUR: 16428
@@ -255,20 +243,17 @@ Potions:
             SULPHUR: 18752
 
     8193: # Potion of Regeneration
-        Effects: ["REGENERATION 0 900"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             GLOWSTONE_DUST: 8225
             REDSTONE: 8257
             SULPHUR: 16385
     8225: # Potion of Regeneration II
-        Effects: ["REGENERATION 1 450"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             REDSTONE: 8257
             SULPHUR: 16417
     8257: # Potion of Regeneration Extended
-        Effects: ["REGENERATION 0 2400"]
         Children:
             FERMENTED_SPIDER_EYE: 8264
             GLOWSTONE_DUST: 8225
@@ -292,38 +277,32 @@ Potions:
             SULPHUR: 19264
 
     8195: # Potion of Fire Resistance
-        Effects: ["FIRE_RESISTANCE 0 3600"]
         Children:
             FERMENTED_SPIDER_EYE: 8202
-            REDSTONE: 3139
+            REDSTONE: 8259
             SULPHUR: 16387
-    3139: # Potion of Fire Resistance Extended
+    8259: # Potion of Fire Resistance Extended
-        Effects: ["FIRE_RESISTANCE 0 9600"]
         Children:
             FERMENTED_SPIDER_EYE: 8266
             GLOWSTONE_DUST: 8195
             SULPHUR: 16451
 
     8205: # Potion of Water Breathing
-        Effects: ["WATER_BREATHING 0 3600"]
         Children:
-            REDSTONE: 3405
+            REDSTONE: 8269
             SULPHUR: 16397
-    3405: # Potion of Water Breathing Extended
+    8269: # Potion of Water Breathing Extended
-        Effects: ["WATER_BREATHING 0 9600"]
         Children:
             GLOWSTONE_DUST: 8205
             SULPHUR: 16461
 
-    3598: # Potion of Invisibility
+    8206: # Potion of Invisibility
-        Effects: ["INVISIBILITY 0 3600"]
         Children:
-            REDSTONE: 3662
+            REDSTONE: 8270
             SULPHUR: 16398
-    3662: # Potion of Invisibility Extended
+    8270: # Potion of Invisibility Extended
-        Effects: ["INVISIBILITY 0 9600"]
         Children:
-            GLOWSTONE_DUST: 3598
+            GLOWSTONE_DUST: 8206
             SULPHUR: 16462
 
     3840: # Potion of Blindness
@@ -338,15 +317,13 @@ Potions:
             SULPHUR: 20288
 
     8198: # Potion of Night Vision
-        Effects: ["NIGHT_VISION 0 3600"]
         Children:
-            FERMENTED_SPIDER_EYE: 3598
+            FERMENTED_SPIDER_EYE: 8206
-            REDSTONE: 4166
+            REDSTONE: 8262
             SULPHUR: 16390
-    4166: # Potion of Night Vision Extended
+    8262: # Potion of Night Vision Extended
-        Effects: ["NIGHT_VISION 0 9600"]
         Children:
-            FERMENTED_SPIDER_EYE: 3662
+            FERMENTED_SPIDER_EYE: 8270
             GLOWSTONE_DUST: 8198
             SULPHUR: 16454
 
@@ -368,31 +345,26 @@ Potions:
             SULPHUR: 20800
 
     8200: # Potion of Weakness
-        Effects: ["WEAKNESS 0 1800"]
         Children:
             REDSTONE: 8264
             SULPHUR: 16392
     8264: # Potion of Weakness Extended
-        Effects: ["WEAKNESS 0 4800"]
         Children:
             GLOWSTONE_DUST: 8200
             SULPHUR: 16456
 
     8196: # Potion of Poison
-        Effects: ["POISON 0 900"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8228
             REDSTONE: 8260
             SULPHUR: 16388
     8228: # Potion of Poison II
-        Effects: ["POISON 1 450"]
         Children:
             FERMENTED_SPIDER_EYE: 8236
             REDSTONE: 8260
             SULPHUR: 16452
     8260: # Potion of Poison Extended
-        Effects: ["POISON 0 2400"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8228
@@ -467,28 +439,23 @@ Potions:
             FERMENTED_SPIDER_EYE: 16392
 
     16386: # Splash Potion of Swiftness
-        Effects: ["SPEED 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             GLOWSTONE_DUST: 16418
             REDSTONE: 16450
     16418: # Splash Potion of Swiftness II
-        Effects: ["SPEED 1 1350"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             REDSTONE: 16450
     16450: # Splash Potion of Swiftness Extended
-        Effects: ["SPEED 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             GLOWSTONE_DUST: 16418
 
     16394: # Splash Potion of Slowness
-        Effects: ["SLOW 0 1350"]
         Children:
             REDSTONE: 16458
     16458: # Splash Potion of Slowness Extended
-        Effects: ["SLOW 0 3600"]
         Children:
             GLOWSTONE_DUST: 16394
 
@@ -521,39 +488,32 @@ Potions:
             GLOWSTONE_DUST: 17440
 
     16393: # Splash Potion of Strength
-        Effects: ["INCREASE_DAMAGE 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             GLOWSTONE_DUST: 16425
             REDSTONE: 16457
     16425: # Splash Potion of Strength II
-        Effects: ["INCREASE_DAMAGE 1 1350"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             REDSTONE: 16457
     16457: # Splash Potion of Strength Extended
-        Effects: ["INCREASE_DAMAGE 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16456
             GLOWSTONE_DUST: 16425
 
     16389: # Splash Potion of Healing
-        Effects: ["HEAL 0"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
             GLOWSTONE_DUST: 16421
     16421: # Splash Potion of Healing II
-        Effects: ["HEAL 1"]
         Children:
             FERMENTED_SPIDER_EYE: 16428
             REDSTONE: 16389
 
     16396: # Splash Potion of Harming
-        Effects: ["HARM 0"]
         Children:
             GLOWSTONE_DUST: 16428
     16428: # Splash Potion of Harming II
-        Effects: ["HARM 1"]
         Children:
             REDSTONE: 16396
 
@@ -581,18 +541,15 @@ Potions:
             GLOWSTONE_DUST: 18688
 
     16385: # Splash Potion of Regeneration
-        Effects: ["REGENERATION 0 675"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             GLOWSTONE_DUST: 16417
             REDSTONE: 16449
     16417: # Splash Potion of Regeneration II
-        Effects: ["REGENERATION 1 338"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             REDSTONE: 16449
     16449: # Splash Potion of Regeneration Extended
-        Effects: ["REGENERATION 0 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 16456
             GLOWSTONE_DUST: 16417
@@ -612,31 +569,25 @@ Potions:
             GLOWSTONE_DUST: 19232
 
     16387: # Splash Potion of Fire Resistance
-        Effects: ["FIRE_RESISTANCE 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             REDSTONE: 16451
     16451: # Splash Potion of Fire Resistance Extended
-        Effects: ["FIRE_RESISTANCE 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16458
             GLOWSTONE_DUST: 16387
 
     16397: # Splash Potion of Water Breathing
-        Effects: ["WATER_BREATHING 0 2700"]
         Children:
             REDSTONE: 16461
     16461: # Splash Potion of Water Breathing Extended
-        Effects: ["WATER_BREATHING 0 7200"]
         Children:
             GLOWSTONE_DUST: 16397
 
     16398: # Splash Potion of Invisibility
-        Effects: ["INVISIBILITY 0 2700"]
         Children:
             REDSTONE: 16462
     16462: # Splash Potion of Invisibility Extended
-        Effects: ["INVISIBILITY 0 7200"]
         Children:
             GLOWSTONE_DUST: 16398
 
@@ -650,12 +601,10 @@ Potions:
             GLOWSTONE_DUST: 20224
 
     16390: # Splash Potion of Night Vision
-        Effects: ["NIGHT_VISION 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16398
             REDSTONE: 16454
     16454: # Splash Potion of Night Vision Extended
-        Effects: ["NIGHT_VISION 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16462
             GLOWSTONE_DUST: 16390
@@ -675,27 +624,22 @@ Potions:
             GLOWSTONE_DUST: 20768
 
     16392: # Splash Potion of Weakness
-        Effects: ["WEAKNESS 0 1350"]
         Children:
             REDSTONE: 16456
     16456: # Splash Potion of Weakness Extended
-        Effects: ["WEAKNESS 0 3600"]
         Children:
             GLOWSTONE_DUST: 16392
 
     16388: # Splash Potion of Poison
-        Effects: ["POISON 0 675"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
             GLOWSTONE_DUST: 16452
             REDSTONE: 16452
     16452: # Splash Potion of Poison II
-        Effects: ["POISON 1 338"]
         Children:
             FERMENTED_SPIDER_EYE: 16428
             REDSTONE: 16452
     16452: # Splash Potion of Poison Extended
-        Effects: ["POISON 0 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
             GLOWSTONE_DUST: 16452

src/main/resources/spout.yml

@@ -0,0 +1,77 @@
+Menu:
+    Key: KEY_M
+XP:
+    Bar:
+        Enabled: true
+        X_POS: 95
+        Y_POS: 6
+    Icon:
+        Enabled: true
+        X_POS: 78
+        Y_POS: 2
+HUD:
+    Show_Power_Level: true
+    Default: STANDARD
+    Retro:
+        Colors:
+            Swords:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Taming:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Acrobatics:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Border:
+                BLUE: 0.0
+                GREEN: 0.0
+                RED: 0.0
+            Background:
+                BLUE: 0.75
+                GREEN: 0.75
+                RED: 0.75
+            Woodcutting:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Archery:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Axes:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Repair:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Fishing:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Excavation:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Herbalism:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Unarmed:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+            Mining:
+                BLUE: 0.75
+                GREEN: 0.3
+                RED: 0.3
+Notifications:
+    Tier1: 200
+    Tier2: 400
+    Tier3: 600
+    Tier4: 800