Bump Javassist version

I am seriously just tired of this and need a break.

.gitignore

@@ -1,12 +1,11 @@
 # Eclipse stuff
-.classpath/
-.project/
-.settings/
+.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.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>
@@ -22,13 +22,31 @@
         <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>com.ning</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>1.7.17</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>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.11</version>
+            <version>1.12</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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,8 @@ package net.md_5.bungee.api;
 
 import net.md_5.bungee.api.plugin.PluginManager;
 import com.google.common.base.Preconditions;
+import com.ning.http.client.AsyncHttpClient;
+import java.io.File;
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.Map;
@@ -10,8 +12,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 +49,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);
+
     /**
      * Gets the main logger which can be used as a suitable replacement for
      * {@link System#out} and {@link System#err}.
@@ -69,20 +79,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 +120,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 +189,64 @@ public abstract class ProxyServer
      *
      * @param name name of the server
      * @param address connectable Minecraft address + port of the 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, 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();
+
+    /**
+     * Gets the the web client used by this proxy to facilitate making web
+     * requests. Care should be taken to ensure that all operations are non
+     * blocking where applicable.
+     *
+     * @return the server's {@link AsyncHttpClient} instance
+     */
+    public abstract AsyncHttpClient getHttpClient();
+
+    /**
+     * 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);
 }

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/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,13 @@ public class ListenerInfo
      * transferred depending on the host they connect to.
      */
     private final Map<String, String> forcedHosts;
+    /**
+     * Get the texture pack used for servers connected to this proxy. May be
+     * null.
+     */
+    private final TexturePackInfo texturePack;
+    /**
+     * Class used to build tab lists for this player.
+     */
+    private final Class<? extends TabListHandler> tabList;
 }

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

@@ -1,69 +1,49 @@
 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.
-     */
-    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<>();
-
-    /**
-     * Add a player to the internal set of this server.
+     * Get the name of this server.
      *
-     * @param player the player to add
+     * @return the configured name for this server address
      */
-    @Synchronized("players")
-    public void addPlayer(ProxiedPlayer player)
-    {
-        players.add( player );
-    }
+    String getName();
 
     /**
-     * Remove a player form 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 remove
+     * @return the IP and port pair for this server
      */
-    @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();
+
+    /**
+     * 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 +51,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/config/TexturePackInfo.java

@@ -0,0 +1,17 @@
+package net.md_5.bungee.api.config;
+
+import lombok.Data;
+
+@Data
+public class TexturePackInfo
+{
+
+    /**
+     * The URL of the texture pack.
+     */
+    private final String url;
+    /**
+     * The square dimension of this texture pack.
+     */
+    private final int size;
+}

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

@@ -30,14 +30,6 @@ public interface PendingConnection extends Connection
      */
     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);
-
     /**
      * Get the listener that accepted this connection.
      *

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

@@ -2,6 +2,8 @@ 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.config.TexturePackInfo;
+import net.md_5.bungee.api.tab.TabListHandler;
 
 /**
  * Represents a player who's connection is being connected to somewhere else,
@@ -15,7 +17,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 +25,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 +34,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 +56,41 @@ 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);
+
+    /**
+     * Send a request to change the players texture pack.
+     *
+     * @param pack the pack to request
+     */
+    void setTexturePack(TexturePackInfo pack);
+
+    /**
+     * 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();
 }

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/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,17 @@
 package net.md_5.bungee.api.event;
 
-import lombok.AllArgsConstructor;
 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;
 
 @Data
-@AllArgsConstructor
 @ToString(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
-public class ServerConnectEvent extends Event
+public class ServerConnectEvent extends Event implements Cancellable
 {
 
     /**
@@ -23,4 +22,14 @@ public class ServerConnectEvent extends Event
      * Server the player will be connected to.
      */
     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,43 @@
+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;
+
+    public ServerKickEvent(ProxiedPlayer player, String kickReason, ServerInfo cancelServer)
+    {
+        this.player = player;
+        this.kickReason = kickReason;
+        this.cancelServer = cancelServer;
+    }
+}

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

@@ -4,5 +4,12 @@ package net.md_5.bungee.api.plugin;
  * Dummy class which all callable events must extend.
  */
 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/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,25 @@
+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() + "] ";
+        setParent( ProxyServer.getInstance().getLogger() );
+    }
+
+    @Override
+    public void log(LogRecord logRecord)
+    {
+        logRecord.setMessage( pluginName + logRecord.getMessage() );
+        super.log( logRecord );
+    }
+}

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

@@ -1,45 +1,62 @@
 package net.md_5.bungee.api.plugin;
 
 import com.google.common.base.Preconditions;
-import com.google.common.eventbus.EventBus;
 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.LinkedHashMap;
 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<>();
+
+    @SuppressWarnings("unchecked")
+    public PluginManager(ProxyServer proxy)
+    {
+        this.proxy = proxy;
+        eventBus = new EventBus( proxy.getLogger(), Subscribe.class, EventHandler.class );
+    }
 
     /**
      * 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() )
@@ -78,7 +95,7 @@ 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;
         }
 
@@ -115,65 +132,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" );
+        if ( pluginStatuses.containsKey( plugin ) )
+        {
+            return pluginStatuses.get( plugin );
+        }
 
-        try ( JarFile jar = new JarFile( file ) )
-        {
-            JarEntry pdf = jar.getJarEntry( "plugin.yml" );
-            Preconditions.checkNotNull( pdf, "Plugin must have a plugin.yml" );
+        // success status
+        boolean status = true;
 
-            try ( InputStream in = jar.getInputStream( pdf ) )
+        // 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 )
+            {
+                if ( dependStack.contains( depend ) )
+                {
+                    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();
+                }
+            }
+
+            if ( dependStatus == Boolean.FALSE )
+            {
+                ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} (required by {1}) is unavailable", new Object[]
+                {
+                    depend.getName(), plugin.getName()
+                } );
+                status = false;
+            }
+
+            if ( !status )
+            {
+                break;
+            }
+        }
+
+        // do actual loading
+        if ( status )
+        {
+            try
             {
-                PluginDescription desc = yaml.loadAs( in, PluginDescription.class );
                 URLClassLoader loader = new PluginClassloader( new URL[]
                 {
-                    file.toURI().toURL()
+                    plugin.getFile().toURI().toURL()
                 } );
-                Class<?> main = loader.loadClass( desc.getMain() );
-                Plugin plugin = (Plugin) main.getDeclaredConstructor().newInstance();
+                Class<?> main = loader.loadClass( plugin.getMain() );
+                Plugin clazz = (Plugin) main.getDeclaredConstructor().newInstance();
 
-                plugin.init( desc );
-                plugins.put( desc.getName(), plugin );
-                plugin.onLoad();
+                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[]
                 {
-                    desc.getName(), desc.getVersion(), desc.getAuthor()
+                    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 +247,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 +256,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,7 +285,20 @@ 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;
     }
 
@@ -220,10 +307,21 @@ public class PluginManager
      * Object which wish to receive events must be annotated with the
      * {@link Subscribe} 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() )
+        {
+            if ( method.isAnnotationPresent( Subscribe.class ) )
+            {
+                proxy.getLogger().log( Level.WARNING, "Listener " + listener + " has registered using depreceated subscribe annotation!"
+                        + " Please advice author to update to @EventHandler."
+                        + " As a server owner you may safely ignore this.", new Exception() );
+            }
+        }
+
         eventBus.register( listener );
     }
 }

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

@@ -0,0 +1,41 @@
+package net.md_5.bungee.api.scheduler;
+
+import java.util.concurrent.TimeUnit;
+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();
+
+    /**
+     * Get the delay in the specified unit before this task will next be
+     * executed.
+     *
+     * @param unit the unit to get the delay in
+     * @return the time before the next execution of this task
+     */
+    long getDelay(TimeUnit unit);
+}

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

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>

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,29 @@
+
+<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.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>net.md-5</groupId>
+    <artifactId>bungeecord-event</artifactId>
+    <version>1.5-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>BungeeCord-Event</name>
+    <description>Generic java event dispatching API intended for use with BungeeCord</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

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

@@ -0,0 +1,163 @@
+package net.md_5.bungee.event;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.HashSet;
+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<Object, Method[]>> eventToHandler = new HashMap<>();
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+    private final Logger logger;
+    private final Class<? extends Annotation>[] annotations;
+
+    public EventBus()
+    {
+        this( null, (Class<? extends Annotation>[]) null );
+    }
+
+    public EventBus(Logger logger)
+    {
+        this( logger, (Class<? extends Annotation>[]) null );
+    }
+
+    @SuppressWarnings("unchecked")
+    public EventBus(Class<? extends Annotation>... annotations)
+    {
+        this( null, annotations );
+    }
+
+    @SuppressWarnings("unchecked")
+    public EventBus(Logger logger, Class<? extends Annotation>... annotations)
+    {
+        this.logger = ( logger == null ) ? Logger.getGlobal() : logger;
+        this.annotations = ( annotations == null || annotations.length == 0 ) ? new Class[]
+        {
+            EventHandler.class
+        } : annotations;
+    }
+
+    public void post(Object event)
+    {
+        lock.readLock().lock();
+        try
+        {
+            Map<Object, Method[]> handlers = eventToHandler.get( event.getClass() );
+            if ( handlers != null )
+            {
+                for ( Map.Entry<Object, Method[]> handler : handlers.entrySet() )
+                {
+                    for ( Method method : handler.getValue() )
+                    {
+                        try
+                        {
+                            method.invoke( handler.getKey(), 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, handler.getKey() ), ex.getCause() );
+                        }
+                    }
+                }
+            }
+        } finally
+        {
+            lock.readLock().unlock();
+        }
+    }
+
+    private Map<Class<?>, Set<Method>> findHandlers(Object listener)
+    {
+        Map<Class<?>, Set<Method>> handler = new HashMap<>();
+        for ( Method m : listener.getClass().getDeclaredMethods() )
+        {
+            for ( Class<? extends Annotation> annotation : annotations )
+            {
+                if ( m.isAnnotationPresent( annotation ) )
+                {
+                    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;
+                    }
+
+                    Set<Method> existing = handler.get( params[0] );
+                    if ( existing == null )
+                    {
+                        existing = new HashSet<>();
+                        handler.put( params[0], existing );
+                    }
+                    existing.add( m );
+                    break;
+                }
+            }
+        }
+        return handler;
+    }
+
+    public void register(Object listener)
+    {
+        Map<Class<?>, Set<Method>> handler = findHandlers( listener );
+        lock.writeLock().lock();
+        try
+        {
+            for ( Map.Entry<Class<?>, Set<Method>> e : handler.entrySet() )
+            {
+                Map<Object, Method[]> a = eventToHandler.get( e.getKey() );
+                if ( a == null )
+                {
+                    a = new HashMap<>();
+                    eventToHandler.put( e.getKey(), a );
+                }
+                Method[] baked = new Method[ e.getValue().size() ];
+                a.put( listener, e.getValue().toArray( baked ) );
+            }
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
+    }
+
+    public void unregister(Object listener)
+    {
+        Map<Class<?>, Set<Method>> handler = findHandlers( listener );
+        lock.writeLock().lock();
+        try
+        {
+            for ( Map.Entry<Class<?>, Set<Method>> e : handler.entrySet() )
+            {
+                Map<Object, Method[]> a = eventToHandler.get( e.getKey() );
+                if ( a != null )
+                {
+                    a.remove( listener );
+                    if ( a.isEmpty() )
+                    {
+                        eventToHandler.remove( e.getKey() );
+                    }
+                }
+            }
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+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
+{
+}

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( latch.getCount(), 0 );
+    }
+
+    @EventHandler
+    public void firstListener(FirstEvent event)
+    {
+        bus.post( new SecondEvent() );
+        Assert.assertEquals( latch.getCount(), 1 );
+        latch.countDown();
+    }
+
+    @EventHandler
+    public void secondListener(SecondEvent event)
+    {
+        latch.countDown();
+    }
+
+    public static class FirstEvent
+    {
+    }
+
+    public static class SecondEvent
+    {
+    }
+}

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,7 +11,7 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord</name>
@@ -38,6 +38,7 @@
 
     <modules>
         <module>api</module>
+        <module>event</module>
         <module>protocol</module>
         <module>proxy</module>
     </modules>
@@ -57,15 +58,22 @@
     </ciManagement>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <build.number>unknown</build.number>
+        <netty.version>4.0.0.CR7</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.11.8</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -92,7 +100,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.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-protocol</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5-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>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

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

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,128 @@
-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.io.IOException;
+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.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.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 = 61;
+    public static final String GAME_VERSION = "1.5.2";
+    @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[0xCC] = PacketCCSettings.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 RuntimeException( "Unknown packet id " + packetId );
+        }
+        return packet;
+    }
+
+    public static DefinedPacket read(short id, ByteBuf buf, Protocol protocol)
     {
-            INT, STRING, BYTE, BYTE, BYTE, BYTE, BYTE
-        };
-        opCodes[0x02] = new OpCode[]
+        DefinedPacket packet = packet( id, protocol );
+        if ( packet != null )
         {
-            BYTE, STRING, STRING, INT
-        };
-        opCodes[0x03] = 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 )
+        {
+            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;
+    }
+
+    
     {
-            STRING
-        };
         opCodes[0x04] = new OpCode[]
         {
             LONG, LONG
@@ -54,10 +143,6 @@ public class PacketDefinitions
         {
             SHORT, SHORT, FLOAT
         };
-        opCodes[0x09] = new OpCode[]
-        {
-            INT, BYTE, BYTE, SHORT, STRING
-        };
         opCodes[0x0A] = new OpCode[]
         {
             BOOLEAN
@@ -214,6 +299,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 +313,7 @@ public class PacketDefinitions
         };
         opCodes[0x64] = new OpCode[]
         {
-            BYTE, BYTE, STRING, BYTE
+            BYTE, BYTE, STRING, BYTE, BOOLEAN
         };
         opCodes[0x65] = new OpCode[]
         {
@@ -278,10 +367,6 @@ public class PacketDefinitions
         {
             INT, BYTE
         };
-        opCodes[0xC9] = new OpCode[]
-        {
-            STRING, BOOLEAN, SHORT
-        };
         opCodes[0xCA] = new OpCode[]
         {
             BYTE, BYTE, BYTE
@@ -290,37 +375,5 @@ public class PacketDefinitions
         {
             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
-        };
     }
 }

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

@@ -1,70 +1,73 @@
-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(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 );
     }
 }

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/Packet2Handshake.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 Packet2Handshake extends DefinedPacket
+{
+
+    private byte procolVersion;
+    private String username;
+    private String host;
+    private int port;
+
+    private Packet2Handshake()
+    {
+        super( 0x02 );
+    }
+
+    @Override
+    public void read(ByteBuf buf)
+    {
+        procolVersion = buf.readByte();
+        username = readString( buf );
+        host = readString( buf );
+        port = buf.readInt();
+    }
+
+    @Override
+    public void write(ByteBuf buf)
+    {
+        buf.writeByte( procolVersion );
+        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,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 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/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,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 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 );
+    }
+}

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
 {
@@ -26,11 +25,8 @@ abstract class Instruction
     static final Instruction USHORT_BYTE = new UnsignedShortByte();
     // 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 );
+        }
+    }
+}

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

@@ -1,24 +1,24 @@
-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;
 import java.util.ArrayList;
 import java.util.List;
-import net.md_5.mendax.PacketDefinitions;
-import net.md_5.mendax.PacketDefinitions.OpCode;
+import net.md_5.bungee.protocol.OpCode;
+import net.md_5.bungee.protocol.Protocol;
 
-public class DataInputPacketReader
+public class PacketReader
 {
 
-    private static final Instruction[][] instructions = new Instruction[ 256 ][];
+    private final Instruction[][] instructions;
 
-    static
+    public PacketReader(Protocol protocol)
     {
+        instructions = new Instruction[ protocol.getOpCodes().length ][];
         for ( int i = 0; i < instructions.length; i++ )
         {
             List<Instruction> output = new ArrayList<>();
 
-            OpCode[] enums = PacketDefinitions.opCodes[i];
+            OpCode[] enums = protocol.getOpCodes()[i];
             if ( enums != null )
             {
                 for ( OpCode struct : enums )
@@ -59,35 +59,16 @@ public class DataInputPacketReader
         }
     }
 
-    private static void readPacket(int packetId, DataInput in, byte[] buffer, int protocol) throws IOException
+    public void tryRead(short packetId, ByteBuf in)
     {
-        Instruction[] packetDef = null;
-        if ( packetId + protocol < instructions.length )
-        {
-            packetDef = instructions[packetId + protocol];
-        }
+        Instruction[] packetDef = instructions[packetId];
 
-        if ( packetDef == null )
+        if ( packetDef != null )
         {
-            if ( protocol == PacketDefinitions.VANILLA_PROTOCOL )
-            {
-                throw new IOException( "Unknown packet id " + packetId );
-            } else
-            {
-                readPacket( packetId, in, buffer, PacketDefinitions.VANILLA_PROTOCOL );
-                return;
-            }
-        }
-
             for ( Instruction instruction : packetDef )
             {
-            instruction.read( in, buffer );
+                instruction.read( in );
             }
         }
-
-    public static void readPacket(DataInput in, byte[] buffer, int protocol) throws IOException
-    {
-        int packetId = in.readUnsignedByte();
-        readPacket( packetId, in, buffer, protocol );
     }
 }

protocol/src/main/java/net/md_5/bungee/protocol/skip/ShortHeader.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 ShortHeader extends Instruction
 {
@@ -14,12 +13,12 @@ class ShortHeader extends Instruction
     }
 
     @Override
-    void read(DataInput in, byte[] buffer) throws IOException
+    void read(ByteBuf in)
     {
         short size = in.readShort();
         for ( short s = 0; s < size; s++ )
         {
-            child.read( in, buffer );
+            child.read( in );
         }
     }
 }

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

@@ -0,0 +1,14 @@
+package net.md_5.bungee.protocol.skip;
+
+import io.netty.buffer.ByteBuf;
+
+class UnsignedShortByte extends Instruction
+{
+
+    @Override
+    void read(ByteBuf in)
+    {
+        int size = in.readUnsignedShort();
+        in.skipBytes( size );
+    }
+}

protocol/src/main/java/net/md_5/mendax/datainput/BulkChunk.java

@@ -1,17 +0,0 @@
-package net.md_5.mendax.datainput;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-public class BulkChunk extends Instruction
-{
-
-    @Override
-    void read(DataInput in, byte[] buffer) throws IOException
-    {
-        short count = in.readShort();
-        int size = in.readInt();
-        in.readBoolean();
-        skip( in, buffer, size + count * 12 );
-    }
-}

protocol/src/main/java/net/md_5/mendax/datainput/Item.java

@@ -1,19 +0,0 @@
-package net.md_5.mendax.datainput;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-class Item extends Instruction
-{
-
-    @Override
-    void read(DataInput in, byte[] buffer) throws IOException
-    {
-        short type = in.readShort();
-        if ( type >= 0 )
-        {
-            skip( in, buffer, 3 );
-            SHORT_BYTE.read( in, buffer );
-        }
-    }
-}

protocol/src/main/java/net/md_5/mendax/datainput/OptionalMotion.java

@@ -1,18 +0,0 @@
-package net.md_5.mendax.datainput;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-public class OptionalMotion extends Instruction
-{
-
-    @Override
-    void read(DataInput in, byte[] buffer) throws IOException
-    {
-        int data = in.readInt();
-        if ( data > 0 )
-        {
-            skip( in, buffer, 6 );
-        }
-    }
-}

protocol/src/main/java/net/md_5/mendax/datainput/UnsignedShortByte.java

@@ -1,15 +0,0 @@
-package net.md_5.mendax.datainput;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-public class UnsignedShortByte extends Instruction
-{
-
-    @Override
-    void read(DataInput in, byte[] buffer) throws IOException
-    {
-        int size = in.readUnsignedShort();
-        skip( in, buffer, size );
-    }
-}

protocol/src/test/java/net/md_5/bungee/protocol/PacketTest.java

@@ -0,0 +1,45 @@
+package net.md_5.bungee.protocol;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import net.md_5.bungee.protocol.packet.AbstractPacketHandler;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PacketTest
+{
+
+    @Test
+    public void testPackets() throws Exception
+    {
+        AbstractPacketHandler handler = new AbstractPacketHandler()
+        {
+        };
+
+        for ( short i = 0; i < 256; i++ )
+        {
+            Class<? extends DefinedPacket> clazz = Vanilla.getInstance().getClasses()[ i];
+            if ( clazz != null )
+            {
+                Assert.assertTrue( "Packet " + clazz + " is not public", Modifier.isPublic( clazz.getModifiers() ) );
+                DefinedPacket packet = Vanilla.packet( i, Vanilla.getInstance() );
+                Assert.assertTrue( "Could not create packet with id " + i + " and class " + clazz, packet != null );
+                Assert.assertTrue( "Packet with id " + i + " does not have correct class (expected " + clazz + " but got " + packet.getClass(), packet.getClass() == clazz );
+                Assert.assertTrue( "Packet " + clazz + " does not report correct id", packet.getId() == i );
+                Assert.assertTrue( "Packet " + clazz + " does not have custom hash code", packet.hashCode() != System.identityHashCode( packet ) );
+                Assert.assertTrue( "Packet " + clazz + " does not have custom toString", packet.toString().indexOf( '@' ) == -1 );
+                // TODO: Enable this test again in v2
+                // Assert.assertTrue( "Packet " + clazz + " does not have private no args constructor", Modifier.isPrivate( clazz.getDeclaredConstructor().getModifiers() ) );
+
+                for ( Field field : clazz.getDeclaredFields() )
+                {
+                    // TODO: Enable this test again in v2
+                    // Assert.assertTrue( "Packet " + clazz + " has non private field " + field, Modifier.isPrivate( field.getModifiers() ) );
+                }
+
+                packet.handle( handler ); // Make sure there are no exceptions
+            }
+        }
+    }
+}

protocol/src/test/java/net/md_5/bungee/protocol/ProtocolTest.java

@@ -0,0 +1,14 @@
+package net.md_5.bungee.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ProtocolTest
+{
+
+    @Test
+    public void testProtocol()
+    {
+        Assert.assertFalse( "Protocols should have different login packet", Vanilla.getInstance().getClasses()[0x01] == Forge.getInstance().classes[0x01] );
+    }
+}

proxy/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>

proxy/pom.xml

@@ -6,39 +6,86 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-proxy</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Proxy</name>
     <description>Proxy component of the Elastic Portal Suite</description>
 
     <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.11</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-protocol</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+            <version>3.0.3</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.22</version>
+            <version>5.1.24</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.18.0-GA</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.7.2</version>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
     <build>
         <finalName>BungeeCord</finalName>
         <plugins>
+            <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>
@@ -75,7 +122,6 @@
                             </excludes>
                         </filter>
                     </filters>
-                    <finalName>${project.build.finalName}-shaded</finalName>
                 </configuration>
             </plugin>
         </plugins>

proxy/src/main/java/net/md_5/bungee/BungeeCord.java

@@ -1,43 +1,72 @@
 package net.md_5.bungee;
 
+import com.google.common.io.ByteStreams;
+import net.md_5.bungee.log.BungeeLogger;
+import net.md_5.bungee.reconnect.SQLReconnectHandler;
+import net.md_5.bungee.scheduler.BungeeScheduler;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.AsyncHttpClientConfig;
+import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
+import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
 import net.md_5.bungee.config.Configuration;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.PrintStream;
 import java.net.InetSocketAddress;
-import java.net.Socket;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jline.UnsupportedTerminal;
+import jline.console.ConsoleReader;
+import jline.internal.Log;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Synchronized;
-import static net.md_5.bungee.Logger.$;
+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.api.ReconnectHandler;
-import net.md_5.bungee.api.TabListHandler;
 import net.md_5.bungee.api.config.ConfigurationAdapter;
 import net.md_5.bungee.api.config.ListenerInfo;
 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.plugin.PluginManager;
+import net.md_5.bungee.api.scheduler.TaskScheduler;
+import net.md_5.bungee.api.tab.CustomTabList;
 import net.md_5.bungee.command.*;
 import net.md_5.bungee.config.YamlConfig;
-import net.md_5.bungee.packet.DefinedPacket;
-import net.md_5.bungee.packet.PacketFAPluginMessage;
+import net.md_5.bungee.log.LoggingOutputStream;
+import net.md_5.bungee.netty.PipelineUtils;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import net.md_5.bungee.protocol.packet.Packet3Chat;
+import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
+import net.md_5.bungee.protocol.Vanilla;
+import net.md_5.bungee.scheduler.BungeeThreadPool;
+import net.md_5.bungee.tab.Custom;
+import net.md_5.bungee.util.CaseInsensitiveMap;
+import org.fusesource.jansi.AnsiConsole;
 
 /**
  * Main BungeeCord proxy class.
@@ -45,14 +74,6 @@ import net.md_5.bungee.packet.PacketFAPluginMessage;
 public class BungeeCord extends ProxyServer
 {
 
-    /**
-     * Server protocol version.
-     */
-    public static final byte PROTOCOL_VERSION = 51;
-    /**
-     * Server game version.
-     */
-    public static final String GAME_VERSION = "1.4.6";
     /**
      * Current operation state.
      */
@@ -62,32 +83,33 @@ public class BungeeCord extends ProxyServer
      */
     public final Configuration config = new Configuration();
     /**
-     * Thread pool.
+     * Localization bundle.
      */
-    public final ExecutorService threadPool = Executors.newCachedThreadPool();
+    public final ResourceBundle bundle = ResourceBundle.getBundle( "messages_en" );
+    /**
+     * Thread pools.
+     */
+    public final ScheduledThreadPoolExecutor executors = new BungeeThreadPool( new ThreadFactoryBuilder().setNameFormat( "Bungee Pool Thread #%1$d" ).build() );
+    public final MultithreadEventLoopGroup eventLoops = new NioEventLoopGroup( Runtime.getRuntime().availableProcessors(), new ThreadFactoryBuilder().setNameFormat( "Netty IO Thread #%1$d" ).build() );
     /**
      * locations.yml save thread.
      */
     private final Timer saveThread = new Timer( "Reconnect Saver" );
+    private final Timer metricsThread = new Timer( "Metrics Thread" );
     /**
      * Server socket listener.
      */
-    private Collection<ListenThread> listeners = new HashSet<>();
+    private Collection<Channel> listeners = new HashSet<>();
     /**
      * Fully qualified connections.
      */
-    public Map<String, UserConnection> connections = new ConcurrentHashMap<>();
-    /**
-     * Tab list handler
-     */
-    @Getter
-    @Setter
-    public TabListHandler tabListHandler;
+    private final Map<String, UserConnection> connections = new CaseInsensitiveMap<>();
+    private final ReadWriteLock connectionLock = new ReentrantReadWriteLock();
     /**
      * Plugin manager.
      */
     @Getter
-    public final PluginManager pluginManager = new PluginManager();
+    public final PluginManager pluginManager = new PluginManager( this );
     @Getter
     @Setter
     private ReconnectHandler reconnectHandler;
@@ -95,17 +117,33 @@ public class BungeeCord extends ProxyServer
     @Setter
     private ConfigurationAdapter configurationAdapter = new YamlConfig();
     private final Collection<String> pluginChannels = new HashSet<>();
+    @Getter
+    private final File pluginsFolder = new File( "plugins" );
+    @Getter
+    private final TaskScheduler scheduler = new BungeeScheduler();
+    @Getter
+    private final AsyncHttpClient httpClient = new AsyncHttpClient(
+            new NettyAsyncHttpProvider(
+            new AsyncHttpClientConfig.Builder().setAsyncHttpClientProviderConfig(
+            new NettyAsyncHttpProviderConfig().addProperty( NettyAsyncHttpProviderConfig.BOSS_EXECUTOR_SERVICE, executors ) ).setExecutorService( executors ).build() ) );
+    @Getter
+    private ConsoleReader consoleReader;
+    @Getter
+    private final Logger logger;
 
     
     {
-        getPluginManager().registerCommand( new CommandReload() );
-        getPluginManager().registerCommand( new CommandEnd() );
-        getPluginManager().registerCommand( new CommandList() );
-        getPluginManager().registerCommand( new CommandServer() );
-        getPluginManager().registerCommand( new CommandIP() );
-        getPluginManager().registerCommand( new CommandAlert() );
-        getPluginManager().registerCommand( new CommandBungee() );
-        getPluginManager().registerCommand( new CommandPerms() );
+        // TODO: Proper fallback when we interface the manager
+        getPluginManager().registerCommand( null, new CommandReload() );
+        getPluginManager().registerCommand( null, new CommandEnd() );
+        getPluginManager().registerCommand( null, new CommandList() );
+        getPluginManager().registerCommand( null, new CommandServer() );
+        getPluginManager().registerCommand( null, new CommandIP() );
+        getPluginManager().registerCommand( null, new CommandAlert() );
+        getPluginManager().registerCommand( null, new CommandBungee() );
+        getPluginManager().registerCommand( null, new CommandPerms() );
+        getPluginManager().registerCommand( null, new CommandSend() );
+        getPluginManager().registerCommand( null, new CommandFind() );
 
         registerChannel( "BungeeCord" );
     }
@@ -115,29 +153,55 @@ public class BungeeCord extends ProxyServer
         return (BungeeCord) ProxyServer.getInstance();
     }
 
+    public BungeeCord() throws IOException
+    {
+        Log.setOutput( new PrintStream( ByteStreams.nullOutputStream() ) ); // TODO: Bug JLine
+        AnsiConsole.systemInstall();
+        consoleReader = new ConsoleReader();
+
+        logger = new BungeeLogger( this );
+        System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
+        System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
+
+        if ( consoleReader.getTerminal() instanceof UnsupportedTerminal )
+        {
+            logger.info( "Unable to initialize fancy terminal. To fix this on Windows, install the correct Microsoft Visual C++ 2008 Runtime" );
+            logger.info( "NOTE: This error is non crucial, and BungeeCord will still function correctly! Do not bug the author about it unless you are still unable to get it working" );
+        }
+    }
+
     /**
      * Starts a new instance of BungeeCord.
      *
      * @param args command line arguments, currently none are used
-     * @throws IOException when the server cannot be started
+     * @throws Exception when the server cannot be started
      */
-    public static void main(String[] args) throws IOException
+    public static void main(String[] args) throws Exception
     {
+        Calendar deadline = Calendar.getInstance();
+        deadline.set( 2013, 7, 1 ); // year, month, date
+        if ( Calendar.getInstance().after( deadline ) )
+        {
+            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 15 seconds ***" );
+            Thread.sleep( TimeUnit.SECONDS.toMillis( 15 ) );
+        }
+
         BungeeCord bungee = new BungeeCord();
         ProxyServer.setInstance( bungee );
-        $().info( "Enabled BungeeCord version " + bungee.getVersion() );
+        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
         bungee.start();
 
-        BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
         while ( bungee.isRunning )
         {
-            String line = br.readLine();
+            String line = bungee.getConsoleReader().readLine( ">" );
             if ( line != null )
             {
-                boolean handled = getInstance().getPluginManager().dispatchCommand( ConsoleCommandSender.getInstance(), line );
-                if ( !handled )
+                if ( !bungee.getPluginManager().dispatchCommand( ConsoleCommandSender.getInstance(), line ) )
                 {
-                    System.err.println( "Command not found" );
+                    bungee.getConsole().sendMessage( ChatColor.RED + "Command not found" );
                 }
             }
         }
@@ -147,21 +211,21 @@ public class BungeeCord extends ProxyServer
      * Start this proxy instance by loading the configuration, plugins and
      * starting the connect thread.
      *
-     * @throws IOException
+     * @throws Exception
      */
-    public void start() throws IOException
+    @Override
+    public void start() throws Exception
     {
-        File plugins = new File( "plugins" );
-        plugins.mkdir();
-        pluginManager.loadPlugins( plugins );
+        pluginsFolder.mkdir();
+        pluginManager.detectPlugins( pluginsFolder );
         config.load();
         if ( reconnectHandler == null )
         {
-            reconnectHandler = new YamlReconnectHandler();
+            reconnectHandler = new SQLReconnectHandler();
         }
         isRunning = true;
 
-        pluginManager.enablePlugins();
+        pluginManager.loadAndEnablePlugins();
 
         startListeners();
 
@@ -173,40 +237,49 @@ public class BungeeCord extends ProxyServer
                 getReconnectHandler().save();
             }
         }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
-
-        new Metrics().start();
+        metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
     }
 
     public void startListeners()
     {
-        for ( ListenerInfo info : config.getListeners() )
+        for ( final ListenerInfo info : config.getListeners() )
         {
-            try
+            ChannelFutureListener listener = new ChannelFutureListener()
             {
-                ListenThread listener = new ListenThread( info );
-                listener.start();
-                listeners.add( listener );
-                $().info( "Listening on " + info.getHost() );
-            } catch ( IOException ex )
+                @Override
+                public void operationComplete(ChannelFuture future) throws Exception
                 {
-                $().log( Level.SEVERE, "Could not start listener " + info, ex );
+                    if ( future.isSuccess() )
+                    {
+                        listeners.add( future.channel() );
+                        getLogger().info( "Listening on " + info.getHost() );
+                    } else
+                    {
+                        getLogger().log( Level.WARNING, "Could not bind to host " + info.getHost(), future.cause() );
                     }
                 }
+            };
+            new ServerBootstrap()
+                    .channel( NioServerSocketChannel.class )
+                    .childAttr( PipelineUtils.LISTENER, info )
+                    .childHandler( PipelineUtils.SERVER_CHILD )
+                    .group( eventLoops )
+                    .localAddress( info.getHost() )
+                    .bind().addListener( listener );
+        }
     }
 
     public void stopListeners()
     {
-        for ( ListenThread listener : listeners )
+        for ( Channel listener : listeners )
         {
-            $().log( Level.INFO, "Closing listen thread {0}", listener.socket );
+            getLogger().log( Level.INFO, "Closing listener {0}", listener );
             try
             {
-                listener.interrupt();
-                listener.socket.close();
-                listener.join();
-            } catch ( InterruptedException | IOException ex )
+                listener.close().syncUninterruptibly();
+            } catch ( ChannelException ex )
             {
-                $().severe( "Could not close listen thread" );
+                getLogger().severe( "Could not close listen thread" );
             }
         }
         listeners.clear();
@@ -215,44 +288,59 @@ public class BungeeCord extends ProxyServer
     @Override
     public void stop()
     {
-        this.isRunning = false;
+        new Thread( "Shutdown Thread" )
+        {
+            @Override
+            public void run()
+            {
+                BungeeCord.this.isRunning = false;
+
+                httpClient.close();
+                executors.shutdown();
 
                 stopListeners();
-        $().info( "Closing pending connections" );
-        threadPool.shutdown();
+                getLogger().info( "Closing pending connections" );
 
-        $().info( "Disconnecting " + connections.size() + " connections" );
+                connectionLock.readLock().lock();
+                try
+                {
+                    getLogger().info( "Disconnecting " + connections.size() + " connections" );
                     for ( UserConnection user : connections.values() )
                     {
-            user.disconnect( "Proxy restarting, brb." );
+                        user.disconnect( getTranslation( "restart" ) );
+                    }
+                } finally
+                {
+                    connectionLock.readLock().unlock();
                 }
 
-        $().info( "Saving reconnect locations" );
-        reconnectHandler.save();
-        saveThread.cancel();
+                getLogger().info( "Closing IO threads" );
+                eventLoops.shutdownGracefully();
+                try
+                {
+                    eventLoops.awaitTermination( Long.MAX_VALUE, TimeUnit.NANOSECONDS );
+                } catch ( InterruptedException ex )
+                {
+                }
 
-        $().info( "Disabling plugins" );
+                getLogger().info( "Saving reconnect locations" );
+                reconnectHandler.save();
+                reconnectHandler.close();
+                saveThread.cancel();
+                metricsThread.cancel();
+
+                // TODO: Fix this shit
+                getLogger().info( "Disabling plugins" );
                 for ( Plugin plugin : pluginManager.getPlugins() )
                 {
                     plugin.onDisable();
+                    getScheduler().cancel( plugin );
                 }
 
-        $().info( "Thank you and goodbye" );
+                getLogger().info( "Thankyou and goodbye" );
                 System.exit( 0 );
             }
-
-    /**
-     * Miscellaneous method to set options on a socket based on those in the
-     * configuration.
-     *
-     * @param socket to set the options on
-     * @throws IOException when the underlying set methods thrown an exception
-     */
-    public void setSocketOptions(Socket socket) throws IOException
-    {
-        socket.setSoTimeout( config.getTimeout() );
-        socket.setTrafficClass( 0x18 );
-        socket.setTcpNoDelay( true );
+        }.start();
     }
 
     /**
@@ -261,10 +349,17 @@ public class BungeeCord extends ProxyServer
      * @param packet the packet to send
      */
     public void broadcast(DefinedPacket packet)
+    {
+        connectionLock.readLock().lock();
+        try
         {
             for ( UserConnection con : connections.values() )
             {
-            con.packetQueue.add( packet );
+                con.unsafe().sendPacket( packet );
+            }
+        } finally
+        {
+            connectionLock.readLock().unlock();
         }
     }
 
@@ -281,29 +376,49 @@ public class BungeeCord extends ProxyServer
     }
 
     @Override
-    public Logger getLogger()
+    public String getTranslation(String name)
     {
-        return $();
+        String translation = "<translation '" + name + "' missing>";
+        try
+        {
+            translation = bundle.getString( name );
+        } catch ( MissingResourceException ex )
+        {
+        }
+        return translation;
     }
 
     @Override
-    @SuppressWarnings("unchecked") // TODO: Abstract more
+    @SuppressWarnings("unchecked")
     public Collection<ProxiedPlayer> getPlayers()
     {
-        return (Collection) connections.values();
+        connectionLock.readLock().lock();
+        try
+        {
+            return (Collection) new HashSet<>( connections.values() );
+        } finally
+        {
+            connectionLock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public int getOnlineCount()
+    {
+        return connections.size();
     }
 
     @Override
     public ProxiedPlayer getPlayer(String name)
     {
-        return connections.get( name );
-    }
-
-    @Override
-    public Server getServer(String name)
+        connectionLock.readLock().lock();
+        try
         {
-        Collection<ProxiedPlayer> users = getServers().get( name ).getPlayers();
-        return ( users != null && !users.isEmpty() ) ? users.iterator().next().getServer() : null;
+            return connections.get( name );
+        } finally
+        {
+            connectionLock.readLock().unlock();
+        }
     }
 
     @Override
@@ -341,31 +456,67 @@ public class BungeeCord extends ProxyServer
 
     public PacketFAPluginMessage registerChannels()
     {
-        StringBuilder sb = new StringBuilder();
-        for ( String s : getChannels() )
-        {
-            sb.append( s );
-            sb.append( '\00' );
-        }
-        byte[] payload = sb.substring( 0, sb.length() - 1 ).getBytes();
-        return new PacketFAPluginMessage( "REGISTER", payload );
+        return new PacketFAPluginMessage( "REGISTER", Util.format( pluginChannels, "\00" ).getBytes() );
     }
 
     @Override
     public byte getProtocolVersion()
     {
-        return PROTOCOL_VERSION;
+        return Vanilla.PROTOCOL_VERSION;
     }
 
     @Override
     public String getGameVersion()
     {
-        return GAME_VERSION;
+        return Vanilla.GAME_VERSION;
     }
 
     @Override
-    public ServerInfo constructServerInfo(String name, InetSocketAddress address)
+    public ServerInfo constructServerInfo(String name, InetSocketAddress address, boolean restricted)
     {
-        return new BungeeServerInfo( name, address );
+        return new BungeeServerInfo( name, address, restricted );
+    }
+
+    @Override
+    public CommandSender getConsole()
+    {
+        return ConsoleCommandSender.getInstance();
+    }
+
+    @Override
+    public void broadcast(String message)
+    {
+        getConsole().sendMessage( message );
+        broadcast( new Packet3Chat( message ) );
+    }
+
+    public void addConnection(UserConnection con)
+    {
+        connectionLock.writeLock().lock();
+        try
+        {
+            connections.put( con.getName(), con );
+        } finally
+        {
+            connectionLock.writeLock().unlock();
+        }
+    }
+
+    public void removeConnection(UserConnection con)
+    {
+        connectionLock.writeLock().lock();
+        try
+        {
+            connections.remove( con.getName() );
+        } finally
+        {
+            connectionLock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public CustomTabList customTabList(ProxiedPlayer player)
+    {
+        return new Custom( player );
     }
 }

proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java

@@ -1,74 +1,131 @@
 package net.md_5.bungee;
 
-import java.io.DataOutputStream;
+import com.google.common.base.Preconditions;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.socket.nio.NioSocketChannel;
 import java.net.InetSocketAddress;
-import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Objects;
 import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Synchronized;
 import net.md_5.bungee.api.Callback;
-import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ServerPing;
 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.packet.DefinedPacket;
-import net.md_5.bungee.packet.PacketFAPluginMessage;
-import net.md_5.bungee.packet.PacketFFKick;
-import net.md_5.bungee.packet.PacketStream;
-import net.md_5.mendax.PacketDefinitions;
+import net.md_5.bungee.connection.PingHandler;
+import net.md_5.bungee.netty.HandlerBoss;
+import net.md_5.bungee.netty.PipelineUtils;
+import net.md_5.bungee.protocol.packet.DefinedPacket;
+import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
 
-public class BungeeServerInfo extends ServerInfo
+@RequiredArgsConstructor
+public class BungeeServerInfo implements ServerInfo
 {
 
     @Getter
-    private final Queue<DefinedPacket> packetQueue = new ConcurrentLinkedQueue<>();
+    private final String name;
+    @Getter
+    private final InetSocketAddress address;
+    private final Collection<ProxiedPlayer> players = new ArrayList<>();
+    @Getter
+    private final boolean restricted;
+    @Getter
+    private final Queue<DefinedPacket> packetQueue = new LinkedList<>();
 
-    public BungeeServerInfo(String name, InetSocketAddress address)
+    @Synchronized("players")
+    public void addPlayer(ProxiedPlayer player)
     {
-        super( name, address );
+        players.add( player );
+    }
+
+    @Synchronized("players")
+    public void removePlayer(ProxiedPlayer player)
+    {
+        players.remove( player );
+    }
+
+    @Synchronized("players")
+    @Override
+    public Collection<ProxiedPlayer> getPlayers()
+    {
+        return Collections.unmodifiableCollection( players );
     }
 
+    @Override
+    public boolean canAccess(CommandSender player)
+    {
+        Preconditions.checkNotNull( player, "player" );
+        return !restricted || player.hasPermission( "bungeecord.server." + name );
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return ( obj instanceof ServerInfo ) && Objects.equals( getAddress(), ( (ServerInfo) obj ).getAddress() );
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return address.hashCode();
+    }
+
+    // TODO: Don't like this method
     @Override
     public void sendData(String channel, byte[] data)
     {
-        Server server = ProxyServer.getInstance().getServer( getName() );
+        Preconditions.checkNotNull( channel, "channel" );
+        Preconditions.checkNotNull( data, "data" );
+
+        Server server = ( players.isEmpty() ) ? null : players.iterator().next().getServer();
         if ( server != null )
         {
             server.sendData( channel, data );
         } else
+        {
+            synchronized ( packetQueue )
             {
                 packetQueue.add( new PacketFAPluginMessage( channel, data ) );
             }
         }
+    }
 
     @Override
     public void ping(final Callback<ServerPing> callback)
     {
-        new Thread()
+        Preconditions.checkNotNull( callback, "callback" );
+
+        ChannelFutureListener listener = new ChannelFutureListener()
         {
             @Override
-            public void run()
+            public void operationComplete(ChannelFuture future) throws Exception
             {
-                try ( Socket socket = new Socket(); )
+                if ( future.isSuccess() )
                 {
-                    socket.connect( getAddress() );
-
-                    DataOutputStream out = new DataOutputStream( socket.getOutputStream() );
-                    out.write( 0xFE );
-                    out.write( 0x01 );
-
-                    PacketStream in = new PacketStream( socket.getInputStream(), PacketDefinitions.VANILLA_PROTOCOL );
-                    PacketFFKick response = new PacketFFKick( in.readPacket() );
-
-                    String[] split = response.message.split( "\00" );
-
-                    ServerPing ping = new ServerPing( Byte.parseByte( split[1] ), split[2], split[3], Integer.parseInt( split[4] ), Integer.parseInt( split[5] ) );
-                    callback.done( ping, null );
-                } catch ( Throwable t )
+                    future.channel().pipeline().get( HandlerBoss.class ).setHandler( new PingHandler( BungeeServerInfo.this, callback ) );
+                } else
                 {
-                    callback.done( null, t );
+                    callback.done( null, future.cause() );
                 }
             }
-        }.start();
+        };
+        new Bootstrap()
+                .channel( NioSocketChannel.class )
+                .group( BungeeCord.getInstance().eventLoops )
+                .handler( PipelineUtils.BASE )
+                .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
+                .remoteAddress( getAddress() )
+                .connect()
+                .addListener( listener );
     }
 }

proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java

@@ -1,29 +1,22 @@
 package net.md_5.bungee;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
+import java.security.GeneralSecurityException;
 import java.security.Key;
+import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
 import java.util.Random;
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import net.md_5.bungee.packet.PacketFCEncryptionResponse;
-import net.md_5.bungee.packet.PacketFDEncryptionRequest;
+import lombok.Getter;
+import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
+import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
 
 /**
  * Class containing all encryption related methods for the proxy.
@@ -32,15 +25,23 @@ public class EncryptionUtil
 {
 
     private static final Random random = new Random();
-    private static KeyPair keys;
+    public static KeyPair keys;
+    @Getter
+    private static SecretKey secret = new SecretKeySpec( new byte[ 16 ], "AES" );
 
-    public static PacketFDEncryptionRequest encryptRequest() throws NoSuchAlgorithmException
+    static
     {
-        if ( keys == null )
+        try
         {
             keys = KeyPairGenerator.getInstance( "RSA" ).generateKeyPair();
+        } catch ( NoSuchAlgorithmException ex )
+        {
+            throw new ExceptionInInitializerError( ex );
+        }
     }
 
+    public static PacketFDEncryptionRequest encryptRequest()
+    {
         String hash = ( BungeeCord.getInstance().config.isOnlineMode() ) ? Long.toString( random.nextLong(), 16 ) : "-";
         byte[] pubKey = keys.getPublic().getEncoded();
         byte[] verify = new byte[ 4 ];
@@ -48,52 +49,37 @@ public class EncryptionUtil
         return new PacketFDEncryptionRequest( hash, pubKey, verify );
     }
 
-    public static SecretKey getSecret(PacketFCEncryptionResponse resp, PacketFDEncryptionRequest request) throws BadPaddingException, IllegalBlockSizeException, IllegalStateException, InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException
+    public static SecretKey getSecret(PacketFCEncryptionResponse resp, PacketFDEncryptionRequest request) throws GeneralSecurityException
     {
         Cipher cipher = Cipher.getInstance( "RSA" );
         cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
-        byte[] decrypted = cipher.doFinal( resp.verifyToken );
+        byte[] decrypted = cipher.doFinal( resp.getVerifyToken() );
 
-        if ( !Arrays.equals( request.verifyToken, decrypted ) )
+        if ( !Arrays.equals( request.getVerifyToken(), decrypted ) )
         {
             throw new IllegalStateException( "Key pairs do not match!" );
         }
 
         cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
-        byte[] shared = resp.sharedSecret;
-        byte[] secret = cipher.doFinal( shared );
-
-        return new SecretKeySpec( secret, "AES" );
+        return new SecretKeySpec( cipher.doFinal( resp.getSharedSecret() ), "AES" );
     }
 
-    public static boolean isAuthenticated(String username, String connectionHash, SecretKey shared) throws NoSuchAlgorithmException, IOException
-    {
-        String encName = URLEncoder.encode( username, "UTF-8" );
-
-        MessageDigest sha = MessageDigest.getInstance( "SHA-1" );
-        for ( byte[] bit : new byte[][]
-        {
-            connectionHash.getBytes( "ISO_8859_1" ), shared.getEncoded(), keys.getPublic().getEncoded()
-        } )
-        {
-            sha.update( bit );
-        }
-
-        String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
-        String authURL = "http://session.minecraft.net/game/checkserver.jsp?user=" + encName + "&serverId=" + encodedHash;
-        String reply;
-        try ( BufferedReader in = new BufferedReader( new InputStreamReader( new URL( authURL ).openStream() ) ) )
-        {
-            reply = in.readLine();
-        }
-
-        return "YES".equals( reply );
-    }
-
-    public static Cipher getCipher(int opMode, Key shared) throws InvalidAlgorithmParameterException, InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException
+    public static Cipher getCipher(int opMode, Key shared) throws GeneralSecurityException
     {
         Cipher cip = Cipher.getInstance( "AES/CFB8/NoPadding" );
         cip.init( opMode, shared, new IvParameterSpec( shared.getEncoded() ) );
         return cip;
     }
+
+    public static PublicKey getPubkey(PacketFDEncryptionRequest request) throws GeneralSecurityException
+    {
+        return KeyFactory.getInstance( "RSA" ).generatePublic( new X509EncodedKeySpec( request.getPublicKey() ) );
+    }
+
+    public static byte[] encrypt(Key key, byte[] b) throws GeneralSecurityException
+    {
+        Cipher hasher = Cipher.getInstance( "RSA" );
+        hasher.init( Cipher.ENCRYPT_MODE, key );
+        return hasher.doFinal( b );
+    }
 }

proxy/src/main/java/net/md_5/bungee/EntityMap.java

@@ -40,7 +40,7 @@ public class EntityMap
         };
         entityIds[0x17] = new int[]
         {
-            1, 20
+            1 //, 20
         };
         entityIds[0x18] = new int[]
         {
@@ -115,7 +115,7 @@ public class EntityMap
 
     public static void rewrite(byte[] packet, int oldId, int newId)
     {
-        int packetId = Util.getId( packet );
+        int packetId = packet[0] & 0xFF;
         if ( packetId == 0x1D )
         { // bulk entity
             for ( int pos = 2; pos < packet.length; pos += 4 )
@@ -147,6 +147,18 @@ public class EntityMap
                 }
             }
         }
+        if ( packetId == 0x17 )
+        {
+            int type = packet[5] & 0xFF;
+            if ( type == 60 || type == 90 )
+            {
+                int index20 = readInt( packet, 20 );
+                if ( packet.length > 24 && index20 == oldId )
+                {
+                    setInt( packet, 20, newId );
+                }
+            }
+        }
     }
 
     private static void setInt(byte[] buf, int pos, int i)

proxy/src/main/java/net/md_5/bungee/GenericConnection.java

@@ -1,61 +0,0 @@
-package net.md_5.bungee;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import static net.md_5.bungee.Logger.$;
-import net.md_5.bungee.packet.PacketFFKick;
-import net.md_5.bungee.packet.PacketStream;
-
-/**
- * Class to represent a Minecraft connection.
- */
-@EqualsAndHashCode
-@RequiredArgsConstructor
-public class GenericConnection
-{
-
-    protected final Socket socket;
-    protected final PacketStream stream;
-    @Getter
-    public String name;
-    @Getter
-    public String displayName;
-
-    /**
-     * Close the socket with the specified reason.
-     *
-     * @param reason to disconnect
-     */
-    public void disconnect(String reason)
-    {
-        if ( socket.isClosed() )
-        {
-            return;
-        }
-        log( "disconnected with " + reason );
-        try
-        {
-            stream.write( new PacketFFKick( "[Proxy] " + reason ) );
-        } catch ( IOException ex )
-        {
-        } finally
-        {
-            try
-            {
-                socket.shutdownOutput();
-                socket.close();
-            } catch ( IOException ioe )
-            {
-            }
-        }
-    }
-
-    public void log(String message)
-    {
-        $().info( socket.getInetAddress() + ( ( name == null ) ? " " : " [" + name + "] " ) + message );
-    }
-}

proxy/src/main/java/net/md_5/bungee/InitialHandler.java

@@ -1,232 +0,0 @@
-package net.md_5.bungee;
-
-import com.google.common.base.Preconditions;
-import java.io.EOFException;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-import lombok.Getter;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.ServerPing;
-import net.md_5.bungee.api.config.ListenerInfo;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.LoginEvent;
-import net.md_5.bungee.api.event.ProxyPingEvent;
-import net.md_5.bungee.packet.DefinedPacket;
-import net.md_5.bungee.packet.Packet1Login;
-import net.md_5.bungee.packet.Packet2Handshake;
-import net.md_5.bungee.packet.PacketCDClientStatus;
-import net.md_5.bungee.packet.PacketFAPluginMessage;
-import net.md_5.bungee.packet.PacketFCEncryptionResponse;
-import net.md_5.bungee.packet.PacketFDEncryptionRequest;
-import net.md_5.bungee.packet.PacketFEPing;
-import net.md_5.bungee.packet.PacketFFKick;
-import net.md_5.bungee.packet.PacketHandler;
-import net.md_5.bungee.packet.PacketStream;
-import net.md_5.mendax.PacketDefinitions;
-
-public class InitialHandler extends PacketHandler implements Runnable, PendingConnection
-{
-
-    private final Socket socket;
-    @Getter
-    private final ListenerInfo listener;
-    private PacketStream stream;
-    private Packet1Login forgeLogin;
-    private Packet2Handshake handshake;
-    private PacketFDEncryptionRequest request;
-    private List<PacketFAPluginMessage> loginMessages = new ArrayList<>();
-    private State thisState = State.HANDSHAKE;
-    private static final PacketFAPluginMessage forgeMods = new PacketFAPluginMessage( "FML", new byte[]
-    {
-        0, 0, 0, 0, 0, 2
-    } );
-
-    public InitialHandler(Socket socket, ListenerInfo info) throws IOException
-    {
-        this.socket = socket;
-        this.listener = info;
-        stream = new PacketStream( socket.getInputStream(), socket.getOutputStream(), PacketDefinitions.VANILLA_PROTOCOL );
-    }
-
-    private enum State
-    {
-
-        HANDSHAKE, ENCRYPT, LOGIN, FINISHED;
-    }
-
-    @Override
-    public void handle(Packet1Login login) throws Exception
-    {
-        Preconditions.checkState( thisState == State.LOGIN, "Not expecting FORGE LOGIN" );
-        Preconditions.checkState( forgeLogin == null, "Already received FORGE LOGIN" );
-        forgeLogin = login;
-        stream.setProtocol( PacketDefinitions.FORGE_PROTOCOL );
-    }
-
-    @Override
-    public void handle(PacketFAPluginMessage pluginMessage) throws Exception
-    {
-        loginMessages.add( pluginMessage );
-    }
-
-    @Override
-    public void handle(PacketFEPing ping) throws Exception
-    {
-        socket.setSoTimeout( 100 );
-        boolean newPing = false;
-        try
-        {
-            socket.getInputStream().read();
-            newPing = true;
-        } catch ( IOException ex )
-        {
-        }
-
-        ServerPing pingevent = new ServerPing( BungeeCord.PROTOCOL_VERSION, BungeeCord.GAME_VERSION,
-                listener.getMotd(), ProxyServer.getInstance().getPlayers().size(), listener.getMaxPlayers() );
-
-        pingevent = ProxyServer.getInstance().getPluginManager().callEvent( new ProxyPingEvent( this, pingevent ) ).getResponse();
-
-        String response = ( newPing ) ? ChatColor.COLOR_CHAR + "1"
-                + "\00" + pingevent.getProtocolVersion()
-                + "\00" + pingevent.getGameVersion()
-                + "\00" + pingevent.getMotd()
-                + "\00" + pingevent.getCurrentPlayers()
-                + "\00" + pingevent.getMaxPlayers()
-                : pingevent.getMotd() + ChatColor.COLOR_CHAR + pingevent.getCurrentPlayers() + ChatColor.COLOR_CHAR + pingevent.getMaxPlayers();
-        disconnect( response );
-    }
-
-    @Override
-    public void handle(Packet2Handshake handshake) throws Exception
-    {
-        Preconditions.checkState( thisState == State.HANDSHAKE, "Not expecting HANDSHAKE" );
-        this.handshake = handshake;
-        stream.write( forgeMods );
-        stream.write( request = EncryptionUtil.encryptRequest() );
-        thisState = State.ENCRYPT;
-    }
-
-    @Override
-    public void handle(PacketFCEncryptionResponse encryptResponse) throws Exception
-    {
-        Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
-
-        SecretKey shared = EncryptionUtil.getSecret( encryptResponse, request );
-        if ( BungeeCord.getInstance().config.isOnlineMode() && !EncryptionUtil.isAuthenticated( handshake.username, request.serverId, shared ) )
-        {
-            throw new KickException( "Not authenticated with minecraft.net" );
-        }
-
-        // Check for multiple connections
-        ProxiedPlayer old = ProxyServer.getInstance().getPlayer( handshake.username );
-        if ( old != null )
-        {
-            old.disconnect( "You are already connected to the server" );
-        }
-
-        // fire login event
-        LoginEvent event = new LoginEvent( this );
-        ProxyServer.getInstance().getPluginManager().callEvent( event );
-        if ( event.isCancelled() )
-        {
-            throw new KickException( event.getCancelReason() );
-        }
-
-        stream.write( new PacketFCEncryptionResponse() );
-        stream = new PacketStream( new CipherInputStream( socket.getInputStream(), EncryptionUtil.getCipher( Cipher.DECRYPT_MODE, shared ) ),
-                new CipherOutputStream( socket.getOutputStream(), EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, shared ) ), stream.getProtocol() );
-
-        thisState = State.LOGIN;
-    }
-
-    @Override
-    public void handle(PacketCDClientStatus clientStatus) throws Exception
-    {
-        Preconditions.checkState( thisState == State.LOGIN, "Not expecting LOGIN" );
-
-        UserConnection userCon = new UserConnection( socket, this, stream, handshake, forgeLogin, loginMessages );
-        ServerInfo server = ProxyServer.getInstance().getReconnectHandler().getServer( userCon );
-        userCon.connect( server, true );
-
-        thisState = State.FINISHED;
-    }
-
-    @Override
-    public void run()
-    {
-        try
-        {
-            while ( thisState != State.FINISHED )
-            {
-                byte[] buf = stream.readPacket();
-                DefinedPacket packet = DefinedPacket.packet( buf );
-                packet.handle( this );
-            }
-        } catch ( KickException ex )
-        {
-            disconnect( "[Proxy - Kicked] " + ex.getMessage() );
-        } catch ( EOFException ex )
-        {
-        } catch ( Exception ex )
-        {
-            disconnect( "[Proxy Error] " + Util.exception( ex ) );
-            ex.printStackTrace();
-        }
-    }
-
-    @Override
-    public void disconnect(String reason)
-    {
-        thisState = State.FINISHED;
-        try
-        {
-            stream.write( new PacketFFKick( reason ) );
-        } catch ( IOException ioe )
-        {
-        } finally
-        {
-            try
-            {
-                socket.shutdownOutput();
-                socket.close();
-            } catch ( IOException ioe2 )
-            {
-            }
-        }
-    }
-
-    @Override
-    public String getName()
-    {
-        return ( handshake == null ) ? null : handshake.username;
-    }
-
-    @Override
-    public byte getVersion()
-    {
-        return ( handshake == null ) ? -1 : handshake.procolVersion;
-    }
-
-    @Override
-    public InetSocketAddress getVirtualHost()
-    {
-        return ( handshake == null ) ? null : new InetSocketAddress( handshake.host, handshake.port );
-    }
-
-    @Override
-    public InetSocketAddress getAddress()
-    {
-        return (InetSocketAddress) socket.getRemoteSocketAddress();
-    }
-}

proxy/src/main/java/net/md_5/bungee/KickException.java

@@ -1,14 +0,0 @@
-package net.md_5.bungee;
-
-/**
- * Exception, which when thrown will disconnect the player from the proxy with
- * the specified message.
- */
-public class KickException extends RuntimeException
-{
-
-    public KickException(String message)
-    {
-        super( message );
-    }
-}

proxy/src/main/java/net/md_5/bungee/ListenThread.java

@@ -1,48 +0,0 @@
-package net.md_5.bungee;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import static net.md_5.bungee.Logger.$;
-import net.md_5.bungee.api.config.ListenerInfo;
-
-/**
- * Thread to listen and dispatch incoming connections to the proxy.
- */
-public class ListenThread extends Thread
-{
-
-    public final ServerSocket socket;
-    private final ListenerInfo info;
-
-    public ListenThread(ListenerInfo info) throws IOException
-    {
-        super( "Listen Thread - " + info );
-        this.info = info;
-        socket = new ServerSocket();
-        socket.bind( info.getHost() );
-    }
-
-    @Override
-    public void run()
-    {
-        while ( !isInterrupted() )
-        {
-            try
-            {
-                Socket client = socket.accept();
-                BungeeCord.getInstance().setSocketOptions( client );
-                $().info( client.getInetAddress() + " has connected" );
-                InitialHandler handler = new InitialHandler( client, info );
-                BungeeCord.getInstance().threadPool.submit( handler );
-            } catch ( SocketException ex )
-            {
-                ex.printStackTrace(); // Now people can see why their operating system is failing them and stop bitching at me!
-            } catch ( IOException ex )
-            {
-                ex.printStackTrace(); // TODO
-            }
-        }
-    }
-}

proxy/src/main/java/net/md_5/bungee/Logger.java

@@ -1,109 +0,0 @@
-package net.md_5.bungee;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-/**
- * Logger to handle formatting and storage of the proxy's logger.
- */
-public class Logger extends java.util.logging.Logger
-{
-
-    private static final Formatter formatter = new ConsoleLogFormatter();
-    private static final Logger instance = new Logger();
-
-    public Logger()
-    {
-        super( "RubberBand", null );
-        try
-        {
-            FileHandler handler = new FileHandler( "proxy.log", 1 << 14, 1, true );
-            handler.setFormatter( formatter );
-            addHandler( handler );
-        } catch ( IOException ex )
-        {
-            System.err.println( "Could not register logger!" );
-            ex.printStackTrace();
-        }
-    }
-
-    @Override
-    public void log(LogRecord record)
-    {
-        super.log( record );
-        String message = formatter.format( record );
-        if ( record.getLevel() == Level.SEVERE || record.getLevel() == Level.WARNING )
-        {
-            System.err.print( message );
-        } else
-        {
-            System.out.print( message );
-        }
-    }
-
-    /**
-     * Gets the current logger instance.
-     *
-     * @return the current logger instance
-     */
-    public static Logger $()
-    {
-        return instance;
-    }
-
-    public static class ConsoleLogFormatter extends Formatter
-    {
-
-        private SimpleDateFormat formatter = new SimpleDateFormat( "HH:mm:ss" );
-
-        @Override
-        public String format(LogRecord logrecord)
-        {
-            StringBuilder formatted = new StringBuilder();
-
-            formatted.append( formatter.format( logrecord.getMillis() ) );
-            Level level = logrecord.getLevel();
-
-            if ( level == Level.FINEST )
-            {
-                formatted.append( " [FINEST] " );
-            } else if ( level == Level.FINER )
-            {
-                formatted.append( " [FINER] " );
-            } else if ( level == Level.FINE )
-            {
-                formatted.append( " [FINE] " );
-            } else if ( level == Level.INFO )
-            {
-                formatted.append( " [INFO] " );
-            } else if ( level == Level.WARNING )
-            {
-                formatted.append( " [WARNING] " );
-            } else if ( level == Level.SEVERE )
-            {
-                formatted.append( " [SEVERE] " );
-            }
-
-            formatted.append( formatMessage( logrecord ) );
-            formatted.append( '\n' );
-            Throwable throwable = logrecord.getThrown();
-
-            if ( throwable != null )
-            {
-                StringWriter writer = new StringWriter();
-
-                throwable.printStackTrace( new PrintWriter( writer ) );
-                formatted.append( writer );
-            }
-
-            return formatted.toString();
-        }
-    }
-}

proxy/src/main/java/net/md_5/bungee/Metrics.java

@@ -8,10 +8,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import static net.md_5.bungee.Logger.$;
+import java.util.TimerTask;
 import net.md_5.bungee.api.ProxyServer;
 
-public class Metrics extends Thread
+public class Metrics extends TimerTask
 {
 
     /**
@@ -29,19 +29,11 @@ public class Metrics extends Thread
     /**
      * Interval of time to ping (in minutes)
      */
-    private final static int PING_INTERVAL = 10;
-
-    public Metrics()
-    {
-        super( "Metrics Gathering Thread" );
-        setDaemon( true );
-    }
+    final static int PING_INTERVAL = 10;
+    boolean firstPost = true;
 
     @Override
     public void run()
-    {
-        boolean firstPost = true;
-        while ( true )
     {
         try
         {
@@ -55,15 +47,7 @@ public class Metrics extends Thread
             firstPost = false;
         } catch ( IOException ex )
         {
-                $().info( "[Metrics] " + ex.getMessage() );
-            }
-            try
-            {
-                sleep( PING_INTERVAL * 1000 * 60 );
-            } catch ( InterruptedException ex )
-            {
-                break;
-            }
+            ProxyServer.getInstance().getLogger().info( "[Metrics] " + ex.getMessage() );
         }
     }
 
@@ -77,7 +61,7 @@ public class Metrics extends Thread
         data.append( encode( "guid" ) ).append( '=' ).append( encode( BungeeCord.getInstance().config.getUuid() ) );
         encodeDataPair( data, "version", ProxyServer.getInstance().getVersion() );
         encodeDataPair( data, "server", "0" );
-        encodeDataPair( data, "players", Integer.toString( ProxyServer.getInstance().getPlayers().size() ) );
+        encodeDataPair( data, "players", Integer.toString( ProxyServer.getInstance().getOnlineCount() ) );
         encodeDataPair( data, "revision", String.valueOf( REVISION ) );
 
         // If we're pinging, append it