Close #656 - fix find filter.

* PacketCBTabComplete: options for completion should be seperated by
NUL
 * PluginManager: append an empty argument to arguments if command ends
with a whitespace (this will match all suggestions)
 * PlayerCommand: suggest only matching players instead of all players

.gitignore

@@ -1,12 +1,11 @@
 # Eclipse stuff
-.classpath/
-.project/
+.classpath
+.project
 .settings/
 
 # netbeans
 nbproject/
 nbactions.xml
-nb-configuration.xml
 
 # we use maven!
 build.xml

api/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

api/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>
@@ -22,13 +22,25 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>13.0.1</version>
+            <version>14.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.11</version>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-config</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-event</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-protocol</artifactId>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java

@@ -0,0 +1,46 @@
+package net.md_5.bungee.api;
+
+import com.google.common.base.Preconditions;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.PendingConnection;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+public abstract class AbstractReconnectHandler implements ReconnectHandler
+{
+
+    @Override
+    public ServerInfo getServer(ProxiedPlayer player)
+    {
+        ServerInfo server = getForcedHost( player.getPendingConnection() );
+        if ( server == null )
+        {
+            server = getStoredServer( player );
+            if ( server == null )
+            {
+                server = ProxyServer.getInstance().getServerInfo( player.getPendingConnection().getListener().getDefaultServer() );
+            }
+
+            Preconditions.checkState( server != null, "Default server not defined" );
+        }
+
+        return server;
+    }
+
+    public static ServerInfo getForcedHost(PendingConnection con)
+    {
+        if ( con.getVirtualHost() == null )
+        {
+            return null;
+        }
+
+        String forced = con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() );
+
+        if ( forced == null && con.getListener().isForceDefault() )
+        {
+            forced = con.getListener().getDefaultServer();
+        }
+        return ProxyServer.getInstance().getServerInfo( forced );
+    }
+
+    protected abstract ServerInfo getStoredServer(ProxiedPlayer player);
+}

api/src/main/java/net/md_5/bungee/api/ChatColor.java

@@ -1,5 +1,7 @@
 package net.md_5.bungee.api;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -105,13 +107,30 @@ public enum ChatColor
      * Pattern to remove all colour codes.
      */
     private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile( "(?i)" + String.valueOf( COLOR_CHAR ) + "[0-9A-FK-OR]" );
+    /**
+     * Colour instances keyed by their active character.
+     */
+    private static final Map<Character, ChatColor> BY_CHAR = new HashMap<>();
+    /**
+     * The code appended to {@link #COLOR_CHAR} to make usable colour.
+     */
+    private final char code;
     /**
      * This colour's colour char prefixed by the {@link #COLOR_CHAR}.
      */
     private final String toString;
 
+    static
+    {
+        for ( ChatColor colour : values() )
+        {
+            BY_CHAR.put( colour.code, colour );
+        }
+    }
+
     private ChatColor(char code)
     {
+        this.code = code;
         this.toString = new String( new char[]
         {
             COLOR_CHAR, code
@@ -153,4 +172,15 @@ public enum ChatColor
         }
         return new String( b );
     }
+
+    /**
+     * Get the colour represented by the specified code.
+     *
+     * @param code the code to search for
+     * @return the mapped colour, or null if non exists
+     */
+    public static ChatColor getByChar(char code)
+    {
+        return BY_CHAR.get( code );
+    }
 }

api/src/main/java/net/md_5/bungee/api/CommandSender.java

@@ -19,6 +19,14 @@ public interface CommandSender
      */
     public void sendMessage(String message);
 
+    /**
+     * Send several messages to this sender. Each message will be sent
+     * separately.
+     *
+     * @param messages the messages to send
+     */
+    public void sendMessages(String... messages);
+
     /**
      * Get all groups this user is part of. This returns an unmodifiable
      * collection.

api/src/main/java/net/md_5/bungee/api/ProxyServer.java

@@ -2,6 +2,7 @@ package net.md_5.bungee.api;
 
 import net.md_5.bungee.api.plugin.PluginManager;
 import com.google.common.base.Preconditions;
+import java.io.File;
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.Map;
@@ -10,8 +11,9 @@ import lombok.Getter;
 import net.md_5.bungee.api.config.ConfigurationAdapter;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.api.scheduler.TaskScheduler;
+import net.md_5.bungee.api.tab.CustomTabList;
 
 public abstract class ProxyServer
 {
@@ -46,6 +48,13 @@ public abstract class ProxyServer
      */
     public abstract String getVersion();
 
+    /**
+     * Gets a localized string from the .properties file.
+     *
+     * @return the localized string
+     */
+    public abstract String getTranslation(String name, Object... args);
+
     /**
      * Gets the main logger which can be used as a suitable replacement for
      * {@link System#out} and {@link System#err}.
@@ -69,20 +78,6 @@ public abstract class ProxyServer
      */
     public abstract ProxiedPlayer getPlayer(String name);
 
-    /**
-     * Get a server by its name. The instance returned will be taken from a
-     * player currently on that server to facilitate abstract proxy -> server
-     * actions.
-     *
-     * @param name the name to lookup
-     * @return the associated server
-     * @deprecated in most cases the {@link #getServerInfo(java.lang.String)}
-     * method should be used, as it will return a server even when no players
-     * are online.
-     */
-    @Deprecated
-    public abstract Server getServer(String name);
-
     /**
      * Return all servers registered to this proxy, keyed by name. Unlike the
      * methods in {@link ConfigurationAdapter#getServers()}, this will not
@@ -124,21 +119,6 @@ public abstract class ProxyServer
      */
     public abstract void setConfigurationAdapter(ConfigurationAdapter adapter);
 
-    /**
-     * Get the currently in use tab list handle.
-     *
-     * @return the tab list handler
-     */
-    public abstract TabListHandler getTabListHandler();
-
-    /**
-     * Set the used tab list handler, should not be changed once players have
-     * connected
-     *
-     * @param handler the tab list handler to set
-     */
-    public abstract void setTabListHandler(TabListHandler handler);
-
     /**
      * Get the currently in use reconnect handler.
      *
@@ -208,7 +188,63 @@ public abstract class ProxyServer
      *
      * @param name name of the server
      * @param address connectable Minecraft address + port of the server
+     * @param motd the motd when used as a forced server
+     * @param restricted whether the server info restricted property will be set
      * @return the constructed instance
      */
-    public abstract ServerInfo constructServerInfo(String name, InetSocketAddress address);
+    public abstract ServerInfo constructServerInfo(String name, InetSocketAddress address, String motd, boolean restricted);
+
+    /**
+     * Returns the console overlord for this proxy. Being the console, this
+     * command server cannot have permissions or groups, and will be able to
+     * execute anything.
+     *
+     * @return the console command sender of this proxy
+     */
+    public abstract CommandSender getConsole();
+
+    /**
+     * Return the folder used to load plugins from.
+     *
+     * @return the folder used to load plugin
+     */
+    public abstract File getPluginsFolder();
+
+    /**
+     * Get the scheduler instance for this proxy.
+     *
+     * @return the in use scheduler
+     */
+    public abstract TaskScheduler getScheduler();
+
+    /**
+     * Get the current number of connected users. The default implementation is
+     * more efficient than {@link #getPlayers()} as it does not take a lock or
+     * make a copy.
+     *
+     * @return the current number of connected players
+     */
+    public abstract int getOnlineCount();
+
+    /**
+     * Send the specified message to the console and all connected players.
+     *
+     * @param message the message to broadcast
+     */
+    public abstract void broadcast(String message);
+
+    /**
+     * Gets a new instance of this proxies custom tab list.
+     *
+     * @param player the player to generate this list in the context of
+     * @return a new {@link CustomTabList} instance
+     */
+    public abstract CustomTabList customTabList(ProxiedPlayer player);
+
+    /**
+     * Gets the commands which are disabled and will not be run on this proxy.
+     *
+     * @return the set of disabled commands
+     */
+    public abstract Collection<String> getDisabledCommands();
 }

api/src/main/java/net/md_5/bungee/api/ReconnectHandler.java

@@ -12,7 +12,7 @@ public interface ReconnectHandler
      * @param player the connecting player
      * @return the server to connect to
      */
-    public ServerInfo getServer(ProxiedPlayer player);
+    ServerInfo getServer(ProxiedPlayer player);
 
     /**
      * Save the server of this player before they disconnect so it can be
@@ -20,12 +20,20 @@ public interface ReconnectHandler
      *
      * @param player the player to save
      */
-    public void setServer(ProxiedPlayer player);
+    void setServer(ProxiedPlayer player); // TOOD: String + String arguments?
 
     /**
      * Save all pending reconnect locations. Whilst not used for database
      * connections, this method will be called at a predefined interval to allow
      * the saving of reconnect files.
      */
-    public void save();
+    void save();
+
+    /**
+     * Close all connections indicating that the proxy is about to shutdown and
+     * all data should be saved. No new requests will be made after this method
+     * has been called.
+     *
+     */
+    void close();
 }

api/src/main/java/net/md_5/bungee/api/config/ConfigurationAdapter.java

@@ -43,6 +43,15 @@ public interface ConfigurationAdapter
      */
     public boolean getBoolean(String path, boolean def);
 
+    /**
+     * Get a list from the specified path.
+     *
+     * @param path the path to retrieve the list form.
+     * @param def the default value
+     * @return the retrieved list
+     */
+    public Collection<?> getList(String path, Collection<?> def);
+
     /**
      * Get the configuration all servers which may be accessible via the proxy.
      *

api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java

@@ -3,6 +3,7 @@ package net.md_5.bungee.api.config;
 import java.net.InetSocketAddress;
 import java.util.Map;
 import lombok.Data;
+import net.md_5.bungee.api.tab.TabListHandler;
 
 /**
  * Class representing the configuration of a server listener. Used for allowing
@@ -32,6 +33,11 @@ public class ListenerInfo
      * Name of the server which users will be taken to by default.
      */
     private final String defaultServer;
+    /**
+     * Name of the server which users will be taken when current server goes
+     * down.
+     */
+    private final String fallbackServer;
     /**
      * Whether reconnect locations will be used, or else the user is simply
      * transferred to the default server on connect.
@@ -42,4 +48,25 @@ public class ListenerInfo
      * transferred depending on the host they connect to.
      */
     private final Map<String, String> forcedHosts;
+    /**
+     * Class used to build tab lists for this player.
+     */
+    private final Class<? extends TabListHandler> tabList;
+    /**
+     * Whether to set the local address when connecting to servers.
+     */
+    private final boolean setLocalAddress;
+    /**
+     * Whether to pass the ping through when we can reliably get the target
+     * server (force default server).
+     */
+    private final boolean pingPassthrough;
+    /**
+     * What port to run udp query on.
+     */
+    private final int queryPort;
+    /**
+     * Whether to enable udp query.
+     */
+    private final boolean queryEnabled;
 }

api/src/main/java/net/md_5/bungee/api/config/ServerInfo.java

@@ -1,69 +1,56 @@
 package net.md_5.bungee.api.config;
 
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Synchronized;
 import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 /**
  * Class used to represent a server to connect to.
  */
-@Data
-@AllArgsConstructor
-public abstract class ServerInfo
+public interface ServerInfo
 {
 
     /**
-     * Name this server displays as.
+     * Get the name of this server.
+     *
+     * @return the configured name for this server address
      */
-    private final String name;
-    /**
-     * Connectable address of this server.
-     */
-    private final InetSocketAddress address;
-    /**
-     * Players connected to a server defined by these properties.
-     */
-    private final Collection<ProxiedPlayer> players = new ArrayList<>();
+    String getName();
 
     /**
-     * Add a player to the internal set of this server.
+     * Gets the connectable host + port pair for this server. Implementations
+     * expect this to be used as the unique identifier per each instance of this
+     * class.
      *
-     * @param player the player to add
+     * @return the IP and port pair for this server
      */
-    @Synchronized("players")
-    public void addPlayer(ProxiedPlayer player)
-    {
-        players.add( player );
-    }
-
-    /**
-     * Remove a player form the internal set of this server.
-     *
-     * @param player the player to remove
-     */
-    @Synchronized("players")
-    public void removePlayer(ProxiedPlayer player)
-    {
-        players.remove( player );
-    }
+    InetSocketAddress getAddress();
 
     /**
      * Get the set of all players on this server.
      *
      * @return an unmodifiable collection of all players on this server
      */
-    @Synchronized("players")
-    public Collection<ProxiedPlayer> getPlayers()
-    {
-        return Collections.unmodifiableCollection( players );
-    }
+    Collection<ProxiedPlayer> getPlayers();
+
+    /**
+     * Returns the MOTD which should be used when this server is a forced host.
+     *
+     * @return the motd
+     */
+    String getMotd();
+
+    /**
+     * Whether the player can access this server. It will only return false when
+     * the player has no permission and this server is restricted.
+     *
+     * @param sender the player to check access for
+     * @return whether access is granted to this server
+     */
+    boolean canAccess(CommandSender sender);
 
     /**
      * Send data by any available means to this server.
@@ -71,12 +58,12 @@ public abstract class ServerInfo
      * @param channel the channel to send this data via
      * @param data the data to send
      */
-    public abstract void sendData(String channel, byte[] data);
+    void sendData(String channel, byte[] data);
 
     /**
      * Asynchronously gets the current player count on this server.
      *
      * @param callback the callback to call when the count has been retrieved.
      */
-    public abstract void ping(Callback<ServerPing> callback);
+    void ping(Callback<ServerPing> callback);
 }

api/src/main/java/net/md_5/bungee/api/connection/Connection.java

@@ -1,6 +1,7 @@
 package net.md_5.bungee.api.connection;
 
 import java.net.InetSocketAddress;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
 
 /**
  * A proxy connection is defined as a connection directly connected to a socket.
@@ -15,5 +16,33 @@ public interface Connection
      *
      * @return the remote address
      */
-    public InetSocketAddress getAddress();
+    InetSocketAddress getAddress();
+
+    /**
+     * Disconnects this end of the connection for the specified reason. If this
+     * is an {@link ProxiedPlayer} the respective server connection will be
+     * closed too.
+     *
+     * @param reason the reason shown to the player / sent to the server on
+     * disconnect
+     */
+    void disconnect(String reason);
+
+    /**
+     * Get the unsafe methods of this class.
+     *
+     * @return the unsafe method interface
+     */
+    Unsafe unsafe();
+
+    interface Unsafe
+    {
+
+        /**
+         * Send a packet to this connection.
+         *
+         * @param packet the packet to send
+         */
+        void sendPacket(DefinedPacket packet);
+    }
 }

api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java

@@ -14,34 +14,26 @@ public interface PendingConnection extends Connection
      *
      * @return the requested username, or null if not set
      */
-    public String getName();
+    String getName();
 
     /**
      * Get the numerical client version of the player attempting to log in.
      *
      * @return the protocol version of the remote client
      */
-    public byte getVersion();
+    byte getVersion();
 
     /**
      * Get the requested virtual host that the client tried to connect to.
      *
      * @return request virtual host or null if invalid / not specified.
      */
-    public InetSocketAddress getVirtualHost();
-
-    /**
-     * Completely kick this user from the proxy and all of its child
-     * connections.
-     *
-     * @param reason the disconnect reason displayed to the player
-     */
-    public void disconnect(String reason);
+    InetSocketAddress getVirtualHost();
 
     /**
      * Get the listener that accepted this connection.
      *
      * @return the accepting listener
      */
-    public ListenerInfo getListener();
+    ListenerInfo getListener();
 }

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

@@ -2,6 +2,7 @@ package net.md_5.bungee.api.connection;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.tab.TabListHandler;
 
 /**
  * Represents a player who's connection is being connected to somewhere else,
@@ -15,7 +16,7 @@ public interface ProxiedPlayer extends Connection, CommandSender
      *
      * @return the players current display name
      */
-    public String getDisplayName();
+    String getDisplayName();
 
     /**
      * Sets this players display name to be used as their nametag and tab list
@@ -23,7 +24,7 @@ public interface ProxiedPlayer extends Connection, CommandSender
      *
      * @param name the name to set
      */
-    public void setDisplayName(String name);
+    void setDisplayName(String name);
 
     /**
      * Connects / transfers this user to the specified connection, gracefully
@@ -32,28 +33,21 @@ public interface ProxiedPlayer extends Connection, CommandSender
      *
      * @param target the new server to connect to
      */
-    public void connect(ServerInfo target);
+    void connect(ServerInfo target);
 
     /**
      * Gets the server this player is connected to.
      *
      * @return the server this player is connected to
      */
-    public Server getServer();
+    Server getServer();
 
     /**
      * Gets the ping time between the proxy and this connection.
      *
      * @return the current ping time
      */
-    public int getPing();
-
-    /**
-     * Disconnect (remove) this player from the proxy with the specified reason.
-     *
-     * @param reason the reason displayed to the player
-     */
-    public void disconnect(String reason);
+    int getPing();
 
     /**
      * Send a plugin message to this player.
@@ -61,12 +55,48 @@ public interface ProxiedPlayer extends Connection, CommandSender
      * @param channel the channel to send this data via
      * @param data the data to send
      */
-    public void sendData(String channel, byte[] data);
+    void sendData(String channel, byte[] data);
 
     /**
      * Get the pending connection that belongs to this player.
      *
      * @return the pending connection that this player used
      */
-    public PendingConnection getPendingConnection();
+    PendingConnection getPendingConnection();
+
+    /**
+     * Make this player chat (say something), to the server he is currently on.
+     *
+     * @param message the message to say
+     */
+    void chat(String message);
+
+    /**
+     * Sets the new tab list for the user. At this stage it is not advisable to
+     * change after the user has logged in!
+     *
+     * @param list the new list
+     */
+    void setTabList(TabListHandler list);
+
+    /**
+     * Get the current tab list.
+     *
+     * @return the tab list in use by this user
+     */
+    TabListHandler getTabList();
+
+    /**
+     * Get the server which this player will be sent to next time the log in.
+     *
+     * @return the server, or null if default
+     */
+    ServerInfo getReconnectServer();
+
+    /**
+     * Set the server which this player will be sent to next time the log in.
+     *
+     * @param server the server to set
+     */
+    void setReconnectServer(ServerInfo server);
 }

api/src/main/java/net/md_5/bungee/api/connection/Server.java

@@ -1,7 +1,5 @@
 package net.md_5.bungee.api.connection;
 
-import net.md_5.bungee.api.Callback;
-import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.config.ServerInfo;
 
 /**
@@ -24,14 +22,4 @@ public interface Server extends Connection
      * @param data the data to send
      */
     public abstract void sendData(String channel, byte[] data);
-
-    /**
-     * Asynchronously gets the current player count on this server.
-     *
-     * @param callback the callback to call when the count has been retrieved.
-     * @deprecated use the corresponding method in {@link ServerInfo} for
-     * clarity
-     */
-    @Deprecated
-    public abstract void ping(Callback<ServerPing> callback);
 }

api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java

@@ -0,0 +1,75 @@
+package net.md_5.bungee.api.event;
+
+import com.google.common.base.Preconditions;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.plugin.Event;
+import net.md_5.bungee.api.plugin.Plugin;
+
+/**
+ * Represents an event which depends on the result of asynchronous operations.
+ *
+ * @param <T> Type of this event
+ */
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class AsyncEvent<T> extends Event
+{
+
+    private final Callback<T> done;
+    private final Set<Plugin> intents = Collections.newSetFromMap( new ConcurrentHashMap<Plugin, Boolean>() );
+    private final AtomicBoolean fired = new AtomicBoolean();
+    private final AtomicInteger latch = new AtomicInteger();
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void postCall()
+    {
+        fired.set( true );
+        if ( latch.get() == 0 )
+        {
+            done.done( (T) this, null );
+        }
+    }
+
+    /**
+     * Register an intent that this plugin will continue to perform work on a
+     * background task, and wishes to let the event proceed once the registered
+     * background task has completed.
+     *
+     * @param plugin the plugin registering this intent
+     */
+    public void registerIntent(Plugin plugin)
+    {
+        Preconditions.checkState( !fired.get(), "Event %s has already been fired", this );
+        Preconditions.checkState( !intents.contains( plugin ), "Plugin %s already registered intent for event %s", plugin, this );
+
+        intents.add( plugin );
+        latch.incrementAndGet();
+    }
+
+    /**
+     * Notifies this event that this plugin has done all its required processing
+     * and wishes to let the event proceed.
+     *
+     * @param plugin a plugin which has an intent registered for this event
+     */
+    @SuppressWarnings("unchecked")
+    public void completeIntent(Plugin plugin)
+    {
+        Preconditions.checkState( intents.contains( plugin ), "Plugin %s has not registered intent for event %s", plugin, this );
+        intents.remove( plugin );
+        if ( latch.decrementAndGet() == 0 && fired.get() )
+        {
+            done.done( (T) this, null );
+        }
+    }
+}

api/src/main/java/net/md_5/bungee/api/event/ChatEvent.java

@@ -30,4 +30,14 @@ public class ChatEvent extends TargetedEvent implements Cancellable
         super( sender, receiver );
         this.message = message;
     }
+
+    /**
+     * Checks whether this message is valid as a command
+     *
+     * @return if this message is a command
+     */
+    public boolean isCommand()
+    {
+        return message.length() > 0 && message.charAt( 0 ) == '/';
+    }
 }

api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java

@@ -3,9 +3,9 @@ package net.md_5.bungee.api.event;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.plugin.Cancellable;
-import net.md_5.bungee.api.plugin.Event;
 
 /**
  * Event called to represent a player logging in.
@@ -13,7 +13,7 @@ import net.md_5.bungee.api.plugin.Event;
 @Data
 @ToString(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
-public class LoginEvent extends Event implements Cancellable
+public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
 {
 
     /**
@@ -28,4 +28,10 @@ public class LoginEvent extends Event implements Cancellable
      * Connection attempting to login.
      */
     private final PendingConnection connection;
+
+    public LoginEvent(PendingConnection connection, Callback<LoginEvent> done)
+    {
+        super( done );
+        this.connection = connection;
+    }
 }

api/src/main/java/net/md_5/bungee/api/event/PermissionCheckEvent.java

@@ -0,0 +1,40 @@
+package net.md_5.bungee.api.event;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.plugin.Event;
+
+/**
+ * Called when the permission of a CommandSender is checked.
+ */
+@Data
+@AllArgsConstructor
+@ToString(callSuper = false)
+@EqualsAndHashCode(callSuper = false)
+public class PermissionCheckEvent extends Event
+{
+
+    /**
+     * The command sender being checked for a permission.
+     */
+    private final CommandSender sender;
+    /**
+     * The permission to check.
+     */
+    private final String permission;
+    /**
+     * The outcome of this permission check.
+     */
+    @Getter(AccessLevel.NONE)
+    private boolean hasPermission;
+
+    public boolean hasPermission()
+    {
+        return hasPermission;
+    }
+}

api/src/main/java/net/md_5/bungee/api/event/PlayerHandshakeEvent.java

@@ -0,0 +1,34 @@
+package net.md_5.bungee.api.event;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.connection.PendingConnection;
+import net.md_5.bungee.protocol.packet.Packet2Handshake;
+import net.md_5.bungee.api.plugin.Event;
+
+/**
+ * Event called to represent a player first making their presence and username
+ * known.
+ */
+@Data
+@ToString(callSuper = false)
+@EqualsAndHashCode(callSuper = false)
+public class PlayerHandshakeEvent extends Event
+{
+
+    /**
+     * Connection attempting to login.
+     */
+    private final PendingConnection connection;
+    /**
+     * The handshake.
+     */
+    private final Packet2Handshake handshake;
+
+    public PlayerHandshakeEvent(PendingConnection connection, Packet2Handshake handshake)
+    {
+        this.connection = connection;
+        this.handshake = handshake;
+    }
+}

api/src/main/java/net/md_5/bungee/api/event/PostLoginEvent.java

@@ -0,0 +1,23 @@
+package net.md_5.bungee.api.event;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Event;
+
+/**
+ * Event called as soon as a connection has an {@link ProxiedPlayer} and is
+ * ready to be connected to a server.
+ */
+@Data
+@ToString(callSuper = false)
+@EqualsAndHashCode(callSuper = false)
+public class PostLoginEvent extends Event
+{
+
+    /**
+     * The player involved with this event.
+     */
+    private final ProxiedPlayer player;
+}

api/src/main/java/net/md_5/bungee/api/event/ServerConnectEvent.java

@@ -1,18 +1,18 @@
 package net.md_5.bungee.api.event;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NonNull;
 import lombok.ToString;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 
 @Data
-@AllArgsConstructor
 @ToString(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
-public class ServerConnectEvent extends Event
+public class ServerConnectEvent extends Event implements Cancellable
 {
 
     /**
@@ -22,5 +22,16 @@ public class ServerConnectEvent extends Event
     /**
      * Server the player will be connected to.
      */
+    @NonNull
     private ServerInfo target;
+    /**
+     * Cancelled state.
+     */
+    private boolean cancelled;
+
+    public ServerConnectEvent(ProxiedPlayer player, ServerInfo target)
+    {
+        this.player = player;
+        this.target = target;
+    }
 }

api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java

@@ -0,0 +1,59 @@
+package net.md_5.bungee.api.event;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Cancellable;
+import net.md_5.bungee.api.plugin.Event;
+
+/**
+ * Represents a player getting kicked from a server.
+ */
+@Data
+@ToString(callSuper = false)
+@EqualsAndHashCode(callSuper = false)
+public class ServerKickEvent extends Event implements Cancellable
+{
+
+    /**
+     * Cancelled status.
+     */
+    private boolean cancelled;
+    /**
+     * Player being kicked.
+     */
+    private final ProxiedPlayer player;
+    /**
+     * Kick reason.
+     */
+    private String kickReason;
+    /**
+     * Server to send player to if this event is cancelled.
+     */
+    private ServerInfo cancelServer;
+    /**
+     * State in which the kick occured.
+     */
+    private State state;
+
+    public enum State
+    {
+
+        CONNECTING, CONNECTED, UNKNOWN;
+    }
+
+    public ServerKickEvent(ProxiedPlayer player, String kickReason, ServerInfo cancelServer)
+    {
+        this( player, kickReason, cancelServer, State.UNKNOWN );
+    }
+
+    public ServerKickEvent(ProxiedPlayer player, String kickReason, ServerInfo cancelServer, State state)
+    {
+        this.player = player;
+        this.kickReason = kickReason;
+        this.cancelServer = cancelServer;
+        this.state = state;
+    }
+}

api/src/main/java/net/md_5/bungee/api/event/ServerSwitchEvent.java

@@ -0,0 +1,22 @@
+package net.md_5.bungee.api.event;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Event;
+
+/**
+ * Called when a player has changed servers.
+ */
+@Data
+@ToString(callSuper = false)
+@EqualsAndHashCode(callSuper = false)
+public class ServerSwitchEvent extends Event
+{
+
+    /**
+     * Player whom the server is for.
+     */
+    private final ProxiedPlayer player;
+}

api/src/main/java/net/md_5/bungee/api/plugin/Event.java

@@ -5,4 +5,11 @@ package net.md_5.bungee.api.plugin;
  */
 public abstract class Event
 {
+
+    /**
+     * Method called after this event has been dispatched to all handlers.
+     */
+    public void postCall()
+    {
+    }
 }

api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java

@@ -1,6 +1,10 @@
 package net.md_5.bungee.api.plugin;
 
+import java.io.File;
+import java.io.InputStream;
+import java.util.logging.Logger;
 import lombok.Getter;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ConfigurationAdapter;
 
 /**
@@ -12,6 +16,12 @@ public class Plugin
 
     @Getter
     private PluginDescription description;
+    @Getter
+    private ProxyServer proxy;
+    @Getter
+    private File file;
+    @Getter
+    private Logger logger;
 
     /**
      * Called when the plugin has just been loaded. Most of the proxy will not
@@ -36,13 +46,41 @@ public class Plugin
     {
     }
 
+    /**
+     * Gets the data folder where this plugin may store arbitrary data. It will
+     * be a child of {@link ProxyServer#getPluginsFolder()}.
+     *
+     * @return the data folder of this plugin
+     */
+    public final File getDataFolder()
+    {
+        return new File( getProxy().getPluginsFolder(), getDescription().getName() );
+    }
+
+    /**
+     * Get a resource from within this plugins jar or container. Care must be
+     * taken to close the returned stream.
+     *
+     * @param name the full path name of this resource
+     * @return the stream for getting this resource, or null if it does not
+     * exist
+     */
+    public final InputStream getResourceAsStream(String name)
+    {
+        return getClass().getClassLoader().getResourceAsStream( name );
+    }
+
     /**
      * Called by the loader to initialize the fields in this plugin.
      *
      * @param description the description that describes this plugin
+     * @param jarfile this plugins jar or container
      */
-    final void init(PluginDescription description)
+    final void init(ProxyServer proxy, PluginDescription description)
     {
+        this.proxy = proxy;
         this.description = description;
+        this.file = description.getFile();
+        this.logger = new PluginLogger( this );
     }
 }

api/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java

@@ -2,13 +2,18 @@ package net.md_5.bungee.api.plugin;
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 public class PluginClassloader extends URLClassLoader
 {
 
-    private static final Set<PluginClassloader> allLoaders = new HashSet<>();
+    private static final Set<PluginClassloader> allLoaders = new CopyOnWriteArraySet<>();
+
+    static
+    {
+        ClassLoader.registerAsParallelCapable();
+    }
 
     public PluginClassloader(URL[] urls)
     {
@@ -45,6 +50,6 @@ public class PluginClassloader extends URLClassLoader
                 }
             }
         }
-        throw new ClassNotFoundException(name);
+        throw new ClassNotFoundException( name );
     }
 }

api/src/main/java/net/md_5/bungee/api/plugin/PluginDescription.java

@@ -1,12 +1,17 @@
 package net.md_5.bungee.api.plugin;
 
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * POJO representing the plugin.yml file.
  */
 @Data
+@NoArgsConstructor
 @AllArgsConstructor
 public class PluginDescription
 {
@@ -27,8 +32,12 @@ public class PluginDescription
      * Plugin author.
      */
     private String author;
-
-    public PluginDescription()
-    {
-    }
+    /**
+     * Plugin hard dependencies.
+     */
+    private Set<String> depends = new HashSet<>();
+    /**
+     * File we were loaded from.
+     */
+    private File file = null;
 }

api/src/main/java/net/md_5/bungee/api/plugin/PluginLogger.java

@@ -0,0 +1,24 @@
+package net.md_5.bungee.api.plugin;
+
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import net.md_5.bungee.api.ProxyServer;
+
+public class PluginLogger extends Logger
+{
+
+    private String pluginName;
+
+    protected PluginLogger(Plugin plugin)
+    {
+        super( plugin.getClass().getCanonicalName(), null );
+        pluginName = "[" + plugin.getDescription().getName() + "] ";
+    }
+
+    @Override
+    public void log(LogRecord logRecord)
+    {
+        logRecord.setMessage( pluginName + logRecord.getMessage() );
+        ProxyServer.getInstance().getLogger().log( logRecord );
+    }
+}

api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java

@@ -1,51 +1,75 @@
 package net.md_5.bungee.api.plugin;
 
 import com.google.common.base.Preconditions;
-import com.google.common.eventbus.EventBus;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.eventbus.Subscribe;
 import java.io.File;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Stack;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
+import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.event.EventBus;
+import net.md_5.bungee.event.EventHandler;
 import org.yaml.snakeyaml.Yaml;
 
 /**
  * Class to manage bridging between plugin duties and implementation duties, for
  * example event handling and plugin management.
  */
+@RequiredArgsConstructor
 public class PluginManager
 {
 
     private static final Pattern argsSplit = Pattern.compile( " " );
     /*========================================================================*/
+    private final ProxyServer proxy;
+    /*========================================================================*/
     private final Yaml yaml = new Yaml();
-    private final EventBus eventBus = new EventBus();
-    private final Map<String, Plugin> plugins = new HashMap<>();
+    private final EventBus eventBus;
+    private final Map<String, Plugin> plugins = new LinkedHashMap<>();
     private final Map<String, Command> commandMap = new HashMap<>();
+    private Map<String, PluginDescription> toLoad = new HashMap<>();
+    private Multimap<Plugin, Command> commandsByPlugin = ArrayListMultimap.create();
+    private Multimap<Plugin, Listener> listenersByPlugin = ArrayListMultimap.create();
+
+    @SuppressWarnings("unchecked")
+    public PluginManager(ProxyServer proxy)
+    {
+        this.proxy = proxy;
+        eventBus = new EventBus( proxy.getLogger() );
+    }
 
     /**
      * Register a command so that it may be executed.
      *
+     * @param plugin the plugin owning this command
      * @param command the command to register
      */
-    public void registerCommand(Command command)
+    public void registerCommand(Plugin plugin, Command command)
     {
         commandMap.put( command.getName().toLowerCase(), command );
         for ( String alias : command.getAliases() )
         {
             commandMap.put( alias.toLowerCase(), command );
         }
+        commandsByPlugin.put( plugin, command );
     }
 
     /**
@@ -56,6 +80,26 @@ public class PluginManager
     public void unregisterCommand(Command command)
     {
         commandMap.values().remove( command );
+        commandsByPlugin.values().remove( command );
+    }
+
+    /**
+     * Unregister all commands owned by a {@link Plugin}
+     *
+     * @param plugin the plugin to register the commands of
+     */
+    public void unregisterCommands(Plugin plugin)
+    {
+        for ( Iterator<Command> it = commandsByPlugin.get( plugin ).iterator(); it.hasNext(); )
+        {
+            commandMap.values().remove( it.next() );
+            it.remove();
+        }
+    }
+
+    public boolean dispatchCommand(CommandSender sender, String commandLine)
+    {
+        return dispatchCommand( sender, commandLine, null );
     }
 
     /**
@@ -66,10 +110,21 @@ public class PluginManager
      * arguments
      * @return whether the command was handled
      */
-    public boolean dispatchCommand(CommandSender sender, String commandLine)
+    public boolean dispatchCommand(CommandSender sender, String commandLine, List<String> tabResults)
     {
         String[] split = argsSplit.split( commandLine );
-        Command command = commandMap.get( split[0].toLowerCase() );
+        // Check for chat that only contains " "
+        if ( split.length == 0 )
+        {
+            return false;
+        }
+
+        String commandName = split[0].toLowerCase();
+        if ( proxy.getDisabledCommands().contains( commandName ) )
+        {
+            return false;
+        }
+        Command command = commandMap.get( commandName );
         if ( command == null )
         {
             return false;
@@ -78,14 +133,23 @@ public class PluginManager
         String permission = command.getPermission();
         if ( permission != null && !permission.isEmpty() && !sender.hasPermission( permission ) )
         {
-            sender.sendMessage( ChatColor.RED + "You do not have permission to execute this command!" );
+            sender.sendMessage( proxy.getTranslation( "no_permission" ) );
             return true;
         }
 
         String[] args = Arrays.copyOfRange( split, 1, split.length );
         try
         {
-            command.execute( sender, args );
+            if ( tabResults == null )
+            {
+                command.execute( sender, args );
+            } else if ( command instanceof TabExecutor )
+            {
+                for ( String s : ( (TabExecutor) command ).onTabComplete( sender, args ) )
+                {
+                    tabResults.add( s );
+                }
+            }
         } catch ( Exception ex )
         {
             sender.sendMessage( ChatColor.RED + "An internal error occurred whilst executing this command, please check the console log for details." );
@@ -115,65 +179,114 @@ public class PluginManager
         return plugins.get( name );
     }
 
-    /**
-     * Enable all plugins by calling the {@link Plugin#onEnable()} method.
-     */
-    public void enablePlugins()
+    public void loadAndEnablePlugins()
     {
-        for ( Map.Entry<String, Plugin> entry : plugins.entrySet() )
+        Map<PluginDescription, Boolean> pluginStatuses = new HashMap<>();
+        for ( Map.Entry<String, PluginDescription> entry : toLoad.entrySet() )
+        {
+            PluginDescription plugin = entry.getValue();
+            if ( !enablePlugin( pluginStatuses, new Stack<PluginDescription>(), plugin ) )
+            {
+                ProxyServer.getInstance().getLogger().warning( "Failed to enable " + entry.getKey() );
+            }
+        }
+        toLoad.clear();
+        toLoad = null;
+
+        for ( Plugin plugin : plugins.values() )
         {
-            Plugin plugin = entry.getValue();
             try
             {
                 plugin.onEnable();
                 ProxyServer.getInstance().getLogger().log( Level.INFO, "Enabled plugin {0} version {1} by {2}", new Object[]
                 {
-                    entry.getKey(), plugin.getDescription().getVersion(), plugin.getDescription().getAuthor()
+                    plugin.getDescription().getName(), plugin.getDescription().getVersion(), plugin.getDescription().getAuthor()
                 } );
-            } catch ( Exception ex )
+            } catch ( Throwable t )
             {
-                ProxyServer.getInstance().getLogger().log( Level.WARNING, "Exception encountered when loading plugin: " + entry.getKey(), ex );
+                ProxyServer.getInstance().getLogger().log( Level.WARNING, "Exception encountered when loading plugin: " + plugin.getDescription().getName(), t );
             }
         }
     }
 
-    /**
-     * Load a plugin from the specified file. This file must be in jar format.
-     * This will not enable plugins, {@link #enablePlugins()} must be called.
-     *
-     * @param file the file to load from
-     * @throws Exception Any exceptions encountered when loading a plugin from
-     * this file.
-     */
-    public void loadPlugin(File file) throws Exception
+    private boolean enablePlugin(Map<PluginDescription, Boolean> pluginStatuses, Stack<PluginDescription> dependStack, PluginDescription plugin)
     {
-        Preconditions.checkNotNull( file, "file" );
-        Preconditions.checkArgument( file.isFile(), "Must load from file" );
-
-        try ( JarFile jar = new JarFile( file ) )
+        if ( pluginStatuses.containsKey( plugin ) )
         {
-            JarEntry pdf = jar.getJarEntry( "plugin.yml" );
-            Preconditions.checkNotNull( pdf, "Plugin must have a plugin.yml" );
+            return pluginStatuses.get( plugin );
+        }
 
-            try ( InputStream in = jar.getInputStream( pdf ) )
+        // success status
+        boolean status = true;
+
+        // try to load dependencies first
+        for ( String dependName : plugin.getDepends() )
+        {
+            PluginDescription depend = toLoad.get( dependName );
+            Boolean dependStatus = ( depend != null ) ? pluginStatuses.get( depend ) : Boolean.FALSE;
+
+            if ( dependStatus == null )
             {
-                PluginDescription desc = yaml.loadAs( in, PluginDescription.class );
-                URLClassLoader loader = new PluginClassloader( new URL[]
+                if ( dependStack.contains( depend ) )
                 {
-                    file.toURI().toURL()
-                } );
-                Class<?> main = loader.loadClass( desc.getMain() );
-                Plugin plugin = (Plugin) main.getDeclaredConstructor().newInstance();
+                    StringBuilder dependencyGraph = new StringBuilder();
+                    for ( PluginDescription element : dependStack )
+                    {
+                        dependencyGraph.append( element.getName() ).append( " -> " );
+                    }
+                    dependencyGraph.append( plugin.getName() ).append( " -> " ).append( dependName );
+                    ProxyServer.getInstance().getLogger().log( Level.WARNING, "Circular dependency detected: " + dependencyGraph );
+                    status = false;
+                } else
+                {
+                    dependStack.push( plugin );
+                    dependStatus = this.enablePlugin( pluginStatuses, dependStack, depend );
+                    dependStack.pop();
+                }
+            }
 
-                plugin.init( desc );
-                plugins.put( desc.getName(), plugin );
-                plugin.onLoad();
-                ProxyServer.getInstance().getLogger().log( Level.INFO, "Loaded plugin {0} version {1} by {2}", new Object[]
+            if ( dependStatus == Boolean.FALSE )
+            {
+                ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} (required by {1}) is unavailable", new Object[]
                 {
-                    desc.getName(), desc.getVersion(), desc.getAuthor()
+                    String.valueOf( depend.getName() ), plugin.getName()
                 } );
+                status = false;
+            }
+
+            if ( !status )
+            {
+                break;
             }
         }
+
+        // do actual loading
+        if ( status )
+        {
+            try
+            {
+                URLClassLoader loader = new PluginClassloader( new URL[]
+                {
+                    plugin.getFile().toURI().toURL()
+                } );
+                Class<?> main = loader.loadClass( plugin.getMain() );
+                Plugin clazz = (Plugin) main.getDeclaredConstructor().newInstance();
+
+                clazz.init( proxy, plugin );
+                plugins.put( plugin.getName(), clazz );
+                clazz.onLoad();
+                ProxyServer.getInstance().getLogger().log( Level.INFO, "Loaded plugin {0} version {1} by {2}", new Object[]
+                {
+                    plugin.getName(), plugin.getVersion(), plugin.getAuthor()
+                } );
+            } catch ( Throwable t )
+            {
+                proxy.getLogger().log( Level.WARNING, "Error enabling plugin " + plugin.getName(), t );
+            }
+        }
+
+        pluginStatuses.put( plugin, status );
+        return status;
     }
 
     /**
@@ -181,7 +294,7 @@ public class PluginManager
      *
      * @param folder the folder to search for plugins in
      */
-    public void loadPlugins(File folder)
+    public void detectPlugins(File folder)
     {
         Preconditions.checkNotNull( folder, "folder" );
         Preconditions.checkArgument( folder.isDirectory(), "Must load from a directory" );
@@ -190,9 +303,17 @@ public class PluginManager
         {
             if ( file.isFile() && file.getName().endsWith( ".jar" ) )
             {
-                try
+                try ( JarFile jar = new JarFile( file ) )
                 {
-                    loadPlugin( file );
+                    JarEntry pdf = jar.getJarEntry( "plugin.yml" );
+                    Preconditions.checkNotNull( pdf, "Plugin must have a plugin.yml" );
+
+                    try ( InputStream in = jar.getInputStream( pdf ) )
+                    {
+                        PluginDescription desc = yaml.loadAs( in, PluginDescription.class );
+                        desc.setFile( file );
+                        toLoad.put( desc.getName(), desc );
+                    }
                 } catch ( Exception ex )
                 {
                     ProxyServer.getInstance().getLogger().log( Level.WARNING, "Could not load plugin from file " + file, ex );
@@ -211,19 +332,64 @@ public class PluginManager
      */
     public <T extends Event> T callEvent(T event)
     {
+        Preconditions.checkNotNull( event, "event" );
+
+        long start = System.nanoTime();
         eventBus.post( event );
+        event.postCall();
+
+        long elapsed = start - System.nanoTime();
+        if ( elapsed > 250000 )
+        {
+            ProxyServer.getInstance().getLogger().log( Level.WARNING, "Event {0} took more {1}ns to process!", new Object[]
+            {
+                event, elapsed
+            } );
+        }
         return event;
     }
 
     /**
      * Register a {@link Listener} for receiving called events. Methods in this
      * Object which wish to receive events must be annotated with the
-     * {@link Subscribe} annotation.
+     * {@link EventHandler} annotation.
      *
+     * @param plugin the owning plugin
      * @param listener the listener to register events for
      */
-    public void registerListener(Listener listener)
+    public void registerListener(Plugin plugin, Listener listener)
     {
+        for ( Method method : listener.getClass().getDeclaredMethods() )
+        {
+            Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ),
+                    "Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
+        }
         eventBus.register( listener );
+        listenersByPlugin.put( plugin, listener );
+    }
+
+    /**
+     * Unregister a {@link Listener} so that the events do not reach it anymore.
+     *
+     * @param listener the listener to unregister
+     */
+    public void unregisterListener(Listener listener)
+    {
+        eventBus.unregister( listener );
+        listenersByPlugin.values().remove( listener );
+    }
+
+    /**
+     * Unregister all of a Plugin's listener.
+     *
+     * @param plugin
+     */
+    public void unregisterListeners(Plugin plugin)
+    {
+        for ( Iterator<Listener> it = listenersByPlugin.get( plugin ).iterator(); it.hasNext(); )
+        {
+            eventBus.unregister( it.next() );
+            it.remove();
+        }
     }
 }

api/src/main/java/net/md_5/bungee/api/plugin/TabExecutor.java

@@ -0,0 +1,10 @@
+package net.md_5.bungee.api.plugin;
+
+import net.md_5.bungee.api.CommandSender;
+
+
+public interface TabExecutor
+{
+
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args);
+}

api/src/main/java/net/md_5/bungee/api/scheduler/ScheduledTask.java

@@ -0,0 +1,36 @@
+package net.md_5.bungee.api.scheduler;
+
+import net.md_5.bungee.api.plugin.Plugin;
+
+/**
+ * Represents a task scheduled for execution by the {@link TaskScheduler}.
+ */
+public interface ScheduledTask
+{
+
+    /**
+     * Gets the unique ID of this task.
+     *
+     * @return this tasks ID
+     */
+    int getId();
+
+    /**
+     * Return the plugin which scheduled this task for execution.
+     *
+     * @return the owning plugin
+     */
+    Plugin getOwner();
+
+    /**
+     * Get the actual method which will be executed by this task.
+     *
+     * @return the {@link Runnable} behind this task
+     */
+    Runnable getTask();
+
+    /**
+     * Cancel this task to suppress subsequent executions.
+     */
+    void cancel();
+}

api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java

@@ -0,0 +1,74 @@
+package net.md_5.bungee.api.scheduler;
+
+import java.util.concurrent.TimeUnit;
+import net.md_5.bungee.api.plugin.Plugin;
+
+/**
+ * This interface represents a scheduler which may be used to queue, delay and
+ * execute tasks in an asynchronous fashion.
+ */
+public interface TaskScheduler
+{
+
+    /**
+     * Cancel a task to prevent it from executing, or if its a repeating task,
+     * prevent its further execution.
+     *
+     * @param id the id of the task to cancel
+     */
+    void cancel(int id);
+
+    /**
+     * Cancel a task to prevent it from executing, or if its a repeating task,
+     * prevent its further execution.
+     *
+     * @param task the task to cancel
+     */
+    void cancel(ScheduledTask task);
+
+    /**
+     * Cancel all tasks owned by this plugin, this preventing them from being
+     * executed hereon in.
+     *
+     * @param plugin the plugin owning the tasks to be cancelled
+     * @return the number of tasks cancelled by this method
+     */
+    int cancel(Plugin plugin);
+
+    /**
+     * Schedule a task to be executed asynchronously. The task will commence
+     * running as soon as this method returns.
+     *
+     * @param owner the plugin owning this task
+     * @param task the task to run
+     * @return the scheduled task
+     */
+    ScheduledTask runAsync(Plugin owner, Runnable task);
+
+    /**
+     * Schedules a task to be executed asynchronously after the specified delay
+     * is up.
+     *
+     * @param owner the plugin owning this task
+     * @param task the task to run
+     * @param delay the delay before this task will be executed
+     * @param unit the unit in which the delay will be measured
+     * @return the scheduled task
+     */
+    ScheduledTask schedule(Plugin owner, Runnable task, long delay, TimeUnit unit);
+
+    /**
+     * Schedules a task to be executed asynchronously after the specified delay
+     * is up. The scheduled task will continue running at the specified
+     * interval. The interval will not begin to count down until the last task
+     * invocation is complete.
+     *
+     * @param owner the plugin owning this task
+     * @param task the task to run
+     * @param delay the delay in milliseconds before this task will be executed
+     * @param period the interval before subsequent executions of this task
+     * @param unit the unit in which the delay and period will be measured
+     * @return the scheduled task
+     */
+    ScheduledTask schedule(Plugin owner, Runnable task, long delay, long period, TimeUnit unit);
+}

api/src/main/java/net/md_5/bungee/api/score/Objective.java

@@ -0,0 +1,20 @@
+package net.md_5.bungee.api.score;
+
+import lombok.Data;
+
+/**
+ * Represents an objective entry.
+ */
+@Data
+public class Objective
+{
+
+    /**
+     * Name of the objective.
+     */
+    private final String name;
+    /**
+     * Value of the objective.
+     */
+    private final String value; // displayName
+}

api/src/main/java/net/md_5/bungee/api/score/Position.java

@@ -0,0 +1,10 @@
+package net.md_5.bungee.api.score;
+
+/**
+ * Represents locations for a scoreboard to be displayed.
+ */
+public enum Position
+{
+
+    LIST, SIDEBAR, BELOW;
+}

api/src/main/java/net/md_5/bungee/api/score/Score.java

@@ -0,0 +1,24 @@
+package net.md_5.bungee.api.score;
+
+import lombok.Data;
+
+/**
+ * Represents a scoreboard score entry.
+ */
+@Data
+public class Score
+{
+
+    /**
+     * Name to be displayed in the list.
+     */
+    private final String itemName; // Player
+    /**
+     * Unique name of the score.
+     */
+    private final String scoreName; // Score
+    /**
+     * Value of the score.
+     */
+    private final int value;
+}

api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java

@@ -0,0 +1,100 @@
+package net.md_5.bungee.api.score;
+
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class Scoreboard
+{
+
+    /**
+     * Unique name for this scoreboard.
+     */
+    private String name;
+    /**
+     * Position of this scoreboard.
+     */
+    private Position position;
+    /**
+     * Objectives for this scoreboard.
+     */
+    private final Map<String, Objective> objectives = new HashMap<>();
+    /**
+     * Scores for this scoreboard.
+     */
+    private final Map<String, Score> scores = new HashMap<>();
+    /**
+     * Teams on this board.
+     */
+    private final Map<String, Team> teams = new HashMap<>();
+
+    public Collection<Objective> getObjectives()
+    {
+        return Collections.unmodifiableCollection( objectives.values() );
+    }
+
+    public Collection<Score> getScores()
+    {
+        return Collections.unmodifiableCollection( scores.values() );
+    }
+
+    public Collection<Team> getTeams()
+    {
+        return Collections.unmodifiableCollection( teams.values() );
+    }
+
+    public void addObjective(Objective objective)
+    {
+        Preconditions.checkNotNull( objective, "objective" );
+        Preconditions.checkArgument( !objectives.containsKey( objective.getName() ), "Objective %s already exists in this scoreboard", objective.getName() );
+        objectives.put( objective.getName(), objective );
+    }
+
+    public void addScore(Score score)
+    {
+        Preconditions.checkNotNull( score, "score" );
+        scores.put( score.getItemName(), score );
+    }
+
+    public void addTeam(Team team)
+    {
+        Preconditions.checkNotNull( team, "team" );
+        Preconditions.checkArgument( !teams.containsKey( team.getName() ), "Team %s already exists in this scoreboard", team.getName() );
+        teams.put( team.getName(), team );
+    }
+
+    public Team getTeam(String name)
+    {
+        return teams.get( name );
+    }
+
+    public void removeObjective(String objectiveName)
+    {
+        objectives.remove( objectiveName );
+    }
+
+    public void removeScore(String scoreName)
+    {
+        scores.remove( scoreName );
+    }
+
+    public void removeTeam(String teamName)
+    {
+        teams.remove( teamName );
+    }
+
+    public void clear()
+    {
+        name = null;
+        position = null;
+        objectives.clear();
+        scores.clear();
+        teams.clear();
+    }
+}

api/src/main/java/net/md_5/bungee/api/score/Team.java

@@ -0,0 +1,36 @@
+package net.md_5.bungee.api.score;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import lombok.Data;
+import lombok.NonNull;
+
+@Data
+public class Team
+{
+
+    @NonNull
+    private final String name;
+    private String displayName;
+    private String prefix;
+    private String suffix;
+    private boolean friendlyFire;
+    private Set<String> players = new HashSet<>();
+
+    public Collection<String> getPlayers()
+    {
+        return Collections.unmodifiableSet( players );
+    }
+
+    public void addPlayer(String name)
+    {
+        players.add( name );
+    }
+
+    public void removePlayer(String name)
+    {
+        players.remove( name );
+    }
+}

api/src/main/java/net/md_5/bungee/api/tab/CustomTabList.java

@@ -0,0 +1,60 @@
+package net.md_5.bungee.api.tab;
+
+/**
+ * Represents a custom tab list, which may have slots manipulated.
+ */
+public interface CustomTabList extends TabListHandler
+{
+
+    /**
+     * Blank out this tab list and update immediately.
+     */
+    void clear();
+
+    /**
+     * Gets the columns in this list.
+     *
+     * @return the width of this list
+     */
+    int getColumns();
+
+    /**
+     * Gets the rows in this list.
+     *
+     * @return the height of this list
+     */
+    int getRows();
+
+    /**
+     * Get the total size of this list.
+     *
+     * @return {@link #getRows()} * {@link #getColumns()}
+     */
+    int getSize();
+
+    /**
+     * Set the text in the specified slot and update immediately.
+     *
+     * @param row the row to set
+     * @param column the column to set
+     * @param text the text to set
+     * @return the padded text
+     */
+    String setSlot(int row, int column, String text);
+
+    /**
+     * Set the text in the specified slot.
+     *
+     * @param row the row to set
+     * @param column the column to set
+     * @param text the text to set
+     * @param update whether or not to invoke {@link #update()} upon completion
+     * @return the padded text
+     */
+    String setSlot(int row, int column, String text, boolean update);
+
+    /**
+     * Flush all queued changes to the user.
+     */
+    void update();
+}

api/src/main/java/net/md_5/bungee/api/tab/TabListAdapter.java

@@ -0,0 +1,39 @@
+package net.md_5.bungee.api.tab;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+@NoArgsConstructor
+public abstract class TabListAdapter implements TabListHandler
+{
+
+    @Getter
+    private ProxiedPlayer player;
+
+    @Override
+    public void init(ProxiedPlayer player)
+    {
+        this.player = player;
+    }
+
+    @Override
+    public void onConnect()
+    {
+    }
+
+    @Override
+    public void onDisconnect()
+    {
+    }
+
+    @Override
+    public void onServerChange()
+    {
+    }
+
+    @Override
+    public void onPingChange(int ping)
+    {
+    }
+}

api/src/main/java/net/md_5/bungee/api/tab/TabListHandler.java

@@ -1,23 +1,30 @@
-package net.md_5.bungee.api;
+package net.md_5.bungee.api.tab;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public interface TabListHandler
 {
 
+    /**
+     * Called so that this class may set member fields to keep track of its
+     * internal state. You should not do any packet sending or manipulation of
+     * the passed player, other than storing it.
+     *
+     * @param player the player to be associated with this list
+     */
+    void init(ProxiedPlayer player);
+
+    /**
+     * Called when this player first connects to the proxy.
+     */
+    void onConnect();
+
     /**
      * Called when a player first connects to the proxy.
      *
      * @param player the connecting player
      */
-    public void onConnect(ProxiedPlayer player);
-
-    /**
-     * Called when a player changes their connected server.
-     *
-     * @param player the player who changed servers
-     */
-    public void onServerChange(ProxiedPlayer player);
+    void onServerChange();
 
     /**
      * Called when a players ping changes. The new ping will have not updated in
@@ -26,14 +33,14 @@ public interface TabListHandler
      * @param player the player who's ping changed
      * @param ping the player's new ping.
      */
-    public void onPingChange(ProxiedPlayer player, int ping);
+    void onPingChange(int ping);
 
     /**
      * Called when a player disconnects.
      *
      * @param player the disconnected player
      */
-    public void onDisconnect(ProxiedPlayer player);
+    void onDisconnect();
 
     /**
      * Called when a list update packet is sent from server to client.
@@ -44,5 +51,5 @@ public interface TabListHandler
      * @param ping ping of the subject player
      * @return whether to send the packet to the client
      */
-    public boolean onListUpdate(ProxiedPlayer player, String name, boolean online, int ping);
+    boolean onListUpdate(String name, boolean online, int ping);
 }

bootstrap/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

bootstrap/pom.xml

@@ -0,0 +1,97 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.md-5</groupId>
+        <artifactId>bungeecord-parent</artifactId>
+        <version>1.6.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>net.md-5</groupId>
+    <artifactId>bungeecord-bootstrap</artifactId>
+    <version>1.6.4-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>BungeeCord-Bootstrap</name>
+    <description>Java 1.6 loader for BungeeCord</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-proxy</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jopt-simple</groupId>
+            <artifactId>jopt-simple</artifactId>
+            <version>4.5</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>BungeeCord</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Don't deploy proxy to maven repo, only APIs -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Main-Class>net.md_5.bungee.Bootstrap</Main-Class> 
+                            <Implementation-Version>${describe}</Implementation-Version>
+                            <Specification-Version>${maven.build.timestamp}</Specification-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>**/*.java</exclude>
+                                <exclude>**/*.SF</exclude>
+                                <exclude>**/*.DSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java

@@ -0,0 +1,81 @@
+package net.md_5.bungee;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.command.ConsoleCommandSender;
+
+public class Bootstrap
+{
+
+    private static List<String> list(String... params)
+    {
+        return Arrays.asList( params );
+    }
+
+    /**
+     * Starts a new instance of BungeeCord.
+     *
+     * @param args command line arguments, currently none are used
+     * @throws Exception when the server cannot be started
+     */
+    public static void main(String[] args) throws Exception
+    {
+        OptionParser parser = new OptionParser();
+        parser.allowsUnrecognizedOptions();
+        parser.acceptsAll( list( "v", "version" ) );
+
+        OptionSet options = parser.parse( args );
+
+        if ( options.has( "version" ) )
+        {
+            System.out.println( Bootstrap.class.getPackage().getImplementationVersion() );
+            return;
+        }
+
+        if ( !System.getProperty( "java.version" ).startsWith( "1.7" ) )
+        {
+            System.err.println( "*** ERROR *** BungeeCord requires Java 7 to function!" );
+            return;
+        }
+
+        if ( BungeeCord.class.getPackage().getSpecificationVersion() != null )
+        {
+            Calendar deadline = Calendar.getInstance();
+            deadline.add( Calendar.WEEK_OF_YEAR, 2 );
+            if ( Calendar.getInstance().after( new SimpleDateFormat( "yyyyMMdd" ).parse( BungeeCord.class.getPackage().getSpecificationVersion() ) ) )
+            {
+                System.err.println( "*** Warning, this build is outdated ***" );
+                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
+                System.err.println( "*** You will get NO support regarding this build ***" );
+                System.err.println( "*** Server will start in 30 seconds ***" );
+                Thread.sleep( TimeUnit.SECONDS.toMillis( 30 ) );
+            }
+        }
+
+        System.setProperty( "java.net.preferIPv4Stack", "true" );
+
+        BungeeCord bungee = new BungeeCord();
+        ProxyServer.setInstance( bungee );
+        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
+        bungee.start();
+
+        while ( bungee.isRunning )
+        {
+            String line = bungee.getConsoleReader().readLine( ">" );
+            if ( line != null )
+            {
+                if ( !bungee.getPluginManager().dispatchCommand( ConsoleCommandSender.getInstance(), line ) )
+                {
+                    bungee.getConsole().sendMessage( ChatColor.RED + "Command not found" );
+                }
+            }
+        }
+    }
+}

config/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

config/pom.xml

@@ -6,29 +6,24 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-config</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Config</name>
     <description>Generic java configuration API intended for use with BungeeCord</description>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.11</version>
+            <version>1.13</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

config/src/main/java/net/md_5/bungee/config/Configuration.java

@@ -2,7 +2,7 @@ package net.md_5.bungee.config;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import lombok.AccessLevel;
@@ -13,36 +13,53 @@ public final class Configuration
 {
 
     private static final char SEPARATOR = '.';
-    private final Map<String, Object> self;
-    private Map<String, Object> comments = new HashMap<>();
+    final Map<String, Object> self;
     private final Configuration defaults;
 
-    private Map<String, Object> getHolder(String path, Map<String, Object> parent, boolean create)
-    {
-        return null;
-    }
-
-    private Object get(String path, Map<String, Object> holder)
+    private Configuration getSectionFor(String path)
     {
         int index = path.indexOf( SEPARATOR );
-        String first, second;
         if ( index == -1 )
         {
-            second = path;
-        } else
-        {
-            first = path.substring( 0, index );
-            second = path.substring( index + 1, path.length() );
+            return this;
         }
-        return null;
+
+        String root = path.substring( 0, index );
+        Object section = self.get( root );
+        if ( section == null )
+        {
+            section = new LinkedHashMap<>();
+            self.put( root, section );
+        }
+        if ( section instanceof Configuration )
+        {
+            return (Configuration) section;
+        }
+
+        return new Configuration( (Map) section, ( defaults == null ) ? null : defaults.getSectionFor( path ) );
+    }
+
+    private String getChild(String path)
+    {
+        int index = path.indexOf( SEPARATOR );
+        return ( index == -1 ) ? path : path.substring( index + 1 );
     }
 
     /*------------------------------------------------------------------------*/
     @SuppressWarnings("unchecked")
     public <T> T get(String path, T def)
     {
-        Object val = get( path, self );
-        return ( val != null && val.getClass().isInstance( def ) ) ? (T) val : (T) defaults.get( path );
+        Configuration section = getSectionFor( path );
+        Object val;
+        if ( section == this )
+        {
+            val = self.get( path );
+        } else
+        {
+            val = section.get( getChild( path ), def );
+        }
+
+        return ( val != null ) ? (T) val : def;
     }
 
     public Object get(String path)
@@ -52,19 +69,26 @@ public final class Configuration
 
     public Object getDefault(String path)
     {
-        return defaults.get( path );
-    }
-
-    public void set(String path, Object value, String comment)
-    {
-        String child = path.substring( path.indexOf( SEPARATOR ) + 1 );
-        getHolder( path, self, true ).put( child, value );
-        getHolder( path, comments, true ).put( child, value );
+        return ( defaults == null ) ? null : defaults.get( path );
     }
 
     public void set(String path, Object value)
     {
-        set( path, value, null );
+        Configuration section = getSectionFor( path );
+        if ( section == this )
+        {
+            self.put( path, value );
+        } else
+        {
+            section.set( getChild( path ), value );
+        }
+    }
+
+    /*------------------------------------------------------------------------*/
+    public Configuration getSection(String path)
+    {
+        Object def = getDefault( path );
+        return new Configuration( (Map) ( get( path, ( def instanceof Map ) ? def : Collections.EMPTY_MAP ) ), ( defaults == null ) ? null : defaults.getSection( path ) );
     }
 
     /*------------------------------------------------------------------------*/

config/src/main/java/net/md_5/bungee/config/ConfigurationProvider.java

@@ -1,7 +1,9 @@
 package net.md_5.bungee.config;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.Reader;
+import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,13 +17,17 @@ public abstract class ConfigurationProvider
         providers.put( YamlConfiguration.class, new YamlConfiguration() );
     }
 
-    public ConfigurationProvider getProvider(Class<? extends ConfigurationProvider> provider)
+    public static ConfigurationProvider getProvider(Class<? extends ConfigurationProvider> provider)
     {
         return providers.get( provider );
     }
     /*------------------------------------------------------------------------*/
 
-    public abstract Configuration load(File file);
+    public abstract void save(Configuration config, File file) throws IOException;
+
+    public abstract void save(Configuration config, Writer writer);
+
+    public abstract Configuration load(File file) throws IOException;
 
     public abstract Configuration load(Reader reader);
 

config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java

@@ -1,14 +1,18 @@
 package net.md_5.bungee.config;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.Writer;
 import java.util.Map;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
+@NoArgsConstructor(access = AccessLevel.PACKAGE)
 public class YamlConfiguration extends ConfigurationProvider
 {
 
@@ -24,14 +28,26 @@ public class YamlConfiguration extends ConfigurationProvider
     };
 
     @Override
-    public Configuration load(File file)
+    public void save(Configuration config, File file) throws IOException
+    {
+        try ( FileWriter writer = new FileWriter( file ) )
+        {
+            save( config, writer );
+        }
+    }
+
+    @Override
+    public void save(Configuration config, Writer writer)
+    {
+        yaml.get().dump( config.self, writer );
+    }
+
+    @Override
+    public Configuration load(File file) throws IOException
     {
         try ( FileReader reader = new FileReader( file ) )
         {
             return load( reader );
-        } catch ( IOException ex )
-        {
-            return null;
         }
     }
 

config/src/test/java/net/md_5/bungee/config/YamlConfigurationTest.java

@@ -0,0 +1,61 @@
+package net.md_5.bungee.config;
+
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class YamlConfigurationTest
+{
+
+    private String docuement = ""
+            + "receipt:     Oz-Ware Purchase Invoice\n"
+            + "date:        2012-08-06\n"
+            + "customer:\n"
+            + "    given:   Dorothy\n"
+            + "    family:  Gale\n"
+            + "\n"
+            + "items:\n"
+            + "    - part_no:   A4786\n"
+            + "      descrip:   Water Bucket (Filled)\n"
+            + "      price:     1.47\n"
+            + "      quantity:  4\n"
+            + "\n"
+            + "    - part_no:   E1628\n"
+            + "      descrip:   High Heeled \"Ruby\" Slippers\n"
+            + "      size:      8\n"
+            + "      price:     100.27\n"
+            + "      quantity:  1\n"
+            + "\n"
+            + "bill-to:  &id001\n"
+            + "    street: |\n"
+            + "            123 Tornado Alley\n"
+            + "            Suite 16\n"
+            + "    city:   East Centerville\n"
+            + "    state:  KS\n"
+            + "\n"
+            + "ship-to:  *id001\n"
+            + "\n"
+            + "specialDelivery:  >\n"
+            + "    Follow the Yellow Brick\n"
+            + "    Road to the Emerald City.\n"
+            + "    Pay no attention to the\n"
+            + "    man behind the curtain.";
+
+    @Test
+    public void testRead() throws Exception
+    {
+        Configuration conf = ConfigurationProvider.getProvider( YamlConfiguration.class ).load( docuement );
+
+        Assert.assertEquals( "receipt", "Oz-Ware Purchase Invoice", conf.getString( "receipt" ) );
+        // Assert.assertEquals( "date", "2012-08-06", conf.get( "date" ).toString() );
+
+        Configuration customer = conf.getSection( "customer" );
+        Assert.assertEquals( "customer.given", "Dorothy", customer.getString( "given" ) );
+        Assert.assertEquals( "customer.given", "Dorothy", conf.getString( "customer.given" ) );
+
+        List items = conf.getList( "items" );
+        Map item = (Map) items.get( 0 );
+        Assert.assertEquals( "items[0].part_no", "A4786", item.get( "part_no" ) );
+    }
+}

event/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

event/pom.xml

@@ -0,0 +1,20 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.md-5</groupId>
+        <artifactId>bungeecord-parent</artifactId>
+        <version>1.6.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>net.md-5</groupId>
+    <artifactId>bungeecord-event</artifactId>
+    <version>1.6.4-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>BungeeCord-Event</name>
+    <description>Generic java event dispatching API intended for use with BungeeCord</description>
+</project>

event/src/main/java/net/md_5/bungee/event/EventBus.java

@@ -0,0 +1,202 @@
+package net.md_5.bungee.event;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class EventBus
+{
+
+    private final Map<Class<?>, Map<Byte, Map<Object, Method[]>>> byListenerAndPriority = new HashMap<>();
+    private final Map<Class<?>, EventHandlerMethod[]> byEventBaked = new HashMap<>();
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+    private final Logger logger;
+
+    public EventBus()
+    {
+        this( null );
+    }
+
+    public EventBus(Logger logger)
+    {
+        this.logger = ( logger == null ) ? Logger.getGlobal() : logger;
+    }
+
+    public void post(Object event)
+    {
+        lock.readLock().lock();
+        try
+        {
+            EventHandlerMethod[] handlers = byEventBaked.get( event.getClass() );
+            if ( handlers != null )
+            {
+                for ( EventHandlerMethod method : handlers )
+                {
+                    try
+                    {
+                        method.invoke( event );
+                    } catch ( IllegalAccessException ex )
+                    {
+                        throw new Error( "Method became inaccessible: " + event, ex );
+                    } catch ( IllegalArgumentException ex )
+                    {
+                        throw new Error( "Method rejected target/argument: " + event, ex );
+                    } catch ( InvocationTargetException ex )
+                    {
+                        logger.log( Level.WARNING, MessageFormat.format( "Error dispatching event {0} to listener {1}", event, method.getListener() ), ex.getCause() );
+                    }
+                }
+            }
+        } finally
+        {
+            lock.readLock().unlock();
+        }
+    }
+
+    private Map<Class<?>, Map<Byte, Set<Method>>> findHandlers(Object listener)
+    {
+        Map<Class<?>, Map<Byte, Set<Method>>> handler = new HashMap<>();
+        for ( Method m : listener.getClass().getDeclaredMethods() )
+        {
+            EventHandler annotation = m.getAnnotation( EventHandler.class );
+            if ( annotation != null )
+            {
+                Class<?>[] params = m.getParameterTypes();
+                if ( params.length != 1 )
+                {
+                    logger.log( Level.INFO, "Method {0} in class {1} annotated with {2} does not have single argument", new Object[]
+                    {
+                        m, listener.getClass(), annotation
+                    } );
+                    continue;
+                }
+                Map<Byte, Set<Method>> prioritiesMap = handler.get( params[0] );
+                if ( prioritiesMap == null )
+                {
+                    prioritiesMap = new HashMap<>();
+                    handler.put( params[0], prioritiesMap );
+                }
+                Set<Method> priority = prioritiesMap.get( annotation.priority() );
+                if ( priority == null )
+                {
+                    priority = new HashSet<>();
+                    prioritiesMap.put( annotation.priority(), priority );
+                }
+                priority.add( m );
+            }
+        }
+        return handler;
+    }
+
+    public void register(Object listener)
+    {
+        Map<Class<?>, Map<Byte, Set<Method>>> handler = findHandlers( listener );
+        lock.writeLock().lock();
+        try
+        {
+            for ( Map.Entry<Class<?>, Map<Byte, Set<Method>>> e : handler.entrySet() )
+            {
+                Map<Byte, Map<Object, Method[]>> prioritiesMap = byListenerAndPriority.get( e.getKey() );
+                if ( prioritiesMap == null )
+                {
+                    prioritiesMap = new HashMap<>();
+                    byListenerAndPriority.put( e.getKey(), prioritiesMap );
+                }
+                for ( Map.Entry<Byte, Set<Method>> entry : e.getValue().entrySet() )
+                {
+                    Map<Object, Method[]> currentPriorityMap = prioritiesMap.get( entry.getKey() );
+                    if ( currentPriorityMap == null )
+                    {
+                        currentPriorityMap = new HashMap<>();
+                        prioritiesMap.put( entry.getKey(), currentPriorityMap );
+                    }
+                    Method[] baked = new Method[ entry.getValue().size() ];
+                    currentPriorityMap.put( listener, entry.getValue().toArray( baked ) );
+                }
+                bakeHandlers( e.getKey() );
+            }
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
+    }
+
+    public void unregister(Object listener)
+    {
+        Map<Class<?>, Map<Byte, Set<Method>>> handler = findHandlers( listener );
+        lock.writeLock().lock();
+        try
+        {
+            for ( Map.Entry<Class<?>, Map<Byte, Set<Method>>> e : handler.entrySet() )
+            {
+                Map<Byte, Map<Object, Method[]>> prioritiesMap = byListenerAndPriority.get( e.getKey() );
+                if ( prioritiesMap != null )
+                {
+                    for ( Byte priority : e.getValue().keySet() )
+                    {
+                        Map<Object, Method[]> currentPriority = prioritiesMap.get( priority );
+                        if ( currentPriority != null )
+                        {
+                            currentPriority.remove( listener );
+                            if ( currentPriority.isEmpty() )
+                            {
+                                prioritiesMap.remove( priority );
+                            }
+                        }
+                    }
+                    if ( prioritiesMap.isEmpty() )
+                    {
+                        byListenerAndPriority.remove( e.getKey() );
+                    }
+                }
+                bakeHandlers( e.getKey() );
+            }
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
+    }
+
+    /**
+     * Shouldn't be called without first locking the writeLock; intended for use
+     * only inside {@link #register(java.lang.Object) register(Object)} or
+     * {@link #unregister(java.lang.Object) unregister(Object)}.
+     */
+    private void bakeHandlers(Class<?> eventClass)
+    {
+        Map<Byte, Map<Object, Method[]>> handlersByPriority = byListenerAndPriority.get( eventClass );
+        if ( handlersByPriority != null )
+        {
+            List<EventHandlerMethod> handlersList = new ArrayList<>( handlersByPriority.size() * 2 );
+            for ( byte value = Byte.MIN_VALUE; value < Byte.MAX_VALUE; value++ )
+            {
+                Map<Object, Method[]> handlersByListener = handlersByPriority.get( value );
+                if ( handlersByListener != null )
+                {
+                    for ( Map.Entry<Object, Method[]> listenerHandlers : handlersByListener.entrySet() )
+                    {
+                        for ( Method method : listenerHandlers.getValue() )
+                        {
+                            EventHandlerMethod ehm = new EventHandlerMethod( listenerHandlers.getKey(), method );
+                            handlersList.add( ehm );
+                        }
+                    }
+                }
+            }
+            byEventBaked.put( eventClass, handlersList.toArray( new EventHandlerMethod[ handlersList.size() ] ) );
+        } else
+        {
+            byEventBaked.put( eventClass, null );
+        }
+    }
+}

event/src/main/java/net/md_5/bungee/event/EventHandler.java

@@ -0,0 +1,26 @@
+package net.md_5.bungee.event;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventHandler
+{
+
+    /**
+     * Define the priority of the event handler.
+     * <p>
+     * Event handlers are called in order of priority:
+     * <ol>
+     * <li>LOWEST</li>
+     * <li>LOW</li>
+     * <li>NORMAL</li>
+     * <li>HIGH</li>
+     * <li>HIGHEST</li>
+     * </ol>
+     */
+    byte priority() default EventPriority.NORMAL;
+}

event/src/main/java/net/md_5/bungee/event/EventHandlerMethod.java

@@ -0,0 +1,21 @@
+package net.md_5.bungee.event;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+public class EventHandlerMethod
+{
+
+    @Getter
+    private final Object listener;
+    @Getter
+    private final Method method;
+
+    public void invoke(Object event) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
+    {
+        method.invoke( listener, event );
+    }
+}

event/src/main/java/net/md_5/bungee/event/EventPriority.java

@@ -0,0 +1,19 @@
+package net.md_5.bungee.event;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * Importance of the {@link EventHandler}. When executing an Event, the handlers
+ * are called in order of their Priority.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class EventPriority
+{
+
+    public static final byte LOWEST = -64;
+    public static final byte LOW = -32;
+    public static final byte NORMAL = 0;
+    public static final byte HIGH = 32;
+    public static final byte HIGHEST = 64;
+}

event/src/test/java/net/md_5/bungee/event/EventBusTest.java

@@ -0,0 +1,42 @@
+package net.md_5.bungee.event;
+
+import java.util.concurrent.CountDownLatch;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EventBusTest
+{
+
+    private final EventBus bus = new EventBus();
+    private final CountDownLatch latch = new CountDownLatch( 2 );
+
+    @Test
+    public void testNestedEvents()
+    {
+        bus.register( this );
+        bus.post( new FirstEvent() );
+        Assert.assertEquals( 0, latch.getCount() );
+    }
+
+    @EventHandler
+    public void firstListener(FirstEvent event)
+    {
+        bus.post( new SecondEvent() );
+        Assert.assertEquals( 1, latch.getCount() );
+        latch.countDown();
+    }
+
+    @EventHandler
+    public void secondListener(SecondEvent event)
+    {
+        latch.countDown();
+    }
+
+    public static class FirstEvent
+    {
+    }
+
+    public static class SecondEvent
+    {
+    }
+}

event/src/test/java/net/md_5/bungee/event/EventPriorityTest.java

@@ -0,0 +1,64 @@
+package net.md_5.bungee.event;
+
+import java.util.concurrent.CountDownLatch;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EventPriorityTest
+{
+
+    private final EventBus bus = new EventBus();
+    private final CountDownLatch latch = new CountDownLatch( 5 );
+
+    @Test
+    public void testPriority()
+    {
+        bus.register( this );
+        bus.register( new EventPriorityListenerPartner() );
+        bus.post( new PriorityTestEvent() );
+        Assert.assertEquals( 0, latch.getCount() );
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onLowestPriority(PriorityTestEvent event)
+    {
+        Assert.assertEquals( 5, latch.getCount() );
+        latch.countDown();
+    }
+
+    @EventHandler
+    public void onNormalPriority(PriorityTestEvent event)
+    {
+        Assert.assertEquals( 3, latch.getCount() );
+        latch.countDown();
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onHighestPriority(PriorityTestEvent event)
+    {
+        Assert.assertEquals( 1, latch.getCount() );
+        latch.countDown();
+    }
+
+    public static class PriorityTestEvent
+    {
+    }
+
+    public class EventPriorityListenerPartner
+    {
+
+        @EventHandler(priority = EventPriority.HIGH)
+        public void onHighPriority(PriorityTestEvent event)
+        {
+            Assert.assertEquals( 2, latch.getCount() );
+            latch.countDown();
+        }
+
+        @EventHandler(priority = EventPriority.LOW)
+        public void onLowPriority(PriorityTestEvent event)
+        {
+            Assert.assertEquals( 4, latch.getCount() );
+            latch.countDown();
+        }
+    }
+}

event/src/test/java/net/md_5/bungee/event/UnregisteringListenerTest.java

@@ -0,0 +1,28 @@
+package net.md_5.bungee.event;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UnregisteringListenerTest
+{
+
+    private final EventBus bus = new EventBus();
+
+    @Test
+    public void testPriority()
+    {
+        bus.register( this );
+        bus.unregister( this );
+        bus.post( new TestEvent() );
+    }
+
+    @EventHandler
+    public void onEvent(TestEvent evt)
+    {
+        Assert.fail( "Event listener wasn't unregistered" );
+    }
+
+    public static class TestEvent
+    {
+    }
+}

nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

pom.xml

@@ -11,16 +11,16 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord</name>
     <description>Parent project for all BungeeCord modules.</description>
-    <url>https://github.com/ElasticPortalSuite/BungeeCord</url>
+    <url>https://github.com/SpigotMC/BungeeCord</url>
     <inceptionYear>2012</inceptionYear>
     <organization>
         <name>Elastic Portal Suite</name>
-        <url>https://github.com/ElasticPortalSuite</url>
+        <url>https://github.com/SpigotMC</url>
     </organization>
     <licenses>
         <license>
@@ -38,18 +38,22 @@
 
     <modules>
         <module>api</module>
+        <module>bootstrap</module>
+        <module>config</module>
+        <module>event</module>
         <module>protocol</module>
         <module>proxy</module>
+        <module>query</module>
     </modules>
 
     <scm>
-        <connection>scm:git:git@github.com:ElasticPortalSuite/BungeeCord.git</connection>
-        <developerConnection>scm:git:git@github.com:ElasticPortalSuite/BungeeCord.git</developerConnection>
-        <url>git@github.com:ElasticPortalSuite/BungeeCord.git</url>
+        <connection>scm:git:git@github.com:SpigotMC/BungeeCord.git</connection>
+        <developerConnection>scm:git:git@github.com:SpigotMC/BungeeCord.git</developerConnection>
+        <url>git@github.com:SpigotMC/BungeeCord.git</url>
     </scm>
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/ElasticPortalSuite/BungeeCord/issues</url>
+        <url>https://github.com/SpigotMC/BungeeCord/issues</url>
     </issueManagement>
     <ciManagement>
         <system>jenkins</system>
@@ -57,15 +61,22 @@
     </ciManagement>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <build.number>unknown</build.number>
+        <netty.version>4.0.9.Final</netty.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>0.11.6</version>
+            <version>0.12.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -92,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>2.5.1</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>

protocol/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>

protocol/pom.xml

@@ -6,15 +6,24 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Protocol</name>
     <description>Minimal implementation of the Minecraft protocol for use in BungeeCord</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>

protocol/src/main/java/net/md_5/bungee/protocol/BadPacketException.java

@@ -0,0 +1,10 @@
+package net.md_5.bungee.protocol;
+
+public class BadPacketException extends RuntimeException
+{
+
+    public BadPacketException(String message)
+    {
+        super( message );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/Forge.java

@@ -0,0 +1,33 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import net.md_5.bungee.protocol.packet.forge.Forge1Login;
+import net.md_5.bungee.protocol.skip.PacketReader;
+
+public class Forge extends Vanilla
+{
+
+    @Getter
+    private static final Forge instance = new Forge();
+
+    public Forge()
+    {
+        classes[0x01] = Forge1Login.class;
+        skipper = new PacketReader( this ); // TODO: :(
+    }
+
+    @Override
+    public DefinedPacket read(short packetId, ByteBuf buf)
+    {
+        int start = buf.readerIndex();
+        DefinedPacket packet = read( packetId, buf, this );
+        if ( buf.readerIndex() == start )
+        {
+            packet = super.read( packetId, buf );
+        }
+
+        return packet;
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/MinecraftInput.java

@@ -0,0 +1,38 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class MinecraftInput
+{
+
+    private final ByteBuf buf;
+
+    public byte readByte()
+    {
+        return buf.readByte();
+    }
+
+    public short readUnisgnedByte()
+    {
+        return buf.readUnsignedByte();
+    }
+
+    public int readInt()
+    {
+        return buf.readInt();
+    }
+
+    public String readString()
+    {
+        short len = buf.readShort();
+        char[] c = new char[ len ];
+        for ( int i = 0; i < c.length; i++ )
+        {
+            c[i] = buf.readChar();
+        }
+
+        return new String( c );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/MinecraftOutput.java

@@ -0,0 +1,56 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+public class MinecraftOutput
+{
+
+    private final ByteBuf buf;
+
+    public MinecraftOutput()
+    {
+        buf = Unpooled.buffer();
+    }
+
+    public byte[] toArray()
+    {
+        if ( buf.hasArray() )
+        {
+            return Arrays.copyOfRange( buf.array(), buf.arrayOffset(), buf.arrayOffset() + buf.writerIndex() );
+        } else
+        {
+            byte[] b = new byte[ buf.writerIndex() ];
+            buf.readBytes( b );
+            return b;
+        }
+    }
+
+    public MinecraftOutput writeByte(byte b)
+    {
+        buf.writeByte( b );
+        return this;
+    }
+
+    public void writeInt(int i)
+    {
+        buf.writeInt( i );
+    }
+
+    public void writeString(String s)
+    {
+        char[] cc = s.toCharArray();
+        buf.writeShort( cc.length );
+        for ( char c : cc )
+        {
+            buf.writeChar( c );
+        }
+    }
+
+    public void writeStringUTF8WithoutLengthHeaderBecauseDinnerboneStuffedUpTheMCBrandPacket(String s)
+    {
+        buf.writeBytes( s.getBytes( Charset.forName( "UTF-8" ) ) );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/OpCode.java

@@ -0,0 +1,7 @@
+package net.md_5.bungee.protocol;
+
+public enum OpCode
+{
+
+    BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, USHORT_BYTE, OPTIONAL_WINDOW
+}

protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java

@@ -0,0 +1,20 @@
+package net.md_5.bungee.protocol;
+
+import io.netty.buffer.ByteBuf;
+import java.lang.reflect.Constructor;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import net.md_5.bungee.protocol.skip.PacketReader;
+
+public interface Protocol
+{
+
+    PacketReader getSkipper();
+
+    DefinedPacket read(short packetId, ByteBuf buf);
+
+    OpCode[][] getOpCodes();
+
+    Class<? extends DefinedPacket>[] getClasses();
+
+    Constructor<? extends DefinedPacket>[] getConstructors();
+}

protocol/src/main/java/net/md_5/bungee/protocol/Vanilla.java

@@ -1,39 +1,131 @@
-package net.md_5.mendax;
+package net.md_5.bungee.protocol;
 
-import static net.md_5.mendax.PacketDefinitions.OpCode.*;
+import io.netty.buffer.ByteBuf;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import lombok.Getter;
+import static net.md_5.bungee.protocol.OpCode.*;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
+import net.md_5.bungee.protocol.packet.Packet1Login;
+import net.md_5.bungee.protocol.packet.Packet2CEntityProperties;
+import net.md_5.bungee.protocol.packet.Packet2Handshake;
+import net.md_5.bungee.protocol.packet.Packet3Chat;
+import net.md_5.bungee.protocol.packet.Packet9Respawn;
+import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
+import net.md_5.bungee.protocol.packet.PacketCBTabComplete;
+import net.md_5.bungee.protocol.packet.PacketCCSettings;
+import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
+import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
+import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
+import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
+import net.md_5.bungee.protocol.packet.PacketD1Team;
+import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
+import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
+import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
+import net.md_5.bungee.protocol.packet.PacketFEPing;
+import net.md_5.bungee.protocol.packet.PacketFFKick;
+import net.md_5.bungee.protocol.skip.PacketReader;
 
-public class PacketDefinitions
+public class Vanilla implements Protocol
 {
 
-    private static final int MAX_PACKET = 256;
-    public static final OpCode[][] opCodes = new OpCode[ MAX_PACKET * 2 ][];
-    public static final int VANILLA_PROTOCOL = 0;
-    public static final int FORGE_PROTOCOL = MAX_PACKET;
+    public static final byte PROTOCOL_VERSION = 78;
+    public static final String GAME_VERSION = "1.6.4";
+    @Getter
+    private static final Vanilla instance = new Vanilla();
+    /*========================================================================*/
+    @Getter
+    private final OpCode[][] opCodes = new OpCode[ 256 ][];
+    @SuppressWarnings("unchecked")
+    @Getter
+    protected Class<? extends DefinedPacket>[] classes = new Class[ 256 ];
+    @SuppressWarnings("unchecked")
+    @Getter
+    private Constructor<? extends DefinedPacket>[] constructors = new Constructor[ 256 ];
+    @Getter
+    protected PacketReader skipper;
+    /*========================================================================*/
 
-    public enum OpCode
+    public Vanilla()
     {
-
-        BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, USHORT_BYTE
+        classes[0x00] = Packet0KeepAlive.class;
+        classes[0x01] = Packet1Login.class;
+        classes[0x02] = Packet2Handshake.class;
+        classes[0x03] = Packet3Chat.class;
+        classes[0x09] = Packet9Respawn.class;
+        classes[0xC9] = PacketC9PlayerListItem.class;
+        classes[0x2C] = Packet2CEntityProperties.class;
+        classes[0xCC] = PacketCCSettings.class;
+        classes[0xCB] = PacketCBTabComplete.class;
+        classes[0xCD] = PacketCDClientStatus.class;
+        classes[0xCE] = PacketCEScoreboardObjective.class;
+        classes[0xCF] = PacketCFScoreboardScore.class;
+        classes[0xD0] = PacketD0DisplayScoreboard.class;
+        classes[0xD1] = PacketD1Team.class;
+        classes[0xFA] = PacketFAPluginMessage.class;
+        classes[0xFC] = PacketFCEncryptionResponse.class;
+        classes[0xFD] = PacketFDEncryptionRequest.class;
+        classes[0xFE] = PacketFEPing.class;
+        classes[0xFF] = PacketFFKick.class;
+        skipper = new PacketReader( this );
     }
 
-    static
+    @Override
+    public DefinedPacket read(short packetId, ByteBuf buf)
     {
-        opCodes[0x00] = new OpCode[]
+        int start = buf.readerIndex();
+        DefinedPacket packet = read( packetId, buf, this );
+        if ( buf.readerIndex() == start )
         {
-            INT
-        };
-        opCodes[0x01] = new OpCode[]
+            throw new BadPacketException( "Unknown packet id " + packetId );
+        }
+        return packet;
+    }
+
+    public static DefinedPacket read(short id, ByteBuf buf, Protocol protocol)
+    {
+        DefinedPacket packet = packet( id, protocol );
+        if ( packet != null )
         {
-            INT, STRING, BYTE, BYTE, BYTE, BYTE, BYTE
-        };
-        opCodes[0x02] = new OpCode[]
+            packet.read( buf );
+            return packet;
+        }
+        protocol.getSkipper().tryRead( id, buf );
+        return null;
+    }
+
+    public static DefinedPacket packet(short id, Protocol protocol)
+    {
+        DefinedPacket ret = null;
+        Class<? extends DefinedPacket> clazz = protocol.getClasses()[id];
+
+        if ( clazz != null )
         {
-            BYTE, STRING, STRING, INT
-        };
-        opCodes[0x03] = new OpCode[]
-        {
-            STRING
-        };
+            try
+            {
+                Constructor<? extends DefinedPacket> constructor = protocol.getConstructors()[id];
+                if ( constructor == null )
+                {
+                    constructor = clazz.getDeclaredConstructor();
+                    constructor.setAccessible( true );
+                    protocol.getConstructors()[id] = constructor;
+                }
+
+                if ( constructor != null )
+                {
+                    ret = constructor.newInstance();
+                }
+            } catch ( NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex )
+            {
+            }
+        }
+
+        return ret;
+    }
+
+    
+    {
         opCodes[0x04] = new OpCode[]
         {
             LONG, LONG
@@ -52,11 +144,7 @@ public class PacketDefinitions
         };
         opCodes[0x08] = new OpCode[]
         {
-            SHORT, SHORT, FLOAT
-        };
-        opCodes[0x09] = new OpCode[]
-        {
-            INT, BYTE, BYTE, SHORT, STRING
+            FLOAT, SHORT, FLOAT
         };
         opCodes[0x0A] = new OpCode[]
         {
@@ -96,7 +184,7 @@ public class PacketDefinitions
         };
         opCodes[0x13] = new OpCode[]
         {
-            INT, BYTE
+            INT, BYTE, INT
         };
         opCodes[0x14] = new OpCode[]
         {
@@ -122,6 +210,10 @@ public class PacketDefinitions
         {
             INT, INT, INT, INT, SHORT
         };
+        opCodes[0x1B] = new OpCode[]
+        {
+            FLOAT, FLOAT, BOOLEAN, BOOLEAN
+        };
         opCodes[0x1C] = new OpCode[]
         {
             INT, SHORT, SHORT, SHORT
@@ -160,7 +252,7 @@ public class PacketDefinitions
         };
         opCodes[0x27] = new OpCode[]
         {
-            INT, INT
+            INT, INT, BOOLEAN
         };
         opCodes[0x28] = new OpCode[]
         {
@@ -214,6 +306,10 @@ public class PacketDefinitions
         {
             STRING, INT, INT, INT, FLOAT, BYTE
         };
+        opCodes[0x3F] = new OpCode[]
+        {
+            STRING, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, INT
+        };
         opCodes[0x46] = new OpCode[]
         {
             BYTE, BYTE
@@ -224,7 +320,7 @@ public class PacketDefinitions
         };
         opCodes[0x64] = new OpCode[]
         {
-            BYTE, BYTE, STRING, BYTE
+            OPTIONAL_WINDOW
         };
         opCodes[0x65] = new OpCode[]
         {
@@ -270,57 +366,21 @@ public class PacketDefinitions
         {
             INT, SHORT, INT, BYTE, SHORT_BYTE
         };
+        opCodes[0x85] = new OpCode[]
+        {
+            BYTE, INT, INT, INT
+        };
         opCodes[0xC3] = new OpCode[]
         {
             SHORT, SHORT, INT_BYTE
         };
         opCodes[0xC8] = new OpCode[]
         {
-            INT, BYTE
-        };
-        opCodes[0xC9] = new OpCode[]
-        {
-            STRING, BOOLEAN, SHORT
+            INT, INT
         };
         opCodes[0xCA] = new OpCode[]
         {
-            BYTE, BYTE, BYTE
-        };
-        opCodes[0xCB] = new OpCode[]
-        {
-            STRING
-        };
-        opCodes[0xCC] = new OpCode[]
-        {
-            STRING, BYTE, BYTE, BYTE, BOOLEAN
-        };
-        opCodes[0xCD] = new OpCode[]
-        {
-            BYTE
-        };
-        opCodes[0xFA] = new OpCode[]
-        {
-            STRING, SHORT_BYTE
-        };
-        opCodes[0xFC] = new OpCode[]
-        {
-            SHORT_BYTE, SHORT_BYTE
-        };
-        opCodes[0xFD] = new OpCode[]
-        {
-            STRING, SHORT_BYTE, SHORT_BYTE
-        };
-        opCodes[0xFE] = new OpCode[]
-        {
-        }; // Should be byte, screw you too bitchy server admins!
-        opCodes[0xFF] = new OpCode[]
-        {
-            STRING
-        };
-        /*========================== Minecraft Forge ===========================*/
-        opCodes[0x01 + FORGE_PROTOCOL] = new OpCode[]
-        {
-            INT, STRING, BYTE, INT, BYTE, BYTE, BYTE
+            BYTE, FLOAT, FLOAT
         };
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/packet/AbstractPacketHandler.java

@@ -1,70 +1,81 @@
-package net.md_5.bungee.packet;
+package net.md_5.bungee.protocol.packet;
 
-public abstract class PacketHandler
+public abstract class AbstractPacketHandler
 {
 
-    private void nop(DefinedPacket packet)
-    {
-        throw new UnsupportedOperationException( "No handler defined for packet " + packet.getClass() );
-    }
-
     public void handle(Packet0KeepAlive alive) throws Exception
     {
-        nop( alive );
     }
 
     public void handle(Packet1Login login) throws Exception
     {
-        nop( login );
     }
 
     public void handle(Packet2Handshake handshake) throws Exception
     {
-        nop( handshake );
     }
 
     public void handle(Packet3Chat chat) throws Exception
     {
-        nop( chat );
     }
 
     public void handle(Packet9Respawn respawn) throws Exception
     {
-        nop( respawn );
+    }
+
+    public void handle(Packet2CEntityProperties properties) throws Exception
+    {
     }
 
     public void handle(PacketC9PlayerListItem playerList) throws Exception
     {
-        nop( playerList );
+    }
+
+    public void handle(PacketCCSettings settings) throws Exception
+    {
     }
 
     public void handle(PacketCDClientStatus clientStatus) throws Exception
     {
-        nop( clientStatus );
+    }
+
+    public void handle(PacketCEScoreboardObjective objective) throws Exception
+    {
+    }
+
+    public void handle(PacketCFScoreboardScore score) throws Exception
+    {
+    }
+
+    public void handle(PacketD0DisplayScoreboard displayScoreboard) throws Exception
+    {
+    }
+
+    public void handle(PacketD1Team team) throws Exception
+    {
     }
 
     public void handle(PacketFAPluginMessage pluginMessage) throws Exception
     {
-        nop( pluginMessage );
     }
 
     public void handle(PacketFCEncryptionResponse encryptResponse) throws Exception
     {
-        nop( encryptResponse );
     }
 
     public void handle(PacketFDEncryptionRequest encryptRequest) throws Exception
     {
-        nop( encryptRequest );
     }
 
     public void handle(PacketFEPing ping) throws Exception
     {
-        nop( ping );
     }
 
     public void handle(PacketFFKick kick) throws Exception
     {
-        nop( kick );
+    }
+
+    public void handle(PacketCBTabComplete tabComplete) throws Exception
+    {
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/packet/DefinedPacket.java

@@ -0,0 +1,69 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public abstract class DefinedPacket
+{
+
+    private final int id;
+
+    public final int getId()
+    {
+        return id;
+    }
+
+    public void writeString(String s, ByteBuf buf)
+    {
+        // TODO: Check len - use Guava?
+        buf.writeShort( s.length() );
+        for ( char c : s.toCharArray() )
+        {
+            buf.writeChar( c );
+        }
+    }
+
+    public String readString(ByteBuf buf)
+    {
+        // TODO: Check len - use Guava?
+        short len = buf.readShort();
+        char[] chars = new char[ len ];
+        for ( int i = 0; i < len; i++ )
+        {
+            chars[i] = buf.readChar();
+        }
+        return new String( chars );
+    }
+
+    public void writeArray(byte[] b, ByteBuf buf)
+    {
+        // TODO: Check len - use Guava?
+        buf.writeShort( b.length );
+        buf.writeBytes( b );
+    }
+
+    public byte[] readArray(ByteBuf buf)
+    {
+        // TODO: Check len - use Guava?
+        short len = buf.readShort();
+        byte[] ret = new byte[ len ];
+        buf.readBytes( ret );
+        return ret;
+    }
+
+    public abstract void read(ByteBuf buf);
+
+    public abstract void write(ByteBuf buf);
+
+    public abstract void handle(AbstractPacketHandler handler) throws Exception;
+
+    @Override
+    public abstract boolean equals(Object obj);
+
+    @Override
+    public abstract int hashCode();
+
+    @Override
+    public abstract String toString();
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet0KeepAlive.java

@@ -0,0 +1,38 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet0KeepAlive extends DefinedPacket
+{
+
+    private int randomId;
+
+    private Packet0KeepAlive()
+    {
+        super( 0x00 );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        randomId = buf.readInt();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeInt( randomId );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet1Login.java

@@ -0,0 +1,73 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet1Login extends DefinedPacket
+{
+
+    protected int entityId;
+    protected String levelType;
+    protected byte gameMode;
+    protected int dimension;
+    protected byte difficulty;
+    protected byte unused;
+    protected byte maxPlayers;
+
+    protected Packet1Login()
+    {
+        super( 0x01 );
+    }
+
+    public Packet1Login(int entityId, String levelType, byte gameMode, byte dimension, byte difficulty, byte unused, byte maxPlayers)
+    {
+        this( entityId, levelType, gameMode, (int) dimension, difficulty, unused, maxPlayers );
+    }
+
+    public Packet1Login(int entityId, String levelType, byte gameMode, int dimension, byte difficulty, byte unused, byte maxPlayers)
+    {
+        this();
+        this.entityId = entityId;
+        this.levelType = levelType;
+        this.gameMode = gameMode;
+        this.dimension = dimension;
+        this.difficulty = difficulty;
+        this.unused = unused;
+        this.maxPlayers = maxPlayers;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        entityId = buf.readInt();
+        levelType = readString( buf );
+        gameMode = buf.readByte();
+        dimension = buf.readByte();
+        difficulty = buf.readByte();
+        unused = buf.readByte();
+        maxPlayers = buf.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeInt( entityId );
+        writeString( levelType, buf );
+        buf.writeByte( gameMode );
+        buf.writeByte( dimension );
+        buf.writeByte( difficulty );
+        buf.writeByte( unused );
+        buf.writeByte( maxPlayers );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2CEntityProperties.java

@@ -0,0 +1,47 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet2CEntityProperties extends DefinedPacket
+{
+
+    public Packet2CEntityProperties()
+    {
+        super( 0x2C );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        buf.readInt();
+        int recordCount = buf.readInt();
+        for ( int i = 0; i < recordCount; i++ )
+        {
+            readString( buf );
+            buf.readDouble();
+            short size = buf.readShort();
+            for ( short s = 0; s < size; s++ )
+            {
+                buf.skipBytes( 25 ); // long, long, double, byte
+            }
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2Handshake.java

@@ -0,0 +1,49 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet2Handshake extends DefinedPacket
+{
+
+    private byte protocolVersion;
+    private String username;
+    private String host;
+    private int port;
+
+    private Packet2Handshake()
+    {
+        super( 0x02 );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        protocolVersion = buf.readByte();
+        username = readString( buf );
+        host = readString( buf );
+        port = buf.readInt();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeByte( protocolVersion );
+        writeString( username, buf );
+        writeString( host, buf );
+        buf.writeInt( port );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet3Chat.java

@@ -0,0 +1,46 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet3Chat extends DefinedPacket
+{
+
+    private String message;
+
+    private Packet3Chat()
+    {
+        super( 0x03 );
+    }
+
+    public Packet3Chat(String message)
+    {
+        this();
+        this.message = message;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        message = readString( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( message, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet9Respawn.java

@@ -0,0 +1,58 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Packet9Respawn extends DefinedPacket
+{
+
+    private int dimension;
+    private byte difficulty;
+    private byte gameMode;
+    private short worldHeight;
+    private String levelType;
+
+    private Packet9Respawn()
+    {
+        super( 0x09 );
+    }
+
+    public Packet9Respawn(int dimension, byte difficulty, byte gameMode, short worldHeight, String levelType)
+    {
+        this();
+        this.dimension = dimension;
+        this.difficulty = difficulty;
+        this.gameMode = gameMode;
+        this.worldHeight = worldHeight;
+        this.levelType = levelType;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        dimension = buf.readInt();
+        difficulty = buf.readByte();
+        gameMode = buf.readByte();
+        worldHeight = buf.readShort();
+        levelType = readString( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeInt( dimension );
+        buf.writeByte( difficulty );
+        buf.writeByte( gameMode );
+        buf.writeShort( worldHeight );
+        writeString( levelType, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketC9PlayerListItem.java

@@ -0,0 +1,52 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketC9PlayerListItem extends DefinedPacket
+{
+
+    private String username;
+    private boolean online;
+    private short ping;
+
+    private PacketC9PlayerListItem()
+    {
+        super( 0xC9 );
+    }
+
+    public PacketC9PlayerListItem(String username, boolean online, short ping)
+    {
+        super( 0xC9 );
+        this.username = username;
+        this.online = online;
+        this.ping = ping;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        username = readString( buf );
+        online = buf.readBoolean();
+        ping = buf.readShort();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( username, buf );
+        buf.writeBoolean( online );
+        buf.writeShort( ping );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketCBTabComplete.java

@@ -0,0 +1,51 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketCBTabComplete extends DefinedPacket
+{
+
+    private String cursor;
+    private String[] commands;
+
+    private PacketCBTabComplete()
+    {
+        super( 0xCB );
+    }
+
+    public PacketCBTabComplete(String[] alternatives)
+    {
+        this();
+        commands = alternatives;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        cursor = readString( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        StringBuilder tab = new StringBuilder();
+        for ( String alternative : commands )
+        {
+            tab.append( alternative );
+            tab.append( "\00" );
+        }
+        writeString( tab.substring( 0, tab.length() - 1 ), buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketCCSettings.java

@@ -0,0 +1,48 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketCCSettings extends DefinedPacket
+{
+
+    private String locale;
+    private byte viewDistance;
+    private byte chatFlags;
+    private byte difficulty;
+    private boolean showCape;
+
+    private PacketCCSettings()
+    {
+        super( 0xCC );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        locale = readString( buf );
+        viewDistance = buf.readByte();
+        chatFlags = buf.readByte();
+        difficulty = buf.readByte();
+        showCape = buf.readBoolean();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( locale, buf );
+        buf.writeByte( viewDistance );
+        buf.writeByte( chatFlags );
+        buf.writeByte( difficulty );
+        buf.writeBoolean( showCape );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketCDClientStatus.java

@@ -0,0 +1,42 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketCDClientStatus extends DefinedPacket
+{
+
+    private byte payload;
+
+    private PacketCDClientStatus()
+    {
+        super( 0xCD );
+    }
+
+    public PacketCDClientStatus(byte payload)
+    {
+        this();
+        this.payload = payload;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        payload = buf.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeByte( payload );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketCEScoreboardObjective.java

@@ -0,0 +1,55 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketCEScoreboardObjective extends DefinedPacket
+{
+
+    private String name;
+    private String text;
+    /**
+     * 0 to create, 1 to remove.
+     */
+    private byte action;
+
+    private PacketCEScoreboardObjective()
+    {
+        super( 0xCE );
+    }
+
+    public PacketCEScoreboardObjective(String name, String text, byte action)
+    {
+        this();
+        this.name = name;
+        this.text = text;
+        this.action = action;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        name = readString( buf );
+        text = readString( buf );
+        action = buf.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( name, buf );
+        writeString( text, buf );
+        buf.writeByte( action );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketCFScoreboardScore.java

@@ -0,0 +1,56 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketCFScoreboardScore extends DefinedPacket
+{
+
+    private String itemName;
+    /**
+     * 0 = create / update, 1 = remove.
+     */
+    private byte action;
+    private String scoreName;
+    private int value;
+
+    private PacketCFScoreboardScore()
+    {
+        super( 0xCF );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        itemName = readString( buf );
+        action = buf.readByte();
+        if ( action != 1 )
+        {
+            scoreName = readString( buf );
+            value = buf.readInt();
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( itemName, buf );
+        buf.writeByte( action );
+        if ( action != 1 )
+        {
+            writeString( scoreName, buf );
+            buf.writeInt( value );
+        }
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD0DisplayScoreboard.java

@@ -0,0 +1,44 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketD0DisplayScoreboard extends DefinedPacket
+{
+
+    /**
+     * 0 = list, 1 = side, 2 = below.
+     */
+    private byte position;
+    private String name;
+
+    private PacketD0DisplayScoreboard()
+    {
+        super( 0xD0 );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        position = buf.readByte();
+        name = readString( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeByte( position );
+        writeString( name, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java

@@ -0,0 +1,92 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketD1Team extends DefinedPacket
+{
+
+    private String name;
+    /**
+     * 0 - create, 1 remove, 2 info update, 3 player add, 4 player remove.
+     */
+    private byte mode;
+    private String displayName;
+    private String prefix;
+    private String suffix;
+    private boolean friendlyFire;
+    private short playerCount;
+    private String[] players;
+
+    private PacketD1Team()
+    {
+        super( 0xD1 );
+    }
+
+    /**
+     * Packet to destroy a team.
+     *
+     * @param name
+     */
+    public PacketD1Team(String name)
+    {
+        this();
+        this.name = name;
+        this.mode = 1;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        name = readString( buf );
+        mode = buf.readByte();
+        if ( mode == 0 || mode == 2 )
+        {
+            displayName = readString( buf );
+            prefix = readString( buf );
+            suffix = readString( buf );
+            friendlyFire = buf.readBoolean();
+        }
+        if ( mode == 0 || mode == 3 || mode == 4 )
+        {
+            players = new String[ buf.readShort() ];
+            for ( int i = 0; i < getPlayers().length; i++ )
+            {
+                players[i] = readString( buf );
+            }
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( name, buf );
+        buf.writeByte( mode );
+        if ( mode == 0 || mode == 2 )
+        {
+            writeString( displayName, buf );
+            writeString( prefix, buf );
+            writeString( suffix, buf );
+            buf.writeBoolean( friendlyFire );
+        }
+        if ( mode == 0 || mode == 3 || mode == 4 )
+        {
+            buf.writeShort( players.length );
+            for ( int i = 0; i < players.length; i++ )
+            {
+                writeString( players[i], buf );
+            }
+        }
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketFAPluginMessage.java

@@ -0,0 +1,64 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import net.md_5.bungee.protocol.MinecraftInput;
+import net.md_5.bungee.protocol.MinecraftOutput;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketFAPluginMessage extends DefinedPacket
+{
+
+    private String tag;
+    private byte[] data;
+
+    private PacketFAPluginMessage()
+    {
+        super( 0xFA );
+    }
+
+    public PacketFAPluginMessage(String tag, byte[] data)
+    {
+        this();
+        this.tag = tag;
+        this.data = data;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        tag = readString( buf );
+        data = readArray( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( tag, buf );
+        writeArray( data, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+
+    public DataInput getStream()
+    {
+        return new DataInputStream( new ByteArrayInputStream( data ) );
+    }
+
+    public MinecraftInput getMCStream()
+    {
+        return new MinecraftInput( Unpooled.wrappedBuffer( data ) );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketFCEncryptionResponse.java

@@ -0,0 +1,48 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketFCEncryptionResponse extends DefinedPacket
+{
+
+    private byte[] sharedSecret;
+    private byte[] verifyToken;
+
+    private PacketFCEncryptionResponse()
+    {
+        super( 0xFC );
+    }
+
+    public PacketFCEncryptionResponse(byte[] sharedSecret, byte[] verifyToken)
+    {
+        this();
+        this.sharedSecret = sharedSecret;
+        this.verifyToken = verifyToken;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        sharedSecret = readArray( buf );
+        verifyToken = readArray( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeArray( sharedSecret, buf );
+        writeArray( verifyToken, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketFDEncryptionRequest.java

@@ -0,0 +1,52 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketFDEncryptionRequest extends DefinedPacket
+{
+
+    private String serverId;
+    private byte[] publicKey;
+    private byte[] verifyToken;
+
+    private PacketFDEncryptionRequest()
+    {
+        super( 0xFD );
+    }
+
+    public PacketFDEncryptionRequest(String serverId, byte[] publicKey, byte[] verifyToken)
+    {
+        this();
+        this.serverId = serverId;
+        this.publicKey = publicKey;
+        this.verifyToken = verifyToken;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        serverId = readString( buf );
+        publicKey = readArray( buf );
+        verifyToken = readArray( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( serverId, buf );
+        writeArray( publicKey, buf );
+        writeArray( verifyToken, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketFEPing.java

@@ -0,0 +1,36 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketFEPing extends DefinedPacket
+{
+
+    private byte version;
+
+    private PacketFEPing()
+    {
+        super( 0xFE );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        version = buf.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeByte( version );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketFFKick.java

@@ -0,0 +1,44 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class PacketFFKick extends DefinedPacket
+{
+
+    private String message;
+
+    private PacketFFKick()
+    {
+        super( 0xFF );
+    }
+
+    public PacketFFKick(String message)
+    {
+        this();
+        this.message = message;
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        message = readString( buf );
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        writeString( message, buf );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/packet/forge/Forge1Login.java

@@ -0,0 +1,52 @@
+package net.md_5.bungee.protocol.packet.forge;
+
+import net.md_5.bungee.protocol.packet.*;
+import io.netty.buffer.ByteBuf;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class Forge1Login extends Packet1Login
+{
+
+    private Forge1Login()
+    {
+        super();
+    }
+
+    public Forge1Login(int entityId, String levelType, byte gameMode, int dimension, byte difficulty, byte unused, byte maxPlayers)
+    {
+        super( entityId, levelType, gameMode, dimension, difficulty, unused, maxPlayers );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        entityId = buf.readInt();
+        levelType = readString( buf );
+        gameMode = buf.readByte();
+        dimension = buf.readInt();
+        difficulty = buf.readByte();
+        unused = buf.readByte();
+        maxPlayers = buf.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeInt( entityId );
+        writeString( levelType, buf );
+        buf.writeByte( gameMode );
+        buf.writeInt( dimension );
+        buf.writeByte( difficulty );
+        buf.writeByte( unused );
+        buf.writeByte( maxPlayers );
+    }
+
+    @Override
+    public void handle(AbstractPacketHandler handler) throws Exception
+    {
+        handler.handle( this );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/skip/BulkChunk.java

@@ -0,0 +1,16 @@
+package net.md_5.bungee.protocol.skip;
+
+import io.netty.buffer.ByteBuf;
+
+public class BulkChunk extends Instruction
+{
+
+    @Override
+    void read(ByteBuf in)
+    {
+        short count = in.readShort();
+        int size = in.readInt();
+        in.readBoolean();
+        in.skipBytes( size + count * 12 );
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/skip/ByteHeader.java

@@ -1,7 +1,6 @@
-package net.md_5.mendax.datainput;
+package net.md_5.bungee.protocol.skip;
 
-import java.io.DataInput;
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 class ByteHeader extends Instruction
 {
@@ -14,12 +13,12 @@ class ByteHeader extends Instruction
     }
 
     @Override
-    void read(DataInput in, byte[] buffer) throws IOException
+    void read(ByteBuf in)
     {
         byte size = in.readByte();
         for ( byte b = 0; b < size; b++ )
         {
-            child.read( in, buffer );
+            child.read( in );
         }
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/skip/Instruction.java

@@ -1,7 +1,6 @@
-package net.md_5.mendax.datainput;
+package net.md_5.bungee.protocol.skip;
 
-import java.io.DataInput;
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 abstract class Instruction
 {
@@ -24,13 +23,11 @@ abstract class Instruction
     static final Instruction SHORT_ITEM = new ShortHeader( ITEM );
     static final Instruction STRING = new ShortHeader( new Jump( 2 ) );
     static final Instruction USHORT_BYTE = new UnsignedShortByte();
+    static final Instruction OPTIONAL_WINDOW = new OptionalWindow();
     // Illegal forward references below this line
     static final Instruction BYTE_INT = new ByteHeader( INT );
+    // Custom instructions
+    static final Instruction STRING_ARRAY = new ShortHeader( STRING );
 
-    abstract void read(DataInput in, byte[] buffer) throws IOException;
-
-    final void skip(DataInput in, byte[] buffer, int len) throws IOException
-    {
-        in.readFully( buffer, 0, len );
-    }
+    abstract void read(ByteBuf in);
 }

protocol/src/main/java/net/md_5/bungee/protocol/skip/IntHeader.java

@@ -1,7 +1,6 @@
-package net.md_5.mendax.datainput;
+package net.md_5.bungee.protocol.skip;
 
-import java.io.DataInput;
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 class IntHeader extends Instruction
 {
@@ -14,12 +13,12 @@ class IntHeader extends Instruction
     }
 
     @Override
-    void read(DataInput in, byte[] buffer) throws IOException
+    void read(ByteBuf in)
     {
         int size = in.readInt();
         for ( int i = 0; i < size; i++ )
         {
-            child.read( in, buffer );
+            child.read( in );
         }
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/skip/Item.java

@@ -0,0 +1,18 @@
+package net.md_5.bungee.protocol.skip;
+
+import io.netty.buffer.ByteBuf;
+
+class Item extends Instruction
+{
+
+    @Override
+    void read(ByteBuf in)
+    {
+        short type = in.readShort();
+        if ( type >= 0 )
+        {
+            in.skipBytes( 3 );
+            SHORT_BYTE.read( in );
+        }
+    }
+}

protocol/src/main/java/net/md_5/bungee/protocol/skip/Jump.java

@@ -1,7 +1,6 @@
-package net.md_5.mendax.datainput;
+package net.md_5.bungee.protocol.skip;
 
-import java.io.DataInput;
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 class Jump extends Instruction
 {
@@ -18,8 +17,8 @@ class Jump extends Instruction
     }
 
     @Override
-    void read(DataInput in, byte[] buffer) throws IOException
+    void read(ByteBuf in)
     {
-        skip( in, buffer, len );
+        in.skipBytes( len );
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/skip/MetaData.java

@@ -1,13 +1,12 @@
-package net.md_5.mendax.datainput;
+package net.md_5.bungee.protocol.skip;
 
-import java.io.DataInput;
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 class MetaData extends Instruction
 {
 
     @Override
-    void read(DataInput in, byte[] buffer) throws IOException
+    void read(ByteBuf in)
     {
         int x = in.readUnsignedByte();
         while ( x != 127 )
@@ -16,25 +15,25 @@ class MetaData extends Instruction
             switch ( type )
             {
                 case 0:
-                    BYTE.read( in, buffer );
+                    BYTE.read( in );
                     break;
                 case 1:
-                    SHORT.read( in, buffer );
+                    SHORT.read( in );
                     break;
                 case 2:
-                    INT.read( in, buffer );
+                    INT.read( in );
                     break;
                 case 3:
-                    FLOAT.read( in, buffer );
+                    FLOAT.read( in );
                     break;
                 case 4:
-                    STRING.read( in, buffer );
+                    STRING.read( in );
                     break;
                 case 5:
-                    ITEM.read( in, buffer );
+                    ITEM.read( in );
                     break;
                 case 6:
-                    skip( in, buffer, 12 ); //  int, int, int
+                    in.skipBytes( 12 ); //  int, int, int
                     break;
                 default:
                     throw new IllegalArgumentException( "Unknown metadata type " + type );

protocol/src/main/java/net/md_5/bungee/protocol/skip/OptionalMotion.java

@@ -0,0 +1,17 @@
+package net.md_5.bungee.protocol.skip;
+
+import io.netty.buffer.ByteBuf;
+
+class OptionalMotion extends Instruction
+{
+
+    @Override
+    void read(ByteBuf in)
+    {
+        int data = in.readInt();
+        if ( data > 0 )
+        {
+            in.skipBytes( 6 );
+        }
+    }
+}