Reimplement class caching, fix performance issue

We'll worry about the tests later

.gitignore

@@ -0,0 +1,165 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+target/
+.gitignore
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

Examples/ItemDisguise/.gitignore

@@ -0,0 +1,165 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+target/
+.gitignore
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

Examples/TinyProtocol/.gitignore

@@ -0,0 +1,165 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+target/
+.gitignore
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

Examples/TinyProtocol/pom.xml

@@ -0,0 +1,125 @@
+<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>
+  <groupId>com.comphenix.tinyprotocol</groupId>
+  <artifactId>TinyProtocol</artifactId>
+  <version>0.1.0</version>
+  <name>TinyProtocol</name>
+  <description>Intercept packets without ProtocolLib.</description>
+
+  <distributionManagement>
+    <repository>
+      <id>comphenix-releases</id>
+      <name>Comphenix Maven Releases</name>
+      <url>http://repo.comphenix.net/content/repositories/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>comphenix-snapshots</id>
+      <name>Comphenix Maven Snapshots</name>
+      <url>http://repo.comphenix.net/content/repositories/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <repositories>
+    <repository>
+      <id>md_5-repo</id>
+      <url>http://repo.md-5.net/content/repositories/public/</url>
+    </repository>
+    <repository>
+      <id>comphenix-rep</id>
+      <name>Comphenix Maven Releases</name>
+      <url>http://repo.comphenix.net/content/groups/public</url>
+    </repository>
+  </repositories>
+
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Examples/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java

@@ -0,0 +1,109 @@
+package com.comphenix.tinyprotocol;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.comphenix.tinyprotocol.Reflection.ConstructorInvoker;
+import com.comphenix.tinyprotocol.Reflection.FieldAccessor;
+
+import net.minecraft.util.io.netty.channel.Channel;
+
+public class ExamplePlugin extends JavaPlugin {
+	// Chat packets
+	private FieldAccessor<String> CHAT_MESSAGE = Reflection.getField(
+			"{nms}.PacketPlayInChat", String.class, 0);
+	
+	// Explosion packet
+	private Class<?> particleClass = Reflection.getClass("{nms}.PacketPlayOutWorldParticles");
+	private FieldAccessor<String> particleName = Reflection.getField(particleClass, String.class, 0);
+	private FieldAccessor<Float> particleX = Reflection.getField(particleClass, float.class, 0);
+	private FieldAccessor<Float> particleY = Reflection.getField(particleClass, float.class, 1);
+	private FieldAccessor<Float> particleZ = Reflection.getField(particleClass, float.class, 2);
+	private FieldAccessor<Integer> particleCount = Reflection.getField(particleClass, int.class, 0);
+	
+	// Server info packet
+	private Class<?> serverInfoClass = Reflection.getClass("{nms}.PacketStatusOutServerInfo");
+	private Class<Object> serverPingClass = Reflection.getUntypedClass("{nms}.ServerPing");
+	private Class<Object> playerSampleClass = Reflection.getUntypedClass("{nms}.ServerPingPlayerSample");
+	private FieldAccessor<Object> serverPing = Reflection.getField(serverInfoClass, serverPingClass, 0);
+	private FieldAccessor<Object> playerSample = Reflection.getField(serverPingClass, playerSampleClass, 0);
+	private ConstructorInvoker playerSampleInvoker = Reflection.getConstructor(playerSampleClass, int.class, int.class);
+	
+	private TinyProtocol protocol;
+	
+	@Override
+	public void onEnable() {
+		protocol = new TinyProtocol(this) {
+			@Override
+			public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
+				// Cancel chat packets
+				if (CHAT_MESSAGE.hasField(packet)) {
+					if (CHAT_MESSAGE.get(packet).contains("dirty")) {
+						sendExplosion(sender);
+						return null;
+					}
+				}
+				if (particleName.hasField(packet)) {
+					System.out.println("Sending particle field:" + packet);
+				}
+				return super.onPacketInAsync(sender, channel, packet);
+			}
+			
+			@Override
+			public Object onPacketOutAsync(Player reciever, Channel channel, Object packet) {
+				if (serverInfoClass.isInstance(packet)) {
+					Object ping = serverPing.get(packet);
+					playerSample.set(ping, playerSampleInvoker.invoke(1000, 0));
+					
+					// Which is equivalent to:
+					//serverPing.get(packet).setPlayerSample(new ServerPingPlayerSample(1000, 0));
+					return packet;
+				}
+				return super.onPacketOutAsync(reciever, channel, packet);
+			}
+		};
+	}
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		if (sender instanceof Player) {
+			Player player = (Player) sender;
+			
+			// Toggle injection
+			if (protocol.hasInjected(player)) {
+				protocol.uninjectPlayer(player);
+				sender.sendMessage(ChatColor.YELLOW + "Player " + player + " has been uninjected.");
+			} else {
+				protocol.injectPlayer(player);
+				sender.sendMessage(ChatColor.DARK_GREEN + "Player " + player + " has been injected.");
+			}
+			return true;
+		} else {
+			sender.sendMessage(ChatColor.RED + "Can only be invoked by a player.");
+		}
+		return false;
+	}  
+	
+	private void sendExplosion(Player player) {
+		try {
+			// Only visible for the client
+			Object explosionPacket = particleClass.newInstance();
+			Location loc = player.getLocation();
+			particleName.set(explosionPacket, "hugeexplosion");
+			particleX.set(explosionPacket, (float) loc.getX());
+			particleY.set(explosionPacket, (float) loc.getY());
+			particleZ.set(explosionPacket, (float) loc.getZ());
+			particleCount.set(explosionPacket, 1);
+
+			// Send the packet to the player
+			protocol.sendPacket(player, explosionPacket);
+			
+		} catch (Exception e) {
+			throw new RuntimeException("Cannot send packet.", e);
+		}
+	}
+}

Examples/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/Reflection.java

@@ -0,0 +1,375 @@
+package com.comphenix.tinyprotocol;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.bukkit.Bukkit;
+
+/**
+ * An utility class that simplifies reflection in Bukkit plugins.
+ * @author Kristian
+ */
+public final class Reflection {
+	/**
+	 * An interface for invoking a specific constructor. 
+	 */
+	public interface ConstructorInvoker {
+		/**
+		 * Invoke a constructor for a specific class.
+		 * @param arguments - the arguments to pass to the constructor.
+		 * @return The constructed object.
+		 */
+		public Object invoke(Object... arguments); 
+	}
+	
+	/**
+	 * An interface for invoking a specific method. 
+	 */
+	public interface MethodInvoker {
+		/**
+		 * Invoke a method on a specific target object.
+		 * @param target - the target object, or NULL for a static method.
+		 * @param arguments - the arguments to pass to the method.
+		 * @return The return value, or NULL if is void.
+		 */
+		public Object invoke(Object target, Object... arguments); 
+	}
+	
+	/**
+	 * An interface for retrieving the field content.
+	 * @param <T> - field type.
+	 */
+	public interface FieldAccessor<T> {
+		/**
+		 * Retrieve the content of a field.
+		 * @param target - the target object, or NULL for a static field.
+		 * @return The value of the field.
+		 */
+		public T get(Object target);
+		
+		/**
+		 * Set the content of a field.
+		 * @param target - the target object, or NULL for a static field.
+		 * @param value - the new value of the field.
+		 */
+		public void set(Object target, Object value);
+		
+		/**
+		 * Determine if the given object has this field.
+		 * @param target - the object to test.
+		 * @return TRUE if it does, FALSE otherwise.
+		 */
+		public boolean hasField(Object target);
+	}
+	
+	// Deduce the net.minecraft.server.v* package
+	private static String OBC_PREFIX = Bukkit.getServer().getClass().getPackage().getName();
+	private static String NMS_PREFIX = OBC_PREFIX.replace("org.bukkit.craftbukkit", "net.minecraft.server");
+	private static String VERSION = OBC_PREFIX.replace("org.bukkit.craftbukkit", "").replace(".", "");
+	
+	// Variable replacement
+	private static Pattern MATCH_VARIABLE = Pattern.compile("\\{([^\\}]+)\\}");
+	
+	private Reflection() {
+		// Seal class
+	}
+	
+	/**
+	 * Retrieve a field accessor for a specific field type and name.
+	 * @param target - the target type.
+	 * @param name - the name of the field, or NULL to ignore.
+	 * @param fieldType - a compatible field type.
+	 * @return The field accessor.
+	 */
+	public static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType) {
+		return getField(target, name, fieldType, 0);
+	}
+	
+	/**
+	 * Retrieve a field accessor for a specific field type and name.
+	 * @param className - lookup name of the class, see {@link #getClass(String)}.
+	 * @param name - the name of the field, or NULL to ignore.
+	 * @param fieldType - a compatible field type.
+	 * @return The field accessor.
+	 */
+	public static <T> FieldAccessor<T> getField(String className, String name, Class<T> fieldType) {
+		return getField(getClass(className), name, fieldType, 0);
+	}
+	
+	/**
+	 * Retrieve a field accessor for a specific field type and name.
+	 * @param target - the target type.
+	 * @param fieldType - a compatible field type.
+	 * @param index - the number of compatible fields to skip.
+	 * @return The field accessor.
+	 */
+	public static <T> FieldAccessor<T> getField(Class<?> target, Class<T> fieldType, int index) {
+		return getField(target, null, fieldType, index);
+	}
+	
+	/**
+	 * Retrieve a field accessor for a specific field type and name.
+	 * @param className - lookup name of the class, see {@link #getClass(String)}.
+	 * @param fieldType - a compatible field type.
+	 * @param index - the number of compatible fields to skip.
+	 * @return The field accessor.
+	 */
+	public static <T> FieldAccessor<T> getField(String className, Class<T> fieldType, int index) {
+		return getField(getClass(className), fieldType, index);
+	}
+	
+	// Common method
+	private static <T> FieldAccessor<T> getField(Class<?> target, String name, Class<T> fieldType, int index) {
+		for (final Field field : target.getDeclaredFields()) {
+			if ((name == null || field.getName().equals(name)) && 
+					fieldType.isAssignableFrom(field.getType()) && index-- <= 0) {
+				field.setAccessible(true);
+				
+				// A function for retrieving a specific field value
+				return new FieldAccessor<T>() {
+					@SuppressWarnings("unchecked")
+					@Override
+					public T get(Object target) {
+						try {
+							return (T) field.get(target);
+						} catch (IllegalAccessException e) {
+							throw new RuntimeException("Cannot access reflection.", e);
+						}
+					}
+					
+					@Override
+					public void set(Object target, Object value) {
+						try {
+							field.set(target, value);
+						} catch (IllegalAccessException e) {
+							throw new RuntimeException("Cannot access reflection.", e);
+						}
+					}
+					
+					@Override
+					public boolean hasField(Object target) {
+						// target instanceof DeclaringClass
+						return field.getDeclaringClass().isAssignableFrom(target.getClass());
+					}
+				};
+			}
+		}
+		
+		// Search in parent classes
+		if (target.getSuperclass() != null)
+			return getField(target.getSuperclass(), name, fieldType, index);
+		throw new IllegalArgumentException("Cannot find field with type " + fieldType);
+	}
+    
+    /**
+     * Search for the first publically and privately defined method of the given name and parameter count.
+     * @param className - lookup name of the class, see {@link #getClass(String)}.
+     * @param methodName - the method name, or NULL to skip.
+     * @param params - the expected parameters.
+     * @return An object that invokes this specific method.
+     * @throws IllegalStateException If we cannot find this method.
+     */
+	public static MethodInvoker getMethod(String className, String methodName, Class<?>... params) {
+		return getTypedMethod(getClass(className), methodName, null, params);
+	}
+	
+    /**
+     * Search for the first publically and privately defined method of the given name and parameter count.
+     * @param clazz - a class to start with.
+     * @param methodName - the method name, or NULL to skip.
+     * @param params - the expected parameters.
+     * @return An object that invokes this specific method.
+     * @throws IllegalStateException If we cannot find this method.
+     */
+    public static MethodInvoker getMethod(Class<?> clazz, String methodName, Class<?>... params) {
+    	return getTypedMethod(clazz, methodName, null, params);
+    }
+	
+    /**
+     * Search for the first publically and privately defined method of the given name and parameter count.
+     * @param clazz - a class to start with.
+     * @param methodName - the method name, or NULL to skip.
+     * @param returnType - the expected return type, or NULL to ignore.
+     * @param params - the expected parameters.
+     * @return An object that invokes this specific method.
+     * @throws IllegalStateException If we cannot find this method.
+     */
+    public static MethodInvoker getTypedMethod(Class<?> clazz, String methodName, Class<?> returnType, Class<?>... params) {
+        for (final Method method : clazz.getDeclaredMethods()) {
+            if ((methodName == null || method.getName().equals(methodName)) &&
+            	(returnType == null) || method.getReturnType().equals(returnType) &&
+                 Arrays.equals(method.getParameterTypes(), params)) {
+
+                method.setAccessible(true);
+                return new MethodInvoker() {
+                	@Override
+                	public Object invoke(Object target, Object... arguments) {
+                		try {
+							return method.invoke(target, arguments);
+						} catch (Exception e) {
+							throw new RuntimeException("Cannot invoke method " + method, e);
+						}
+                	}
+                };
+            }
+        }
+        // Search in every superclass
+        if (clazz.getSuperclass() != null)
+            return getMethod(clazz.getSuperclass(), methodName, params);
+        throw new IllegalStateException(String.format(
+            "Unable to find method %s (%s).", methodName, Arrays.asList(params)));
+    }
+    
+    /**
+     * Search for the first publically and privately defined constructor of the given name and parameter count.
+     * @param className - lookup name of the class, see {@link #getClass(String)}.
+     * @param params - the expected parameters.
+     * @return An object that invokes this constructor.
+     * @throws IllegalStateException If we cannot find this method.
+     */
+    public static ConstructorInvoker getConstructor(String className, Class<?>... params) {
+    	return getConstructor(getClass(className), params);
+    }
+    
+    /**
+     * Search for the first publically and privately defined constructor of the given name and parameter count.
+     * @param clazz - a class to start with.
+     * @param params - the expected parameters.
+     * @return An object that invokes this constructor.
+     * @throws IllegalStateException If we cannot find this method.
+     */
+    public static ConstructorInvoker getConstructor(Class<?> clazz, Class<?>... params) {
+        for (final Constructor<?> constructor : clazz.getDeclaredConstructors()) {
+            if (Arrays.equals(constructor.getParameterTypes(), params)) {
+
+            	constructor.setAccessible(true);
+                return new ConstructorInvoker() {
+                	@Override
+                	public Object invoke(Object... arguments) {
+                		try {
+							return constructor.newInstance(arguments);
+						} catch (Exception e) {
+							throw new RuntimeException("Cannot invoke constructor " + constructor, e);
+						}
+                	}
+                };
+            }
+        }
+        throw new IllegalStateException(String.format(
+            "Unable to find constructor for %s (%s).", clazz, Arrays.asList(params)));
+    }
+     
+    /**
+     * Retrieve a class from its full name, without knowing its type on compile time.
+     * <p>
+     * This is useful when looking up fields by a NMS or OBC type.
+     * <p>
+     * @see {@link #getClass()} for more information.
+     * @param lookupName - the class name with variables.
+     * @return The class.
+     */
+    public static Class<Object> getUntypedClass(String lookupName) {
+    	@SuppressWarnings({"rawtypes", "unchecked"})
+		Class<Object> clazz = (Class<Object>)(Class)getClass(lookupName);
+    	return clazz;
+    }
+    
+    /**
+     * Retrieve a class from its full name.
+     * <p>
+     * Strings enclosed with curly brackets - such as {TEXT} - will be replaced according 
+     * to the following table:
+     * <p>
+	 * <table border="1">
+	 *   <tr>
+	 *     <th>Variable</th>
+	 *     <th>Content</th>
+	 *   </tr>
+	 *   <tr>
+	 *     <td>{nms}</td>
+	 *     <td>Actual package name of net.minecraft.server.VERSION</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <td>{obc}</td>
+	 *     <td>Actual pacakge name of org.bukkit.craftbukkit.VERSION</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <td>{version}</td>
+	 *     <td>The current Minecraft package VERSION, if any.</td>
+	 *   </tr>
+	 * </table>
+     * @param lookupName - the class name with variables.
+     * @return The looked up class.
+     * @throws IllegalArgumentException If a variable or class could not be found.
+     */
+    public static Class<?> getClass(String lookupName) {
+    	return getCanonicalClass(expandVariables(lookupName));
+    }
+    
+	/**
+	 * Retrieve a class in the net.minecraft.server.VERSION.* package.
+	 * @param name - the name of the class, excluding the package.
+	 * @throws IllegalArgumentException If the class doesn't exist.
+	 */
+	public static Class<?> getMinecraftClass(String name) {
+		return getCanonicalClass(NMS_PREFIX + "." + name);
+	}
+	
+	/**
+	 * Retrieve a class in the org.bukkit.craftbukkit.VERSION.* package.
+	 * @param name - the name of the class, excluding the package.
+	 * @throws IllegalArgumentException If the class doesn't exist.
+	 */
+	public static Class<?> getCraftBukkitClass(String name) {
+		return getCanonicalClass(OBC_PREFIX + "." + name);
+	}
+	
+	/**
+	 * Retrieve a class by its canonical name.
+	 * @param canonicalName - the canonical name.
+	 * @return The class.
+	 */
+	private static Class<?> getCanonicalClass(String canonicalName) {
+    	try {
+			return Class.forName(canonicalName);
+		} catch (ClassNotFoundException e) {
+			throw new IllegalArgumentException("Cannot find " + canonicalName, e);
+		}
+	}
+	
+	/**
+	 * Expand variables such as "{nms}" and "{obc}" to their corresponding packages.
+	 * @param name - the full name of the class.
+	 * @return The expanded string.
+	 */
+	private static String expandVariables(String name) {
+	    StringBuffer output = new StringBuffer();
+	    Matcher matcher = MATCH_VARIABLE.matcher(name);
+	    
+	    while (matcher.find()) {
+	    	String variable = matcher.group(1);
+	    	String replacement = "";
+	    	
+	    	// Expand all detected variables
+	    	if ("nms".equalsIgnoreCase(variable))
+	    		replacement = NMS_PREFIX;
+	    	else if ("obc".equalsIgnoreCase(variable))
+	    		replacement = OBC_PREFIX;
+	    	else if ("version".equalsIgnoreCase(variable))
+	    		replacement = VERSION;
+	    	else
+	    		throw new IllegalArgumentException("Unknown variable: " + variable);
+	    	
+	    	// Assume the expanded variables are all packages, and append a dot
+	    	if (replacement.length() > 0 && matcher.end() < name.length() && name.charAt(matcher.end()) != '.')
+	    		replacement += ".";
+	        matcher.appendReplacement(output, Matcher.quoteReplacement(replacement));
+	    }
+	    matcher.appendTail(output);
+	    return output.toString();
+	}
+}

Examples/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -0,0 +1,472 @@
+package com.comphenix.tinyprotocol;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+
+import net.minecraft.util.com.mojang.authlib.GameProfile;
+// These are not versioned, but they require CraftBukkit
+import net.minecraft.util.io.netty.channel.Channel;
+import net.minecraft.util.io.netty.channel.ChannelDuplexHandler;
+import net.minecraft.util.io.netty.channel.ChannelFuture;
+import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
+import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
+import net.minecraft.util.io.netty.channel.ChannelInitializer;
+import net.minecraft.util.io.netty.channel.ChannelPipeline;
+import net.minecraft.util.io.netty.channel.ChannelPromise;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.tinyprotocol.Reflection.FieldAccessor;
+import com.comphenix.tinyprotocol.Reflection.MethodInvoker;
+import com.google.common.collect.Lists;
+import com.google.common.collect.MapMaker;
+
+/**
+ * Represents a very tiny alternative to ProtocolLib in 1.7.2.
+ * <p>
+ * It now supports intercepting packets during login and status ping (such as OUT_SERVER_PING)!
+ * @author Kristian
+ */
+public abstract class TinyProtocol {
+	private static final AtomicInteger ID = new AtomicInteger(0);
+	
+	// Used in order to lookup a channel
+	private static final MethodInvoker getPlayerHandle = Reflection.getMethod("{obc}.entity.CraftPlayer", "getHandle");
+	private static final FieldAccessor<Object> getConnection = Reflection.getField("{nms}.EntityPlayer", "playerConnection", Object.class);
+	private static final FieldAccessor<Object> getManager = Reflection.getField("{nms}.PlayerConnection", "networkManager", Object.class);
+	private static final FieldAccessor<Channel> getChannel = Reflection.getField("{nms}.NetworkManager", Channel.class, 0);
+	
+	// Looking up ServerConnection
+	private static final Class<Object> minecraftServerClass = Reflection.getUntypedClass("{nms}.MinecraftServer");
+	private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
+	private static final FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
+	private static final FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
+	private static final MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
+	
+	// Packets we have to intercept
+	private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
+	private static final FieldAccessor<GameProfile> getGameProfile = Reflection.getField(PACKET_LOGIN_IN_START, GameProfile.class, 0);
+	
+	// Speedup channel lookup
+	private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
+	private Listener listener;
+	
+	// Channels that have already been removed
+	private Set<Channel> uninjectedChannels = Collections.newSetFromMap(new MapMaker().weakKeys().<Channel, Boolean>makeMap());
+	
+	// List of network markers
+	private List<Object> networkManagers;
+	
+	// Injected channel handlers
+	private List<Channel> serverChannels = Lists.newArrayList();
+	private ChannelInboundHandlerAdapter serverChannelHandler;
+	private ChannelInitializer<Channel> beginInitProtocol;
+	private ChannelInitializer<Channel> endInitProtocol;
+	
+	// Current handler name
+	private String handlerName;
+	
+	protected volatile boolean closed;
+	protected Plugin plugin;
+	
+	/**
+	 * Construct a new instance of TinyProtocol, and start intercepting packets for all connected clients and future clients. 
+	 * <p>
+	 * You can construct multiple instances per plugin.
+	 * @param plugin - the plugin.
+	 */
+	public TinyProtocol(Plugin plugin) {
+		this.plugin = plugin;
+		
+		// Compute handler name
+		this.handlerName = getHandlerName();
+		
+		// Prepare existing players
+		registerBukkitEvents();
+		registerChannelHandler();
+		registerPlayers(plugin);
+	}
+
+	private void createServerChannelHandler() {
+        // Handle connected channels
+        endInitProtocol = new ChannelInitializer<Channel>() {
+            @Override
+            protected void initChannel(Channel channel) throws Exception {
+            	try {
+                    // This can take a while, so we need to stop the main thread from interfering
+                    synchronized (networkManagers) {
+                    	// Stop injecting channels
+                    	if (closed)
+                    		return;
+                    	injectChannelInternal(channel);
+					}
+            	} catch (Exception e) {
+            		plugin.getLogger().log(Level.SEVERE, "Cannot inject incomming channel " + channel, e);
+            	}
+            }
+        };
+        
+        // This is executed before Minecraft's channel handler
+        beginInitProtocol = new ChannelInitializer<Channel>() {
+        	@Override
+        	protected void initChannel(Channel channel) throws Exception {
+        		channel.pipeline().addLast(endInitProtocol);
+        	}
+        };
+		
+        serverChannelHandler = new ChannelInboundHandlerAdapter() {
+        	@Override
+        	public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                Channel channel = (Channel) msg;
+
+                // Prepare to initialize ths channel
+                channel.pipeline().addFirst(beginInitProtocol);
+                ctx.fireChannelRead(msg);
+        	}
+        };
+	}
+	
+	/**
+	 * Register bukkit events.
+	 */
+	private void registerBukkitEvents() {
+		listener = new Listener() {
+			@EventHandler(priority = EventPriority.LOWEST)
+			public final void onPlayerLogin(PlayerLoginEvent e) {
+				if (closed) 
+					return;
+				Channel channel = getChannel(e.getPlayer());
+				
+				// Don't inject players that have been explicitly uninjected
+				if (!uninjectedChannels.contains(channel)) {
+					injectPlayer(e.getPlayer());
+				}
+			}
+			
+			@EventHandler
+			public final void onPluginDisable(PluginDisableEvent e) {
+				if (e.getPlugin().equals(plugin)) {
+					close();
+				}
+			}
+		};
+		
+		this.plugin.getServer().getPluginManager().registerEvents(listener, plugin);
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void registerChannelHandler() {
+		Object mcServer = getMinecraftServer.get(Bukkit.getServer());
+		Object serverConnection = getServerConnection.get(mcServer);
+		boolean looking = true;
+		
+		// We need to synchronize against this list
+		networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
+		createServerChannelHandler();
+		
+		// Find the correct list, or implicitly throw an exception
+		for (int i = 0; looking; i++) {
+			List<Object> list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection);
+			
+			for (Object item : list) {
+				if (!ChannelFuture.class.isInstance(item)) 
+					break;
+				
+				// Channel future that contains the server connection
+				Channel serverChannel = ((ChannelFuture)item).channel();
+	
+				serverChannels.add(serverChannel);
+				serverChannel.pipeline().addFirst(serverChannelHandler);
+				looking = false;
+			}
+		}
+	}
+	
+	private void unregisterChannelHandler() {
+		if (serverChannelHandler == null)
+			return;
+		
+		for (Channel serverChannel : serverChannels) {
+			final ChannelPipeline pipeline = serverChannel.pipeline();
+			
+			// Remove channel handler
+			serverChannel.eventLoop().execute(new Runnable() {
+				public void run() {
+					try {
+						pipeline.remove(serverChannelHandler);
+					} catch (NoSuchElementException e) {
+						// That's fine
+					}
+				}
+			});
+		}
+	}
+	
+	private void registerPlayers(Plugin plugin) {
+		for (Player player : plugin.getServer().getOnlinePlayers()) {
+			injectPlayer(player);
+		}
+	}
+		
+	/**
+	 * Invoked when the server is starting to send a packet to a player.
+	 * <p>
+	 * Note that this is not executed on the main thread.
+	 * @param reciever - the receiving player, NULL for early login/status packets.
+	 * @param remoteAddress - remote address of the sending client. Never NULL.
+	 * @param packet - the packet being sent.
+	 * @return The packet to send instead, or NULL to cancel the transmission.
+	 */
+	public Object onPacketOutAsync(Player reciever, Channel channel, Object packet) {
+		return packet;
+	}
+
+	/**
+	 * Invoked when the server has received a packet from a given player.
+	 * <p>
+	 * Use {@link Channel#remoteAddress()} to get the remote address of the client.
+	 * @param sender - the player that sent the packet, NULL for early login/status packets.
+	 * @param channel - channel that received the packet. Never NULL.
+	 * @param packet - the packet being received.
+	 * @return The packet to recieve instead, or NULL to cancel.
+	 */
+	public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
+		return packet;
+	}
+	
+	/**
+	 * Send a packet to a particular player.
+	 * <p>
+	 * Note that {@link #onPacketOutAsync(Player, Object)} will be invoked with this packet.
+	 * @param player - the destination player.
+	 * @param packet - the packet to send.
+	 */
+	public void sendPacket(Player player, Object packet) {
+		sendPacket(getChannel(player), packet);
+	}
+	
+	/**
+	 * Send a packet to a particular client.
+	 * <p>
+	 * Note that {@link #onPacketOutAsync(Player, Object)} will be invoked with this packet.
+	 * @param channel - client identified by a channel.
+	 * @param packet - the packet to send.
+	 */
+	public void sendPacket(Channel channel, Object packet) {
+		channel.pipeline().writeAndFlush(packet);
+	}
+		
+	/**
+	 * Pretend that a given packet has been received from a player.
+	 * <p>
+	 * Note that {@link #onPacketInAsync(Player, Object)} will be invoked with this packet.
+	 * @param player - the player that sent the packet.
+	 * @param packet - the packet that will be received by the server.
+	 */
+	public void receivePacket(Player player, Object packet) {
+		receivePacket(getChannel(player), packet);
+	}
+	
+	/**
+	 * Pretend that a given packet has been received from a given client.
+	 * <p>
+	 * Note that {@link #onPacketInAsync(Player, Object)} will be invoked with this packet.
+	 * @param channel - client identified by a channel.
+	 * @param packet - the packet that will be received by the server.
+	 */
+	public void receivePacket(Channel channel, Object packet) {
+		channel.pipeline().context("encoder").fireChannelRead(packet);
+	}
+	
+	/**
+	 * Retrieve the name of the channel injector, default implementation is "tiny-" + plugin name + "-" + a unique ID.
+	 * <p>
+	 * Note that this method will only be invoked once. It is no longer necessary to override this to support multiple instances.
+	 * @return A unique channel handler name.
+	 */
+	protected String getHandlerName() {
+		return "tiny-" + plugin.getName() + "-" + ID.incrementAndGet();
+	}
+	
+	/**
+	 * Add a custom channel handler to the given player's channel pipeline, 
+	 * allowing us to intercept sent and received packets.
+	 * <p>
+	 * This will automatically be called when a player has logged in.
+	 * @param player - the player to inject.
+	 */
+	public void injectPlayer(Player player) {
+		injectChannelInternal(getChannel(player)).player = player;
+	}
+	
+	/**
+	 * Add a custom channel handler to the given channel.
+	 * @param player - the channel to inject.
+	 * @return The intercepted channel, or NULL if it has already been injected.
+	 */
+	public void injectChannel(Channel channel) {
+		injectChannelInternal(channel);
+	}
+	
+	/**
+	 * Add a custom channel handler to the given channel.
+	 * @param player - the channel to inject.
+	 * @return The packet interceptor.
+	 */
+	private PacketInterceptor injectChannelInternal(Channel channel) {
+		try {
+			PacketInterceptor interceptor = (PacketInterceptor) channel.pipeline().get(handlerName);
+			
+			// Inject our packet interceptor
+			if (interceptor == null) {
+				interceptor = new PacketInterceptor();
+				channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
+				uninjectedChannels.remove(channel);
+			}
+			return interceptor;	
+		} catch (IllegalArgumentException e) {
+			// Try again
+			return (PacketInterceptor) channel.pipeline().get(handlerName);
+		}
+	}
+	
+	/**
+	 * Retrieve the Netty channel associated with a player. This is cached.
+	 * @param player - the player.
+	 * @return The Netty channel.
+	 */
+	public Channel getChannel(Player player) {
+		Channel channel = channelLookup.get(player.getName());
+		
+		// Lookup channel again
+		if (channel == null) {
+			Object connection = getConnection.get(getPlayerHandle.invoke(player));
+			Object manager = getManager.get(connection);
+			
+			channelLookup.put(player.getName(), channel = getChannel.get(manager));
+		}
+		return channel;
+	}
+	
+	/**
+	 * Uninject a specific player.
+	 * @param player - the injected player.
+	 */
+	public void uninjectPlayer(Player player) {
+		uninjectChannel(getChannel(player));
+	}
+	
+	/**
+	 * Uninject a specific channel.
+	 * <p>
+	 * This will also disable the automatic channel injection that occurs when a player has properly logged in.
+	 * @param channel - the injected channel.
+	 */
+	public void uninjectChannel(final Channel channel) {
+		// No need to guard against this if we're closing
+		if (!closed) {
+			uninjectedChannels.add(channel);
+		}
+		
+		// See ChannelInjector in ProtocolLib, line 590
+		channel.eventLoop().execute(new Runnable() {
+			@Override
+			public void run() {
+				channel.pipeline().remove(handlerName);
+			}
+		});
+	}
+	
+	/**
+	 * Determine if the given player has been injected by TinyProtocol.
+	 * @param player - the player.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean hasInjected(Player player) {
+		return hasInjected(getChannel(player));
+	}
+	
+	/**
+	 * Determine if the given channel has been injected by TinyProtocol.
+	 * @param channel - the channel.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean hasInjected(Channel channel) {
+		return channel.pipeline().get(handlerName) != null;
+	}
+	
+	/**
+	 * Cease listening for packets. This is called automatically when your plugin is disabled.
+	 */
+	public final void close() {
+		if (!closed) {
+			closed = true;
+			
+			// Remove our handlers
+			for (Player player : plugin.getServer().getOnlinePlayers()) {
+				uninjectPlayer(player);
+			}
+			// Clean up Bukkit
+			HandlerList.unregisterAll(listener);
+			unregisterChannelHandler();
+		}
+	}
+	
+	/**
+	 * Channel handler that is inserted into the player's channel pipeline, allowing us to intercept sent and received packets.
+	 * @author Kristian
+	 */
+	private final class PacketInterceptor extends ChannelDuplexHandler {		
+		// Updated by the login event
+		public volatile Player player;
+		
+		@Override
+		public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+			// Intercept channel
+			final Channel channel = ctx.channel();
+			handleLoginStart(channel, msg);
+			
+			try {
+				msg = onPacketInAsync(player, channel, msg);
+			} catch (Exception e) {
+				plugin.getLogger().log(Level.SEVERE, "Error in onPacketInAsync().", e);
+			}
+			
+			if (msg != null) {
+				super.channelRead(ctx, msg);
+			}
+		}
+		@Override
+		public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {			
+			try {
+				msg = onPacketOutAsync(player, ctx.channel(), msg);
+			} catch (Exception e) {
+				plugin.getLogger().log(Level.SEVERE, "Error in onPacketOutAsync().", e);
+			}
+			
+			if (msg != null) {
+				super.write(ctx, msg, promise);
+			}
+		}
+		
+		private void handleLoginStart(Channel channel, Object packet) {
+			if (PACKET_LOGIN_IN_START.isInstance(packet)) {
+				GameProfile profile = getGameProfile.get(packet);
+				channelLookup.put(profile.getName(), channel);
+			}
+		}
+	}
+}

Examples/TinyProtocol/src/main/resources/plugin.yml

@@ -0,0 +1,14 @@
+name: TinyProtocol
+version: 0.1.0
+description: Intercept packets without ProtocolLib
+author: Comphenix
+
+load: startup
+
+main: com.comphenix.tinyprotocol.ExamplePlugin
+database: false
+
+commands:
+   toggleinjection:
+      description: Toggle the TinyProtocol injection of the current player.
+      usage: /<command>

ItemDisguise/.classpath

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/ProtocolLib"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

ItemDisguise/.gitignore

@@ -1 +0,0 @@
-target/

ItemDisguise/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ItemDisguise</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

ItemDisguise/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6

ItemDisguise/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

ProtocolLib/.classpath

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

ProtocolLib/.gitignore

@@ -1 +1,165 @@
-target/
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+target/
+.gitignore
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

ProtocolLib/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ProtocolLib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

ProtocolLib/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=cp1252
-encoding//src/test/java=cp1252
-encoding/<project>=cp1252

ProtocolLib/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6

ProtocolLib/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

ProtocolLib/dependency-reduced-pom.xml

@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.comphenix.protocol</groupId>
-  <artifactId>ProtocolLib</artifactId>
-  <name>ProtocolLib</name>
-  <version>1.5.0</version>
-  <description>Provides read/write access to the Minecraft protocol.</description>
-  <url>http://dev.bukkit.org/server-mods/protocollib/</url>
-  <developers>
-    <developer>
-      <id>aadnk</id>
-      <name>Kristian S. Stangeland</name>
-      <email>kr_stang@hotmail.com</email>
-      <url>http://comphenix.net/</url>
-      <roles>
-        <role>developer</role>
-        <role>maintainer</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>GNU GENERAL PUBLIC LICENSE - Version 2, June 1991</name>
-      <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/aadnk/ProtocolLib.git</connection>
-    <developerConnection>scm:git:git@github.com:aadnk/ProtocolLib.git</developerConnection>
-    <url>https://github.com/aadnk/ProtocolLib</url>
-  </scm>
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <testSourceDirectory>src/test/java</testSourceDirectory>
-    <defaultGoal>clean install</defaultGoal>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <shadedArtifactAttached>false</shadedArtifactAttached>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <relocations>
-                <relocation>
-                  <pattern>net.sf</pattern>
-                  <shadedPattern>com.comphenix.net.sf</shadedPattern>
-                </relocation>
-              </relocations>
-              <artifactSet>
-                <excludes>
-                  <exclude>org.bukkit:craftbukkit</exclude>
-                  <exclude>junit:junit</exclude>
-                </excludes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>release-sign-artifacts</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <repositories>
-    <repository>
-      <id>bukkit-rep</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.3.2-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <threshold>High</threshold>
-          <effort>Default</effort>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  <distributionManagement>
-    <repository>
-      <id>comphenix-releases</id>
-      <name>Comphenix Maven Releases</name>
-      <url>http://repo.comphenix.net/content/repositories/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>comphenix-snapshots</id>
-      <name>Comphenix Maven Snapshots</name>
-      <url>http://repo.comphenix.net/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-  <properties>
-    <project.build.sourceEncoding>cp1252</project.build.sourceEncoding>
-  </properties>
-</project>
-

ProtocolLib/pom.xml

@@ -1,48 +1,56 @@
-<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">
+<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>
   <groupId>com.comphenix.protocol</groupId>
-  <artifactId>ProtocolLib</artifactId>
-  <version>1.5.0</version>
-  <packaging>jar</packaging>
+  <artifactId>ProtocolLib-Legacy</artifactId>
+  <version>3.7.0</version>
+  <name>ProtocolLib-Legacy</name>
+
   <description>Provides read/write access to the Minecraft protocol.</description>
-  
+  <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
+  <packaging>jar</packaging>
+
   <properties>
     <project.build.sourceEncoding>cp1252</project.build.sourceEncoding>
+    <powermock.version>1.5</powermock.version>
   </properties>
 
   <distributionManagement>
     <repository>
-      <id>comphenix-releases</id>
-      <name>Comphenix Maven Releases</name>
-      <url>http://repo.comphenix.net/content/repositories/releases/</url>
+      <id>dmulloy2-releases</id>
+      <url>http://repo.dmulloy2.net/content/repositories/releases/</url>
     </repository>
     <snapshotRepository>
-      <id>comphenix-snapshots</id>
-      <name>Comphenix Maven Snapshots</name>
-      <url>http://repo.comphenix.net/content/repositories/snapshots/</url>
+      <id>dmulloy2-snapshots</id>
+      <url>http://repo.dmulloy2.net/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
- 
+
   <repositories>
     <repository>
-      <id>bukkit-rep</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
+      <id>dmulloy2-repo</id>
+      <url>http://repo.dmulloy2.net/content/groups/public/</url>
+    </repository>
+    <repository>
+      <id>md_5-repo</id>
+      <url>http://repo.md-5.net/content/repositories/public/</url>
     </repository>
   </repositories>
- 
+
   <build>
     <defaultGoal>clean install</defaultGoal>
     <sourceDirectory>src/main/java</sourceDirectory>
     <testSourceDirectory>src/test/java</testSourceDirectory>
     <resources>
       <resource>
-        <directory>src/main/java</directory>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
       </resource>
     </resources>
-    
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -56,7 +64,7 @@
             </goals>
             <configuration>
               <shadedArtifactAttached>false</shadedArtifactAttached>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
 
               <relocations>
                 <relocation>
@@ -64,10 +72,11 @@
                   <shadedPattern>com.comphenix.net.sf</shadedPattern>
                 </relocation>
               </relocations>
-              
+
               <artifactSet>
                 <excludes>
-                  <exclude>org.bukkit:craftbukkit</exclude>
+                  <exclude>org.spigotmc:spigot</exclude>
+                  <exclude>org.spigotmc:spigot-api</exclude>
                   <exclude>junit:junit</exclude>
                 </excludes>
               </artifactSet>
@@ -75,7 +84,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
@@ -85,91 +94,100 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+          <finalName>${project.name}</finalName>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
-  
+
   <reporting>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
         <version>2.5.2</version>
-          <configuration>
-            <threshold>High</threshold>
-            <effort>Default</effort>
-          </configuration>
+        <configuration>
+          <threshold>High</threshold>
+          <effort>Default</effort>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>
-  
+
   <profiles>
-  <profile>
-    <id>release-sign-artifacts</id>
-    <activation>
-      <property>
-        <name>performRelease</name>
-        <value>true</value>
-      </property>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.2</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.9</version>
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.4</version>
-          <executions>
-            <execution>
-              <id>sign-artifacts</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>sign</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        
-      </plugins>
-    </build>
-  </profile>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
   </profiles>
-  
-  <url>http://dev.bukkit.org/server-mods/protocollib/</url>
-  <name>ProtocolLib</name>
-  
+
   <scm>
     <connection>scm:git:git://github.com/aadnk/ProtocolLib.git</connection>
     <developerConnection>scm:git:git@github.com:aadnk/ProtocolLib.git</developerConnection>
     <url>https://github.com/aadnk/ProtocolLib</url>
   </scm>
-  
+
   <licenses>
     <license>
       <name>GNU GENERAL PUBLIC LICENSE - Version 2, June 1991</name>
@@ -177,39 +195,75 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  
+
   <developers>
+    <developer>
+      <id>dmulloy2</id>
+      <name>Dan Mulloy</name>
+      <url>http://shadowvolt.com/</url>
+      <roles>
+        <role>developer</role>
+        <role>maintainer</role>
+      </roles>
+    </developer>
     <developer>
       <id>aadnk</id>
       <name>Kristian S. Stangeland</name>
       <email>kr_stang@hotmail.com</email>
       <url>http://comphenix.net/</url>
       <roles>
-        <role>developer</role>
-        <role>maintainer</role>
+        <role>former author</role>
       </roles>
       <timezone>1</timezone>
     </developer>
   </developers>
-  
+
   <dependencies>
-  	<dependency>
-  		<groupId>cglib</groupId>
-  		<artifactId>cglib-nodep</artifactId>
-  		<version>2.2.2</version>
-  		<scope>compile</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.bukkit</groupId>
-  		<artifactId>craftbukkit</artifactId>
-  		<version>1.3.2-R1.0</version>
-  		<scope>provided</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>junit</groupId>
-  		<artifactId>junit</artifactId>
-  		<version>4.10</version>
-  		<scope>test</scope>
-  	</dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.comphenix.executors</groupId>
+      <artifactId>BukkitExecutors</artifactId>
+      <version>1.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.8.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

ProtocolLib/src/main/java/com/comphenix/protocol/Application.java

@@ -17,14 +17,42 @@
 
 package com.comphenix.protocol;
 
+import org.bukkit.Bukkit;
+
 /**
  * Ignore this class.
  * 
  * @author Kristian
  */
 public class Application {
+	private static Thread mainThread;
+	private static boolean primaryMethod = true;
+	
 	public static void main(String[] args) {
 		// For now, though we might consider making a proper application
 		System.out.println("This is a Bukkit library. Place it in the plugin-folder and restart the server!");
 	}
+
+	/**
+	 * Determine if we are running on the main thread.
+	 * @return TRUE if we are, FALSE otherwise.
+	 */
+	public static boolean isPrimaryThread() {
+		if (primaryMethod) {
+			try {
+				return Bukkit.isPrimaryThread();
+			} catch (LinkageError e) {
+				primaryMethod = false;
+			}
+		}
+		// Fallback method
+		return Thread.currentThread().equals(mainThread);
+	}
+	
+	/**
+	 * Register the calling thread as the primary thread.
+	 */
+	static void registerPrimaryThread() {
+		mainThread = Thread.currentThread();
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/AsynchronousManager.java

@@ -22,6 +22,7 @@ import java.util.Set;
 import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.async.AsyncListenerHandler;
+import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
@@ -35,9 +36,11 @@ public interface AsynchronousManager {
 	/**
 	 * Registers an asynchronous packet handler.
 	 * <p>
+	 * Use {@link AsyncMarker#incrementProcessingDelay()} to delay a packet until its ready to be transmitted.
+	 * <p>
 	 * To start listening asynchronously, pass the getListenerLoop() runnable to a different thread.
-	 * @param listener - the packet listener that will recieve these asynchronous events.
-	 * @return An asynchrouns handler.
+	 * @param listener - the packet listener that will receive these asynchronous events.
+	 * @return An asynchronous handler.
 	 */
 	public abstract AsyncListenerHandler registerAsyncHandler(PacketListener listener);
 
@@ -47,6 +50,12 @@ public interface AsynchronousManager {
 	 */
 	public abstract void unregisterAsyncHandler(AsyncListenerHandler handler);
 
+	/**
+	 * Unregisters and closes the first asynchronous handler associated with the given listener.
+	 * @param handler - asynchronous handler.
+	 */
+	public abstract void unregisterAsyncHandler(PacketListener listener);
+	
 	/**
 	 * Unregisters every asynchronous handler associated with this plugin.
 	 * @param plugin - the original plugin.
@@ -56,16 +65,36 @@ public interface AsynchronousManager {
 	/**
 	 * Retrieves a immutable set containing the ID of the sent server packets that will be 
 	 * observed by the asynchronous listeners.
+	 * <p>
+	 * Deprecated: Use {@link #getSendingTypes()} instead.
 	 * @return Every filtered server packet.
 	 */
+	@Deprecated
 	public abstract Set<Integer> getSendingFilters();
 
+	/**
+	 * Retrieves a immutable set containing the types of the sent server packets that will be 
+	 * observed by the asynchronous listeners.
+	 * @return Every filtered server packet.
+	 */
+	public abstract Set<PacketType> getSendingTypes();
+	
 	/**
 	 * Retrieves a immutable set containing the ID of the recieved client packets that will be
+	 * <p>
+	 * Deprecated: Use {@link #getReceivingTypes()} instead.
 	 * observed by the asynchronous listeners.
 	 * @return Every filtered client packet.
 	 */
+	@Deprecated
 	public abstract Set<Integer> getReceivingFilters();
+	
+	/**
+	 * Retrieves a immutable set containing the types of the received client packets that will be
+	 * observed by the asynchronous listeners.
+	 * @return Every filtered client packet.
+	 */
+	public abstract Set<PacketType> getReceivingTypes();
 
 	/**
 	 * Determine if a given synchronous packet has asynchronous listeners.
@@ -99,4 +128,28 @@ public interface AsynchronousManager {
 	 * @param packet - packet to signal.
 	 */
 	public abstract void signalPacketTransmission(PacketEvent packet);
+
+	/**
+	 * Register a synchronous listener that handles packets when they time out.
+	 * @param listener - synchronous listener that will handle timed out packets.
+	 */
+	public abstract void registerTimeoutHandler(PacketListener listener);
+	
+	/**
+	 * Unregisters a given timeout listener.
+	 * @param listener - the timeout listener to unregister.
+	 */
+	public abstract void unregisterTimeoutHandler(PacketListener listener);
+
+	/**
+	 * Get a immutable set of every registered timeout handler.
+	 * @return Set of every registered timeout handler.
+	 */
+	public abstract Set<PacketListener> getTimeoutHandlers();
+
+	/**
+	 * Get an immutable set of every registered asynchronous packet listener.
+	 * @return Set of every asynchronous packet listener.
+	 */
+	public abstract Set<PacketListener> getAsyncHandlers();
 }

ProtocolLib/src/main/java/com/comphenix/protocol/CleanupStaticMembers.java

@@ -1,3 +1,20 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol;
 
 import java.lang.reflect.Field;
@@ -7,19 +24,28 @@ import java.util.List;
 
 import com.comphenix.protocol.async.AsyncListenerHandler;
 import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.injector.BukkitUnwrapper;
+import com.comphenix.protocol.injector.server.AbstractInputStreamLookup;
+import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
+import com.comphenix.protocol.injector.spigot.SpigotPacketInjector;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.MethodUtils;
-import com.comphenix.protocol.reflect.ObjectCloner;
-import com.comphenix.protocol.reflect.PrimitiveUtils;
+import com.comphenix.protocol.reflect.ObjectWriter;
 import com.comphenix.protocol.reflect.compiler.BackgroundCompiler;
 import com.comphenix.protocol.reflect.compiler.StructureCompiler;
 import com.comphenix.protocol.reflect.instances.CollectionGenerator;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
 import com.comphenix.protocol.reflect.instances.PrimitiveGenerator;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.ChunkPosition;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+import com.comphenix.protocol.wrappers.WrappedWatchableObject;
+import com.comphenix.protocol.wrappers.nbt.io.NbtBinarySerializer;
 
 /**
  * Used to fix ClassLoader leaks that may lead to filling up the permanent generation.
@@ -27,7 +53,10 @@ import com.comphenix.protocol.reflect.instances.PrimitiveGenerator;
  * @author Kristian
  */
 class CleanupStaticMembers {
-
+	// Reports
+	public final static ReportType REPORT_CANNOT_RESET_FIELD = new ReportType("Unable to reset field %s: %s");
+	public final static ReportType REPORT_CANNOT_UNLOAD_CLASS = new ReportType("Unable to unload class %s.");
+	
 	private ClassLoader loader;
 	private ErrorReporter reporter;
 
@@ -41,13 +70,16 @@ class CleanupStaticMembers {
 	 */
 	public void resetAll() {
 		// This list must always be updated
+		@SuppressWarnings("deprecation")
 		Class<?>[] publicClasses = { 
 				AsyncListenerHandler.class, ListeningWhitelist.class, PacketContainer.class, 
 				BukkitUnwrapper.class, DefaultInstances.class, CollectionGenerator.class,
 				PrimitiveGenerator.class, FuzzyReflection.class, MethodUtils.class, 
 				BackgroundCompiler.class, StructureCompiler.class,
-				ObjectCloner.class, PrimitiveUtils.class, Packets.Server.class, 
-				Packets.Client.class 
+				ObjectWriter.class, Packets.Server.class, Packets.Client.class, 
+				ChunkPosition.class, WrappedDataWatcher.class, WrappedWatchableObject.class,
+				AbstractInputStreamLookup.class, TemporaryPlayerFactory.class, SpigotPacketInjector.class,
+				MinecraftReflection.class, NbtBinarySerializer.class
 		};
 							   			
 		String[] internalClasses = {
@@ -57,14 +89,14 @@ class CleanupStaticMembers {
 			 "com.comphenix.protocol.injector.player.NetworkObjectInjector",
 			 "com.comphenix.protocol.injector.player.NetworkServerInjector",
 			 "com.comphenix.protocol.injector.player.PlayerInjector",
-			 "com.comphenix.protocol.injector.player.TemporaryPlayerFactory",
 			 "com.comphenix.protocol.injector.EntityUtilities",
-			 "com.comphenix.protocol.injector.MinecraftRegistry",
-			 "com.comphenix.protocol.injector.PacketInjector",
-			 "com.comphenix.protocol.injector.ReadPacketModifier",
+			 "com.comphenix.protocol.injector.packet.PacketRegistry",
+			 "com.comphenix.protocol.injector.packet.PacketInjector",
+			 "com.comphenix.protocol.injector.packet.ReadPacketModifier",
 			 "com.comphenix.protocol.injector.StructureCache",
 			 "com.comphenix.protocol.reflect.compiler.BoxingHelper",
-			 "com.comphenix.protocol.reflect.compiler.MethodDescriptor"
+			 "com.comphenix.protocol.reflect.compiler.MethodDescriptor",
+			 "com.comphenix.protocol.wrappers.nbt.WrappedElement",
 		};
 		
 		resetClasses(publicClasses);
@@ -84,13 +116,17 @@ class CleanupStaticMembers {
 			
 			// Only check static non-primitive fields. We also skip strings.
 			if (Modifier.isStatic(field.getModifiers()) && 
-					!type.isPrimitive() && !type.equals(String.class)) {
+					!type.isPrimitive() && !type.equals(String.class) && 
+					!type.equals(ReportType.class)) {
 				
 				try {
 					setFinalStatic(field, null);
 				} catch (IllegalAccessException e) {
 					// Just inform the player
-					reporter.reportWarning(this, "Unable to reset field " + field.getName() + ": " + e.getMessage(), e);
+					reporter.reportWarning(this, 
+							Report.newBuilder(REPORT_CANNOT_RESET_FIELD).error(e).messageParam(field.getName(), e.getMessage())
+					);
+					e.printStackTrace();
 				}
 			}
 		}
@@ -125,7 +161,7 @@ class CleanupStaticMembers {
 				output.add(loader.loadClass(name));
 			} catch (ClassNotFoundException e) {
 				// Warn the user
-				reporter.reportWarning(this, "Unable to unload class " + name, e);
+				reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_UNLOAD_CLASS).error(e).messageParam(name));
 			}
 		}
 		

ProtocolLib/src/main/java/com/comphenix/protocol/CommandBase.java

@@ -0,0 +1,156 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+
+/**
+ * Base class for all our commands.
+ * 
+ * @author Kristian
+ */
+abstract class CommandBase implements CommandExecutor {
+	public static final ReportType REPORT_COMMAND_ERROR = new ReportType("Cannot execute command %s.");
+	public static final ReportType REPORT_UNEXPECTED_COMMAND = new ReportType("Incorrect command assigned to %s.");
+	
+	public static final String PERMISSION_ADMIN = "protocol.admin";
+	
+	private String permission;
+	private String name;
+	private int minimumArgumentCount;
+	
+	protected ErrorReporter reporter;
+	
+	public CommandBase(ErrorReporter reporter, String permission, String name) {
+		this(reporter, permission, name, 0);
+	}
+	
+	public CommandBase(ErrorReporter reporter, String permission, String name, int minimumArgumentCount) {
+		this.reporter = reporter;
+		this.name = name;
+		this.permission = permission;
+		this.minimumArgumentCount = minimumArgumentCount;
+	}
+
+	@Override
+	public final boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		try {
+			// Make sure we're dealing with the correct command
+			if (!command.getName().equalsIgnoreCase(name)) {
+				reporter.reportWarning(this, Report.newBuilder(REPORT_UNEXPECTED_COMMAND).messageParam(this));
+				return false;
+			}
+			if (permission != null && !sender.hasPermission(permission)) {
+				sender.sendMessage(ChatColor.RED + "You haven't got permission to run this command.");
+				return true;
+			}
+			
+			// Check argument length
+			if (args != null && args.length >= minimumArgumentCount) {
+				return handleCommand(sender, args);
+			} else {
+				sender.sendMessage(ChatColor.RED + "Insufficient commands. You need at least " + minimumArgumentCount);
+				return false;
+			}
+			
+		} catch (Exception e) {
+			reporter.reportDetailed(this, 
+					Report.newBuilder(REPORT_COMMAND_ERROR).error(e).messageParam(name).callerParam(sender, label, args)
+			);
+			return true;
+		}
+	}
+
+	/**
+	 * Parse a boolean value at the head of the queue.
+	 * @param arguments - the queue of arguments.
+	 * @param parameterName - the parameter name we will match.
+	 * @return The parsed boolean, or NULL if not valid.
+	 */
+	protected Boolean parseBoolean(Deque<String> arguments, String parameterName) {
+		Boolean result = null;
+		
+		if (!arguments.isEmpty()) {
+			String arg = arguments.peek();
+			
+			if (arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("on"))
+				result = true;
+			else if (arg.equalsIgnoreCase(parameterName))
+				result = true;
+			else if (arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("off"))
+				result = false;
+		}
+		
+		if (result != null)
+			arguments.poll();
+		return result;
+	}
+		
+	/**
+	 * Create a queue from a sublist of a given array.
+	 * @param args - the source array.
+	 * @param start - the starting index.
+	 * @return A queue that contains every element in the array, starting at the given index.
+	 */
+	protected Deque<String> toQueue(String[] args, int start) {
+		return new ArrayDeque<String>(Arrays.asList(args).subList(start, args.length));
+	}
+	
+	/**
+	 * Retrieve the permission necessary to execute this command.
+	 * @return The permission, or NULL if not needed.
+	 */
+	public String getPermission() {
+		return permission;
+	}
+	
+	/**
+	 * Retrieve the primary name of this command.
+	 * @return Primary name.
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Retrieve the error reporter.
+	 * @return Error reporter.
+	 */
+	protected ErrorReporter getReporter() {
+		return reporter;
+	}
+	
+	/**
+	 * Main implementation of this command.
+	 * @param sender - command sender.
+	 * @param args - input arguments.
+	 * @return TRUE if the command was successfully handled, FALSE otherwise.
+	 */
+	protected abstract boolean handleCommand(CommandSender sender, String[] args);
+}

ProtocolLib/src/main/java/com/comphenix/protocol/CommandFilter.java

@@ -0,0 +1,482 @@
+package com.comphenix.protocol;
+
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.conversations.Conversable;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
+import org.bukkit.conversations.ConversationAbandonedListener;
+import org.bukkit.conversations.ConversationContext;
+import org.bukkit.conversations.ConversationFactory;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.MultipleLinesPrompt.MultipleConversationCanceller;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.events.PacketEvent;
+import com.google.common.collect.Sets;
+
+/**
+ * A command to apply JavaScript filtering to the packet command.
+ * 
+ * @author Kristian
+ */
+public class CommandFilter extends CommandBase {
+	public static final ReportType REPORT_FALLBACK_ENGINE = new ReportType("Falling back to the Rhino engine.");
+	public static final ReportType REPORT_CANNOT_LOAD_FALLBACK_ENGINE = new ReportType("Could not load Rhino either. Please upgrade your JVM or OS.");
+	public static final ReportType REPORT_PACKAGES_UNSUPPORTED_IN_ENGINE = new ReportType("Unable to initialize packages for JavaScript engine.");
+	public static final ReportType REPORT_FILTER_REMOVED_FOR_ERROR = new ReportType("Removing filter %s for causing %s.");
+	public static final ReportType REPORT_CANNOT_HANDLE_CONVERSATION = new ReportType("Cannot handle conversation.");
+	
+	public interface FilterFailedHandler{
+		/**
+		 * Invoked when a given filter has failed.
+		 * @param event - the packet event.
+		 * @param filter - the filter that failed.
+		 * @param ex - the failure.
+		 * @return TRUE to keep processing this filter, FALSE to remove it.
+		 */
+		public boolean handle(PacketEvent event, Filter filter, Exception ex);
+	}
+	
+	/**
+	 * Possible sub commands.
+	 * 
+	 * @author Kristian
+	 */
+	private enum SubCommand {
+		ADD, REMOVE;
+	}
+	
+	/**
+	 * A filter that will be used to process a packet event.
+	 * @author Kristian
+	 */
+	public static class Filter {
+		private final String name;
+		private final String predicate;
+		
+		private final Set<PacketType> packets;
+		
+		/**
+		 * Construct a new immutable filter.
+		 * @param name - the unique name of the filter.
+ 		 * @param predicate - the JavaScript predicate that will be used to filter packet events.
+		 * @param packets - a list of packet types this filter applies to.
+		 */
+		public Filter(String name, String predicate, Set<PacketType> packets) {
+			this.name = name;
+			this.predicate = predicate;
+			this.packets = Sets.newHashSet(packets);
+		}
+		
+		/**
+		 * Retrieve the unique name of the filter.
+		 * @return Unique name of the filter.
+		 */
+		public String getName() {
+			return name;
+		}
+		
+		/**
+		 * Retrieve the JavaScript predicate that will be used to filter packet events.
+		 * @return Predicate itself.
+		 */
+		public String getPredicate() {
+			return predicate;
+		}
+		
+		/**
+		 * Retrieve a copy of the set of packets this filter applies to.
+		 * @return Set of packets this filter applies to.
+		 */
+		public Set<PacketType> getRanges() {
+			return Sets.newHashSet(packets);
+		}
+		
+		/**
+		 * Determine whether or not a packet event needs to be passed to this filter.
+		 * @param event - the event to test.
+		 * @return TRUE if it does, FALSE otherwise.
+		 */
+		private boolean isApplicable(PacketEvent event) {
+			return packets.contains(event.getPacketType());
+		}
+		
+		/**
+		 * Evaluate the current filter using the provided ScriptEngine as context.
+		 * <p>
+		 * This context may be modified with additional code.
+		 * @param context - the current script context.
+		 * @param event - the packet event to evaluate.
+		 * @return TRUE to pass this packet event on to the debug listeners, FALSE otherwise.
+		 * @throws ScriptException If the compilation failed or the filter is not valid.
+		 */
+		public boolean evaluate(ScriptEngine context, PacketEvent event) throws ScriptException {
+			if (!isApplicable(event))
+				return true;
+			// Ensure that the predicate has been compiled
+			compile(context);
+			
+			try {
+				Object result = ((Invocable) context).invokeFunction(name, event, event.getPacket().getHandle());
+				
+				if (result instanceof Boolean)
+					return (Boolean) result;
+				else
+					throw new ScriptException("Filter result wasn't a boolean: " + result);
+				
+			} catch (NoSuchMethodException e) {
+				// Must be a fault with the script engine itself
+				throw new IllegalStateException("Unable to compile " + name + " into current script engine.", e);
+			}
+		}
+		
+		/**
+		 * Force the compilation of a specific filter.
+		 * @param context - the current script context.
+		 * @throws ScriptException If the compilation failed.
+		 */
+		public void compile(ScriptEngine context) throws ScriptException {
+			if (context.get(name) == null) {
+				context.eval("var " + name + " = function(event, packet) {\n" + predicate);
+			}
+		}
+		
+		/**
+		 * Clean up all associated code from this filter in the provided script engine.
+		 * @param context - the current script context.
+		 */
+		public void close(ScriptEngine context) {
+			context.put(name, null);
+		}
+	}
+	
+	private class CompilationSuccessCanceller implements MultipleConversationCanceller {
+		@Override
+		public boolean cancelBasedOnInput(ConversationContext context, String in) {
+			throw new UnsupportedOperationException("Cannot cancel on the last line alone.");
+		}
+
+		@Override
+		public void setConversation(Conversation conversation) {
+			// Ignore
+		}
+
+		@Override
+		public boolean cancelBasedOnInput(ConversationContext context, String currentLine, StringBuilder lines, int lineCount) {
+			try {
+				engine.eval("function(event, packet) {\n" + lines.toString());
+				
+				// It compiles - accept the filter!
+				return true;
+			} catch (ScriptException e) {
+				// We also have the function() line
+				int realLineCount = lineCount + 1;
+				
+				// Only possible to recover from an error on the last line.
+				return e.getLineNumber() < realLineCount;
+			}
+		}
+		
+		@Override
+		public CompilationSuccessCanceller clone() {
+			return new CompilationSuccessCanceller();
+		}
+	}
+	
+	/**
+	 * Name of this command.
+	 */
+	public static final String NAME = "filter";
+	
+	// Default error handler
+	private FilterFailedHandler defaultFailedHandler;
+	
+	// Currently registered filters
+	private List<Filter> filters = new ArrayList<Filter>();
+	
+	// Owner plugin
+	private final Plugin plugin;
+	
+	// Whether or not the command is enabled
+	private ProtocolConfig config;
+	
+	// Script engine
+	private ScriptEngine engine;
+	private boolean uninitialized;
+	
+	public CommandFilter(ErrorReporter reporter, Plugin plugin, ProtocolConfig config) {
+		super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 2);
+		this.plugin = plugin;
+		this.config = config;
+		
+		// Tell the filter system to initialize the script first chance it gets
+		this.uninitialized = true;
+	}
+	
+	private void initalizeScript() {
+		try {
+			// First attempt
+			initializeEngine();
+			
+			// Oh for ..
+			if (!isInitialized()) {
+				throw new ScriptException("A JavaScript engine could not be found.");
+			} else {
+				plugin.getLogger().info("Loaded command filter engine.");
+			}
+		} catch (ScriptException e1) {
+			// It's not a huge deal
+			printPackageWarning(e1);
+			
+			if (!config.getScriptEngineName().equals("rhino")) {
+				reporter.reportWarning(this, Report.newBuilder(REPORT_FALLBACK_ENGINE));
+				config.setScriptEngineName("rhino");
+				config.saveAll();
+				
+				try {
+					initializeEngine();
+					
+					if (!isInitialized()) {
+						reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_LOAD_FALLBACK_ENGINE));
+					}
+				} catch (ScriptException e2) {
+					// And again ..
+					printPackageWarning(e2);
+				}
+			}
+		}
+	}
+	
+	private void printPackageWarning(ScriptException e) {
+		reporter.reportWarning(this, Report.newBuilder(REPORT_PACKAGES_UNSUPPORTED_IN_ENGINE).error(e));
+	}
+	
+	/**
+	 * Initialize the current configured engine.
+	 * @throws ScriptException If we are unable to import packages.
+	 */
+	private void initializeEngine() throws ScriptException {
+		ScriptEngineManager manager = new ScriptEngineManager();
+		engine = manager.getEngineByName(config.getScriptEngineName());
+		
+		// Import useful packages
+		if (engine != null) {
+			engine.eval("importPackage(org.bukkit);");
+			engine.eval("importPackage(com.comphenix.protocol.reflect);");
+		}
+	}
+	
+	/**
+	 * Determine if the filter engine has been successfully initialized.
+	 * @return TRUE if it has, FALSE otherwise.
+	 */
+	public boolean isInitialized() {
+		return engine != null;
+	}
+
+	private FilterFailedHandler getDefaultErrorHandler() {
+		// No need to create a new object every time
+		if (defaultFailedHandler == null) {
+			defaultFailedHandler = new FilterFailedHandler() {
+				@Override
+				public boolean handle(PacketEvent event, Filter filter, Exception ex) {
+					reporter.reportMinimal(plugin, "filterEvent(PacketEvent)", ex, event);
+					reporter.reportWarning(this, 
+							Report.newBuilder(REPORT_FILTER_REMOVED_FOR_ERROR).messageParam(filter.getName(), ex.getClass().getSimpleName())
+					);
+					return false;
+				}
+			};
+		}
+		return defaultFailedHandler;
+	}
+	
+	/**
+	 * Determine whether or not to pass the given packet event to the packet listeners.
+	 * <p>
+	 * Uses a default filter failure handler that simply prints the error message and removes the filter.
+	 * @param event - the event.
+	 * @return TRUE if we should, FALSE otherwise.
+	 */
+	public boolean filterEvent(PacketEvent event) {
+		return filterEvent(event, getDefaultErrorHandler());
+	}
+	
+	/**
+	 * Determine whether or not to pass the given packet event to the packet listeners.
+	 * @param event - the event.
+	 * @param handler - failure handler.
+	 * @return TRUE if we should, FALSE otherwise.
+	 * @throws FilterFailedException If one of the filters failed.
+	 */
+	public boolean filterEvent(PacketEvent event, FilterFailedHandler handler) {
+		for (Iterator<Filter> it = filters.iterator(); it.hasNext(); ) {
+			Filter filter = it.next();
+			
+			try {
+				if (!filter.evaluate(engine, event)) {
+					return false;
+				}
+			} catch (Exception ex) {
+				if (!handler.handle(event, filter, ex)) {
+					it.remove();
+				}
+			}
+		}
+		// Pass!
+		return true;
+	}
+
+	/**
+	 * Initialize the script engine if necessary.
+	 */
+	private void checkScriptStatus() {
+		// Start the engine
+		if (uninitialized) {
+			uninitialized = false;
+			initalizeScript();
+		}
+	}
+	
+	/*
+	 * Description: Adds or removes a simple packet filter.
+       Usage:       /<command> add|remove name [packet IDs]
+	 */
+	@Override
+	protected boolean handleCommand(CommandSender sender, String[] args) {
+		checkScriptStatus();
+		
+		if (!config.isDebug()) {
+			sender.sendMessage(ChatColor.RED + "Debug mode must be enabled in the configuration first!");
+			return true;
+		}
+		if (!isInitialized()) {
+			sender.sendMessage(ChatColor.RED + "JavaScript engine was not present. Filter system is disabled.");
+			return true;
+		}
+		
+		final SubCommand command = parseCommand(args, 0);
+		final String name = args[1];
+		
+		switch (command) {
+			case ADD:
+				// Never overwrite an existing filter
+				if (findFilter(name) != null) {
+					sender.sendMessage(ChatColor.RED + "Filter " + name + " already exists. Remove it first.");
+					return true;
+				}
+				
+				// Prepare the input to the packet type parser
+				Deque<String> rangeArguments = toQueue(args, 2);
+				
+				final PacketTypeParser parser = new PacketTypeParser();
+				final Set<PacketType> packets = parser.parseTypes(rangeArguments, PacketTypeParser.DEFAULT_MAX_RANGE);
+				sender.sendMessage("Enter filter program ('}' to complete or CANCEL):");
+				
+				// Make sure we can use the conversable interface
+				if (sender instanceof Conversable) {
+					final MultipleLinesPrompt prompt = 
+							new MultipleLinesPrompt(new CompilationSuccessCanceller(), "function(event, packet) {");
+					
+					new ConversationFactory(plugin).
+						withFirstPrompt(prompt).
+						withEscapeSequence("CANCEL").
+						withLocalEcho(false).
+						addConversationAbandonedListener(new ConversationAbandonedListener() {
+							@Override
+							public void conversationAbandoned(ConversationAbandonedEvent event) {
+								try {
+									final Conversable whom = event.getContext().getForWhom();
+									
+									if (event.gracefulExit()) {
+										String predicate = prompt.removeAccumulatedInput(event.getContext());
+										Filter filter = new Filter(name, predicate, packets);
+	
+										// Print the last line as well
+										whom.sendRawMessage(prompt.getPromptText(event.getContext()));
+										
+										try {
+											// Force early compilation
+											filter.compile(engine);
+											
+											filters.add(filter);
+											whom.sendRawMessage(ChatColor.GOLD + "Added filter " + name);
+										} catch (ScriptException e) {
+											e.printStackTrace();
+											whom.sendRawMessage(ChatColor.GOLD + "Compilation error: " + e.getMessage());
+										}
+									} else {
+										// Too bad
+										whom.sendRawMessage(ChatColor.RED + "Cancelled filter.");
+									}
+								} catch (Exception e) {
+									reporter.reportDetailed(this, 
+											Report.newBuilder(REPORT_CANNOT_HANDLE_CONVERSATION).error(e).callerParam(event)
+									);
+								}
+							}
+						}).
+						buildConversation((Conversable) sender).
+						begin();
+				} else {
+					sender.sendMessage(ChatColor.RED + "Only console and players are supported!");
+				}
+				
+				break;
+				
+			case REMOVE:
+				Filter filter = findFilter(name);
+				
+				// See if it exists before we remove it
+				if (filter != null) {
+					filter.close(engine);
+					filters.remove(filter);
+					sender.sendMessage(ChatColor.GOLD + "Removed filter " + name);
+				} else {
+					sender.sendMessage(ChatColor.RED + "Unable to find a filter by the name " + name);
+				}
+				break;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Lookup a filter by its name.
+	 * @param name - the filter name.
+	 * @return The filter, or NULL if not found.
+	 */
+	private Filter findFilter(String name) {
+		// We'll just use a linear scan for now - we don't expect that many filters
+		for (Filter filter : filters) {
+			if (filter.getName().equalsIgnoreCase(name)) {
+				return filter;
+			}
+		}
+		return null;
+	}
+	
+	private SubCommand parseCommand(String[] args, int index) {
+		String text = args[index].toUpperCase();
+		
+		try {
+			return SubCommand.valueOf(text);
+		} catch (IllegalArgumentException e) {
+			throw new IllegalArgumentException(text + " is not a valid sub command. Must be add or remove.", e);
+		}
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java

@@ -0,0 +1,547 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import net.sf.cglib.proxy.Factory;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.concurrency.PacketTypeSet;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.events.ListeningWhitelist;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.PrettyPrinter;
+import com.comphenix.protocol.reflect.PrettyPrinter.ObjectPrinter;
+import com.comphenix.protocol.utility.ChatExtensions;
+import com.comphenix.protocol.utility.HexDumper;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.BukkitConverters;
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Sets;
+
+/**
+ * Handles the "packet" debug command.
+ * 
+ * @author Kristian
+ */
+class CommandPacket extends CommandBase {
+	public static final ReportType REPORT_CANNOT_SEND_MESSAGE = new ReportType("Cannot send chat message.");
+
+	private enum SubCommand {
+		ADD, REMOVE, NAMES, PAGE;
+	}
+	
+	/**
+	 * Name of this command.
+	 */
+	public static final String NAME = "packet";
+
+	/**
+	 * Number of lines per page.
+	 */
+	public static final int PAGE_LINE_COUNT = 9;
+	
+	/**
+	 * Number of bytes before we do a hex dump.
+	 */
+	private static final int HEX_DUMP_THRESHOLD = 256;
+	
+	private Plugin plugin;
+	private Logger logger;
+	private ProtocolManager manager;
+		
+	private ChatExtensions chatter;
+	
+	// The main parser
+	private PacketTypeParser typeParser = new PacketTypeParser();
+	
+	// Paged message
+	private Map<CommandSender, List<String>> pagedMessage = new WeakHashMap<CommandSender, List<String>>();
+	
+	// Current registered packet types
+	private PacketTypeSet packetTypes = new PacketTypeSet();
+	private PacketTypeSet extendedTypes = new PacketTypeSet();
+	
+	// Compare listeners
+	private PacketTypeSet compareTypes = new PacketTypeSet();
+	private Map<PacketEvent, String> originalPackets = new MapMaker().weakKeys().makeMap();
+	
+	// The packet listener
+	private PacketListener listener;
+	
+	// Compare listener
+	private PacketListener compareListener;
+	
+	// Filter packet events
+	private CommandFilter filter;
+	
+	public CommandPacket(ErrorReporter reporter, Plugin plugin, Logger logger, CommandFilter filter, ProtocolManager manager) {
+		super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 1);
+		this.plugin = plugin;
+		this.logger = logger;
+		this.manager = manager;
+		this.filter = filter;
+		this.chatter = new ChatExtensions(manager);
+	}
+
+	/**
+	 * Send a message without invoking the packet listeners.
+	 * @param receiver - the player to send it to.
+	 * @param message - the message to send.
+	 * @return TRUE if the message was sent successfully, FALSE otherwise.
+	 */
+	public void sendMessageSilently(CommandSender receiver, String message) {
+		try {
+			chatter.sendMessageSilently(receiver, message);
+		} catch (InvocationTargetException e) {
+			reporter.reportDetailed(this, 
+					Report.newBuilder(REPORT_CANNOT_SEND_MESSAGE).error(e).callerParam(receiver, message)
+			);
+		}
+	}
+	
+	/**
+	 * Broadcast a message without invoking any packet listeners.
+	 * @param message - message to send.
+	 * @param permission - permission required to receieve the message. NULL to target everyone.
+	 */
+	public void broadcastMessageSilently(String message, String permission) {
+		try {
+			chatter.broadcastMessageSilently(message, permission);
+		} catch (InvocationTargetException e) {
+			reporter.reportDetailed(this, 
+					Report.newBuilder(REPORT_CANNOT_SEND_MESSAGE).error(e).callerParam(message, permission)
+			);
+		}
+	}
+	
+	private void printPage(CommandSender sender, int pageIndex) {
+		List<String> paged = pagedMessage.get(sender);
+		
+		// Make sure the player has any pages
+		if (paged != null) {
+			int lastPage = ((paged.size() - 1) / PAGE_LINE_COUNT) + 1;
+			
+			for (int i = PAGE_LINE_COUNT * (pageIndex - 1); i < PAGE_LINE_COUNT * pageIndex; i++) {
+				if (i < paged.size()) {
+					sendMessageSilently(sender, " " + paged.get(i));
+				}
+			}
+			
+			// More data?
+			if (pageIndex < lastPage) {
+				sendMessageSilently(sender, "Send /packet page " + (pageIndex + 1) + " for the next page.");
+			}
+			
+		} else {
+			sendMessageSilently(sender, ChatColor.RED + "No pages found.");
+		}
+	}
+	
+	/*
+	 * Description: Adds or removes a simple packet listener.
+       Usage:       /<command> add|remove client|server|both [ID start] [ID stop] [detailed] 
+	 */
+	@Override
+	protected boolean handleCommand(CommandSender sender, String[] args) {
+		try {
+			Deque<String> arguments = new ArrayDeque<String>(Arrays.asList(args));
+			SubCommand subCommand = parseCommand(arguments);
+
+			// Commands with different parameters
+			if (subCommand == SubCommand.PAGE) {
+				if (args.length <= 1) {
+					sendMessageSilently(sender, ChatColor.RED + "Must specify a page index.");
+					return true;
+				}
+				
+				int page = Integer.parseInt(args[1]);
+				
+				if (page > 0)
+					printPage(sender, page);
+				else
+					sendMessageSilently(sender, ChatColor.RED + "Page index must be greater than zero.");
+				return true;
+			}
+			
+			Set<PacketType> types = typeParser.parseTypes(arguments, PacketTypeParser.DEFAULT_MAX_RANGE);
+			Boolean detailed = parseBoolean(arguments, "detailed");
+			Boolean compare = parseBoolean(arguments, "compare");
+			
+			// Notify user
+			if (typeParser.getLastProtocol() == null) {
+				sender.sendMessage(ChatColor.YELLOW + "Warning: Missing protocol (PLAY, etc) - assuming legacy IDs.");
+			}
+			if (arguments.size() > 0) {
+				throw new IllegalArgumentException("Cannot parse " + arguments);
+			}
+		
+			// The last elements are optional
+			if (detailed == null) {
+				detailed = false;
+			}
+			if (compare == null) {
+				compare = false;
+			} else {
+				// This is implied - we cannot compare content without going detailed
+				detailed = true;
+			}
+
+			// Perform commands
+			if (subCommand == SubCommand.ADD) {
+				// The add command is dangerous - don't default on the connection side
+				if (args.length == 1) {
+					sender.sendMessage(ChatColor.RED + "Please specify a connection side.");
+					return false;
+				}
+				
+				executeAddCommand(sender, types, detailed, compare);
+			} else if (subCommand == SubCommand.REMOVE) {
+				executeRemoveCommand(sender, types);
+			} else if (subCommand == SubCommand.NAMES) {
+				executeNamesCommand(sender, types);
+			}
+			
+		} catch (NumberFormatException e) {
+			sendMessageSilently(sender, ChatColor.RED + "Cannot parse number: " + e.getMessage());
+		} catch (IllegalArgumentException e) {
+			sendMessageSilently(sender, ChatColor.RED + e.getMessage());
+		}
+		
+		return true;
+	}
+	
+	private void executeAddCommand(CommandSender sender, Set<PacketType> addition, boolean detailed, boolean compare) {
+		packetTypes.addAll(addition);
+		
+		// Also mark these types as "detailed"
+		if (detailed) {
+			extendedTypes.addAll(addition);
+		}
+		// Whether or not to compare the packet with the initial state
+		if (compare) {
+			compareTypes.addAll(addition);
+		}
+		
+		updatePacketListener();
+		sendMessageSilently(sender, ChatColor.YELLOW + "Added listener " + getWhitelistInfo(listener));
+	}
+	
+	private void executeRemoveCommand(CommandSender sender, Set<PacketType> removal) {
+		packetTypes.removeAll(removal);
+		extendedTypes.removeAll(removal);
+		compareTypes.removeAll(removal);
+		updatePacketListener();
+		sendMessageSilently(sender, ChatColor.YELLOW + "Removing packet types.");
+	}
+	
+	private void executeNamesCommand(CommandSender sender, Set<PacketType> types) {
+		List<String> messages = new ArrayList<String>();
+		
+		// Print the equivalent name of every given ID
+		for (PacketType type : types) {
+			messages.add(ChatColor.YELLOW + type.toString());
+		}
+		
+		if (sender instanceof Player && messages.size() > 0 && messages.size() > PAGE_LINE_COUNT) {
+			// Divide the messages into chuncks
+			pagedMessage.put(sender, messages);
+			printPage(sender, 1);
+			
+		} else {
+			// Just print the damn thing
+			for (String message : messages) {
+				sendMessageSilently(sender, message);
+			}
+		}
+	}
+
+	/**
+	 * Retrieve whitelist information about a given listener.
+	 * @param listener - the given listener.
+	 * @return Whitelist information.
+	 */
+	private String getWhitelistInfo(PacketListener listener) {
+		boolean sendingEmpty = ListeningWhitelist.isEmpty(listener.getSendingWhitelist());
+		boolean receivingEmpty = ListeningWhitelist.isEmpty(listener.getReceivingWhitelist());
+		
+		if (!sendingEmpty && !receivingEmpty)
+			return String.format("Sending: %s, Receiving: %s", listener.getSendingWhitelist(), listener.getReceivingWhitelist());
+		else if (!sendingEmpty)
+			return listener.getSendingWhitelist().toString();
+		else if (!receivingEmpty)
+			return listener.getReceivingWhitelist().toString();
+		else
+			return "[None]";
+	}
+		
+	private Set<PacketType> filterTypes(Set<PacketType> types, Sender sender) {
+		Set<PacketType> result = Sets.newHashSet();
+		
+		for (PacketType type : types) {
+			if (type.getSender() == sender) {
+				result.add(type);
+			}
+		}
+		return result;
+	}
+	
+	public PacketListener createPacketListener(Set<PacketType> type) {
+		final ListeningWhitelist serverList = ListeningWhitelist.newBuilder().
+				types(filterTypes(type, Sender.SERVER)).
+				gamePhaseBoth().
+				monitor().
+				build();
+		
+		final ListeningWhitelist clientList = ListeningWhitelist.newBuilder(serverList).
+				types(filterTypes(type, Sender.CLIENT)).
+				monitor().
+				build();
+		
+		return new PacketListener() {
+			@Override
+			public void onPacketSending(PacketEvent event) {
+				if (filter.filterEvent(event)) {
+					printInformation(event);
+				}
+			}
+			
+			@Override
+			public void onPacketReceiving(PacketEvent event) {
+				if (filter.filterEvent(event)) {
+					printInformation(event);
+				}
+			}
+			
+			private void printInformation(PacketEvent event) {
+				String verb = event.isServerPacket() ? "Sent" : "Received";
+				String format = event.isServerPacket() ? 
+						"%s %s to %s" : 
+						"%s %s from %s";
+				
+				String shortDescription = String.format(format,
+						event.isCancelled() ? "Cancelled" : verb,
+						event.getPacketType(),
+						event.getPlayer().getName()
+				);
+				
+				// Detailed will print the packet's content too
+				if (extendedTypes.contains(event.getPacketType())) {
+					try {
+						String original = originalPackets.remove(event);
+						
+						// Also print original
+						if (original != null) {
+							logger.info("Initial packet:\n" + original + " -> ");
+						}
+						
+						logger.info(shortDescription + ":\n" + getPacketDescription(
+							event.getPacket())
+						);
+					} catch (IllegalAccessException e) {
+						logger.log(Level.WARNING, "Unable to use reflection.", e);
+					}
+				} else {
+					logger.info(shortDescription + ".");
+				}
+			}
+			
+			@Override
+			public ListeningWhitelist getSendingWhitelist() {
+				return serverList;
+			}
+			
+			@Override
+			public ListeningWhitelist getReceivingWhitelist() {
+				return clientList;
+			}
+			
+			@Override
+			public Plugin getPlugin() {
+				return plugin;
+			}
+		};
+	}
+	
+	public PacketListener createCompareListener(Set<PacketType> type) {
+		final ListeningWhitelist serverList = ListeningWhitelist.newBuilder().
+				types(filterTypes(type, Sender.SERVER)).
+				gamePhaseBoth().
+				lowest().
+				build();
+		
+		final ListeningWhitelist clientList = ListeningWhitelist.newBuilder(serverList).
+				types(filterTypes(type, Sender.CLIENT)).
+				lowest().
+				build();
+		
+		return new PacketListener() {
+			@Override
+			public void onPacketSending(PacketEvent event) {
+				savePacketState(event);
+			}
+			
+			@Override
+			public void onPacketReceiving(PacketEvent event) {
+				savePacketState(event);
+			}
+			
+			/**
+			 * Save the original value.
+			 * @param event - the event with the packet to save.
+			 */
+			private void savePacketState(PacketEvent event) {
+				try {
+					originalPackets.put(event, getPacketDescription(event.getPacket()));
+				} catch (IllegalAccessException e) {
+					throw new RuntimeException("Cannot read packet.", e);
+				}
+			}
+			
+			@Override
+			public ListeningWhitelist getSendingWhitelist() {
+				return serverList;
+			}
+			
+			@Override
+			public ListeningWhitelist getReceivingWhitelist() {
+				return clientList;
+			}
+			
+			@Override
+			public Plugin getPlugin() {
+				return plugin;
+			}
+		};
+	}
+	
+	/**
+	 * Retrieve a detailed string representation of the given packet.
+	 * @param packetContainer - the packet to describe. 
+	 * @return The detailed description.
+	 * @throws IllegalAccessException An error occured.
+	 */
+	public String getPacketDescription(PacketContainer packetContainer) throws IllegalAccessException {
+		Object packet = packetContainer.getHandle();
+		Class<?> clazz = packet.getClass();
+		
+		// Get the first Minecraft super class
+		while (clazz != null && clazz != Object.class &&
+				(!MinecraftReflection.isMinecraftClass(clazz) || 
+				 Factory.class.isAssignableFrom(clazz))) {
+			clazz = clazz.getSuperclass();
+		}
+		
+		return PrettyPrinter.printObject(packet, clazz, MinecraftReflection.getPacketClass(), PrettyPrinter.RECURSE_DEPTH, new ObjectPrinter() {
+			@Override
+			public boolean print(StringBuilder output, Object value) {
+				// Special case
+				if (value instanceof byte[]) {
+					byte[] data = (byte[]) value;
+					
+					if (data.length > HEX_DUMP_THRESHOLD) {
+						output.append("[");
+						HexDumper.defaultDumper().appendTo(output, data);
+						output.append("]");
+						return true;
+					}
+				} else if (value != null) {
+					EquivalentConverter<Object> converter = findConverter(value.getClass());
+
+					if (converter != null) {
+						output.append(converter.getSpecific(value));
+						return true;
+					}
+				}
+				return false;
+			}
+		});
+	}
+	
+	/**
+	 * Retrieve the closest equivalent converter to a specific class.
+	 * @param clazz - the class.
+	 * @return The closest converter, or NULL if not found,
+	 */
+	private EquivalentConverter<Object> findConverter(Class<?> clazz) {
+		Map<Class<?>, EquivalentConverter<Object>> converters = BukkitConverters.getConvertersForGeneric();
+		
+		while (clazz != null) {
+			EquivalentConverter<Object> result = converters.get(clazz);
+			
+			if (result != null)
+				return result;
+			else
+				clazz = clazz.getSuperclass();
+		}
+		return null;
+	}
+		
+	public PacketListener updatePacketListener() {
+		if (listener != null) {
+			manager.removePacketListener(listener);
+		}
+		if (compareListener != null) {
+			manager.removePacketListener(compareListener);
+		}
+		
+		// Register the new listeners 
+		listener = createPacketListener(packetTypes.values());
+		compareListener = createCompareListener(compareTypes.values());
+		manager.addPacketListener(listener);
+		manager.addPacketListener(compareListener);
+		return listener;
+	}
+	
+	private SubCommand parseCommand(Deque<String> arguments) {
+		String text = arguments.poll().toLowerCase();
+		
+		// Parse this too
+		if ("add".startsWith(text))
+			return SubCommand.ADD;
+		else if ("remove".startsWith(text))
+			return SubCommand.REMOVE;
+		else if ("names".startsWith(text)) 
+			return SubCommand.NAMES;
+		else if ("page".startsWith(text)) 
+			return SubCommand.PAGE;
+		else
+			throw new IllegalArgumentException(text + " is not a valid sub command. Must be add or remove.");
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java

@@ -0,0 +1,146 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.timing.TimedListenerManager;
+import com.comphenix.protocol.timing.TimingReportGenerator;
+
+/**
+ * Handles the "protocol" administration command.
+ *
+ * @author Kristian
+ */
+class CommandProtocol extends CommandBase {
+	/**
+	 * Name of this command.
+	 */
+	public static final String NAME = "protocol";
+
+	private Plugin plugin;
+	private ProtocolConfig config;
+
+	public CommandProtocol(ErrorReporter reporter, Plugin plugin, ProtocolConfig config) {
+		super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 1);
+		this.plugin = plugin;
+		this.config = config;
+	}
+
+	@Override
+	protected boolean handleCommand(CommandSender sender, String[] args) {
+		String subCommand = args[0];
+
+		// Only return TRUE if we executed the correct command
+		if (subCommand.equalsIgnoreCase("config") || subCommand.equalsIgnoreCase("reload"))
+			reloadConfiguration(sender);
+		else if (subCommand.equalsIgnoreCase("timings"))
+			toggleTimings(sender, args);
+		else if (subCommand.equalsIgnoreCase("listeners"))
+			printListeners(sender, args);
+		else
+			return false;
+		return true;
+	}
+
+	// Display every listener on the server
+	private void printListeners(final CommandSender sender, String[] args) {
+		ProtocolManager manager = ProtocolLibrary.getProtocolManager();
+
+		for (PacketListener listener : manager.getPacketListeners()) {
+			sender.sendMessage(ChatColor.GOLD + "Packet listeners:");
+			sender.sendMessage(ChatColor.GOLD + " " + listener);
+		}
+		// Along with every asynchronous listener
+		for (PacketListener listener : manager.getAsynchronousManager().getAsyncHandlers()) {
+			sender.sendMessage(ChatColor.GOLD + "Asynchronous listeners:");
+			sender.sendMessage(ChatColor.GOLD + " " + listener);
+		}
+	}
+
+	private void toggleTimings(CommandSender sender, String[] args) {
+		TimedListenerManager manager = TimedListenerManager.getInstance();
+		boolean state = !manager.isTiming(); // toggle
+
+		// Parse the boolean parameter
+		if (args.length == 2) {
+			Boolean parsed = parseBoolean(toQueue(args, 2), "start");
+
+			if (parsed != null) {
+				state = parsed;
+			} else {
+				sender.sendMessage(ChatColor.RED + "Specify a state: ON or OFF.");
+				return;
+			}
+		} else if (args.length > 2) {
+			sender.sendMessage(ChatColor.RED + "Too many parameters.");
+			return;
+		}
+
+		// Now change the state
+		if (state) {
+			if (manager.startTiming())
+				sender.sendMessage(ChatColor.GOLD + "Started timing packet listeners.");
+			else
+				sender.sendMessage(ChatColor.RED + "Packet timing already started.");
+		} else {
+			if (manager.stopTiming()) {
+				saveTimings(manager);
+				sender.sendMessage(ChatColor.GOLD + "Stopped and saved result in plugin folder.");
+			} else {
+				sender.sendMessage(ChatColor.RED + "Packet timing already stopped.");
+			}
+ 		}
+	}
+
+	private void saveTimings(TimedListenerManager manager) {
+		try {
+			File destination = new File(plugin.getDataFolder(), "Timings - " + System.currentTimeMillis() + ".txt");
+			TimingReportGenerator generator = new TimingReportGenerator();
+
+			// Print to a text file
+			generator.saveTo(destination, manager);
+			manager.clear();
+
+		} catch (IOException e) {
+			reporter.reportMinimal(plugin, "saveTimings()", e);
+		}
+	}
+
+	/**
+	 * Prevent further automatic updates until the next delay.
+	 */
+	public void updateFinished() {
+		long currentTime = System.currentTimeMillis() / ProtocolLibrary.MILLI_PER_SECOND;
+
+		config.setAutoLastTime(currentTime);
+		config.saveAll();
+	}
+
+	public void reloadConfiguration(CommandSender sender) {
+		plugin.reloadConfig();
+		sender.sendMessage(ChatColor.YELLOW + "Reloaded configuration!");
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/MultipleLinesPrompt.java

@@ -0,0 +1,163 @@
+package com.comphenix.protocol;
+
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationCanceller;
+import org.bukkit.conversations.ConversationContext;
+import org.bukkit.conversations.ExactMatchConversationCanceller;
+import org.bukkit.conversations.Prompt;
+import org.bukkit.conversations.StringPrompt;
+
+/**
+ * Represents a conversation prompt that accepts a list of lines.
+ * 
+ * @author Kristian
+ */
+class MultipleLinesPrompt extends StringPrompt {
+	/**
+	 * Represents a canceller that determines if the multiple lines prompt is finished.
+	 * @author Kristian
+	 */
+	public static interface MultipleConversationCanceller extends ConversationCanceller {
+		@Override
+		public boolean cancelBasedOnInput(ConversationContext context, String currentLine);
+
+		/**
+		 * Determine if the current prompt is done based on the context, last
+		 * line and collected lines.
+		 * 
+		 * @param context - current context.
+		 * @param currentLine - current (last) line.
+		 * @param lines - collected lines.
+		 * @param lineCount - number of lines.
+		 * @return TRUE if we are done, FALSE otherwise.
+		 */
+		public boolean cancelBasedOnInput(ConversationContext context, String currentLine, 
+										  StringBuilder lines, int lineCount);
+	}
+
+	/**
+	 * A wrapper class for turning a ConversationCanceller into a MultipleConversationCanceller.
+	 * @author Kristian
+	 */
+	private static class MultipleWrapper implements MultipleConversationCanceller {
+		private ConversationCanceller canceller;
+
+		public MultipleWrapper(ConversationCanceller canceller) {
+			this.canceller = canceller;
+		}
+		
+		@Override
+		public boolean cancelBasedOnInput(ConversationContext context, String currentLine) {
+			return canceller.cancelBasedOnInput(context, currentLine);
+		}
+		
+		@Override
+		public boolean cancelBasedOnInput(ConversationContext context, String currentLine, 
+										  StringBuilder lines, int lineCount) {
+			return cancelBasedOnInput(context, currentLine);
+		}
+
+		@Override
+		public void setConversation(Conversation conversation) {
+			canceller.setConversation(conversation);
+		}
+		
+		@Override
+		public MultipleWrapper clone() {
+			return new MultipleWrapper(canceller.clone());
+		}
+	}
+
+	// Feels a bit like Android
+	private static final String KEY = "multiple_lines_prompt";
+	private static final String KEY_LAST = KEY + ".last_line";
+	private static final String KEY_LINES = KEY + ".linecount";
+
+	private final MultipleConversationCanceller endMarker;
+	private final String initialPrompt;
+
+	/**
+	 * Retrieve and remove the current accumulated input.
+	 * 
+	 * @param context
+	 *            - conversation context.
+	 * @return The accumulated input, or NULL if not found.
+	 */
+	public String removeAccumulatedInput(ConversationContext context) {
+		Object result = context.getSessionData(KEY);
+
+		if (result instanceof StringBuilder) {
+			context.setSessionData(KEY, null);
+			context.setSessionData(KEY_LINES, null);
+			return ((StringBuilder) result).toString();
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Construct a multiple lines input prompt with a specific end marker.
+	 * <p>
+	 * This is usually an empty string.
+	 * 
+	 * @param endMarker - the end marker.
+	 */
+	public MultipleLinesPrompt(String endMarker, String initialPrompt) {
+		this(new ExactMatchConversationCanceller(endMarker), initialPrompt);
+	}
+
+	/**
+	 * Construct a multiple lines input prompt with a specific end marker implementation.
+	 * <p>
+	 * Note: Use {@link #MultipleLinesPrompt(MultipleConversationCanceller, String)} if implementing a custom canceller.
+	 * @param endMarker - the end marker.
+	 * @param initialPrompt - the initial prompt text.
+	 */
+	public MultipleLinesPrompt(ConversationCanceller endMarker, String initialPrompt) {
+		this.endMarker = new MultipleWrapper(endMarker);
+		this.initialPrompt = initialPrompt;
+	}
+	
+	/**
+	 * Construct a multiple lines input prompt with a specific end marker implementation.
+	 * @param endMarker - the end marker.
+	 * @param initialPrompt - the initial prompt text.
+	 */
+	public MultipleLinesPrompt(MultipleConversationCanceller endMarker, String initialPrompt) {
+		this.endMarker = endMarker;
+		this.initialPrompt = initialPrompt;
+	}
+
+	@Override
+	public Prompt acceptInput(ConversationContext context, String in) {
+		StringBuilder result = (StringBuilder) context.getSessionData(KEY);
+		Integer count = (Integer) context.getSessionData(KEY_LINES);
+		
+		// Handle first run
+		if (result == null) 
+			context.setSessionData(KEY, result = new StringBuilder());
+		if (count == null)
+			count = 0;
+		
+		// Save the last line as well
+		context.setSessionData(KEY_LAST, in);
+		context.setSessionData(KEY_LINES, ++count);
+		result.append(in + "\n");
+
+		// And we're done
+		if (endMarker.cancelBasedOnInput(context, in, result, count))
+			return Prompt.END_OF_CONVERSATION;
+		else
+			return this;
+	}
+
+	@Override
+	public String getPromptText(ConversationContext context) {
+		Object last = context.getSessionData(KEY_LAST);
+
+		if (last instanceof String)
+			return (String) last;
+		else
+			return initialPrompt;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/PacketStream.java

@@ -21,6 +21,8 @@ import java.lang.reflect.InvocationTargetException;
 
 import org.bukkit.entity.Player;
 
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketContainer;
 
 /**
@@ -29,25 +31,36 @@ import com.comphenix.protocol.events.PacketContainer;
  * @author Kristian
  */
 public interface PacketStream {
-	
 	/**
 	 * Send a packet to the given player.
-	 * @param reciever - the reciever.
+	 * @param receiver - the reciever.
 	 * @param packet - packet to send.
 	 * @throws InvocationTargetException - if an error occured when sending the packet.
 	 */
-	public void sendServerPacket(Player reciever, PacketContainer packet) 
+	public void sendServerPacket(Player receiver, PacketContainer packet) 
 			throws InvocationTargetException;
 
 	/**
 	 * Send a packet to the given player.
-	 * @param reciever - the reciever.
+	 * @param receiver - the reciever.
 	 * @param packet - packet to send.
-	 * @param filters - whether or not to invoke any packet filters.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
 	 * @throws InvocationTargetException - if an error occured when sending the packet.
 	 */
-	public void sendServerPacket(Player reciever, PacketContainer packet, boolean filters)
+	public void sendServerPacket(Player receiver, PacketContainer packet, boolean filters)
 			throws InvocationTargetException;
+	
+	/**
+	 * Send a packet to the given player.
+	 * @param receiver - the receiver.
+	 * @param packet - packet to send.
+	 * @param marker - the network marker to use.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
+	 * @throws InvocationTargetException - if an error occured when sending the packet.
+	 */
+	public void sendServerPacket(Player receiver, PacketContainer packet, NetworkMarker marker, boolean filters)
+			throws InvocationTargetException;
+
 
 	/**
 	 * Simulate recieving a certain packet from a given player.
@@ -63,10 +76,22 @@ public interface PacketStream {
 	 * Simulate recieving a certain packet from a given player.
 	 * @param sender - the sender.
 	 * @param packet - the packet that was sent.
-	 * @param filters - whether or not to invoke any packet filters.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
 	 * @throws InvocationTargetException If the reflection machinery failed.
 	 * @throws IllegalAccessException If the underlying method caused an error.
 	 */
 	public void recieveClientPacket(Player sender, PacketContainer packet, boolean filters)
 			throws IllegalAccessException, InvocationTargetException;
+	
+	/**
+	 * Simulate recieving a certain packet from a given player.
+	 * @param sender - the sender.
+	 * @param packet - the packet that was sent.
+	 * @param marker - the network marker to use.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
+	 * @throws InvocationTargetException If the reflection machinery failed.
+	 * @throws IllegalAccessException If the underlying method caused an error.
+	 */
+	public void recieveClientPacket(Player sender, PacketContainer packet, NetworkMarker marker, boolean filters)
+			throws IllegalAccessException, InvocationTargetException;
 }

ProtocolLib/src/main/java/com/comphenix/protocol/PacketType.java

@@ -0,0 +1,951 @@
+package com.comphenix.protocol;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+import org.bukkit.Bukkit;
+
+import com.comphenix.protocol.annotations.Spigot;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.comphenix.protocol.reflect.ObjectEnum;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+
+/**
+ * Represents the type of a packet in a specific protocol.
+ * <p>
+ * Note that vanilla Minecraft reuses packet IDs per protocol (ping, game, login), so you cannot
+ * rely on IDs alone.
+ * @author Kristian
+ */
+public class PacketType implements Serializable, Comparable<PacketType> {
+	// Increment whenever the type changes
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Represents an unknown legacy packet ID.
+	 */
+	public static final int UNKNOWN_PACKET = -1;
+
+	/**
+	 * Packets sent during handshake.
+	 * @author Kristian
+	 */
+	public static class Handshake {
+		private static final Protocol PROTOCOL = Protocol.HANDSHAKING;
+
+		/**
+		 * Incoming packets.
+		 * @author Kristian
+		 */
+		public static class Client extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+			/**
+			 * Legacy name: HANDSHAKE.
+			 */
+			public static final PacketType SET_PROTOCOL =             new PacketType(PROTOCOL, SENDER, 0x00, 2);
+
+			private final static Client INSTANCE = new Client();
+
+			// Prevent accidental construction
+			private Client() { super(PacketType.class); }
+
+			public static Client getInstance() {
+				return INSTANCE;
+			}
+			public static Sender getSender() {
+				return SENDER;
+			}
+		}
+
+		/**
+		 * An empty enum, as the server will not send any packets in this protocol.
+		 * @author Kristian
+		 */
+		public static class Server extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+			private final static Server INSTANCE = new Server();
+			private Server() { super(PacketType.class); }
+
+			public static Server getInstance() {
+				return INSTANCE;
+			}
+			public static Sender getSender() {
+				return SENDER;
+			}
+		}
+
+		public static Protocol getProtocol() {
+			return PROTOCOL;
+		}
+	}
+
+	/**
+	 * Packets sent and received when logged into the game.
+	 * @author Kristian
+	 */
+	public static class Play {
+		private static final Protocol PROTOCOL = Protocol.PLAY;
+
+		/**
+		 * Outgoing packets.
+		 * @author Kristian
+		 */
+		public static class Server extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.SERVER;
+
+			public static final PacketType KEEP_ALIVE =               new PacketType(PROTOCOL, SENDER, 0x00, 0);
+			public static final PacketType LOGIN =                    new PacketType(PROTOCOL, SENDER, 0x01, 1);
+			public static final PacketType CHAT =                     new PacketType(PROTOCOL, SENDER, 0x02, 3);
+			public static final PacketType UPDATE_TIME =              new PacketType(PROTOCOL, SENDER, 0x03, 4);
+			public static final PacketType ENTITY_EQUIPMENT =         new PacketType(PROTOCOL, SENDER, 0x04, 5);
+			public static final PacketType SPAWN_POSITION =           new PacketType(PROTOCOL, SENDER, 0x05, 6);
+			public static final PacketType UPDATE_HEALTH =            new PacketType(PROTOCOL, SENDER, 0x06, 8);
+			public static final PacketType RESPAWN =                  new PacketType(PROTOCOL, SENDER, 0x07, 9);
+			public static final PacketType POSITION =                 new PacketType(PROTOCOL, SENDER, 0x08, 13);
+			public static final PacketType HELD_ITEM_SLOT =           new PacketType(PROTOCOL, SENDER, 0x09, 16);
+            /**
+             * Note that this was Packets.Server.ENTITY_LOCATION_ACTION.
+             */
+			public static final PacketType BED =                      new PacketType(PROTOCOL, SENDER, 0x0A, 17);
+			public static final PacketType ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x0B, 18);
+			public static final PacketType NAMED_ENTITY_SPAWN =       new PacketType(PROTOCOL, SENDER, 0x0C, 20);
+			public static final PacketType COLLECT =                  new PacketType(PROTOCOL, SENDER, 0x0D, 22);
+			public static final PacketType SPAWN_ENTITY =             new PacketType(PROTOCOL, SENDER, 0x0E, 23);
+			public static final PacketType SPAWN_ENTITY_LIVING =      new PacketType(PROTOCOL, SENDER, 0x0F, 24);
+			public static final PacketType SPAWN_ENTITY_PAINTING =    new PacketType(PROTOCOL, SENDER, 0x10, 25);
+			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =
+			                                                          new PacketType(PROTOCOL, SENDER, 0x11, 26);
+			public static final PacketType ENTITY_VELOCITY =          new PacketType(PROTOCOL, SENDER, 0x12, 28);
+			public static final PacketType ENTITY_DESTROY =           new PacketType(PROTOCOL, SENDER, 0x13, 29);
+			public static final PacketType ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x14, 30);
+			public static final PacketType REL_ENTITY_MOVE =          new PacketType(PROTOCOL, SENDER, 0x15, 31);
+			public static final PacketType ENTITY_LOOK =              new PacketType(PROTOCOL, SENDER, 0x16, 32);
+			public static final PacketType ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x17, 33);
+			public static final PacketType ENTITY_TELEPORT =          new PacketType(PROTOCOL, SENDER, 0x18, 34);
+			public static final PacketType ENTITY_HEAD_ROTATION =     new PacketType(PROTOCOL, SENDER, 0x19, 35);
+			public static final PacketType ENTITY_STATUS =            new PacketType(PROTOCOL, SENDER, 0x1A, 38);
+			public static final PacketType ATTACH_ENTITY =            new PacketType(PROTOCOL, SENDER, 0x1B, 39);
+			public static final PacketType ENTITY_METADATA =          new PacketType(PROTOCOL, SENDER, 0x1C, 40);
+			public static final PacketType ENTITY_EFFECT =            new PacketType(PROTOCOL, SENDER, 0x1D, 41);
+			public static final PacketType REMOVE_ENTITY_EFFECT =     new PacketType(PROTOCOL, SENDER, 0x1E, 42);
+			public static final PacketType EXPERIENCE =               new PacketType(PROTOCOL, SENDER, 0x1F, 43);
+			public static final PacketType UPDATE_ATTRIBUTES =        new PacketType(PROTOCOL, SENDER, 0x20, 44);
+			public static final PacketType MAP_CHUNK =                new PacketType(PROTOCOL, SENDER, 0x21, 51);
+			public static final PacketType MULTI_BLOCK_CHANGE =       new PacketType(PROTOCOL, SENDER, 0x22, 52);
+			public static final PacketType BLOCK_CHANGE =             new PacketType(PROTOCOL, SENDER, 0x23, 53);
+			public static final PacketType BLOCK_ACTION =             new PacketType(PROTOCOL, SENDER, 0x24, 54);
+			public static final PacketType BLOCK_BREAK_ANIMATION =    new PacketType(PROTOCOL, SENDER, 0x25, 55);
+			public static final PacketType MAP_CHUNK_BULK =           new PacketType(PROTOCOL, SENDER, 0x26, 56);
+			public static final PacketType EXPLOSION =                new PacketType(PROTOCOL, SENDER, 0x27, 60);
+			public static final PacketType WORLD_EVENT =              new PacketType(PROTOCOL, SENDER, 0x28, 61);
+			public static final PacketType NAMED_SOUND_EFFECT =       new PacketType(PROTOCOL, SENDER, 0x29, 62);
+			public static final PacketType WORLD_PARTICLES =          new PacketType(PROTOCOL, SENDER, 0x2A, 63);
+			/**
+			 * Note that this was Packets.Server.BED.
+			 */
+			public static final PacketType GAME_STATE_CHANGE =        new PacketType(PROTOCOL, SENDER, 0x2B, 70);
+			public static final PacketType SPAWN_ENTITY_WEATHER =     new PacketType(PROTOCOL, SENDER, 0x2C, 71);
+			public static final PacketType OPEN_WINDOW =              new PacketType(PROTOCOL, SENDER, 0x2D, 100);
+			public static final PacketType CLOSE_WINDOW =             new PacketType(PROTOCOL, SENDER, 0x2E, 101);
+			public static final PacketType SET_SLOT =                 new PacketType(PROTOCOL, SENDER, 0x2F, 103);
+			public static final PacketType WINDOW_ITEMS =             new PacketType(PROTOCOL, SENDER, 0x30, 104);
+			public static final PacketType CRAFT_PROGRESS_BAR =       new PacketType(PROTOCOL, SENDER, 0x31, 105);
+			public static final PacketType TRANSACTION =              new PacketType(PROTOCOL, SENDER, 0x32, 106);
+			public static final PacketType UPDATE_SIGN =              new PacketType(PROTOCOL, SENDER, 0x33, 130);
+			public static final PacketType MAP =                      new PacketType(PROTOCOL, SENDER, 0x34, 131);
+			public static final PacketType TILE_ENTITY_DATA =         new PacketType(PROTOCOL, SENDER, 0x35, 132);
+			public static final PacketType OPEN_SIGN_ENTITY =         new PacketType(PROTOCOL, SENDER, 0x36, 133);
+			public static final PacketType STATISTICS =               new PacketType(PROTOCOL, SENDER, 0x37, 200);
+			public static final PacketType PLAYER_INFO =              new PacketType(PROTOCOL, SENDER, 0x38, 201);
+			public static final PacketType ABILITIES =                new PacketType(PROTOCOL, SENDER, 0x39, 202);
+			public static final PacketType TAB_COMPLETE =             new PacketType(PROTOCOL, SENDER, 0x3A, 203);
+			public static final PacketType SCOREBOARD_OBJECTIVE =     new PacketType(PROTOCOL, SENDER, 0x3B, 206);
+			public static final PacketType SCOREBOARD_SCORE =         new PacketType(PROTOCOL, SENDER, 0x3C, 207);
+			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE =
+			                                                          new PacketType(PROTOCOL, SENDER, 0x3D, 208);
+			public static final PacketType SCOREBOARD_TEAM =          new PacketType(PROTOCOL, SENDER, 0x3E, 209);
+			public static final PacketType CUSTOM_PAYLOAD =           new PacketType(PROTOCOL, SENDER, 0x3F, 250);
+			public static final PacketType KICK_DISCONNECT =          new PacketType(PROTOCOL, SENDER, 0x40, 255);
+
+			@Spigot(minimumBuild = 1628)
+			public static final PacketType TITLE =        			  new PacketType(PROTOCOL, SENDER, 0x45, -1);
+			@Spigot(minimumBuild = 1628)
+			public static final PacketType TAB_HEADER =        		  new PacketType(PROTOCOL, SENDER, 0x47, -1);
+			@Spigot(minimumBuild = 1628)
+			public static final PacketType RESOURCE_PACK_SEND =       new PacketType(PROTOCOL, SENDER, 0x48, -1);
+
+			// The instance must
+			private final static Server INSTANCE = new Server();
+
+			// Prevent accidental construction
+			private Server() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Server getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		/**
+		 * Incoming packets.
+		 * @author Kristian
+		 */
+		public static class Client extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+
+			public static final PacketType KEEP_ALIVE =               new PacketType(PROTOCOL, SENDER, 0x00, 0);
+			public static final PacketType CHAT =                     new PacketType(PROTOCOL, SENDER, 0x01, 3);
+			public static final PacketType USE_ENTITY =               new PacketType(PROTOCOL, SENDER, 0x02, 7);
+			public static final PacketType FLYING =                   new PacketType(PROTOCOL, SENDER, 0x03, 10);
+			public static final PacketType POSITION =                 new PacketType(PROTOCOL, SENDER, 0x04, 11);
+			public static final PacketType LOOK =                     new PacketType(PROTOCOL, SENDER, 0x05, 12);
+			public static final PacketType POSITION_LOOK =            new PacketType(PROTOCOL, SENDER, 0x06, 13);
+			public static final PacketType BLOCK_DIG =                new PacketType(PROTOCOL, SENDER, 0x07, 14);
+			public static final PacketType BLOCK_PLACE =              new PacketType(PROTOCOL, SENDER, 0x08, 15);
+			public static final PacketType HELD_ITEM_SLOT =           new PacketType(PROTOCOL, SENDER, 0x09, 16);
+			public static final PacketType ARM_ANIMATION =            new PacketType(PROTOCOL, SENDER, 0x0A, 18);
+			public static final PacketType ENTITY_ACTION =            new PacketType(PROTOCOL, SENDER, 0x0B, 19);
+			public static final PacketType STEER_VEHICLE =            new PacketType(PROTOCOL, SENDER, 0x0C, 27);
+			public static final PacketType CLOSE_WINDOW =             new PacketType(PROTOCOL, SENDER, 0x0D, 101);
+			public static final PacketType WINDOW_CLICK =             new PacketType(PROTOCOL, SENDER, 0x0E, 102);
+			public static final PacketType TRANSACTION =              new PacketType(PROTOCOL, SENDER, 0x0F, 106);
+			public static final PacketType SET_CREATIVE_SLOT =        new PacketType(PROTOCOL, SENDER, 0x10, 107);
+			public static final PacketType ENCHANT_ITEM =             new PacketType(PROTOCOL, SENDER, 0x11, 108);
+			public static final PacketType UPDATE_SIGN =              new PacketType(PROTOCOL, SENDER, 0x12, 130);
+			public static final PacketType ABILITIES =                new PacketType(PROTOCOL, SENDER, 0x13, 202);
+			public static final PacketType TAB_COMPLETE =             new PacketType(PROTOCOL, SENDER, 0x14, 203);
+			public static final PacketType SETTINGS =                 new PacketType(PROTOCOL, SENDER, 0x15, 204);
+			public static final PacketType CLIENT_COMMAND =           new PacketType(PROTOCOL, SENDER, 0x16, 205);
+			public static final PacketType CUSTOM_PAYLOAD =           new PacketType(PROTOCOL, SENDER, 0x17, 250);
+
+			@Spigot(minimumBuild = 1628)
+			public static final PacketType RESOURCE_PACK_STATUS =     new PacketType(PROTOCOL, SENDER, 0x19, -1);
+
+			private final static Client INSTANCE = new Client();
+
+			// Prevent accidental construction
+			private Client() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Client getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		public static Protocol getProtocol() {
+			return PROTOCOL;
+		}
+	}
+
+	/**
+	 * Packets sent and received when querying the server in the multiplayer menu.
+	 * @author Kristian
+	 */
+	public static class Status {
+		private static final Protocol PROTOCOL = Protocol.STATUS;
+
+		/**
+		 * Outgoing packets.
+		 * @author Kristian
+		 */
+		public static class Server extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.SERVER;
+
+			public static final PacketType OUT_SERVER_INFO =          new PacketType(PROTOCOL, SENDER, 0x00, 255);
+			@SuppressWarnings("deprecation")
+			public static final PacketType OUT_PING =                 new PacketType(PROTOCOL, SENDER, 0x01, Packets.Server.PING_TIME);
+
+			private final static Server INSTANCE = new Server();
+
+			// Prevent accidental construction
+			private Server() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Server getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		/**
+		 * Incoming packets.
+		 * @author Kristian
+		 */
+		public static class Client extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+
+			public static final PacketType IN_START =                 new PacketType(PROTOCOL, SENDER, 0x00, 254);
+			@SuppressWarnings("deprecation")
+			public static final PacketType IN_PING =                  new PacketType(PROTOCOL, SENDER, 0x01, Packets.Client.PING_TIME);
+
+			private final static Client INSTANCE = new Client();
+
+			// Prevent accidental construction
+			private Client() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Client getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		public static Protocol getProtocol() {
+			return PROTOCOL;
+		}
+	}
+
+	/**
+	 * Packets sent and received when logging in to the server.
+	 * @author Kristian
+	 */
+	public static class Login {
+		private static final Protocol PROTOCOL = Protocol.LOGIN;
+
+		/**
+		 * Outgoing packets.
+		 * @author Kristian
+		 */
+		public static class Server extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.SERVER;
+
+			public static final PacketType DISCONNECT =               new PacketType(PROTOCOL, SENDER, 0x00, 255);
+			public static final PacketType ENCRYPTION_BEGIN =         new PacketType(PROTOCOL, SENDER, 0x01, 253);
+			@SuppressWarnings("deprecation")
+			public static final PacketType SUCCESS =                  new PacketType(PROTOCOL, SENDER, 0x02, Packets.Server.LOGIN_SUCCESS);
+
+			@Spigot(minimumBuild = 1628)
+			public static final PacketType LOGIN_COMPRESSION =        new PacketType(PROTOCOL, SENDER, 0x03, -1);
+
+			private final static Server INSTANCE = new Server();
+
+			// Prevent accidental construction
+			private Server() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Server getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		/**
+		 * Incoming packets.
+		 * @author Kristian
+		 */
+		public static class Client extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+
+			@SuppressWarnings("deprecation")
+			public static final PacketType START =                    new PacketType(PROTOCOL, SENDER, 0x00, Packets.Client.LOGIN_START);
+			public static final PacketType ENCRYPTION_BEGIN =         new PacketType(PROTOCOL, SENDER, 0x01, 252);
+
+			private final static Client INSTANCE = new Client();
+
+			// Prevent accidental construction
+			private Client() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Client getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		public static Protocol getProtocol() {
+			return PROTOCOL;
+		}
+	}
+
+	/**
+	 * Contains every packet Minecraft 1.6.4 packet removed in Minecraft 1.7.2.
+	 * @author Kristian
+	 */
+	public static class Legacy {
+		private static final Protocol PROTOCOL = Protocol.LEGACY;
+
+		/**
+		 * Outgoing packets.
+		 * @author Kristian
+		 */
+		// Missing server packets: [10, 11, 12, 21, 107, 252]
+		public static class Server extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.SERVER;
+
+			public static final PacketType PLAYER_FLYING =            PacketType.newLegacy(SENDER, 10);
+			public static final PacketType PLAYER_POSITION =          PacketType.newLegacy(SENDER, 11);
+			public static final PacketType PLAYER_POSITON_LOOK =      PacketType.newLegacy(SENDER, 12);
+			/**
+			 * Removed in Minecraft 1.4.6.
+			 */
+			public static final PacketType PICKUP_SPAWN =             PacketType.newLegacy(SENDER, 21);
+			/**
+			 * Removed in Minecraft 1.7.2
+			 */
+			public static final PacketType SET_CREATIVE_SLOT =        PacketType.newLegacy(SENDER, 107);
+
+			/**
+			 * Removed in Minecraft 1.7.2
+			 */
+			public static final PacketType KEY_RESPONSE =             PacketType.newLegacy(SENDER, 252);
+
+			private final static Server INSTANCE = new Server();
+
+			// Prevent accidental construction
+			private Server() {
+				super(PacketType.class);
+			}
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Server getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		/**
+		 * Incoming packets.
+		 * @author Kristian
+		 */
+		// Missing client packets: [1, 9, 255]
+		public static class Client extends ObjectEnum<PacketType> {
+			private final static Sender SENDER = Sender.CLIENT;
+
+			public static final PacketType LOGIN =                    PacketType.newLegacy(SENDER, 1);
+			public static final PacketType RESPAWN =                  PacketType.newLegacy(SENDER, 9);
+			public static final PacketType DISCONNECT =               PacketType.newLegacy(SENDER, 255);
+
+			private final static Client INSTANCE = new Client();
+
+			// Prevent accidental construction
+			private Client() { super(PacketType.class); }
+
+			public static Sender getSender() {
+				return SENDER;
+			}
+			public static Client getInstance() {
+				return INSTANCE;
+			}
+		}
+
+		public static Protocol getProtocol() {
+			return PROTOCOL;
+		}
+	}
+
+	/**
+	 * Represents the different protocol or connection states.
+	 * @author Kristian
+	 */
+	public enum Protocol {
+		HANDSHAKING,
+		PLAY,
+		STATUS,
+		LOGIN,
+
+		/**
+		 * Only for packets removed in Minecraft 1.7.2
+		 */
+		LEGACY;
+
+		/**
+		 * Retrieve the correct protocol enum from a given vanilla enum instance.
+		 * @param vanilla - the vanilla protocol enum instance.
+		 * @return The corresponding protocol.
+		 */
+		public static Protocol fromVanilla(Enum<?> vanilla) {
+			String name = vanilla.name();
+
+			if ("HANDSHAKING".equals(name))
+					return HANDSHAKING;
+			if ("PLAY".equals(name))
+				return PLAY;
+			if ("STATUS".equals(name))
+				return STATUS;
+			if ("LOGIN".equals(name))
+				return LOGIN;
+			throw new IllegalArgumentException("Unrecognized vanilla enum " + vanilla);
+		}
+	}
+
+	/**
+	 * Represents the sender of this packet type.
+	 * @author Kristian
+	 *
+	 */
+	public enum Sender {
+		/**
+		 * Indicates that packets of this type will be sent by connected clients.
+		 */
+		CLIENT,
+
+		/**
+		 * Indicate that packets of this type will be sent by the current server.
+		 */
+		SERVER;
+
+		/**
+		 * Retrieve the equivialent connection side.
+		 * @return The connection side.
+		 */
+		public ConnectionSide toSide() {
+			return this == CLIENT ? ConnectionSide.CLIENT_SIDE : ConnectionSide.SERVER_SIDE;
+		}
+	}
+
+	// Lookup of packet types
+	private static PacketTypeLookup LOOKUP;
+
+	/**
+	 * Protocol version of all the current IDs.
+	 */
+	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.WORLD_UPDATE;
+
+	private final Protocol protocol;
+	private final Sender sender;
+	private final int currentId;
+	private final int legacyId;
+	private final MinecraftVersion version;
+
+	/**
+	 * Retrieve the current packet/legacy lookup.
+	 * @return The packet type lookup.
+	 */
+	private static PacketTypeLookup getLookup() {
+		if (LOOKUP == null) {
+			LOOKUP = new PacketTypeLookup().
+				addPacketTypes(Handshake.Client.getInstance()).
+				addPacketTypes(Handshake.Server.getInstance()).
+				addPacketTypes(Play.Client.getInstance()).
+				addPacketTypes(Play.Server.getInstance()).
+				addPacketTypes(Status.Client.getInstance()).
+				addPacketTypes(Status.Server.getInstance()).
+				addPacketTypes(Login.Client.getInstance()).
+				addPacketTypes(Login.Server.getInstance()).
+				addPacketTypes(Legacy.Client.getInstance()).
+				addPacketTypes(Legacy.Server.getInstance());
+		}
+		return LOOKUP;
+	}
+
+	/**
+	 * Find every packet type known to the current version of ProtocolLib.
+	 * @return Every packet type.
+	 */
+	public static Iterable<PacketType> values() {
+		List<Iterable<? extends PacketType>> sources = Lists.newArrayList();
+		sources.add(Handshake.Client.getInstance());
+		sources.add(Handshake.Server.getInstance());
+		sources.add(Play.Client.getInstance());
+		sources.add(Play.Server.getInstance());
+		sources.add(Status.Client.getInstance());
+		sources.add(Status.Server.getInstance());
+		sources.add(Login.Client.getInstance());
+		sources.add(Login.Server.getInstance());
+
+		// Add the missing types in earlier versions
+		if (!MinecraftReflection.isUsingNetty()) {
+			sources.add(Legacy.Client.getInstance());
+			sources.add(Legacy.Server.getInstance());
+		}
+		return Iterables.concat(sources);
+	}
+
+	/**
+	 * Retrieve a packet type from a legacy (1.6.4 and below) packet ID.
+	 * @param packetId - the legacy packet ID.
+	 * @return The corresponding packet type.
+	 * @throws IllegalArgumentException If the legacy packet could not be found.
+	 */
+	public static PacketType findLegacy(int packetId) {
+		PacketType type = getLookup().getFromLegacy(packetId);
+
+		if (type != null)
+			return type;
+		throw new IllegalArgumentException("Cannot find legacy packet " + packetId);
+	}
+
+	/**
+	 * Retrieve a packet type from a legacy (1.6.4 and below) packet ID.
+	 * @param packetId - the legacy packet ID.
+	 * @param preference - the preferred sender, or NULL for any arbitrary sender.
+	 * @return The corresponding packet type.
+	 * @throws IllegalArgumentException If the legacy packet could not be found.
+	 */
+	public static PacketType findLegacy(int packetId, Sender preference) {
+		if (preference == null)
+			return findLegacy(packetId);
+		PacketType type = getLookup().getFromLegacy(packetId, preference);
+
+		if (type != null)
+			return type;
+		throw new IllegalArgumentException("Cannot find legacy packet " + packetId);
+	}
+
+	/**
+	 * Determine if the given legacy packet exists.
+	 * @param packetId - the legacy packet ID.
+	 * @param preference - the sender preference.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public static boolean hasLegacy(int packetId) {
+		return getLookup().getFromLegacy(packetId) != null;
+	}
+
+	/**
+	 * Retrieve a packet type from a protocol, sender and packet ID.
+	 * <p>
+	 * It is usually better to access the packet types statically, like so:
+	 * <ul>
+	 *   <li>{@link PacketType.Play.Server#SPAWN_ENTITY}
+	 * </ul>
+	 * @param protocol - the current protocol.
+	 * @param sender - the sender.
+	 * @param packetId - the packet ID.
+	 * @return The corresponding packet type.
+	 * @throws IllegalArgumentException If the current packet could not be found.
+	 */
+	public static PacketType findCurrent(Protocol protocol, Sender sender, int packetId) {
+		PacketType type = getLookup().getFromCurrent(protocol, sender, packetId);
+
+		if (type != null)
+			return type;
+		throw new IllegalArgumentException("Cannot find packet " + packetId +
+				"(Protocol: " + protocol + ", Sender: " + sender + ")");
+	}
+
+	/**
+	 * Determine if the given packet exists.
+	 * @param protocol - the protocol.
+	 * @param sender - the sender.
+	 * @param packetId - the packet ID.
+	 * @return TRUE if it exists, FALSE otherwise.
+	 */
+	public static boolean hasCurrent(Protocol protocol, Sender sender, int packetId) {
+		return getLookup().getFromCurrent(protocol, sender, packetId) != null;
+	}
+
+	/**
+	 * Retrieve a packet type from a legacy ID.
+	 * <p>
+	 * If no associated packet type could be found, a new will be registered under LEGACY.
+	 * @param id - the legacy ID.
+	 * @param sender - the sender of the packet, or NULL if unknown.
+	 * @return The packet type.
+	 * @throws IllegalArgumentException If the sender is NULL and the packet doesn't exist.
+	 */
+	public static PacketType fromLegacy(int id, Sender sender) {
+		PacketType type = getLookup().getFromLegacy(id, sender);
+
+		if (type == null) {
+			if (sender == null)
+				throw new IllegalArgumentException("Cannot find legacy packet " + id);
+			type = newLegacy(sender, id);
+
+			// As below
+			scheduleRegister(type, "Dynamic-" + UUID.randomUUID().toString());
+		}
+		return type;
+	}
+
+	/**
+	 * Retrieve a packet type from a protocol, sender and packet ID.
+	 * <p>
+	 * The packet will automatically be registered if its missing.
+	 * @param protocol - the current protocol.
+	 * @param sender - the sender.
+	 * @param packetId - the packet ID. Can be UNKNOWN_PACKET.
+	 * @param legacyId - the legacy packet ID. Can be UNKNOWN_PACKET.
+	 * @return The corresponding packet type.
+	 */
+	public static PacketType fromCurrent(Protocol protocol, Sender sender, int packetId, int legacyId) {
+		PacketType type = getLookup().getFromCurrent(protocol, sender, packetId);
+
+		if (type == null) {
+			type = new PacketType(protocol, sender, packetId, legacyId);
+
+			// Many may be scheduled, but only the first will be executed
+			scheduleRegister(type, "Dynamic-" + UUID.randomUUID().toString());
+		}
+		return type;
+	}
+
+	/**
+	 * Lookup a packet type from a packet class.
+	 * @param packetClass - the packet class.
+	 * @return The corresponding packet type, or NULL if not found.
+	 */
+	public static PacketType fromClass(Class<?> packetClass) {
+		PacketType type = PacketRegistry.getPacketType(packetClass);
+
+		if (type != null)
+			return type;
+		throw new IllegalArgumentException("Class " + packetClass + " is not a registered packet.");
+	}
+
+	/**
+	 * Retrieve every packet type with the given UPPER_CAMEL_CASE name.
+	 * <p>
+	 * Note that the collection is unmodiable.
+	 * @param name - the name.
+	 * @return Every packet type, or an empty collection.
+	 */
+	public static Collection<PacketType> fromName(String name) {
+		return getLookup().getFromName(name);
+	}
+
+	/**
+	 * Determine if a given class represents a packet class.
+	 * @param packetClass - the class to lookup.
+	 * @return TRUE if this is a packet class, FALSE otherwise.
+	 */
+	public static boolean hasClass(Class<?> packetClass) {
+		return PacketRegistry.getPacketType(packetClass) != null;
+	}
+
+	/**
+	 * Register a particular packet type.
+	 * <p>
+	 * Note that the registration will be performed on the main thread.
+	 * @param type - the type to register.
+	 * @param name - the name of the packet.
+	 * @return A future telling us if our instance was registered.
+	 */
+	public static Future<Boolean> scheduleRegister(final PacketType type, final String name) {
+		Callable<Boolean> callable = new Callable<Boolean>() {
+			@Override
+			public Boolean call() throws Exception {
+				ObjectEnum<PacketType> objEnum;
+
+				// A bit ugly, but performance is critical
+				objEnum = getObjectEnum(type);
+
+				if (objEnum.registerMember(type, name)) {
+					getLookup().addPacketTypes(Arrays.asList(type));
+					return true;
+				}
+				return false;
+			}
+		};
+
+		// Execute in the main thread if possible
+		if (Bukkit.getServer() == null || Application.isPrimaryThread()) {
+			try {
+				return Futures.immediateFuture(callable.call());
+			} catch (Exception e) {
+				return Futures.immediateFailedFuture(e);
+			}
+		}
+		return ProtocolLibrary.getExecutorSync().submit(callable);
+	}
+
+	/**
+	 * Retrieve the correct object enum from a specific packet type.
+	 * @param type - the packet type.
+	 * @return The corresponding object enum.
+	 */
+	public static ObjectEnum<PacketType> getObjectEnum(final PacketType type) {
+		switch (type.getProtocol()) {
+			case HANDSHAKING:
+				return type.isClient() ? Handshake.Client.getInstance() : Handshake.Server.getInstance();
+			case PLAY:
+				return type.isClient() ? Play.Client.getInstance() : Play.Server.getInstance();
+			case STATUS:
+				return type.isClient() ? Status.Client.getInstance() : Status.Server.getInstance();
+			case LOGIN:
+				return type.isClient() ? Login.Client.getInstance() : Login.Server.getInstance();
+			case LEGACY:
+				return type.isClient() ? Legacy.Client.getInstance() : Legacy.Server.getInstance();
+			default:
+				throw new IllegalStateException("Unexpected protocol: " + type.getProtocol());
+		}
+	}
+
+	/**
+	 * Construct a new packet type.
+	 * @param protocol - the current protocol.
+	 * @param sender - client or server.
+	 * @param currentId - the current packet ID, or
+	 * @param legacyId - the legacy packet ID.
+	 */
+	public PacketType(Protocol protocol, Sender sender, int currentId, int legacyId) {
+		this(protocol, sender, currentId, legacyId, PROTOCOL_VERSION);
+	}
+
+	/**
+	 * Construct a new packet type.
+	 * @param protocol - the current protocol.
+	 * @param sender - client or server.
+	 * @param currentId - the current packet ID.
+	 * @param legacyId - the legacy packet ID.
+	 * @param version - the version of the current ID.
+	 */
+	public PacketType(Protocol protocol, Sender sender, int currentId, int legacyId, MinecraftVersion version) {
+		this.protocol = Preconditions.checkNotNull(protocol, "protocol cannot be NULL");
+		this.sender = Preconditions.checkNotNull(sender, "sender cannot be NULL");
+		this.currentId = currentId;
+		this.legacyId = legacyId;
+		this.version = version;
+	}
+
+	/**
+	 * Construct a legacy packet type.
+	 * @param sender - client or server.
+	 * @param legacyId - the legacy packet ID.
+	 */
+	public static PacketType newLegacy(Sender sender, int legacyId) {
+		return new PacketType(Protocol.LEGACY, sender, PacketType.UNKNOWN_PACKET, legacyId, MinecraftVersion.WORLD_UPDATE);
+	}
+
+	/**
+	 * Determine if this packet is supported on the current server.
+	 * @return Whether or not the packet is supported.
+	 */
+	public boolean isSupported() {
+		return PacketRegistry.isSupported(this);
+	}
+
+	/**
+	 * Retrieve the protocol (the connection state) the packet type belongs.
+	 * @return The protocol of this type.
+	 */
+	public Protocol getProtocol() {
+		return protocol;
+	}
+
+	/**
+	 * Retrieve which sender will transmit packets of this type.
+	 * @return The sender of these packets.
+	 */
+	public Sender getSender() {
+		return sender;
+	}
+
+	/**
+	 * Determine if this packet was sent by the client.
+	 * @return TRUE if it was, FALSE otherwise.
+	 */
+	public boolean isClient() {
+		return sender == Sender.CLIENT;
+	}
+
+	/**
+	 * Determine if this packet was sent by the server.
+	 * @return TRUE if it was, FALSE otherwise.
+	 */
+	public boolean isServer() {
+		return sender == Sender.SERVER;
+	}
+
+	/**
+	 * Retrieve the current protocol ID for this packet type.
+	 * <p>
+	 * This is only unique within a specific protocol and target.
+	 * <p>
+	 * It is only unknown if the packet was removed in Minecraft 1.7.2.
+	 * @return The current ID, or {@link #UNKNOWN_PACKET} if unknown.
+	 */
+	public int getCurrentId() {
+		return currentId;
+	}
+
+	/**
+	 * Retrieve the equivalent packet class.
+	 * @return The packet class, or NULL if not found.
+	 */
+	public Class<?> getPacketClass() {
+		try {
+			return PacketRegistry.getPacketClassFromType(this);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Retrieve the declared enum name of this packet type.
+	 * @return The enum name.
+	 */
+	public String name() {
+		return getObjectEnum(this).getDeclaredName(this);
+	}
+
+	/**
+	 * Retrieve the Minecraft version for the current ID.
+	 * @return The Minecraft version.
+	 */
+	public MinecraftVersion getCurrentVersion() {
+		return version;
+	}
+
+	/**
+	 * Retrieve the legacy (1.6.4 or below) protocol ID of the packet type.
+	 * <p>
+	 * This ID is globally unique.
+	 * @return The legacy ID, or {@link #UNKNOWN_PACKET} if unknown.
+	 */
+	public int getLegacyId() {
+		return legacyId;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(protocol, sender, currentId, legacyId);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this)
+			return true;
+
+		if (obj instanceof PacketType) {
+			PacketType other = (PacketType) obj;
+			return protocol == other.protocol &&
+				   sender == other.sender &&
+				   currentId == other.currentId &&
+				   legacyId == other.legacyId;
+		}
+		return false;
+	}
+
+	@Override
+	public int compareTo(PacketType other) {
+		return ComparisonChain.start().
+				compare(protocol, other.getProtocol()).
+				compare(sender, other.getSender()).
+				compare(currentId, other.getCurrentId()).
+				compare(legacyId, other.getLegacyId()).
+				result();
+	}
+
+	@Override
+	public String toString() {
+		Class<?> clazz = getPacketClass();;
+
+		if (clazz == null)
+			return "UNREGISTERED [" + protocol + ", " + sender + ", " + currentId + ", legacy: " + legacyId + "]";
+		else
+			return clazz.getSimpleName() + "[" + currentId + ", legacy: " + legacyId + "]";
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/PacketTypeLookup.java

@@ -0,0 +1,139 @@
+package com.comphenix.protocol;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import com.comphenix.protocol.PacketType.Protocol;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.collections.IntegerMap;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
+/**
+ * Retrieve a packet type based on its version and ID, optionally with protocol and sender too.
+ * @author Kristian
+ */
+class PacketTypeLookup {
+	private static class ProtocolSenderLookup {
+		// Unroll lookup for performance reasons
+		public final IntegerMap<PacketType> HANDSHAKE_CLIENT = IntegerMap.newMap();
+		public final IntegerMap<PacketType> HANDSHAKE_SERVER = IntegerMap.newMap();
+		public final IntegerMap<PacketType> GAME_CLIENT = IntegerMap.newMap();
+		public final IntegerMap<PacketType> GAME_SERVER = IntegerMap.newMap();
+		public final IntegerMap<PacketType> STATUS_CLIENT = IntegerMap.newMap();
+		public final IntegerMap<PacketType> STATUS_SERVER = IntegerMap.newMap();
+		public final IntegerMap<PacketType> LOGIN_CLIENT = IntegerMap.newMap();
+		public final IntegerMap<PacketType> LOGIN_SERVER = IntegerMap.newMap();
+		
+		/**
+		 * Retrieve the correct integer map for a specific protocol and sender.
+		 * @param protocol - the protocol.
+		 * @param sender - the sender.
+		 * @return The integer map of packets.
+		 */
+		public IntegerMap<PacketType> getMap(Protocol protocol, Sender sender) {
+			switch (protocol) {
+				case HANDSHAKING: 
+					return sender == Sender.CLIENT ? HANDSHAKE_CLIENT : HANDSHAKE_SERVER;
+				case PLAY:
+					return sender == Sender.CLIENT ? GAME_CLIENT : GAME_SERVER;
+				case STATUS:
+					return sender == Sender.CLIENT ? STATUS_CLIENT : STATUS_SERVER;
+				case LOGIN:
+					return sender == Sender.CLIENT ? LOGIN_CLIENT : LOGIN_SERVER;
+				default:
+					throw new IllegalArgumentException("Unable to find protocol " + protocol);
+			}
+		}
+	}
+	
+	// Packet IDs from 1.6.4 and below
+	private final IntegerMap<PacketType> legacyLookup = new IntegerMap<PacketType>();
+	private final IntegerMap<PacketType> serverLookup = new IntegerMap<PacketType>();
+	private final IntegerMap<PacketType> clientLookup = new IntegerMap<PacketType>();
+	
+	// Packets for 1.7.2
+	private final ProtocolSenderLookup currentLookup = new ProtocolSenderLookup();
+
+	// Packets based on name
+	private final Multimap<String, PacketType> nameLookup = HashMultimap.create();
+	
+	/**
+	 * Add a collection of packet types to the lookup.
+	 * @param types - the types to add.
+	 */
+	public PacketTypeLookup addPacketTypes(Iterable<? extends PacketType> types) {
+		Preconditions.checkNotNull(types, "types cannot be NULL");
+		
+		for (PacketType type : types) {
+			int legacy = type.getLegacyId();
+			
+			// Skip unknown legacy packets
+			if (legacy != PacketType.UNKNOWN_PACKET) {
+				if (type.isServer())
+					serverLookup.put(type.getLegacyId(), type);
+				if (type.isClient())
+					clientLookup.put(type.getLegacyId(), type);
+				legacyLookup.put(type.getLegacyId(), type);
+			}
+			// Skip unknown current packets
+			if (type.getCurrentId() != PacketType.UNKNOWN_PACKET) {
+				currentLookup.getMap(type.getProtocol(), type.getSender()).put(type.getCurrentId(), type);
+			}
+			// Save name
+			nameLookup.put(type.name(), type);
+		}
+		return this;
+	}
+	
+	/**
+	 * Retrieve a packet type from a legacy (1.6.4 and below) packet ID.
+	 * @param packetId - the legacy packet ID.
+	 * @return The corresponding packet type, or NULL if not found.
+	 */
+	public PacketType getFromLegacy(int packetId) {
+		return legacyLookup.get(packetId);
+	}
+	
+	/**
+	 * Retrieve an unmodifiable view of all the packet types with this name.
+	 * @param name - the name.
+	 * @return The packet types, usually one.
+	 */
+	public Collection<PacketType> getFromName(String name) {
+		return Collections.unmodifiableCollection(nameLookup.get(name));
+	}
+	
+	/**
+	 * Retrieve a packet type from a legacy (1.6.4 and below) packet ID.
+	 * @param packetId - the legacy packet ID.
+	 * @param preference - which packet type to look for first.
+	 * @return The corresponding packet type, or NULL if not found.
+	 */
+	public PacketType getFromLegacy(int packetId, Sender preference) {	
+		if (preference == Sender.CLIENT)
+			return getFirst(packetId, clientLookup, serverLookup);
+		else
+			return getFirst(packetId, serverLookup, clientLookup);
+	}
+	
+	// Helper method for looking up in two sets
+	private <T> T getFirst(int packetId, IntegerMap<T> first, IntegerMap<T> second) {
+		if (first.containsKey(packetId))
+			return first.get(packetId);
+		else
+			return second.get(packetId);
+	}
+	
+	/**
+	 * Retrieve a packet type from a protocol, sender and packet ID.
+	 * @param protocol - the current protocol.
+	 * @param sender - the sender.
+	 * @param packetId - the packet ID.
+	 * @return The corresponding packet type, or NULL if not found.
+	 */
+	public PacketType getFromCurrent(Protocol protocol, Sender sender, int packetId) {
+		return currentLookup.getMap(protocol, sender).get(packetId);
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/PacketTypeParser.java

@@ -0,0 +1,147 @@
+package com.comphenix.protocol;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import com.comphenix.protocol.PacketType.Protocol;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.google.common.collect.DiscreteDomains;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Range;
+import com.google.common.collect.Ranges;
+import com.google.common.collect.Sets;
+
+class PacketTypeParser {
+	public final static Range<Integer> DEFAULT_MAX_RANGE = Ranges.closed(0, 255);
+	
+	private Sender side = null;
+	private Protocol protocol = null;
+	
+	public Set<PacketType> parseTypes(Deque<String> arguments, Range<Integer> defaultRange) {
+		Set<PacketType> result = Sets.newHashSet();
+		side = null;
+		protocol = null;
+		
+		// Find these first
+		while (side == null) {
+			String arg = arguments.poll();
+			
+			// Attempt to parse a side or protocol first
+			if (side == null) {
+				ConnectionSide connection = parseSide(arg);
+				
+				if (connection != null) {
+					side = connection.getSender();
+					continue;
+				}
+			}
+			if (protocol == null) {
+				if ((protocol = parseProtocol(arg)) != null) {
+					continue;
+				}
+			}
+			throw new IllegalArgumentException("Specify connection side (CLIENT or SERVER).");
+		}
+		
+		// Then we move on to parsing IDs (named packet types soon to come)
+		List<Range<Integer>> ranges = RangeParser.getRanges(arguments, DEFAULT_MAX_RANGE);
+
+		// And finally, parse packet names if we have a protocol
+		if (protocol != null) {
+			for (Iterator<String> it = arguments.iterator(); it.hasNext(); ) {
+				String name = it.next().toUpperCase();
+				Collection<PacketType> names = PacketType.fromName(name);
+				
+				for (PacketType type : names) {
+					if (type.getProtocol() == protocol && type.getSender() == side) {
+						result.add(type);
+						it.remove();
+					}
+				}
+			}
+		}
+		
+		// Supply a default integer range
+		if (ranges.isEmpty() && result.isEmpty()) {
+			ranges = Lists.newArrayList();
+			ranges.add(defaultRange);
+		}
+		
+		for (Range<Integer> range : ranges) {
+			for (Integer id : range.asSet(DiscreteDomains.integers())) {
+				// Deprecated packets
+				if (protocol == null) {
+					if (PacketType.hasLegacy(id)) {
+						result.add(PacketType.findLegacy(id, side));
+					}
+				} else {
+					if (PacketType.hasCurrent(protocol, side, id)) {
+						result.add(PacketType.findCurrent(protocol, side, id));
+					}
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Retrieve the last parsed protocol.
+	 * @return Last protocol.
+	 */
+	public Protocol getLastProtocol() {
+		return protocol;
+	}
+	
+	/**
+	 * Retrieve the last sender.
+	 * @return Last sender.
+	 */
+	public Sender getLastSide() {
+		return side;
+	}
+	
+	/**
+	 * Parse a connection sides from a string.
+	 * @param text - the possible connection side.
+	 * @return The connection side, or NULL if not found.
+	 */
+	public ConnectionSide parseSide(String text) {
+		if (text == null)
+			return null;
+		String candidate = text.toLowerCase();
+		
+		// Parse the side gracefully
+		if ("client".startsWith(candidate))
+			return ConnectionSide.CLIENT_SIDE;
+		else if ("server".startsWith(candidate))
+			return ConnectionSide.SERVER_SIDE;
+		else
+			return null;
+	}
+	
+	/**
+	 * Parse a protocol from a string.
+	 * @param text - the possible protocol.
+	 * @return The protocol, or NULL if not found.
+	 */
+	public Protocol parseProtocol(String text) {
+		if (text == null)
+			return null;
+		String candidate = text.toLowerCase();
+		
+		if ("handshake".equals(candidate) || "handshaking".equals(candidate))
+			return Protocol.HANDSHAKING;
+		else if ("login".equals(candidate))
+			return Protocol.LOGIN;
+		else if ("play".equals(candidate) || "game".equals(candidate))
+			return Protocol.PLAY;
+		else if ("status".equals(candidate))
+			return Protocol.STATUS;
+		else
+			return null;
+	}	
+}

ProtocolLib/src/main/java/com/comphenix/protocol/Packets.java

@@ -25,15 +25,30 @@ import com.comphenix.protocol.reflect.IntEnum;
 
 /**
  * List of known packet IDs since 1.3.2.
- * 
+ * <p>
+ * Deprecated: Use {@link PacketType} instead.
  * @author Kristian
  */
+@Deprecated
 public final class Packets {
 	
+	/**
+	 * The highest possible packet ID. It's unlikely that this value will ever change.
+	 */
+	public static final int MAXIMUM_PACKET_ID = 255;
+	
+	/**
+	 * The maximum number of unique packet IDs. It's unlikely this will ever change.
+	 */
+	public static final int PACKET_COUNT = 256;
+	
 	/**
 	 * List of packets sent only by the server.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @author Kristian
 	 */
+	@Deprecated
 	public static final class Server extends IntEnum {
 		/**
 		 * The singleton instance. Can also be retrieved from the parent class.
@@ -52,9 +67,18 @@ public final class Packets {
 		public static final int PLAYER_POSITION = 11;
 		public static final int PLAYER_LOOK = 12;
 		public static final int PLAYER_LOOK_MOVE = 13;
+		/**
+		 * Made bi-directional in 1.4.6.
+		 */
+		public static final int BLOCK_ITEM_SWITCH = 16;
 		public static final int ENTITY_LOCATION_ACTION = 17;
 		public static final int ARM_ANIMATION = 18;
 		public static final int NAMED_ENTITY_SPAWN = 20;
+		/**
+		 * Removed in 1.4.6 and replaced with VEHICLE_SPAWN. 
+		 * @see <a href="http://www.wiki.vg/Protocol_History#2012-12-20">Protocol History - MinecraftCoalition</a>
+		 */
+		@Deprecated()
 		public static final int PICKUP_SPAWN = 21;
 		public static final int COLLECT = 22;
 		public static final int VEHICLE_SPAWN = 23;
@@ -71,10 +95,17 @@ public final class Packets {
 		public static final int ENTITY_HEAD_ROTATION = 35;
 		public static final int ENTITY_STATUS = 38;
 		public static final int ATTACH_ENTITY = 39;
+		
+		/**
+		 * Sent when an entities DataWatcher is updated.
+		 * <p>
+		 * Remember to clone the packet if you are modifying it.
+		 */
 		public static final int ENTITY_METADATA = 40;
 		public static final int MOB_EFFECT = 41;
 		public static final int REMOVE_MOB_EFFECT = 42;
 		public static final int SET_EXPERIENCE = 43;
+		public static final int UPDATE_ATTRIBUTES = 44;
 		public static final int MAP_CHUNK = 51;
 		public static final int MULTI_BLOCK_CHANGE = 52;
 		public static final int BLOCK_CHANGE = 53;
@@ -84,6 +115,7 @@ public final class Packets {
 		public static final int EXPLOSION = 60;
 		public static final int WORLD_EVENT = 61;
 		public static final int NAMED_SOUND_EFFECT = 62;
+		public static final int WORLD_PARTICLES = 63;
 		public static final int BED = 70;
 		public static final int WEATHER = 71;
 		public static final int OPEN_WINDOW = 100;
@@ -95,16 +127,37 @@ public final class Packets {
 		public static final int SET_CREATIVE_SLOT = 107;
 		public static final int UPDATE_SIGN = 130;
 		public static final int ITEM_DATA = 131;
+		
+		/**
+		 * Sent the first time a tile entity (chest inventory, etc.) is withing range of the player, or has been updated.
+		 * <p>
+		 * Remember to clone the packet if you are modifying it.
+		 */
 		public static final int TILE_ENTITY_DATA = 132;
+		public static final int OPEN_TILE_ENTITY = 133;
 		public static final int STATISTIC = 200;
 		public static final int PLAYER_INFO = 201;
 		public static final int ABILITIES = 202;
 		public static final int TAB_COMPLETE = 203;
+		public static final int SCOREBOARD_OBJECTIVE = 206;
+		public static final int UPDATE_SCORE  = 207;
+		public static final int DISPLAY_SCOREBOARD = 208;
+		public static final int TEAMS = 209;
 		public static final int CUSTOM_PAYLOAD = 250;
 		public static final int KEY_RESPONSE = 252;
 		public static final int KEY_REQUEST = 253;
 		public static final int KICK_DISCONNECT = 255;
 		
+		/**
+		 * This packet was introduced in 1.7.2.
+		 */
+		public static final int PING_TIME = 230;
+		
+		/**
+		 * This packet was introduced in 1.7.2.
+		 */
+		public static final int LOGIN_SUCCESS = 232;
+		
 		/**
 		 * A registry that parses between names and packet IDs.
 		 * @return The current server registry.
@@ -115,10 +168,13 @@ public final class Packets {
 		
 		/**
 		 * Determine if the given packet is a valid server packet in the current version of Minecraft.
+		 * <p>
+		 * Use {@link PacketType#isSupported()} instead.
 		 * @param packetID - the packet to test.
 		 * @return TRUE if this packet is supported, FALSE otherwise.
 		 * @throws FieldAccessException If we're unable to retrieve the server packet data from Minecraft.
 		 */
+		@Deprecated
 		public static boolean isSupported(int packetID) throws FieldAccessException {
 			return PacketFilterManager.getServerPackets().contains(packetID);
 		}
@@ -128,6 +184,7 @@ public final class Packets {
 		 * @return Every supported server packet.
 		 * @throws FieldAccessException If we're unable to retrieve the server packet data from Minecraft.
 		 */
+		@Deprecated
 		public static Set<Integer> getSupported() throws FieldAccessException {
 			return PacketFilterManager.getServerPackets();
 		}
@@ -140,8 +197,11 @@ public final class Packets {
 	
 	/**
 	 * List of packets sent by the client.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @author Kristian
 	 */
+	@Deprecated
 	public static class Client extends IntEnum {
 		/**
 		 * The singleton instance. Can also be retrieved from the parent class.
@@ -153,7 +213,13 @@ public final class Packets {
 		public static final int HANDSHAKE = 2;
 		public static final int CHAT = 3;
 		public static final int USE_ENTITY = 7;
+		
+		/**
+		 * Since 1.3.1, the client no longer sends a respawn packet. Moved to CLIENT_COMMAND.
+		 */
+		@Deprecated
 		public static final int RESPAWN = 9;
+		
 		public static final int FLYING = 10;
 		public static final int PLAYER_POSITION = 11;
 		public static final int PLAYER_LOOK = 12;
@@ -163,6 +229,7 @@ public final class Packets {
 		public static final int BLOCK_ITEM_SWITCH = 16;
 		public static final int ARM_ANIMATION = 18;
 		public static final int ENTITY_ACTION = 19;
+		public static final int PLAYER_INPUT = 27;
 		public static final int CLOSE_WINDOW = 101;
 		public static final int WINDOW_CLICK = 102;
 		public static final int TRANSACTION = 106;
@@ -178,6 +245,16 @@ public final class Packets {
 		public static final int GET_INFO = 254;
 		public static final int KICK_DISCONNECT = 255;
 		
+		/**
+		 * This packet was introduced in 1.7.2.
+		 */
+		public static final int PING_TIME = 230;
+		
+		/**
+		 * This packet was introduced in 1.7.2.
+		 */
+		public static final int LOGIN_START = 231;
+		
 		/**
 		 * A registry that parses between names and packet IDs.
 		 * @return The current client registry.
@@ -213,25 +290,34 @@ public final class Packets {
 	
 	/**
 	 * A registry that parses between names and packet IDs.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @return The current client registry.
 	 */
+	@Deprecated
 	public static Server getServerRegistry() {
 		return Server.getRegistry();
 	}
 
 	/**
 	 * A registry that parses between names and packet IDs.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @return The current server registry.
 	 */
+	@Deprecated
 	public static Client getClientRegistry() {
 		return Client.INSTANCE;
 	}
 	
 	/**
 	 * Find a packet by name. Must be capitalized and use underscores.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @param name - name of packet to find.
 	 * @return The packet ID found.
 	 */
+	@Deprecated
 	public static int valueOf(String name) {
 		Integer serverAttempt = Server.INSTANCE.valueOf(name);
 		
@@ -243,9 +329,12 @@ public final class Packets {
 	
 	/**
 	 * Retrieves the name of a packet.
+	 * <p>
+	 * Deprecated: Use {@link PacketType} instead.
 	 * @param packetID - packet to retrieve name.
 	 * @return The name, or NULL if unable to find such a packet.
 	 */
+	@Deprecated
 	public static String getDeclaredName(int packetID) {
 		String serverAttempt = Server.INSTANCE.getDeclaredName(packetID);
 		

ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolConfig.java

@@ -0,0 +1,458 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.io.Files;
+
+/**
+ * Represents the configuration of ProtocolLib.
+ * 
+ * @author Kristian
+ */
+public class ProtocolConfig {
+	private static final String LAST_UPDATE_FILE = "lastupdate";
+	
+	private static final String SECTION_GLOBAL = "global";
+	private static final String SECTION_AUTOUPDATER = "auto updater";
+	
+	private static final String METRICS_ENABLED = "metrics";
+	
+	private static final String IGNORE_VERSION_CHECK = "ignore version check";	
+	private static final String BACKGROUND_COMPILER_ENABLED = "background compiler";
+
+	private static final String DEBUG_MODE_ENABLED = "debug";
+	private static final String DETAILED_ERROR = "detailed error";
+	private static final String INJECTION_METHOD = "injection method";
+	
+	private static final String SCRIPT_ENGINE_NAME = "script engine";
+	private static final String SUPPRESSED_REPORTS = "suppressed reports";
+	
+	private static final String UPDATER_NOTIFY = "notify";
+	private static final String UPDATER_DOWNLAD = "download";
+	private static final String UPDATER_DELAY = "delay";
+	
+	// Defaults
+	private static final long DEFAULT_UPDATER_DELAY = 43200;
+	
+	private Plugin plugin;
+	private Configuration config;
+	private boolean loadingSections;
+	
+	private ConfigurationSection global;
+	private ConfigurationSection updater;
+	
+	// Last update time
+	private long lastUpdateTime;
+	private boolean configChanged;
+	private boolean valuesChanged;
+	
+	// Modifications
+	private int modCount;
+	
+	public ProtocolConfig(Plugin plugin) {
+		this(plugin, plugin.getConfig());
+	}
+	
+	public ProtocolConfig(Plugin plugin, Configuration config) {
+		this.plugin = plugin;
+		reloadConfig();
+	}
+	
+	/**
+	 * Reload configuration file.
+	 */
+	public void reloadConfig() {
+		// Reset
+		configChanged = false;
+		valuesChanged = false;
+		modCount++;
+		
+		this.config = plugin.getConfig();
+		this.lastUpdateTime = loadLastUpdate();
+		loadSections(!loadingSections);
+	}
+	
+	/**
+	 * Load the last update time stamp from the file system.
+	 * @return Last update time stamp.
+	 */
+	private long loadLastUpdate() {
+		File dataFile = getLastUpdateFile();
+		
+		if (dataFile.exists()) {
+			try {
+				return Long.parseLong(Files.toString(dataFile, Charsets.UTF_8));
+			} catch (NumberFormatException e) {
+				plugin.getLogger().warning("Cannot parse " + dataFile + " as a number.");
+			} catch (IOException e) {
+				plugin.getLogger().warning("Cannot read " + dataFile);
+			}
+		}
+		// Default last update
+		return 0;
+	}
+	
+	/**
+	 * Store the given time stamp.
+	 * @param value - time stamp to store.
+	 */
+	private void saveLastUpdate(long value) {
+		File dataFile = getLastUpdateFile();
+	
+		// The data folder must exist
+		dataFile.getParentFile().mkdirs();
+		
+		if (dataFile.exists())
+			dataFile.delete();
+		
+		try {
+			Files.write(Long.toString(value), dataFile, Charsets.UTF_8);
+		} catch (IOException e) {
+			throw new RuntimeException("Cannot write " + dataFile, e);
+		}
+	}
+	
+	/**
+	 * Retrieve the file that is used to store the update time stamp.
+	 * @return File storing the update time stamp.
+	 */
+	private File getLastUpdateFile() {
+		return new File(plugin.getDataFolder(), LAST_UPDATE_FILE);
+	}
+	
+	/**
+	 * Load data sections.
+	 * @param copyDefaults - whether or not to copy configuration defaults.
+	 */
+	private void loadSections(boolean copyDefaults) {
+		if (config != null) {
+			global = config.getConfigurationSection(SECTION_GLOBAL);
+		}
+		if (global != null) {
+			updater = global.getConfigurationSection(SECTION_AUTOUPDATER);
+		}
+
+		// Automatically copy defaults
+		if (copyDefaults && (!getFile().exists() || global == null || updater == null)) {
+			loadingSections = true;
+			
+			if (config != null)
+				config.options().copyDefaults(true);
+			plugin.saveDefaultConfig();
+			plugin.reloadConfig();
+			loadingSections = false;	
+			
+			// Inform the user
+			System.out.println("[ProtocolLib] Created default configuration.");
+		}
+	}
+	
+	/**
+	 * Set a particular configuration key value pair.
+	 * @param section - the configuration root.
+	 * @param path - the path to the key.
+	 * @param value - the value to set.
+	 */
+	private void setConfig(ConfigurationSection section, String path, Object value) {
+		configChanged = true;
+		section.set(path, value);
+	}
+
+	/**
+	 * Retrieve a reference to the configuration file.
+	 * @return Configuration file on disk.
+	 */
+	public File getFile() {
+		return new File(plugin.getDataFolder(), "config.yml");
+	}
+	
+	/**
+	 * Determine if detailed error reporting is enabled. Default FALSE.
+	 * @return TRUE if it is enabled, FALSE otherwise.
+	 */
+	public boolean isDetailedErrorReporting() {
+		return global.getBoolean(DETAILED_ERROR, false);
+	}
+	
+	/**
+	 * Set whether or not detailed error reporting is enabled.
+	 * @param value - TRUE if it is enabled, FALSE otherwise.
+	 */
+	public void setDetailedErrorReporting(boolean value) {
+		global.set(DETAILED_ERROR, value);
+	}
+	
+	/**
+	 * Retrieve whether or not ProtocolLib should determine if a new version has been released.
+	 * @return TRUE if it should do this automatically, FALSE otherwise.
+	 */
+	public boolean isAutoNotify() {
+		return updater.getBoolean(UPDATER_NOTIFY, true);
+	}
+	
+	/**
+	 * Set whether or not ProtocolLib should determine if a new version has been released.
+	 * @param value - TRUE to do this automatically, FALSE otherwise.
+	 */
+	public void setAutoNotify(boolean value) {
+		setConfig(updater, UPDATER_NOTIFY, value);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve whether or not ProtocolLib should automatically download the new version.
+	 * @return TRUE if it should, FALSE otherwise.
+	 */
+	public boolean isAutoDownload() {
+		return updater != null && updater.getBoolean(UPDATER_DOWNLAD, true);
+	}
+	
+	/**
+	 * Set whether or not ProtocolLib should automatically download the new version.
+	 * @param value - TRUE if it should. FALSE otherwise.
+	 */
+	public void setAutoDownload(boolean value) {
+		setConfig(updater, UPDATER_DOWNLAD, value);
+		modCount++;
+	}
+	
+	/**
+	 * Determine whether or not debug mode is enabled.
+	 * <p>
+	 * This grants access to the filter command.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean isDebug() {
+		return global.getBoolean(DEBUG_MODE_ENABLED, false);
+	}
+	
+	/**
+	 * Set whether or not debug mode is enabled.
+	 * @param value - TRUE if it is enabled, FALSE otherwise.
+	 */
+	public void setDebug(boolean value) {
+		setConfig(global, DEBUG_MODE_ENABLED, value);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve an immutable list of every suppressed report type.
+	 * @return Every suppressed report type.
+	 */
+	public ImmutableList<String> getSuppressedReports() {
+		return ImmutableList.copyOf(global.getStringList(SUPPRESSED_REPORTS));
+	}
+	
+	/**
+	 * Set the list of suppressed report types,
+	 * @param reports - suppressed report types.
+	 */
+	public void setSuppressedReports(List<String> reports) {
+		global.set(SUPPRESSED_REPORTS, Lists.newArrayList(reports));
+		modCount++;
+	}
+
+	/**
+	 * Retrieve the amount of time to wait until checking for a new update.
+	 * @return The amount of time to wait.
+	 */
+	public long getAutoDelay() {
+		// Note that the delay must be greater than 59 seconds
+		return Math.max(updater.getInt(UPDATER_DELAY, 0), DEFAULT_UPDATER_DELAY);
+	}
+	
+	/**
+	 * Set the amount of time to wait until checking for a new update.
+	 * <p>
+	 * This time must be greater than 59 seconds.
+	 * @param delaySeconds - the amount of time to wait.
+	 */
+	public void setAutoDelay(long delaySeconds) {
+		// Silently fix the delay
+		if (delaySeconds < DEFAULT_UPDATER_DELAY)
+			delaySeconds = DEFAULT_UPDATER_DELAY;
+		setConfig(updater, UPDATER_DELAY, delaySeconds);
+		modCount++;
+	}
+	
+	/**
+	 * The version of Minecraft to ignore the built-in safety feature.
+	 * @return The version to ignore ProtocolLib's satefy.
+	 */
+	public String getIgnoreVersionCheck() {
+		return global.getString(IGNORE_VERSION_CHECK, "");
+	}
+	
+	/**
+	 * Sets under which version of Minecraft the version safety feature will be ignored.
+	 * <p>
+	 * This is useful if a server operator has tested and verified that a version of ProtocolLib works,
+	 * but doesn't want or can't upgrade to a newer version.
+	 * 
+	 * @param ignoreVersion - the version of Minecraft where the satefy will be disabled.
+	 */
+	public void setIgnoreVersionCheck(String ignoreVersion) {
+		setConfig(global, IGNORE_VERSION_CHECK, ignoreVersion);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve whether or not metrics is enabled.
+	 * @return TRUE if metrics is enabled, FALSE otherwise.
+	 */
+	public boolean isMetricsEnabled() {
+		return global.getBoolean(METRICS_ENABLED, true);
+	}
+	
+	/**
+	 * Set whether or not metrics is enabled.
+	 * <p>
+	 * This setting will take effect next time ProtocolLib is started.
+	 * 
+	 * @param enabled - whether or not metrics is enabled.
+	 */
+	public void setMetricsEnabled(boolean enabled) {
+		setConfig(global, METRICS_ENABLED, enabled);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve whether or not the background compiler for structure modifiers is enabled or not.
+	 * @return TRUE if it is enabled, FALSE otherwise.
+	 */
+	public boolean isBackgroundCompilerEnabled() {
+		return global.getBoolean(BACKGROUND_COMPILER_ENABLED, true);
+	}
+	
+	/**
+	 * Set whether or not the background compiler for structure modifiers is enabled or not.
+	 * <p>
+	 * This setting will take effect next time ProtocolLib is started.
+	 * @param enabled - TRUE if is enabled/running, FALSE otherwise.
+	 */
+	public void setBackgroundCompilerEnabled(boolean enabled) {
+		setConfig(global, BACKGROUND_COMPILER_ENABLED, enabled);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve the last time we updated, in seconds since 1970.01.01 00:00.
+	 * @return Last update time.
+	 */
+	public long getAutoLastTime() {
+		return lastUpdateTime;
+	}
+
+	/**
+	 * Set the last time we updated, in seconds since 1970.01.01 00:00.
+	 * <p>
+	 * Note that this is not considered to modify the configuration, so the modification count 
+	 * will not be incremented.
+	 * @param lastTimeSeconds - new last update time.
+	 */
+	public void setAutoLastTime(long lastTimeSeconds) { 
+		this.valuesChanged = true;
+		this.lastUpdateTime = lastTimeSeconds;
+	}
+	
+	/**
+	 * Retrieve the unique name of the script engine to use for filtering.
+	 * @return Script engine to use.
+	 */
+	public String getScriptEngineName() {
+		return global.getString(SCRIPT_ENGINE_NAME, "JavaScript");
+	}
+	
+	/**
+	 * Set the unique name of the script engine to use for filtering.
+	 * <p>
+	 * This setting will take effect next time ProtocolLib is started.
+	 * @param name - name of the script engine to use.
+	 */
+	public void setScriptEngineName(String name) {
+		setConfig(global, SCRIPT_ENGINE_NAME, name);
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve the default injection method.
+	 * @return Default method.
+	 */
+	public PlayerInjectHooks getDefaultMethod() {
+		return PlayerInjectHooks.NETWORK_SERVER_OBJECT;
+	}
+	
+	/**
+	 * Retrieve the injection method that has been set in the configuration, or use a default value.
+	 * @return Injection method to use.
+	 * @throws IllegalArgumentException If the configuration option is malformed.
+	 */
+	public PlayerInjectHooks getInjectionMethod() throws IllegalArgumentException {
+		String text = global.getString(INJECTION_METHOD);
+		
+		// Default hook if nothing has been set
+		PlayerInjectHooks hook = getDefaultMethod();
+		
+		if (text != null) 
+			hook = PlayerInjectHooks.valueOf(text.toUpperCase().replace(" ", "_"));
+		return hook;
+	}
+	
+	/**
+	 * Set the starting injection method to use.
+	 * @return Injection method.
+	 */
+	public void setInjectionMethod(PlayerInjectHooks hook) {
+		setConfig(global, INJECTION_METHOD, hook.name());
+		modCount++;
+	}
+	
+	/**
+	 * Retrieve the number of modifications made to this configuration.
+	 * @return The number of modifications.
+	 */
+	public int getModificationCount() {
+		return modCount;
+	}
+	
+	/**
+	 * Save the current configuration file.
+	 */
+	public void saveAll() {
+		if (valuesChanged)
+			saveLastUpdate(lastUpdateTime);
+		if (configChanged)
+			plugin.saveConfig();
+		
+		// And we're done
+		valuesChanged = false;
+		configChanged = false;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolLibrary.java

@@ -2,227 +2,618 @@
  *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
  *  Copyright (C) 2012 Kristian S. Stangeland
  *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the 
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
  *  the License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License along with this program; 
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
 
 package com.comphenix.protocol;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Set;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.bukkit.Server;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import com.comphenix.executors.BukkitExecutors;
 import com.comphenix.protocol.async.AsyncFilterManager;
+import com.comphenix.protocol.error.BasicErrorReporter;
+import com.comphenix.protocol.error.DelegatedErrorReporter;
 import com.comphenix.protocol.error.DetailedErrorReporter;
 import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.MonitorAdapter;
-import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.injector.DelayedSingleTask;
+import com.comphenix.protocol.injector.InternalManager;
 import com.comphenix.protocol.injector.PacketFilterManager;
+import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
 import com.comphenix.protocol.metrics.Statistics;
 import com.comphenix.protocol.reflect.compiler.BackgroundCompiler;
+import com.comphenix.protocol.utility.ChatExtensions;
+import com.comphenix.protocol.utility.EnhancerFactory;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 
 /**
  * The main entry point for ProtocolLib.
- * 
+ *
  * @author Kristian
  */
 public class ProtocolLibrary extends JavaPlugin {
-	
+	// Every possible error or warning report type
+	public static final ReportType REPORT_CANNOT_LOAD_CONFIG = new ReportType("Cannot load configuration");
+	public static final ReportType REPORT_CANNOT_DELETE_CONFIG = new ReportType("Cannot delete old ProtocolLib configuration.");
+	public static final ReportType REPORT_CANNOT_PARSE_INJECTION_METHOD = new ReportType("Cannot parse injection method. Using default.");
+
+	public static final ReportType REPORT_PLUGIN_LOAD_ERROR = new ReportType("Cannot load ProtocolLib.");
+	public static final ReportType REPORT_PLUGIN_ENABLE_ERROR = new ReportType("Cannot enable ProtocolLib.");
+
+	public static final ReportType REPORT_METRICS_IO_ERROR = new ReportType("Unable to enable metrics due to network problems.");
+	public static final ReportType REPORT_METRICS_GENERIC_ERROR = new ReportType("Unable to enable metrics due to network problems.");
+
+	public static final ReportType REPORT_CANNOT_PARSE_MINECRAFT_VERSION = new ReportType("Unable to retrieve current Minecraft version. Assuming %s");
+	public static final ReportType REPORT_CANNOT_DETECT_CONFLICTING_PLUGINS = new ReportType("Unable to detect conflicting plugin versions.");
+	public static final ReportType REPORT_CANNOT_REGISTER_COMMAND = new ReportType("Cannot register command %s: %s");
+
+	public static final ReportType REPORT_CANNOT_CREATE_TIMEOUT_TASK = new ReportType("Unable to create packet timeout task.");
+	public static final ReportType REPORT_CANNOT_UPDATE_PLUGIN = new ReportType("Cannot perform automatic updates.");
+
+	/**
+	 * The minimum version ProtocolLib has been tested with.
+	 */
+	public static final String MINIMUM_MINECRAFT_VERSION = "1.0.0";
+
+	/**
+	 * The maximum version ProtocolLib has been tested with,
+	 */
+	public static final String MAXIMUM_MINECRAFT_VERSION = "1.7.10";
+
+	/**
+	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version was released.
+	 */
+	public static final String MINECRAFT_LAST_RELEASE_DATE = "2013-12-10";
+
+	// Different commands
+	private enum ProtocolCommand {
+		FILTER,
+		PACKET,
+		PROTOCOL
+	}
+
+	/**
+	 * The number of milliseconds per second.
+	 */
+	static final long MILLI_PER_SECOND = 1000;
+
+	private static final String PERMISSION_INFO = "protocol.info";
+
 	// There should only be one protocol manager, so we'll make it static
-	private static PacketFilterManager protocolManager;
-	
-	// Information logger
-	private Logger logger;
-	
+	private static InternalManager protocolManager;
+
 	// Error reporter
-	private ErrorReporter reporter;
-	
-	// Metrics and statistisc
-	private Statistics statistisc;
-	
+	private static ErrorReporter reporter = new BasicErrorReporter();
+
+	// Strongly typed configuration
+	private static ProtocolConfig config;
+
+	// Metrics and statistics
+	private Statistics statistics;
+
+	// Executors
+	private static ListeningScheduledExecutorService executorAsync;
+	private static ListeningScheduledExecutorService executorSync;
+
 	// Structure compiler
 	private BackgroundCompiler backgroundCompiler;
-	
-	// Used to clean up server packets that have expired. 
-	// But mostly required to simulate recieving client packets.
-	private int asyncPacketTask = -1;
+
+	// Used to clean up server packets that have expired, but mostly required to simulate
+	// recieving client packets.
+	private int packetTask = -1;
 	private int tickCounter = 0;
-	private static final int ASYNC_PACKET_DELAY = 1;
-	
+	private static final int ASYNC_MANAGER_DELAY = 1;
+
 	// Used to unhook players after a delay
 	private DelayedSingleTask unhookTask;
-	
-	// Used for debugging
-	private boolean debugListener;
-	
+
+	// Settings/options
+	private int configExpectedMod = -1;
+
+	// Logger
+	private Logger logger;
+	private Handler redirectHandler;
+
+	// Commands
+	private CommandProtocol commandProtocol;
+	private CommandPacket commandPacket;
+	private CommandFilter commandFilter;
+
+	// Whether or not disable is not needed
+	private boolean skipDisable;
+
 	@Override
 	public void onLoad() {
+		// Load configuration
+		logger = getLoggerSafely();
+		Application.registerPrimaryThread();
+
+		// Initialize enhancer factory
+		EnhancerFactory.getInstance().setClassLoader(getClassLoader());
+
+		// Initialize executors
+		executorAsync = BukkitExecutors.newAsynchronous(this);
+		executorSync = BukkitExecutors.newSynchronous(this);
+
 		// Add global parameters
-		DetailedErrorReporter reporter = new DetailedErrorReporter();
-		
+		DetailedErrorReporter detailedReporter = new DetailedErrorReporter(this);
+		reporter = getFilteredReporter(detailedReporter);
+
 		try {
-			logger = getLoggerSafely();
+			config = new ProtocolConfig(this);
+		} catch (Exception e) {
+			reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_LOAD_CONFIG).error(e));
+
+			// Load it again
+			if (deleteConfig()) {
+				config = new ProtocolConfig(this);
+			} else {
+				reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_DELETE_CONFIG));
+			}
+		}
+
+		// Print the state of the debug mode
+		if (config.isDebug()) {
+			logger.warning("Debug mode is enabled!");
+		}
+		// And the state of the error reporter
+		if (config.isDetailedErrorReporting()) {
+			detailedReporter.setDetailedReporting(true);
+			logger.warning("Detailed error reporting enabled!");
+		}
+
+		try {
+			// Check for other versions
+			checkConflictingVersions();
+
+			// Handle unexpected Minecraft versions
+			MinecraftVersion version = verifyMinecraftVersion();
+
 			unhookTask = new DelayedSingleTask(this);
-			protocolManager = new PacketFilterManager(getClassLoader(), getServer(), unhookTask, reporter);
-			reporter.addGlobalParameter("manager", protocolManager);
-			
+			protocolManager = PacketFilterManager.newBuilder().classLoader(getClassLoader()).server(getServer()).library(this).minecraftVersion(version).unhookTask(unhookTask).reporter(reporter).build();
+
+			// Setup error reporter
+			detailedReporter.addGlobalParameter("manager", protocolManager);
+
+			// Update injection hook
+			try {
+				PlayerInjectHooks hook = config.getInjectionMethod();
+
+				// Only update the hook if it's different
+				if (!protocolManager.getPlayerHook().equals(hook)) {
+					logger.info("Changing player hook from " + protocolManager.getPlayerHook() + " to " + hook);
+					protocolManager.setPlayerHook(hook);
+				}
+			} catch (IllegalArgumentException e) {
+				reporter.reportWarning(config, Report.newBuilder(REPORT_CANNOT_PARSE_INJECTION_METHOD).error(e));
+			}
+
+			// Send logging information to player listeners too
+			initializeCommands();
+			setupBroadcastUsers(PERMISSION_INFO);
+
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
 		} catch (Throwable e) {
-			reporter.reportDetailed(this, "Cannot load ProtocolLib.", e, protocolManager);
+			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_LOAD_ERROR).error(e).callerParam(protocolManager));
+			disablePlugin();
 		}
 	}
-	
+
+	/**
+	 * Initialize all command handlers.
+	 */
+	private void initializeCommands() {
+		// Initialize command handlers
+		for (ProtocolCommand command : ProtocolCommand.values()) {
+			try {
+				switch (command) {
+				case PROTOCOL:
+					commandProtocol = new CommandProtocol(reporter, this, config);
+					break;
+				case FILTER:
+					commandFilter = new CommandFilter(reporter, this, config);
+					break;
+				case PACKET:
+					commandPacket = new CommandPacket(reporter, this, logger, commandFilter, protocolManager);
+					break;
+				}
+			} catch (OutOfMemoryError e) {
+				throw e;
+			} catch (ThreadDeath e) {
+				throw e;
+			} catch (Throwable e) {
+				reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_REGISTER_COMMAND).messageParam(command.name(), e.getMessage()).error(e));
+			}
+		}
+	}
+
+	/**
+	 * Retrieve a error reporter that may be filtered by the configuration.
+	 * @return The new default error reporter.
+	 */
+	private ErrorReporter getFilteredReporter(ErrorReporter reporter) {
+		return new DelegatedErrorReporter(reporter) {
+			private int lastModCount = -1;
+			private Set<String> reports = Sets.newHashSet();
+
+			@Override
+			protected Report filterReport(Object sender, Report report, boolean detailed) {
+				try {
+					String canonicalName = ReportType.getReportName(sender, report.getType());
+					String reportName = Iterables.getLast(Splitter.on("#").split(canonicalName)).toUpperCase();
+
+					if (config != null && config.getModificationCount() != lastModCount) {
+						// Update our cached set again
+						reports = Sets.newHashSet(config.getSuppressedReports());
+						lastModCount = config.getModificationCount();
+					}
+
+					// Cancel reports either on the full canonical name, or just the report name
+					if (reports.contains(canonicalName) || reports.contains(reportName))
+						return null;
+
+				} catch (Exception e) {
+					// Only report this with a minor message
+					logger.warning("Error filtering reports: " + e.toString());
+				}
+				// Don't filter anything
+				return report;
+			}
+		};
+	}
+
+	private boolean deleteConfig() {
+		return config.getFile().delete();
+	}
+
+	@Override
+	public void reloadConfig() {
+		super.reloadConfig();
+
+		// Reload configuration
+		if (config != null) {
+			config.reloadConfig();
+		}
+	}
+
+	private void setupBroadcastUsers(final String permission) {
+		// Guard against multiple calls
+		if (redirectHandler != null)
+			return;
+
+		// Broadcast information to every user too
+		redirectHandler = new Handler() {
+			@Override
+			public void publish(LogRecord record) {
+				// Only display warnings and above
+				if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
+					commandPacket.broadcastMessageSilently(record.getMessage(), permission);
+				}
+			}
+
+			@Override
+			public void flush() {
+				// Not needed.
+			}
+
+			@Override
+			public void close() throws SecurityException {
+				// Do nothing.
+			}
+		};
+
+		logger.addHandler(redirectHandler);
+	}
+
 	@Override
 	public void onEnable() {
 		try {
 			Server server = getServer();
 			PluginManager manager = server.getPluginManager();
-	
-			// Initialize background compiler
-			if (backgroundCompiler == null) {
-				backgroundCompiler = new BackgroundCompiler(getClassLoader());
-				BackgroundCompiler.setInstance(backgroundCompiler);
+
+			// Don't do anything else!
+			if (manager == null)
+				return;
+			// Silly plugin reloaders!
+			if (protocolManager == null) {
+				Logger directLogging = Logger.getLogger("Minecraft");
+				String[] message = new String[] { " PROTOCOLLIB DOES NOT SUPPORT PLUGIN RELOADERS. ", " PLEASE USE THE BUILT-IN RELOAD COMMAND. ", };
+
+				// Print as severe
+				for (String line : ChatExtensions.toFlowerBox(message, "*", 3, 1)) {
+					directLogging.severe(line);
+				}
+				disablePlugin();
+				return;
 			}
-	
-			// Notify server managers of incompatible plugins
-			checkForIncompatibility(manager);
-			
+
+			// Initialize background compiler
+			if (backgroundCompiler == null && config.isBackgroundCompilerEnabled()) {
+				backgroundCompiler = new BackgroundCompiler(getClassLoader(), reporter);
+				BackgroundCompiler.setInstance(backgroundCompiler);
+
+				logger.info("Started structure compiler thread.");
+			} else {
+				logger.info("Structure compiler thread has been disabled.");
+			}
+
+			// Set up command handlers
+			registerCommand(CommandProtocol.NAME, commandProtocol);
+			registerCommand(CommandPacket.NAME, commandPacket);
+			registerCommand(CommandFilter.NAME, commandFilter);
+
 			// Player login and logout events
 			protocolManager.registerEvents(manager, this);
-				
+
 			// Worker that ensures that async packets are eventually sent
-			createAsyncTask(server);
-			//toggleDebugListener();
-		
+			// It also performs the update check.
+			createPacketTask(server);
+
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
 		} catch (Throwable e) {
-			reporter.reportDetailed(this, "Cannot enable ProtocolLib.", e);
+			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_ENABLE_ERROR).error(e));
 			disablePlugin();
 			return;
 		}
-		
+
 		// Try to enable statistics
 		try {
-			statistisc = new Statistics(this);
+			if (config.isMetricsEnabled()) {
+				statistics = new Statistics(this);
+			}
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
 		} catch (IOException e) {
-			reporter.reportDetailed(this, "Unable to enable metrics.", e, statistisc);
+			reporter.reportDetailed(this, Report.newBuilder(REPORT_METRICS_IO_ERROR).error(e).callerParam(statistics));
 		} catch (Throwable e) {
-			reporter.reportDetailed(this, "Metrics cannot be enabled. Incompatible Bukkit version.", e, statistisc);
+			reporter.reportDetailed(this, Report.newBuilder(REPORT_METRICS_GENERIC_ERROR).error(e).callerParam(statistics));
 		}
 	}
 
-	/**
-	 * Toggle a listener that prints every sent and received packet.
-	 */
-	void toggleDebugListener() {
-		
-		if (debugListener) {
-			protocolManager.removePacketListeners(this);
-		} else {
-			// DEBUG DEBUG
-			protocolManager.addPacketListener(new MonitorAdapter(this, ConnectionSide.BOTH, logger) {
-				@Override
-				public void onPacketReceiving(PacketEvent event) {
-					Object handle = event.getPacket().getHandle();
-					
-					logger.info(String.format(
-							"RECEIVING %s@%s from %s.",
-							handle.getClass().getSimpleName(), handle.hashCode(), event.getPlayer().getName()
-					));
-				};
-				@Override
-				public void onPacketSending(PacketEvent event) {
-					Object handle = event.getPacket().getHandle();
-					
-					logger.info(String.format(
-							"SENDING %s@%s from %s.",
-							handle.getClass().getSimpleName(), handle.hashCode(), event.getPlayer().getName()
-					));
-				}
-			});
+	// Used to check Minecraft version
+	private MinecraftVersion verifyMinecraftVersion() {
+		MinecraftVersion minimum = new MinecraftVersion(MINIMUM_MINECRAFT_VERSION);
+		MinecraftVersion maximum = new MinecraftVersion(MAXIMUM_MINECRAFT_VERSION);
+
+		try {
+			MinecraftVersion current = new MinecraftVersion(getServer());
+
+			// Skip certain versions
+			if (!config.getIgnoreVersionCheck().equals(current.getVersion())) {
+				// We'll just warn the user for now
+				if (current.compareTo(minimum) < 0)
+					logger.warning("Version " + current + " is lower than the minimum " + minimum);
+				if (current.compareTo(maximum) > 0)
+					logger.warning("Version " + current + " has not yet been tested! Proceed with caution.");
+			}
+			return current;
+
+		} catch (Exception e) {
+			reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_PARSE_MINECRAFT_VERSION).error(e).messageParam(maximum));
+
+			// Unknown version - just assume it is the latest
+			return maximum;
 		}
-		debugListener = !debugListener;
 	}
-	
+
+	private void checkConflictingVersions() {
+		Pattern ourPlugin = Pattern.compile("ProtocolLib-(.*)\\.jar");
+		MinecraftVersion currentVersion = new MinecraftVersion(this.getDescription().getVersion());
+		MinecraftVersion newestVersion = null;
+
+		// Skip the file that contains this current instance however
+		File loadedFile = getFile();
+
+		try {
+			// Scan the plugin folder for newer versions of ProtocolLib
+			File pluginFolder = new File("plugins/");
+
+			for (File candidate : pluginFolder.listFiles()) {
+				if (candidate.isFile() && !candidate.equals(loadedFile)) {
+					Matcher match = ourPlugin.matcher(candidate.getName());
+
+					if (match.matches()) {
+						MinecraftVersion version = new MinecraftVersion(match.group(1));
+
+						if (candidate.length() == 0) {
+							// Delete and inform the user
+							logger.info((candidate.delete() ? "Deleted " : "Could not delete ") + candidate);
+						} else if (newestVersion == null || newestVersion.compareTo(version) < 0) {
+							newestVersion = version;
+						}
+					}
+				}
+			}
+
+		} catch (Exception e) {
+			reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_DETECT_CONFLICTING_PLUGINS).error(e));
+		}
+
+		// See if the newest version is actually higher
+		if (newestVersion != null && currentVersion.compareTo(newestVersion) < 0) {
+			// We don't need to set internal classes or instances to NULL - that would break the other loaded plugin
+			skipDisable = true;
+
+			throw new IllegalStateException(String.format("Detected a newer version of ProtocolLib (%s) in plugin folder than the current (%s). Disabling.", newestVersion.getVersion(), currentVersion.getVersion()));
+		}
+	}
+
+	private void registerCommand(String name, CommandExecutor executor) {
+		try {
+			// Ignore these - they must have printed an error already
+			if (executor == null)
+				return;
+
+			PluginCommand command = getCommand(name);
+
+			// Try to load the command
+			if (command != null)
+				command.setExecutor(executor);
+			else
+				throw new RuntimeException("plugin.yml might be corrupt.");
+
+		} catch (RuntimeException e) {
+			reporter.reportWarning(this, Report.newBuilder(REPORT_CANNOT_REGISTER_COMMAND).messageParam(name, e.getMessage()).error(e));
+		}
+	}
+
 	/**
 	 * Disable the current plugin.
 	 */
 	private void disablePlugin() {
 		getServer().getPluginManager().disablePlugin(this);
 	}
-	
-	private void createAsyncTask(Server server) {
+
+	private void createPacketTask(Server server) {
 		try {
-			if (asyncPacketTask >= 0)
-				throw new IllegalStateException("Async task has already been created");
-			
+			if (packetTask >= 0)
+				throw new IllegalStateException("Packet task has already been created");
+
 			// Attempt to create task
-			asyncPacketTask = server.getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
+			packetTask = server.getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
 				@Override
 				public void run() {
 					AsyncFilterManager manager = (AsyncFilterManager) protocolManager.getAsynchronousManager();
-					
+
 					// We KNOW we're on the main thread at the moment
 					manager.sendProcessedPackets(tickCounter++, true);
+
+					// House keeping
+					updateConfiguration();
 				}
-			}, ASYNC_PACKET_DELAY, ASYNC_PACKET_DELAY);
-		
+			}, ASYNC_MANAGER_DELAY, ASYNC_MANAGER_DELAY);
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
 		} catch (Throwable e) {
-			if (asyncPacketTask == -1) {
-				reporter.reportDetailed(this, "Unable to create packet timeout task.", e);
+			if (packetTask == -1) {
+				reporter.reportDetailed(this, Report.newBuilder(REPORT_CANNOT_CREATE_TIMEOUT_TASK).error(e));
 			}
 		}
 	}
-	
-	private void checkForIncompatibility(PluginManager manager) {
-		// Plugin authors: Notify me to remove these
-		String[] incompatiblePlugins = {};
-		
-		for (String plugin : incompatiblePlugins) {
-			if (manager.getPlugin(plugin) != null) {
-				// Check for versions, ect.
-				reporter.reportWarning(this, "Detected incompatible plugin: " + plugin);
-			}
+
+	private void updateConfiguration() {
+		if (config != null && config.getModificationCount() != configExpectedMod) {
+			configExpectedMod = config.getModificationCount();
+
+			// Update the debug flag
+			protocolManager.setDebug(config.isDebug());
 		}
 	}
-	
+
 	@Override
 	public void onDisable() {
+		if (skipDisable) {
+			return;
+		}
+
 		// Disable compiler
 		if (backgroundCompiler != null) {
 			backgroundCompiler.shutdownAll();
 			backgroundCompiler = null;
 			BackgroundCompiler.setInstance(null);
 		}
-		
+
 		// Clean up
-		if (asyncPacketTask >= 0) {
-			getServer().getScheduler().cancelTask(asyncPacketTask);
-			asyncPacketTask = -1;
+		if (packetTask >= 0) {
+			getServer().getScheduler().cancelTask(packetTask);
+			packetTask = -1;
 		}
-		
-		unhookTask.close();
-		protocolManager.close();
+
+		// And redirect handler too
+		if (redirectHandler != null) {
+			logger.removeHandler(redirectHandler);
+		}
+		if (protocolManager != null)
+			protocolManager.close();
+		else
+			return; // Plugin reloaders!
+
+		if (unhookTask != null)
+			unhookTask.close();
 		protocolManager = null;
-		statistisc = null;
-		
-		// Leaky ClassLoader begone!
-		CleanupStaticMembers cleanup = new CleanupStaticMembers(getClassLoader(), reporter);
-		cleanup.resetAll();
+		statistics = null;
+
+		// To clean up global parameters
+		reporter = new BasicErrorReporter();
 	}
-	
+
+	// Get the Bukkit logger first, before we try to create our own
+	private Logger getLoggerSafely() {
+		Logger log = null;
+
+		try {
+			log = getLogger();
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
+		} catch (Throwable e) {
+			// Ignore
+		}
+
+		// Use the default logger instead
+		if (log == null)
+			log = Logger.getLogger("Minecraft");
+		return log;
+	}
+
+	/**
+	 * Retrieve the current error reporter.
+	 * <p>
+	 * This is guaranteed to not be NULL in 2.5.0 and later.
+	 * @return Current error reporter.
+	 */
+	public static ErrorReporter getErrorReporter() {
+		return reporter;
+	}
+
+	/**
+	 * Retrieve the current strongly typed configuration.
+	 * @return The configuration, or NULL if ProtocolLib hasn't loaded yet.
+	 */
+	public static ProtocolConfig getConfiguration() {
+		return config;
+	}
+
 	/**
 	 * Retrieves the packet protocol manager.
 	 * @return Packet protocol manager, or NULL if it has been disabled.
@@ -230,30 +621,35 @@ public class ProtocolLibrary extends JavaPlugin {
 	public static ProtocolManager getProtocolManager() {
 		return protocolManager;
 	}
-	
+
 	/**
 	 * Retrieve the metrics instance used to measure users of this library.
 	 * <p>
-	 * Note that this method may return NULL when the server is reloading or shutting down.
+	 * Note that this method may return NULL when the server is reloading or shutting down. It is also
+	 * NULL if metrics has been disabled.
 	 * @return Metrics instance container.
 	 */
 	public Statistics getStatistics() {
-		return statistisc;
+		return statistics;
 	}
-	
-	// Get the Bukkit logger first, before we try to create our own
-	private Logger getLoggerSafely() {
-		
-		Logger log = null;
-	
-		try {
-			log = getLogger();
-		} catch (Throwable e) {
-			// We'll handle it
-		}
-		
-		if (log == null)
-			log = Logger.getLogger("Minecraft");
-		return log;
+
+	/**
+	 * Retrieve an executor service for performing asynchronous tasks on the behalf of ProtocolLib.
+	 * <p>
+	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
+	 * @return The executor service, or NULL.
+	 */
+	public static ListeningScheduledExecutorService getExecutorAsync() {
+		return executorAsync;
+	}
+
+	/**
+	 * Retrieve an executor service for performing synchronous tasks (main thread) on the behalf of ProtocolLib.
+	 * <p>
+	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
+	 * @return The executor service, or NULL.
+	 */
+	public static ListeningScheduledExecutorService getExecutorSync() {
+		return executorSync;
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolManager.java

@@ -17,17 +17,23 @@
 
 package com.comphenix.protocol;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import com.comphenix.protocol.async.AsyncMarker;
+import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.PacketConstructor;
 import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.utility.MinecraftVersion;
 import com.google.common.collect.ImmutableSet;
 
 /**
@@ -35,7 +41,73 @@ import com.google.common.collect.ImmutableSet;
  * @author Kristian
  */
 public interface ProtocolManager extends PacketStream {
-
+	/**
+	 * Retrieve the protocol version of a given player.
+	 * <p>
+	 * This only really makes sense of a server that support clients of multiple Minecraft versions, such as Spigot #1628.
+	 * @param player - the player.
+	 * @return The associated protocol version, or {@link Integer#MIN_VALUE} if unknown.
+	 */
+	public int getProtocolVersion(Player player);
+	
+	/**
+	 * Send a packet to the given player.
+	 * <p>
+	 * Re-sending a previously cancelled packet is discouraged. Use {@link AsyncMarker#incrementProcessingDelay()} 
+	 * to delay a packet until a certain condition has been met.
+	 * 
+	 * @param receiver - the receiver.
+	 * @param packet - packet to send.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
+	 * @throws InvocationTargetException - if an error occurred when sending the packet.
+	 */
+	@Override
+	public void sendServerPacket(Player receiver, PacketContainer packet, boolean filters) 
+			throws InvocationTargetException;
+	
+	/**
+	 * Simulate receiving a certain packet from a given player.
+	 * <p>
+	 * Receiving a previously cancelled packet is discouraged. Use {@link AsyncMarker#incrementProcessingDelay()} 
+	 * to delay a packet until a certain condition has been met.
+	 * 
+	 * @param sender - the sender.
+	 * @param packet - the packet that was sent.
+	 * @param filters - whether or not to invoke any packet filters below {@link ListenerPriority#MONITOR}.
+	 * @throws InvocationTargetException If the reflection machinery failed.
+	 * @throws IllegalAccessException If the underlying method caused an error.
+	 */
+	@Override
+	public void recieveClientPacket(Player sender, PacketContainer packet, boolean filters) 
+			throws IllegalAccessException, InvocationTargetException;
+	
+	/**
+	 * Broadcast a given packet to every connected player on the server.
+	 * @param packet - the packet to broadcast.
+	 * @throws FieldAccessException If we were unable to send the packet due to reflection problems.
+	 */
+	public void broadcastServerPacket(PacketContainer packet);
+	
+	/**
+	 * Broadcast a packet to every player that is receiving information about a given entity. 
+	 * <p>
+	 * This is usually every player in the same world within an observable distance. If the entity is a 
+	 * player, it will only be included if <i>includeTracker</i> is TRUE.
+	 * @param packet - the packet to broadcast.
+	 * @param entity - the entity whose trackers we will inform.
+	 * @param includeTracker - whether or not to also transmit the packet to the entity, if it is a tracker.
+	 * @throws FieldAccessException If we were unable to send the packet due to reflection problems.
+	 */
+	public void broadcastServerPacket(PacketContainer packet, Entity entity, boolean includeTracker);
+	
+	/**
+	 * Broadcast a packet to every player within the given maximum observer distance.
+	 * @param packet - the packet to broadcast.
+	 * @param origin - the origin to consider when calculating the distance to each observer.
+	 * @param maxObserverDistance - the maximum distance to the origin.
+	 */
+	public void broadcastServerPacket(PacketContainer packet, Location origin, int maxObserverDistance);
+	
 	/**
 	 * Retrieves a list of every registered packet listener.
 	 * @return Every registered packet listener.
@@ -68,11 +140,38 @@ public interface ProtocolManager extends PacketStream {
 
 	/**
 	 * Constructs a new encapsulated Minecraft packet with the given ID.
+	 * <p>
+	 * Deprecated: Use {@link #createPacket(PacketType)} instead.
 	 * @param id - packet ID.
 	 * @return New encapsulated Minecraft packet.
 	 */
+	@Deprecated
 	public PacketContainer createPacket(int id);
 	
+	/**
+	 * Constructs a new encapsulated Minecraft packet with the given ID.
+	 * @param  type - packet  type.
+	 * @return New encapsulated Minecraft packet.
+	 */
+	public PacketContainer createPacket(PacketType type);
+	
+	/**
+	 * Constructs a new encapsulated Minecraft packet with the given ID.
+	 * <p>
+	 * If set to true, the <i>forceDefaults</i> option will force the system to automatically 
+	 * give non-primitive fields in the packet sensible default values. For instance, certain
+	 * packets - like Packet60Explosion - require a List or Set to be non-null. If the
+	 * forceDefaults option is true, the List or Set will be automatically created.
+	 * <p>
+	 * Deprecated: Use {@link #createPacket(PacketType, boolean)} instead.
+	 * 
+	 * @param id - packet ID.
+	 * @param forceDefaults - TRUE to use sensible defaults in most fields, FALSE otherwise.
+	 * @return New encapsulated Minecraft packet.
+	 */
+	@Deprecated
+	public PacketContainer createPacket(int id, boolean forceDefaults);
+	
 	/**
 	 * Constructs a new encapsulated Minecraft packet with the given ID.
 	 * <p>
@@ -81,22 +180,33 @@ public interface ProtocolManager extends PacketStream {
 	 * packets - like Packet60Explosion - require a List or Set to be non-null. If the
 	 * forceDefaults option is true, the List or Set will be automatically created.
 	 * 
-	 * @param id - packet ID.
+	 * @param type - packet type.
 	 * @param forceDefaults - TRUE to use sensible defaults in most fields, FALSE otherwise.
 	 * @return New encapsulated Minecraft packet.
 	 */
-	public PacketContainer createPacket(int id, boolean forceDefaults);
+	public PacketContainer createPacket(PacketType type, boolean forceDefaults);
 
 	/**
 	 * Construct a packet using the special builtin Minecraft constructors.
+	 * <p>
+	 * Deprecated: Use {@link #createPacketConstructor(PacketType, Object...)} instead.
 	 * @param id - the packet ID.
 	 * @param arguments - arguments that will be passed to the constructor.
 	 * @return The packet constructor.
 	 */
+	@Deprecated
 	public PacketConstructor createPacketConstructor(int id, Object... arguments);
 	
 	/**
-	 * Completely refresh all clients about an entity.
+	 * Construct a packet using the special builtin Minecraft constructors.
+	 * @param id - the packet type.
+	 * @param arguments - arguments that will be passed to the constructor.
+	 * @return The packet constructor.
+	 */
+	public PacketConstructor createPacketConstructor(PacketType type, Object... arguments);
+	
+	/**
+	 * Completely resend an entity to a list of clients.
 	 * <p>
 	 * Note that this method is NOT thread safe. If you call this method from anything 
 	 * but the main thread, it will throw an exception.
@@ -105,27 +215,68 @@ public interface ProtocolManager extends PacketStream {
 	 */
 	public void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException;
 	
+	/**
+	 * Retrieve the associated entity.
+	 * @param container - the world the entity belongs to.
+	 * @param id - the unique ID of the entity.
+	 * @return The associated entity.
+	 * @throws FieldAccessException Reflection failed.
+	 */
+	public Entity getEntityFromID(World container, int id) throws FieldAccessException;
+	
+	/**
+	 * Retrieve every client that is receiving information about a given entity.
+	 * @param entity - the entity that is being tracked.
+	 * @return Every client/player that is tracking the given entity.
+	 * @throws FieldAccessException If reflection failed.
+	 */
+	public List<Player> getEntityTrackers(Entity entity) throws FieldAccessException;
+	
 	/**
 	 * Retrieves a immutable set containing the ID of the sent server packets that will be observed by listeners.
+	 * <p>
+	 * Deprecated: Use {@link #getSendingFilterTypes()} instead.
 	 * @return Every filtered server packet.
 	 */
+	@Deprecated
 	public Set<Integer> getSendingFilters();
 	
 	/**
-	 * Retrieves a immutable set containing the ID of the recieved client packets that will be observed by listeners.
+	 * Retrieves a immutable set containing the type of the sent server packets that will be observed by listeners.
+	 * @return Every filtered server packet.
+	 */
+	public Set<PacketType> getSendingFilterTypes();
+	
+	/**
+	 * Retrieves a immutable set containing the ID of the received client packets that will be observed by listeners.
+	 * <p>
+	 * Deprecated: Use {@link #getReceivingFilterTypes()} instead.
 	 * @return Every filtered client packet.
 	 */
+	@Deprecated
 	public Set<Integer> getReceivingFilters();
 	
 	/**
-	 * Determines whether or not this protocol mananger has been disabled. 
+	 * Retrieves a immutable set containing the type of the received client packets that will be observed by listeners.
+	 * @return Every filtered client packet.
+	 */
+	public Set<PacketType> getReceivingFilterTypes();
+	
+	/**
+	 * Retrieve the current Minecraft version.
+	 * @return The current version.
+	 */
+	public MinecraftVersion getMinecraftVersion();
+	
+	/**
+	 * Determines whether or not this protocol manager has been disabled. 
 	 * @return TRUE if it has, FALSE otherwise.
 	 */
 	public boolean isClosed();
 
 	/**
-	 * Retrieve the current asyncronous packet manager.
-	 * @return Asyncronous packet manager.
+	 * Retrieve the current asynchronous packet manager.
+	 * @return Asynchronous packet manager.
 	 */
 	public AsynchronousManager getAsynchronousManager();
 }

ProtocolLib/src/main/java/com/comphenix/protocol/RangeParser.java

@@ -0,0 +1,164 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.List;
+
+import com.google.common.collect.DiscreteDomains;
+import com.google.common.collect.Range;
+import com.google.common.collect.Ranges;
+
+/**
+ * Used to parse ranges in CommandPacket.
+ * 
+ * @author Kristian
+ */
+class RangeParser {
+	/**
+	 * Parse a range from a given text.
+	 * @param text - the text.
+	 * @param legalRange - range of legal values.
+	 * @return The parsed ranges.
+	 */
+	public static List<Range<Integer>> getRanges(String text, Range<Integer> legalRange) {
+		return getRanges(new ArrayDeque<String>(Arrays.asList(text)), legalRange);
+	}
+	
+	/**
+	 * Parse ranges from an array of elements.
+	 * @param args - array of elements.
+	 * @param offset - beginning offset.
+	 * @param lastIndex - the last index of the array to read.
+	 * @param legalRange - range of legal values.
+	 * @return The parsed ranges.
+	 */
+	public static List<Range<Integer>> getRanges(Deque<String> input, Range<Integer> legalRange) {
+		List<String> tokens = tokenizeInput(input);
+		List<Range<Integer>> ranges = new ArrayList<Range<Integer>>();
+		
+		for (int i = 0; i < tokens.size(); i++) {
+			Range<Integer> range;
+			String current = tokens.get(i);
+			String next = i + 1 < tokens.size() ? tokens.get(i + 1) : null;
+			
+			// Yoda equality is done for null-safety
+			if ("-".equals(current)) {
+				throw new IllegalArgumentException("A hyphen must appear between two numbers.");
+			} else if ("-".equals(next)) {
+				if (i + 2 >= tokens.size())
+					throw new IllegalArgumentException("Cannot form a range without a upper limit.");
+
+				// This is a proper range
+				range = Ranges.closed(Integer.parseInt(current), Integer.parseInt(tokens.get(i + 2)));
+				ranges.add(range);
+				
+				// Skip the two next tokens
+				i += 2;
+				
+			} else {
+				// Just a single number
+				range = Ranges.singleton(Integer.parseInt(current));
+				ranges.add(range);
+			}
+			
+			// Validate ranges
+			if (!legalRange.encloses(range)) {
+				throw new IllegalArgumentException(range + " is not in the range " + range.toString());
+			}
+		}
+		
+		return simplify(ranges, legalRange.upperEndpoint());
+	}
+	
+	/**
+	 * Simplify a list of ranges by assuming a maximum value.
+	 * @param ranges - the list of ranges to simplify.
+	 * @param maximum - the maximum value (minimum value is always 0).
+	 * @return A simplified list of ranges.
+	 */
+	private static List<Range<Integer>> simplify(List<Range<Integer>> ranges, int maximum) {
+		List<Range<Integer>> result = new ArrayList<Range<Integer>>();
+		boolean[] set = new boolean[maximum + 1];
+		int start = -1;
+		
+		// Set every ID
+		for (Range<Integer> range : ranges) {
+			for (int id : range.asSet(DiscreteDomains.integers())) {
+				set[id] = true;
+			}
+		}
+		
+		// Generate ranges from this set
+		for (int i = 0; i <= set.length; i++) {
+			if (i < set.length && set[i]) {
+				if (start < 0) {
+					start = i;
+				}
+			} else {
+				if (start >= 0) {
+					result.add(Ranges.closed(start, i - 1));
+					start = -1;
+				}
+			}
+		}
+		
+		return result;
+	}
+	
+	private static List<String> tokenizeInput(Deque<String> input) {
+		List<String> tokens = new ArrayList<String>();
+		
+		// Tokenize the input
+		while (!input.isEmpty()) {
+			StringBuilder number = new StringBuilder();
+			String text = input.peek();
+			
+			for (int j = 0; j < text.length(); j++) {
+				char current = text.charAt(j);
+				
+				if (Character.isDigit(current)) {
+					number.append(current);
+				} else if (Character.isWhitespace(current)) {
+					// That's ok
+				} else if (current == '-') {
+					// Add the number token first
+					if (number.length() > 0) {
+						tokens.add(number.toString());
+						number.setLength(0);
+					}
+					
+					tokens.add(Character.toString(current));
+				} else {
+					// We're no longer dealing with integers - quit
+					return tokens;
+				}
+			}
+			
+			// Add the number token, if it hasn't already
+			if (number.length() > 0)
+				tokens.add(number.toString());
+			input.poll();
+		}
+		
+		return tokens;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/annotations/Spigot.java

@@ -0,0 +1,27 @@
+package com.comphenix.protocol.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicate that this API and its descendants are only valid on Spigot.
+ * @author Kristian
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PACKAGE,
+	     ElementType.PARAMETER, ElementType.TYPE, ElementType.FIELD})
+public @interface Spigot {
+	/**
+	 * The minimum build number of Spigot where this is valid.
+	 * @return The minimum build.
+	 */
+	int minimumBuild();
+
+	/**
+	 * The maximum build number of Spigot where this is valid, or Integer.MAX_VALUE if not set.
+	 * @return The maximum build number.
+	 */
+	int maximumBuild() default Integer.MAX_VALUE;
+}

ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncFilterManager.java

@@ -20,13 +20,16 @@ package com.comphenix.protocol.async;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
 
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketStream;
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.ListeningWhitelist;
@@ -34,72 +37,137 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.PacketFilterManager;
 import com.comphenix.protocol.injector.PrioritizedListener;
+import com.comphenix.protocol.injector.SortedPacketListenerList;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
 
 /**
  * Represents a filter manager for asynchronous packets.
- * 
+ * <p>
+ * By using {@link AsyncMarker#incrementProcessingDelay()}, a packet can be delayed without having to block the
+ * processing thread.
  * @author Kristian
  */
 public class AsyncFilterManager implements AsynchronousManager {
 
+	private SortedPacketListenerList serverTimeoutListeners;
+	private SortedPacketListenerList clientTimeoutListeners;
+	private Set<PacketListener> timeoutListeners;
+	
 	private PacketProcessingQueue serverProcessingQueue;
-	private PacketSendingQueue serverQueue;
-	
 	private PacketProcessingQueue clientProcessingQueue;
-	private PacketSendingQueue clientQueue;
+
+	// Sending queues
+	private final PlayerSendingHandler playerSendingHandler;
 	
-	private ErrorReporter reporter;
+	// Report exceptions
+	private final ErrorReporter reporter;
 	
 	// The likely main thread
-	private Thread mainThread;
+	private final Thread mainThread;
 	
 	// Default scheduler
-	private BukkitScheduler scheduler;
+	private final BukkitScheduler scheduler;
+	
+	// Current packet index
+	private final AtomicInteger currentSendingIndex = new AtomicInteger();
 	
 	// Our protocol manager
 	private ProtocolManager manager;
 	
-	// Current packet index
-	private AtomicInteger currentSendingIndex = new AtomicInteger();
-	
-	// Whether or not we're currently cleaning up
-	private volatile boolean cleaningUp;
-	
-	public AsyncFilterManager(ErrorReporter reporter, BukkitScheduler scheduler, ProtocolManager manager) {
-		
-		// Server packets are synchronized already
-		this.serverQueue = new PacketSendingQueue(false);
-		
-		// Client packets must be synchronized
-		this.clientQueue = new PacketSendingQueue(true); 
-		
-		this.serverProcessingQueue = new PacketProcessingQueue(serverQueue);
-		this.clientProcessingQueue = new PacketProcessingQueue(clientQueue);
+	/**
+	 * Initialize a asynchronous filter manager.
+	 * <p>
+	 * <b>Internal method</b>. Retrieve the global asynchronous manager from the protocol manager instead. 
+	 * @param reporter - desired error reporter.
+	 * @param scheduler - task scheduler.
+	 */
+	public AsyncFilterManager(ErrorReporter reporter, BukkitScheduler scheduler) {
+		// Initialize timeout listeners
+		this.serverTimeoutListeners = new SortedPacketListenerList();
+		this.clientTimeoutListeners = new SortedPacketListenerList();
+		this.timeoutListeners = Sets.newSetFromMap(new ConcurrentHashMap<PacketListener, Boolean>());
+
+		this.playerSendingHandler = new PlayerSendingHandler(reporter, serverTimeoutListeners, clientTimeoutListeners);
+		this.serverProcessingQueue = new PacketProcessingQueue(playerSendingHandler);
+		this.clientProcessingQueue = new PacketProcessingQueue(playerSendingHandler);
+		this.playerSendingHandler.initializeScheduler();
 		
 		this.scheduler = scheduler;
-		this.manager = manager;
-		
 		this.reporter = reporter;
 		this.mainThread = Thread.currentThread();
 	}
 	
+	/**
+	 * Retrieve the protocol manager.
+	 * @return The protocol manager.
+	 */
+	public ProtocolManager getManager() {
+		return manager;
+	}
+	
+	/**
+	 * Set the associated protocol manager.
+	 * @param manager - the new manager.
+	 */
+	public void setManager(ProtocolManager manager) {
+		this.manager = manager;
+	}
+	
 	@Override
 	public AsyncListenerHandler registerAsyncHandler(PacketListener listener) {
 		return registerAsyncHandler(listener, true);
 	}
 	
+	@Override
+	public void registerTimeoutHandler(PacketListener listener) {
+		if (listener == null)
+			throw new IllegalArgumentException("listener cannot be NULL.");
+		if (!timeoutListeners.add(listener))
+			return;
+		
+		ListeningWhitelist sending = listener.getSendingWhitelist();
+		ListeningWhitelist receiving = listener.getReceivingWhitelist();
+		
+		if (!ListeningWhitelist.isEmpty(sending))
+			serverTimeoutListeners.addListener(listener, sending);
+		if (!ListeningWhitelist.isEmpty(receiving))
+			serverTimeoutListeners.addListener(listener, receiving);
+	}
+
+	@Override
+	public Set<PacketListener> getTimeoutHandlers() {
+		return ImmutableSet.copyOf(timeoutListeners);
+	}
+	
+	@Override
+	public Set<PacketListener> getAsyncHandlers() {
+		ImmutableSet.Builder<PacketListener> builder = ImmutableSet.builder();
+		
+		// Add every asynchronous packet listener
+		for (PrioritizedListener<AsyncListenerHandler> handler : 
+				Iterables.concat(serverProcessingQueue.values(), clientProcessingQueue.values())) {
+			builder.add(handler.getListener().getAsyncListener());
+		}
+		return builder.build();
+	}
+	
 	/**
 	 * Registers an asynchronous packet handler.
 	 * <p>
+	 * Use {@link AsyncMarker#incrementProcessingDelay()} to delay a packet until its ready to be transmitted.
+	 * <p>
 	 * To start listening asynchronously, pass the getListenerLoop() runnable to a different thread.
 	 * <p>
 	 * Asynchronous events will only be executed if a synchronous listener with the same packets is registered.
 	 * If you already have a synchronous event, call this method with autoInject set to FALSE.
 	 * 
-	 * @param listener - the packet listener that will recieve these asynchronous events.
+	 * @param listener - the packet listener that will receive these asynchronous events.
 	 * @param autoInject - whether or not to automatically create the corresponding synchronous listener,
-	 * @return An asynchrouns handler.
+	 * @return An asynchronous handler.
 	 */
 	public AsyncListenerHandler registerAsyncHandler(PacketListener listener, boolean autoInject) {
 		AsyncListenerHandler handler = new AsyncListenerHandler(mainThread, this, listener);
@@ -107,12 +175,15 @@ public class AsyncFilterManager implements AsynchronousManager {
 		ListeningWhitelist sendingWhitelist = listener.getSendingWhitelist();
 		ListeningWhitelist receivingWhitelist = listener.getReceivingWhitelist();
 		
+		if (!hasValidWhitelist(sendingWhitelist) && !hasValidWhitelist(receivingWhitelist)) {
+			throw new IllegalArgumentException("Listener has an empty sending and receiving whitelist.");
+		}
+		
 		// Add listener to either or both processing queue
 		if (hasValidWhitelist(sendingWhitelist)) {
 			PacketFilterManager.verifyWhitelist(listener, sendingWhitelist);
 			serverProcessingQueue.addListener(handler, sendingWhitelist);
 		}
-		
 		if (hasValidWhitelist(receivingWhitelist)) {
 			PacketFilterManager.verifyWhitelist(listener, receivingWhitelist);
 			clientProcessingQueue.addListener(handler, receivingWhitelist);
@@ -123,12 +194,55 @@ public class AsyncFilterManager implements AsynchronousManager {
 			handler.setNullPacketListener(new NullPacketListener(listener));
 			manager.addPacketListener(handler.getNullPacketListener());
 		}
-		
 		return handler;
 	}
 	
 	private boolean hasValidWhitelist(ListeningWhitelist whitelist) {
-		return whitelist != null && whitelist.getWhitelist().size() > 0;
+		return whitelist != null && whitelist.getTypes().size() > 0;
+	}
+	
+	@Override
+	public void unregisterTimeoutHandler(PacketListener listener) {
+		if (listener == null)
+			throw new IllegalArgumentException("listener cannot be NULL.");
+		
+		ListeningWhitelist sending = listener.getSendingWhitelist();
+		ListeningWhitelist receiving = listener.getReceivingWhitelist();
+		
+		// Do it in the opposite order
+		if (serverTimeoutListeners.removeListener(listener, sending).size() > 0 ||
+			clientTimeoutListeners.removeListener(listener, receiving).size() > 0) {
+			timeoutListeners.remove(listener);
+		}
+	}
+	
+	@Override
+	public void unregisterAsyncHandler(PacketListener listener) {
+		if (listener == null)
+			throw new IllegalArgumentException("listener cannot be NULL.");
+		
+		AsyncListenerHandler handler = 
+					  findHandler(serverProcessingQueue, listener.getSendingWhitelist(), listener);
+		
+		if (handler == null) {
+			handler = findHandler(clientProcessingQueue, listener.getReceivingWhitelist(), listener);
+		}
+		unregisterAsyncHandler(handler);
+	}
+	
+	// Search for the first correct handler
+	private AsyncListenerHandler findHandler(PacketProcessingQueue queue, ListeningWhitelist search, PacketListener target) {
+		if (ListeningWhitelist.isEmpty(search)) 
+			return null;
+		
+		for (PacketType type : search.getTypes()) {
+			for (PrioritizedListener<AsyncListenerHandler> element : queue.getListener(type)) {
+				if (element.getListener().getAsyncListener() == target) {
+					return element.getListener();
+				}
+			}
+		}
+		return null;
 	}
 	
 	@Override
@@ -152,18 +266,15 @@ public class AsyncFilterManager implements AsynchronousManager {
 		
 		// Just remove it from the queue(s)
 		if (hasValidWhitelist(listener.getSendingWhitelist())) {
-			List<Integer> removed = serverProcessingQueue.removeListener(handler, listener.getSendingWhitelist());
+			List<PacketType> removed = serverProcessingQueue.removeListener(handler, listener.getSendingWhitelist());
 			
 			// We're already taking care of this, so don't do anything
-			if (!cleaningUp)
-				serverQueue.signalPacketUpdate(removed, synchronusOK);
+			playerSendingHandler.sendServerPackets(removed, synchronusOK);
 		}
 		
 		if (hasValidWhitelist(listener.getReceivingWhitelist())) {
-			List<Integer> removed = clientProcessingQueue.removeListener(handler, listener.getReceivingWhitelist());
-			
-			if (!cleaningUp)
-				clientQueue.signalPacketUpdate(removed, synchronusOK);
+			List<PacketType> removed = clientProcessingQueue.removeListener(handler, listener.getReceivingWhitelist());
+			playerSendingHandler.sendClientPackets(removed, synchronusOK);
 		}
 	}
 	
@@ -214,26 +325,35 @@ public class AsyncFilterManager implements AsynchronousManager {
 	
 	@Override
 	public Set<Integer> getSendingFilters() {
+		return PacketRegistry.toLegacy(serverProcessingQueue.keySet());
+	}
+	
+	@Override
+	public Set<PacketType> getReceivingTypes() {
 		return serverProcessingQueue.keySet();
 	}
 	
 	@Override
 	public Set<Integer> getReceivingFilters() {
+		return PacketRegistry.toLegacy(clientProcessingQueue.keySet());
+	}
+	
+	@Override
+	public Set<PacketType> getSendingTypes() {
 		return clientProcessingQueue.keySet();
 	}
 	
 	/**
-	 * Used to create a default asynchronous task.
-	 * @param plugin - the calling plugin.
-	 * @param runnable - the runnable.
+	 * Retrieve the current task scheduler.
+	 * @return Current task scheduler.
 	 */
-	public void scheduleAsyncTask(Plugin plugin, Runnable runnable) {
-		scheduler.scheduleAsyncDelayedTask(plugin, runnable);
+	public BukkitScheduler getScheduler() {
+		return scheduler;
 	}
 	
 	@Override
 	public boolean hasAsynchronousListeners(PacketEvent packet) {
-		 Collection<?> list = getProcessingQueue(packet).getListener(packet.getPacketID());
+		 Collection<?> list = getProcessingQueue(packet).getListener(packet.getPacketType());
 		 return list != null && list.size() > 0;
 	}
 	
@@ -273,11 +393,14 @@ public class AsyncFilterManager implements AsynchronousManager {
 	
 	@Override
 	public void cleanupAll() {
-		cleaningUp = true;
 		serverProcessingQueue.cleanupAll();
-		serverQueue.cleanupAll();
+		playerSendingHandler.cleanupAll();
+		timeoutListeners.clear();
+		
+		serverTimeoutListeners = null;
+		clientTimeoutListeners = null;
 	}
-
+	
 	@Override
 	public void signalPacketTransmission(PacketEvent packet) {
 		signalPacketTransmission(packet, onMainThread());
@@ -298,8 +421,12 @@ public class AsyncFilterManager implements AsynchronousManager {
 					"A packet must have been queued before it can be transmitted.");
 		
 		// Only send if the packet is ready
-		if (marker.decrementProcessingDelay() == 0) {			
-			getSendingQueue(packet).signalPacketUpdate(packet, onMainThread);
+		if (marker.decrementProcessingDelay() == 0) {
+			PacketSendingQueue queue = getSendingQueue(packet, false);
+			
+			// No need to create a new queue if the player has logged out
+			if (queue != null)
+				queue.signalPacketUpdate(packet, onMainThread);
 		}
 	}
 	
@@ -308,8 +435,27 @@ public class AsyncFilterManager implements AsynchronousManager {
 	 * @param packet - the packet.
 	 * @return The server or client sending queue the packet belongs to.
 	 */
-	private PacketSendingQueue getSendingQueue(PacketEvent packet) {
-		return packet.isServerPacket() ? serverQueue : clientQueue;
+	public PacketSendingQueue getSendingQueue(PacketEvent packet) {
+		return playerSendingHandler.getSendingQueue(packet);
+	}
+	
+	/**
+	 * Retrieve the sending queue this packet belongs to.
+	 * @param packet - the packet.
+	 * @param createNew - if TRUE, create a new queue if it hasn't already been created.
+	 * @return The server or client sending queue the packet belongs to.
+	 */
+	public PacketSendingQueue getSendingQueue(PacketEvent packet, boolean createNew) {
+		return playerSendingHandler.getSendingQueue(packet, createNew);
+	}
+	
+	/**
+	 * Retrieve the processing queue this packet belongs to.
+	 * @param packet - the packet.
+	 * @return The server or client sending processing the packet belongs to.
+	 */
+	public PacketProcessingQueue getProcessingQueue(PacketEvent packet) {
+		return packet.isServerPacket() ? serverProcessingQueue : clientProcessingQueue;
 	}
 	
 	/**
@@ -320,25 +466,23 @@ public class AsyncFilterManager implements AsynchronousManager {
 		getProcessingQueue(packet).signalProcessingDone();
 	}
 	
-	/**
-	 * Retrieve the processing queue this packet belongs to.
-	 * @param packet - the packet.
-	 * @return The server or client sending processing the packet belongs to.
-	 */
-	private PacketProcessingQueue getProcessingQueue(PacketEvent packet) {
-		return packet.isServerPacket() ? serverProcessingQueue : clientProcessingQueue;
-	}
-
 	/**
 	 * Send any due packets, or clean up packets that have expired.
 	 */
 	public void sendProcessedPackets(int tickCounter, boolean onMainThread) {
-		
 		// The server queue is unlikely to need checking that often
 		if (tickCounter % 10 == 0) {
-			serverQueue.trySendPackets(onMainThread);
+			playerSendingHandler.trySendServerPackets(onMainThread);
 		}
+		
+		playerSendingHandler.trySendClientPackets(onMainThread);
+	}
 
-		clientQueue.trySendPackets(onMainThread);
+	/**
+	 * Clean up after a given player has logged out.
+	 * @param player - the player that has just logged out.
+	 */
+	public void removePlayer(Player player) {
+		playerSendingHandler.removePlayer(player);
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java

@@ -20,24 +20,35 @@ package com.comphenix.protocol.async;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.bukkit.plugin.Plugin;
 
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.timing.TimedListenerManager;
+import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
+import com.comphenix.protocol.timing.TimedTracker;
+import com.comphenix.protocol.utility.WrappedScheduler;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 
 /**
  * Represents a handler for an asynchronous event.
- * 
+ * <p>
+ * Use {@link AsyncMarker#incrementProcessingDelay()} to delay a packet until a certain condition has been met.
  * @author Kristian
  */
 public class AsyncListenerHandler {
+	public static final ReportType REPORT_HANDLER_NOT_STARTED = new ReportType(
+		"Plugin %s did not start the asynchronous handler %s by calling start() or syncStart().");	
 
 	/**
 	 * Signal an end to packet processing.
@@ -49,6 +60,11 @@ public class AsyncListenerHandler {
 	 */
 	private static final PacketEvent WAKEUP_PACKET = new PacketEvent(new Object());
 	
+	/**
+	 * The expected number of ticks per second.
+	 */
+	private static final int TICKS_PER_SECOND = 20;
+	
 	// Unique worker ID
 	private static final AtomicInteger nextID = new AtomicInteger();
 	
@@ -75,10 +91,25 @@ public class AsyncListenerHandler {
 	private final Set<Integer> stoppedTasks = new HashSet<Integer>();
 	private final Object stopLock = new Object();
 	
+	// Processing task on the main thread
+	private int syncTask = -1;
+	
 	// Minecraft main thread
 	private Thread mainThread;
 	
-	public AsyncListenerHandler(Thread mainThread, AsyncFilterManager filterManager, PacketListener listener) {
+	// Warn plugins that the async listener handler must be started
+	private int warningTask;
+	
+	// Timing manager
+	private TimedListenerManager timedManager = TimedListenerManager.getInstance();
+	
+	/**
+	 * Construct a manager for an asynchronous packet handler.
+	 * @param mainThread - the main game thread.
+	 * @param filterManager - the parent filter manager.
+	 * @param listener - the current packet listener.
+	 */
+	AsyncListenerHandler(Thread mainThread, AsyncFilterManager filterManager, PacketListener listener) {
 		if (filterManager == null)
 			throw new IllegalArgumentException("filterManager cannot be NULL");
 		if (listener == null)
@@ -87,12 +118,44 @@ public class AsyncListenerHandler {
 		this.mainThread = mainThread;
 		this.filterManager = filterManager;
 		this.listener = listener;
+		startWarningTask();
 	}
 	
+	private void startWarningTask() {
+		warningTask = filterManager.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
+			@Override
+			public void run() {
+				ProtocolLibrary.getErrorReporter().reportWarning(AsyncListenerHandler.this, Report.
+						newBuilder(REPORT_HANDLER_NOT_STARTED).
+						messageParam(listener.getPlugin(), AsyncListenerHandler.this).
+						build()
+				);
+			}
+		}, 2 * TICKS_PER_SECOND);
+	}
+	
+	private void stopWarningTask() {
+		int taskId = warningTask;
+		
+		// Ensure we have a task to cancel
+		if (warningTask >= 0) {
+			filterManager.getScheduler().cancelTask(taskId);
+			warningTask = -1;
+		}
+	}
+	
+	/**
+	 * Determine whether or not this asynchronous handler has been cancelled.
+	 * @return TRUE if it has been cancelled/stopped, FALSE otherwise.
+	 */
 	public boolean isCancelled() {
 		return cancelled;
 	}
 
+	/**
+	 * Retrieve the current asynchronous packet listener.
+	 * @return Current packet listener.
+	 */
 	public PacketListener getAsyncListener() {
 		return listener;
 	}
@@ -223,7 +286,8 @@ public class AsyncListenerHandler {
 		
 		final AsyncRunnable listenerLoop = getListenerLoop();
 		
-		filterManager.scheduleAsyncTask(listener.getPlugin(), new Runnable() {
+		stopWarningTask();
+		scheduleAsync(new Runnable() {
 			@Override
 			public void run() {
 				Thread thread = Thread.currentThread();
@@ -271,7 +335,7 @@ public class AsyncListenerHandler {
 		final AsyncRunnable listenerLoop = getListenerLoop();
 		final Function<AsyncRunnable, Void> delegateCopy = executor;
 		
-		filterManager.scheduleAsyncTask(listener.getPlugin(), new Runnable() {
+		scheduleAsync(new Runnable() {
 			@Override
 			public void run() {
 				delegateCopy.apply(listenerLoop);
@@ -279,6 +343,11 @@ public class AsyncListenerHandler {
 		});
 	}
 	
+	private void scheduleAsync(Runnable runnable) {
+		// Handle deprecation
+		WrappedScheduler.runAsynchronouslyRepeat(listener.getPlugin(), filterManager.getScheduler(), runnable, 0L, -1L);
+	}
+	
 	/**
 	 * Create a friendly thread name using the following convention:
 	 * <p><code>
@@ -305,7 +374,107 @@ public class AsyncListenerHandler {
 		if (whitelist == null)
 			return "";
 		else
-			return Joiner.on(", ").join(whitelist.getWhitelist());
+			return Joiner.on(", ").join(whitelist.getTypes());
+	}
+	
+	/**
+	 * Start processing packets on the main thread.
+	 * <p>
+	 * This is useful if you need to synchronize with the main thread in your packet listener, but
+	 * you're not performing any expensive processing.
+	 * <p>
+	 * <b>Note</b>: Use a asynchronous worker if the packet listener may use more than 0.5 ms 
+	 * of processing time on a single packet. Do as much as possible on the worker thread, and schedule synchronous tasks 
+	 * to use the Bukkit API instead.
+	 * @return TRUE if the synchronized processing was successfully started, FALSE if it's already running.
+	 * @throws IllegalStateException If we couldn't start the underlying task.
+	 */
+	public synchronized boolean syncStart() {
+		return syncStart(500, TimeUnit.MICROSECONDS);
+	}
+	
+	/**
+	 * Start processing packets on the main thread.
+	 * <p>
+	 * This is useful if you need to synchronize with the main thread in your packet listener, but
+	 * you're not performing any expensive processing.
+	 * <p>
+	 * The processing time parameter gives the upper bound for the amount of time spent processing pending packets. 
+	 * It should be set to a fairly low number, such as 0.5 ms or 1% of a game tick - to reduce the impact 
+	 * on the main thread. Never go beyond 50 milliseconds.
+	 * <p>
+	 * <b>Note</b>: Use a asynchronous worker if the packet listener may exceed the ideal processing time 
+	 * on a single packet. Do as much as possible on the worker thread, and schedule synchronous tasks 
+	 * to use the Bukkit API instead.
+	 * 
+	 * @param time - the amount of processing time alloted per game tick (20 ticks per second).
+	 * @param unit - the unit of the processingTime argument.
+	 * @return TRUE if the synchronized processing was successfully started, FALSE if it's already running.
+	 * @throws IllegalStateException If we couldn't start the underlying task.
+	 */
+	public synchronized boolean syncStart(final long time, final TimeUnit unit) {
+		if (time <= 0)
+			throw new IllegalArgumentException("Time must be greater than zero.");
+		if (unit == null)
+			throw new IllegalArgumentException("TimeUnit cannot be NULL.");
+	
+		final long tickDelay = 1;
+		final int workerID = nextID.incrementAndGet();
+		
+		if (syncTask < 0) {
+			stopWarningTask();
+			
+			syncTask = filterManager.getScheduler().scheduleSyncRepeatingTask(getPlugin(), new Runnable() {
+				@Override
+				public void run() {
+					long stopTime = System.nanoTime() + unit.convert(time, TimeUnit.NANOSECONDS);
+					
+					while (!cancelled) {
+						PacketEvent packet = queuedPackets.poll();
+						
+						if (packet == INTERUPT_PACKET || packet == WAKEUP_PACKET) {
+							// Sorry, asynchronous threads!
+							queuedPackets.add(packet);
+							
+							// Try again next tick
+							break;
+						} else if (packet != null && packet.getAsyncMarker() != null) {
+							processPacket(workerID, packet, "onSyncPacket()");
+						} else {
+							// No more packets left - wait a tick
+							break;
+						}
+						
+						// Check time here, ensuring that we at least process one packet
+						if (System.nanoTime() < stopTime)
+							break;
+					}
+				}
+			}, tickDelay, tickDelay);
+			
+			// This is very bad - force the caller to handle it
+			if (syncTask < 0)
+				throw new IllegalStateException("Cannot start synchronous task.");
+			else
+				return true;
+		} else {
+			return false;
+		}
+	}
+	
+	/**
+	 * Stop processing packets on the main thread.
+	 * @return TRUE if we stopped any processing tasks, FALSE if it has already been stopped.
+	 */
+	public synchronized boolean syncStop() {
+		if (syncTask > 0) {
+			filterManager.getScheduler().cancelTask(syncTask);
+			
+			syncTask = -1;
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	/**
@@ -386,9 +555,13 @@ public class AsyncListenerHandler {
 		}
 	}
 	
-	// DO NOT call this method from the main thread
+	/**
+	 * The main processing loop of asynchronous threads.
+	 * <p>
+	 * Note: DO NOT call this method from the main thread
+	 * @param workerID - the current worker ID.
+	 */
 	private void listenerLoop(int workerID) {
-		
 		// Danger, danger!
 		if (Thread.currentThread().getId() == mainThread.getId()) 
 			throw new IllegalStateException("Do not call this method from the main thread.");
@@ -403,16 +576,11 @@ public class AsyncListenerHandler {
 			// Proceed
 			started.incrementAndGet();
 			
-			mainLoop:
 			while (!cancelled) {
 				PacketEvent packet = queuedPackets.take();
-				AsyncMarker marker = packet.getAsyncMarker();
 				
 				// Handle cancel requests
-				if (packet == null || marker == null || packet == INTERUPT_PACKET) {
-					return;
-					
-				} else if (packet == WAKEUP_PACKET) {
+				if (packet == WAKEUP_PACKET) {
 					// This is a bit slow, but it should be safe
 					synchronized (stopLock) {
 						// Are we the one who is supposed to stop?
@@ -421,40 +589,13 @@ public class AsyncListenerHandler {
 						if (waitForStops())
 							return;
 					}
+				} else if (packet == INTERUPT_PACKET) {
+					return;
 				}
 				
-				// Here's the core of the asynchronous processing
-				try {
-					marker.setListenerHandler(this);
-					marker.setWorkerID(workerID);
-					
-					synchronized (marker.getProcessingLock()) {
-						if (packet.isServerPacket())
-							listener.onPacketSending(packet);
-						else
-							listener.onPacketReceiving(packet);
-					}
-					
-				} catch (Throwable e) {
-					// Minecraft doesn't want your Exception.
-					filterManager.getErrorReporter().reportMinimal(listener.getPlugin(), "onAsyncPacket()", e);
+				if (packet != null && packet.getAsyncMarker() != null) {
+					processPacket(workerID, packet, "onAsyncPacket()");
 				}
-				
-				// Now, get the next non-cancelled listener
-				for (; marker.getListenerTraversal().hasNext(); ) {
-					AsyncListenerHandler handler = marker.getListenerTraversal().next().getListener();
-					
-					if (!handler.isCancelled()) {
-						handler.enqueuePacket(packet);
-						continue mainLoop;
-					}
-				}
-				
-				// There are no more listeners - queue the packet for transmission
-				filterManager.signalFreeProcessingSlot(packet);
-				
-				// Note that listeners can opt to delay the packet transmission
-				filterManager.signalPacketTransmission(packet);
 			}
 			
 		} catch (InterruptedException e) {
@@ -462,16 +603,87 @@ public class AsyncListenerHandler {
 		} finally {
 			// Clean up
 			started.decrementAndGet();
-			close();
 		}
 	}
 	
+	/**
+	 * Called when a packet is scheduled for processing.
+	 * @param workerID - the current worker ID.
+	 * @param packet - the current packet.
+	 * @param methodName - name of the method.
+	 */
+	private void processPacket(int workerID, PacketEvent packet, String methodName) {
+		AsyncMarker marker = packet.getAsyncMarker();
+		
+		// Here's the core of the asynchronous processing
+		try {	
+			synchronized (marker.getProcessingLock()) {
+				marker.setListenerHandler(this);
+				marker.setWorkerID(workerID);
+				
+				// We're not THAT worried about performance here
+				if (timedManager.isTiming()) {
+					// Retrieve the tracker to use
+					TimedTracker tracker = timedManager.getTracker(listener, 
+						packet.isServerPacket() ? ListenerType.ASYNC_SERVER_SIDE : ListenerType.ASYNC_CLIENT_SIDE);
+					long token = tracker.beginTracking();
+					
+					if (packet.isServerPacket())
+						listener.onPacketSending(packet);
+					else
+						listener.onPacketReceiving(packet);
+					
+					// And we're done
+					tracker.endTracking(token, packet.getPacketType());
+					
+				} else {
+					if (packet.isServerPacket())
+						listener.onPacketSending(packet);
+					else
+						listener.onPacketReceiving(packet);
+				}
+			}
+			
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
+		} catch (Throwable e) {
+			// Minecraft doesn't want your Exception.
+			filterManager.getErrorReporter().reportMinimal(listener.getPlugin(), methodName, e);
+		}
+		
+		// Now, get the next non-cancelled listener
+		if (!marker.hasExpired()) {
+			for (; marker.getListenerTraversal().hasNext(); ) {
+				AsyncListenerHandler handler = marker.getListenerTraversal().next().getListener();
+				
+				if (!handler.isCancelled()) {
+					handler.enqueuePacket(packet);
+					return;
+				}
+			}
+		}
+		
+		// There are no more listeners - queue the packet for transmission
+		filterManager.signalFreeProcessingSlot(packet);
+		
+		// Note that listeners can opt to delay the packet transmission
+		filterManager.signalPacketTransmission(packet);
+	}
+	
+	/**
+	 * Close all worker threads and the handler itself.
+	 */
 	private synchronized void close() {
 		// Remove the listener itself
 		if (!cancelled) {
 			filterManager.unregisterAsyncHandlerInternal(this);
 			cancelled = true;
 			
+			// Close processing tasks
+			syncStop();
+			
 			// Tell every uncancelled thread to end
 			stopThreads();
 		}

ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncMarker.java

@@ -25,13 +25,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.minecraft.server.Packet;
-
 import com.comphenix.protocol.PacketStream;
+import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.PrioritizedListener;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.utility.MinecraftReflection;
 import com.google.common.primitives.Longs;
 
 /**
@@ -51,7 +51,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	/**
 	 * Default number of milliseconds until a packet will rejected.
 	 */
-	public static final int DEFAULT_TIMEOUT_DELTA = 60000;
+	public static final int DEFAULT_TIMEOUT_DELTA = 1800 * 1000;
 	
 	/**
 	 * Default number of packets to skip.
@@ -99,8 +99,8 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	private transient int workerID;
 	
 	// Determine if Minecraft processes this packet asynchronously
-	private static Method isMinecraftAsync;
-	private static boolean alwaysSync;
+	private volatile static Method isMinecraftAsync;
+	private volatile static boolean alwaysSync;
 
 	/**
 	 * Create a container for asyncronous packets.
@@ -206,7 +206,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	}
 
 	/**
-	 * Increment the number of times this packet must be signalled as done before its transmitted.
+	 * Increment the number of times the current packet must be signalled as done before its transmitted.
 	 * <p>
 	 * This is useful if an asynchronous listener is waiting for further information before the
 	 * packet can be sent to the user. A packet listener <b>MUST</b> eventually call 
@@ -215,9 +215,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	 * <p>
 	 * It is recommended that processing outside a packet listener is wrapped in a synchronized block 
 	 * using the {@link #getProcessingLock()} method.
-	 * <p>
-	 * To decrement the processing delay, call signalPacketUpdate. A thread that calls this method
-	 * multiple times must call signalPacketUpdate at least that many times.
+	 * 
 	 * @return The new processing delay.
 	 */
 	public int incrementProcessingDelay() {
@@ -384,9 +382,9 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	void sendPacket(PacketEvent event) throws IOException {
 		try {
 			if (event.isServerPacket()) {
-				packetStream.sendServerPacket(event.getPlayer(), event.getPacket(), false);
+				packetStream.sendServerPacket(event.getPlayer(), event.getPacket(), NetworkMarker.getNetworkMarker(event), false);
 			} else {
-				packetStream.recieveClientPacket(event.getPlayer(), event.getPacket(), false);
+				packetStream.recieveClientPacket(event.getPlayer(), event.getPacket(), NetworkMarker.getNetworkMarker(event), false);
 			}
 			transmitted = true;
 			
@@ -405,10 +403,10 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 		
 		if (isMinecraftAsync == null && !alwaysSync) {
 			try {
-				isMinecraftAsync = FuzzyReflection.fromClass(Packet.class).getMethodByName("a_.*");
+				isMinecraftAsync = FuzzyReflection.fromClass(MinecraftReflection.getPacketClass()).getMethodByName("a_.*");
 			} catch (RuntimeException e) {
 				// This will occur in 1.2.5 (or possibly in later versions)
-				List<Method> methods = FuzzyReflection.fromClass(Packet.class).
+				List<Method> methods = FuzzyReflection.fromClass(MinecraftReflection.getPacketClass()).
 										getMethodListByParameters(boolean.class, new Class[] {});
 				
 				// Try to look for boolean methods
@@ -418,7 +416,7 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 					// We're in 1.2.5
 					alwaysSync = true;
 				} else {
-					System.err.println("Cannot determine asynchronous state of packets!");
+					System.err.println("[ProtocolLib] Cannot determine asynchronous state of packets!");
 					alwaysSync = true;
 				}
 			}
@@ -447,4 +445,20 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 		else
 			return Longs.compare(getNewSendingIndex(), o.getNewSendingIndex());
 	}
+	
+	@Override
+	public boolean equals(Object other) {
+		// Standard equals
+		if (other == this)
+			return true;
+		if (other instanceof AsyncMarker)
+			return getNewSendingIndex() == ((AsyncMarker) other).getNewSendingIndex();
+		else
+			return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return Longs.hashCode(getNewSendingIndex());
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/async/NullPacketListener.java

@@ -19,6 +19,7 @@ package com.comphenix.protocol.async;
 
 import org.bukkit.plugin.Plugin;
 
+import com.comphenix.protocol.events.ListenerOptions;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketEvent;
@@ -67,7 +68,8 @@ class NullPacketListener implements PacketListener {
 	
 	private ListeningWhitelist cloneWhitelist(ListenerPriority priority, ListeningWhitelist whitelist) {
 		if (whitelist != null) 
-			return new ListeningWhitelist(priority, whitelist.getWhitelist(), whitelist.getGamePhase());
+			// We don't use the Bukkit API, so don't engage the ProtocolLib synchronization code
+			return ListeningWhitelist.newBuilder(whitelist).priority(priority).mergeOptions(ListenerOptions.ASYNC).build();
 		else 
 			return null;
 	}

ProtocolLib/src/main/java/com/comphenix/protocol/async/PacketEventHolder.java

@@ -20,6 +20,7 @@ package com.comphenix.protocol.async;
 import com.comphenix.protocol.events.PacketEvent;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ComparisonChain;
+import com.google.common.primitives.Longs;
 
 /**
  * Provides a comparable to a packet event.
@@ -56,4 +57,20 @@ class PacketEventHolder implements Comparable<PacketEventHolder> {
 			   compare(sendingIndex, other.sendingIndex).
 			   result();
 	}
+	
+	@Override
+	public boolean equals(Object other) {
+		// Standard equals
+		if (other == this)
+			return true;
+		if (other instanceof PacketEventHolder)
+			return sendingIndex == ((PacketEventHolder) other).sendingIndex;
+		else
+			return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return Longs.hashCode(sendingIndex);
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java

@@ -19,10 +19,14 @@ package com.comphenix.protocol.async;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.concurrent.Semaphore;
 
+import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.concurrency.AbstractConcurrentListenerMultimap;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.PrioritizedListener;
 import com.google.common.collect.MinMaxPriorityQueue;
@@ -34,6 +38,8 @@ import com.google.common.collect.MinMaxPriorityQueue;
  * @author Kristian
  */
 class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncListenerHandler> {
+	public static final ReportType REPORT_GUAVA_CORRUPT_MISSING = 
+			new ReportType("Guava is either missing or corrupt. Reverting to PriorityQueue.");
 
 	// Initial number of elements
 	public static final int INITIAL_CAPACITY = 64;
@@ -58,23 +64,33 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 	private Queue<PacketEventHolder> processingQueue;
 	
 	// Packets for sending
-	private PacketSendingQueue sendingQueue;
-
-	public PacketProcessingQueue(PacketSendingQueue sendingQueue) {
-		this(sendingQueue, INITIAL_CAPACITY, DEFAULT_QUEUE_LIMIT, DEFAULT_MAXIMUM_CONCURRENCY);
+	private PlayerSendingHandler sendingHandler;
+	
+	public PacketProcessingQueue(PlayerSendingHandler sendingHandler) {
+		this(sendingHandler, INITIAL_CAPACITY, DEFAULT_QUEUE_LIMIT, DEFAULT_MAXIMUM_CONCURRENCY);
 	}
 	
-	public PacketProcessingQueue(PacketSendingQueue sendingQueue, int initialSize, int maximumSize, int maximumConcurrency) {
+	public PacketProcessingQueue(PlayerSendingHandler sendingHandler, int initialSize, int maximumSize, int maximumConcurrency) {
 		super();
 
-		this.processingQueue = Synchronization.queue(MinMaxPriorityQueue.
-				expectedSize(initialSize).
-				maximumSize(maximumSize).
-				<PacketEventHolder>create(), null);
+		try {
+			this.processingQueue = Synchronization.queue(MinMaxPriorityQueue.
+					expectedSize(initialSize).
+					maximumSize(maximumSize).
+					<PacketEventHolder>create(), null);
+		} catch (IncompatibleClassChangeError e) {
+			// Print in the console
+			ProtocolLibrary.getErrorReporter().reportWarning(
+				this, Report.newBuilder(REPORT_GUAVA_CORRUPT_MISSING).error(e));
+			
+			// It's a Beta class after all
+			this.processingQueue = Synchronization.queue(
+					new PriorityQueue<PacketEventHolder>(), null);
+		}
 				
 		this.maximumConcurrency = maximumConcurrency;
 		this.concurrentProcessing = new Semaphore(maximumConcurrency);
-		this.sendingQueue = sendingQueue;
+		this.sendingHandler = sendingHandler;
 	}
 	
 	/**
@@ -115,7 +131,7 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 			if (holder != null) {
 				PacketEvent packet = holder.getEvent();
 				AsyncMarker marker = packet.getAsyncMarker();
-				Collection<PrioritizedListener<AsyncListenerHandler>> list = getListener(packet.getPacketID());
+				Collection<PrioritizedListener<AsyncListenerHandler>> list = getListener(packet.getPacketType());
 				
 				marker.incrementProcessingDelay();
 				
@@ -131,8 +147,13 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 				}
 				
 				// The packet has no further listeners. Just send it.
-				if (marker.decrementProcessingDelay() == 0)
-					sendingQueue.signalPacketUpdate(packet, onMainThread);
+				if (marker.decrementProcessingDelay() == 0) {
+					PacketSendingQueue sendingQueue = sendingHandler.getSendingQueue(packet, false);
+					
+					// In case the player has logged out
+					if (sendingQueue != null)
+						sendingQueue.signalPacketUpdate(packet, onMainThread);
+				}
 				signalProcessingDone();
 				
 			} else {
@@ -168,5 +189,8 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 		
 		// Remove the rest, just in case
 		clearListeners();
+		
+		// Remove every packet in the queue
+		processingQueue.clear();
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java

@@ -21,10 +21,15 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.concurrent.PriorityBlockingQueue;
 
 import org.bukkit.entity.Player;
 
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.PlayerLoggedOutException;
 import com.comphenix.protocol.reflect.FieldAccessException;
@@ -33,14 +38,29 @@ import com.comphenix.protocol.reflect.FieldAccessException;
  * Represents packets ready to be transmitted to a client.
  * @author Kristian
  */
-class PacketSendingQueue {
-
-	public static final int INITIAL_CAPACITY = 64;
+abstract class PacketSendingQueue {
+	public static final ReportType REPORT_DROPPED_PACKET = new ReportType("Warning: Dropped packet index %s of type %s.");
+	
+	public static final int INITIAL_CAPACITY = 10;
 	
 	private PriorityBlockingQueue<PacketEventHolder> sendingQueue;
 	
-	// Whether or not packet transmission can only occur on the main thread
-	private final boolean synchronizeMain;
+	// Asynchronous packet sending
+	private Executor asynchronousSender;
+	// Whether or not packet transmission must occur on a specific thread
+	private final boolean notThreadSafe;
+	// Whether or not we've run the cleanup procedure
+	private boolean cleanedUp = false;
+	
+	/**
+	 * Create a packet sending queue.
+	 * @param notThreadSafe - whether or not to synchronize with the main thread or a background thread.
+	 */
+	public PacketSendingQueue(boolean notThreadSafe, Executor asynchronousSender) {
+		this.sendingQueue = new PriorityBlockingQueue<PacketEventHolder>(INITIAL_CAPACITY);
+		this.notThreadSafe = notThreadSafe;
+		this.asynchronousSender = asynchronousSender;
+	}
 	
 	/**
 	 * Number of packet events in the queue.
@@ -50,15 +70,6 @@ class PacketSendingQueue {
 		return sendingQueue.size();
 	}
 	
-	/**
-	 * Create a packet sending queue.
-	 * @param synchronizeMain - whether or not to synchronize with the main thread.
-	 */
-	public PacketSendingQueue(boolean synchronizeMain) {
-		this.sendingQueue = new PriorityBlockingQueue<PacketEventHolder>(INITIAL_CAPACITY);
-		this.synchronizeMain = synchronizeMain;
-	}
-	
 	/**
 	 * Enqueue a packet for sending. 
 	 * @param packet - packet to queue.
@@ -77,10 +88,11 @@ class PacketSendingQueue {
 		AsyncMarker marker = packetUpdated.getAsyncMarker();
 		
 		// Should we reorder the event?
-		if (marker.getQueuedSendingIndex() != marker.getNewSendingIndex()) {
+		if (marker.getQueuedSendingIndex() != marker.getNewSendingIndex() && !marker.hasExpired()) {
 			PacketEvent copy = PacketEvent.fromSynchronous(packetUpdated, marker);
 			
 			// "Cancel" the original event
+			packetUpdated.setReadOnly(false);
 			packetUpdated.setCancelled(true);
 			
 			// Enqueue the copy with the new sending index
@@ -97,15 +109,14 @@ class PacketSendingQueue {
 	 * @param packetsRemoved - packets that no longer have any listeners.
 	 * @param onMainThread - whether or not this is occuring on the main thread.
 	 */
-	public synchronized void signalPacketUpdate(List<Integer> packetsRemoved, boolean onMainThread) {
-		
-		Set<Integer> lookup = new HashSet<Integer>(packetsRemoved);
+	public synchronized void signalPacketUpdate(List<PacketType> packetsRemoved, boolean onMainThread) {
+		Set<PacketType> lookup = new HashSet<PacketType>(packetsRemoved);
 		
 		// Note that this is O(n), so it might be expensive
 		for (PacketEventHolder holder : sendingQueue) {
 			PacketEvent event = holder.getEvent();
 			
-			if (lookup.contains(event.getPacketID())) {
+			if (lookup.contains(event.getPacketType())) {
 				event.getAsyncMarker().setProcessed(true);
 			}
 		}
@@ -119,49 +130,115 @@ class PacketSendingQueue {
 	 * @param onMainThread - whether or not this is occuring on the main thread.
 	 */
 	public void trySendPackets(boolean onMainThread) {
-				
+		// Whether or not to continue sending packets
+		boolean sending = true;
+		
 		// Transmit as many packets as we can
-		while (true) {
-			PacketEventHolder holder = sendingQueue.peek();
-					
+		while (sending) {
+			PacketEventHolder holder = sendingQueue.poll();
+			
 			if (holder != null) {
-				PacketEvent current = holder.getEvent();
-				AsyncMarker marker = current.getAsyncMarker();
+				sending = processPacketHolder(onMainThread, holder);
+					
+				if (!sending) {
+					// Add it back again
+					sendingQueue.add(holder);
+				}
 				
-				// Abort if we're not on the main thread
-				if (synchronizeMain) {
+			} else {
+				// No more packets to send
+				sending = false;
+			}
+		}
+	}
+	
+	/**
+	 * Invoked when a packet might be ready for transmission.
+	 * @param onMainThread - TRUE if we're on the main thread, FALSE otherwise.
+	 * @param holder - packet container.
+	 * @return TRUE to continue sending packets, FALSE otherwise.
+	 */
+	private boolean processPacketHolder(boolean onMainThread, final PacketEventHolder holder) {
+		PacketEvent current = holder.getEvent();
+		AsyncMarker marker = current.getAsyncMarker();
+		boolean hasExpired = marker.hasExpired();
+		
+		// Guard in cause the queue is closed
+		if (cleanedUp) {
+			return true;
+		}
+				
+		// End condition?
+		if (marker.isProcessed() || hasExpired) {
+			if (hasExpired) {
+				// Notify timeout listeners
+				onPacketTimeout(current);
+				
+				// Recompute
+				marker = current.getAsyncMarker();
+				hasExpired = marker.hasExpired();
+				
+				// Could happen due to the timeout listeners
+				if (!marker.isProcessed() && !hasExpired) {
+					return false;
+				}
+			}
+			
+			// Is it okay to send the packet?
+			if (!current.isCancelled() && !hasExpired) {
+				// Make sure we're on the main thread
+				if (notThreadSafe) {
 					try {
 						boolean wantAsync = marker.isMinecraftAsync(current);
 						boolean wantSync = !wantAsync;
 						
-						// Quit if we haven't fulfilled our promise
-						if ((onMainThread && wantAsync) || (!onMainThread && wantSync))
-							return;
+						// Wait for the next main thread heartbeat if we haven't fulfilled our promise
+						if (!onMainThread && wantSync) {
+							return false;
+						}
+						
+						// Let's give it what it wants
+						if (onMainThread && wantAsync) {
+							asynchronousSender.execute(new Runnable() {
+								@Override
+								public void run() {
+									// We know this isn't on the main thread
+									processPacketHolder(false, holder);
+								}
+							});
+							
+							// Scheduler will do the rest
+							return true;
+						}
 						
 					} catch (FieldAccessException e) {
 						e.printStackTrace();
-						return;
+						
+						// Just drop the packet
+						return true;
 					}
-				}
+				} 
 				
-				if (marker.isProcessed() || marker.hasExpired()) {
-					if (marker.isProcessed() && !current.isCancelled()) {
-						// Silently skip players that have logged out
-						if (isOnline(current.getPlayer())) {
-							sendPacket(current);
-						}
-					}
-					
-					sendingQueue.poll();
-					continue;
+				// Silently skip players that have logged out
+				if (isOnline(current.getPlayer())) {
+					sendPacket(current);
 				}
-			}
+			} 
 			
-			// Only repeat when packets are removed
-			break;
+			// Drop the packet
+			return true;
 		}
+		
+		// Add it back and stop sending
+		return false;
 	}
 	
+	/**
+	 * Invoked when a packet has timed out.
+	 * @param event - the timed out packet.
+	 */
+	protected abstract void onPacketTimeout(PacketEvent event);
+	
 	private boolean isOnline(Player player) {
 		return player != null && player.isOnline();
 	}
@@ -186,7 +263,7 @@ class PacketSendingQueue {
 	 * @return TRUE if it must, FALSE otherwise.
 	 */
 	public boolean isSynchronizeMain() {
-		return synchronizeMain;
+		return notThreadSafe;
 	}
 
 	/**
@@ -204,10 +281,10 @@ class PacketSendingQueue {
 			}
 		
 		} catch (PlayerLoggedOutException e) {
-			System.out.println(String.format(
-					"[ProtocolLib] Warning: Dropped packet index %s of ID %s",
-					marker.getOriginalSendingIndex(), event.getPacketID()
-			));
+			ProtocolLibrary.getErrorReporter().reportDebug(this, Report.newBuilder(REPORT_DROPPED_PACKET).
+				messageParam(marker.getOriginalSendingIndex(), event.getPacketType()).
+				callerParam(event)
+			);
 			
 		} catch (IOException e) {
 			// Just print the error
@@ -219,7 +296,12 @@ class PacketSendingQueue {
 	 * Automatically transmits every delayed packet.
 	 */
 	public void cleanupAll() {
-		// Note that the cleanup itself will always occur on the main thread
-		forceSend();
+		if (!cleanedUp) {
+			// Note that the cleanup itself will always occur on the main thread
+			forceSend();
+			
+			// And we're done
+			cleanedUp = true;
+		}
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java

@@ -0,0 +1,264 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol.async;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+import org.bukkit.entity.Player;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.concurrency.ConcurrentPlayerMap;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.injector.SortedPacketListenerList;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+/**
+ * Contains every sending queue for every player.
+ * 
+ * @author Kristian
+ */
+class PlayerSendingHandler {
+	private ErrorReporter reporter;
+	private ConcurrentMap<Player, QueueContainer> playerSendingQueues;
+	
+	// Timeout listeners
+	private SortedPacketListenerList serverTimeoutListeners;
+	private SortedPacketListenerList clientTimeoutListeners;
+	
+	// Asynchronous packet sending
+	private Executor asynchronousSender;
+	
+	// Whether or not we're currently cleaning up
+	private volatile boolean cleaningUp;
+	
+	/**
+	 * Sending queues for a given player.
+	 * 
+	 * @author Kristian
+	 */
+	private class QueueContainer {
+		private PacketSendingQueue serverQueue;
+		private PacketSendingQueue clientQueue;
+		
+		public QueueContainer() {
+			// Server packets can be sent concurrently
+			serverQueue = new PacketSendingQueue(false, asynchronousSender) {
+				@Override
+				protected void onPacketTimeout(PacketEvent event) {
+					if (!cleaningUp) {
+						serverTimeoutListeners.invokePacketSending(reporter, event);
+					}
+				}
+			};
+			
+			// Client packets must be synchronized
+			clientQueue = new PacketSendingQueue(true, asynchronousSender) {
+				@Override
+				protected void onPacketTimeout(PacketEvent event) {
+					if (!cleaningUp) {
+						clientTimeoutListeners.invokePacketSending(reporter, event);
+					}
+				}
+			};
+		}
+
+		public PacketSendingQueue getServerQueue() {
+			return serverQueue;
+		}
+
+		public PacketSendingQueue getClientQueue() {
+			return clientQueue;
+		}
+	}
+	
+	/**
+	 * Initialize a packet sending handler.
+	 * @param reporter - error reporter.
+	 * @param serverTimeoutListeners - set of server timeout listeners.
+	 * @param clientTimeoutListeners - set of client timeout listeners.
+	 */
+	public PlayerSendingHandler(ErrorReporter reporter, 
+			SortedPacketListenerList serverTimeoutListeners, SortedPacketListenerList clientTimeoutListeners) {
+		
+		this.reporter = reporter;
+		this.serverTimeoutListeners = serverTimeoutListeners;
+		this.clientTimeoutListeners = clientTimeoutListeners;
+		
+		// Initialize storage of queues
+		this.playerSendingQueues = ConcurrentPlayerMap.usingAddress();
+	}
+	
+	/**
+	 * Start the asynchronous packet sender.
+	 */
+	public synchronized void initializeScheduler() {
+		if (asynchronousSender == null) {
+			ThreadFactory factory = new ThreadFactoryBuilder().
+				setDaemon(true).
+				setNameFormat("ProtocolLib-AsyncSender %s").
+				build();
+			asynchronousSender = Executors.newSingleThreadExecutor(factory);
+		}
+	}
+
+	/**
+	 * Retrieve the sending queue this packet belongs to.
+	 * @param packet - the packet.
+	 * @return The server or client sending queue the packet belongs to.
+	 */
+	public PacketSendingQueue getSendingQueue(PacketEvent packet) {
+		return getSendingQueue(packet, true);
+	}
+	
+	/**
+	 * Retrieve the sending queue this packet belongs to.
+	 * @param packet - the packet.
+	 * @param createNew - if TRUE, create a new queue if it hasn't already been created.
+	 * @return The server or client sending queue the packet belongs to.
+	 */
+	public PacketSendingQueue getSendingQueue(PacketEvent packet, boolean createNew) {
+		QueueContainer queues = playerSendingQueues.get(packet.getPlayer());
+		
+		// Safe concurrent initialization
+		if (queues == null && createNew) {
+			final QueueContainer newContainer = new QueueContainer();
+
+			// Attempt to map the queue
+			queues = playerSendingQueues.putIfAbsent(packet.getPlayer(), newContainer);
+			
+			if (queues == null) {
+				queues = newContainer;
+			}
+		}
+		
+		// Check for NULL again
+		if (queues != null)
+			return packet.isServerPacket() ? queues.getServerQueue() : queues.getClientQueue();
+		else
+			return null;
+	}
+
+	/**
+	 * Send all pending packets.
+	 */
+	public void sendAllPackets() {
+		if (!cleaningUp) {
+			for (QueueContainer queues : playerSendingQueues.values()) {
+				queues.getClientQueue().cleanupAll();
+				queues.getServerQueue().cleanupAll();
+			}
+		}
+	}
+	
+	/**
+	 * Immediately send every server packet with the given list of IDs.
+	 * @param types - types of every packet to send immediately.
+	 * @param synchronusOK - whether or not we're running on the main thread. 
+	 */
+	public void sendServerPackets(List<PacketType> types, boolean synchronusOK) {
+		if (!cleaningUp) {
+			for (QueueContainer queue : playerSendingQueues.values()) {
+				queue.getServerQueue().signalPacketUpdate(types, synchronusOK);
+			}
+		}
+	}
+	
+	/**
+	 * Immediately send every client packet with the given list of IDs.
+	 * @param ids - ID of every packet to send immediately.
+	 * @param synchronusOK - whether or not we're running on the main thread. 
+	 */
+	public void sendClientPackets(List<PacketType> types, boolean synchronusOK) {
+		if (!cleaningUp) {
+			for (QueueContainer queue : playerSendingQueues.values()) {
+				queue.getClientQueue().signalPacketUpdate(types, synchronusOK);
+			}
+		}
+	}
+	
+	/**
+	 * Send any outstanding server packets.
+	 * @param onMainThread - whether or not this is occuring on the main thread.
+	 */
+	public void trySendServerPackets(boolean onMainThread) {
+		for (QueueContainer queue : playerSendingQueues.values()) {
+			queue.getServerQueue().trySendPackets(onMainThread);
+		}
+	}
+	
+	/**
+	 * Send any outstanding server packets.
+	 * @param onMainThread - whether or not this is occuring on the main thread.
+	 */
+	public void trySendClientPackets(boolean onMainThread) {
+		for (QueueContainer queue : playerSendingQueues.values()) {
+			queue.getClientQueue().trySendPackets(onMainThread);
+		}
+	}
+	
+	/**
+	 * Retrieve every server packet queue for every player.
+	 * @return Every sever packet queue.
+	 */
+	public List<PacketSendingQueue> getServerQueues() {
+		List<PacketSendingQueue> result = new ArrayList<PacketSendingQueue>();
+		
+		for (QueueContainer queue : playerSendingQueues.values())
+			result.add(queue.getServerQueue());
+		return result;
+	}
+	
+	/**
+	 * Retrieve every client packet queue for every player.
+	 * @return Every client packet queue.
+	 */
+	public List<PacketSendingQueue> getClientQueues() {
+		List<PacketSendingQueue> result = new ArrayList<PacketSendingQueue>();
+		
+		for (QueueContainer queue : playerSendingQueues.values())
+			result.add(queue.getClientQueue());
+		return result;
+	}
+	
+	/**
+	 * Send all pending packets and clean up queues.
+	 */
+	public void cleanupAll() {
+		if (!cleaningUp) {
+			cleaningUp = true;
+			
+			sendAllPackets();
+			playerSendingQueues.clear();
+		}
+	}
+
+	/**
+	 * Invoked when a player has just logged out.
+	 * @param player - the player that just logged out.
+	 */
+	public void removePlayer(Player player) {
+		// Every packet will be dropped - there's nothing we can do
+		playerSendingQueues.remove(player);
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/collections/ExpireHashMap.java

@@ -0,0 +1,246 @@
+package com.comphenix.protocol.collections;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.PriorityQueue;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Ticker;
+import com.google.common.collect.Maps;
+import com.google.common.primitives.Longs;
+
+/**
+ * Represents a hash map where each association may expire after a given time has elapsed.
+ * <p>
+ * Note that replaced key-value associations are only collected once the original expiration time has elapsed. 
+ * 
+ * @author Kristian Stangeland
+ *
+ * @param <K> - type of the keys.
+ * @param <V> - type of the values.
+ */
+public class ExpireHashMap<K, V> {
+	private class ExpireEntry implements Comparable<ExpireEntry> {
+		public final long expireTime;
+		public final K expireKey;
+		public final V expireValue;
+		
+		public ExpireEntry(long expireTime, K expireKey, V expireValue) {
+			this.expireTime = expireTime;
+			this.expireKey = expireKey;
+			this.expireValue = expireValue;
+		}
+
+		@Override
+		public int compareTo(ExpireEntry o) {
+			return Longs.compare(expireTime, o.expireTime);
+		}
+
+		@Override
+		public String toString() {
+			return "ExpireEntry [expireTime=" + expireTime + ", expireKey=" + expireKey
+					+ ", expireValue=" + expireValue + "]";
+		}
+	}
+	
+	private Map<K, ExpireEntry> keyLookup = new HashMap<K, ExpireEntry>();
+	private PriorityQueue<ExpireEntry> expireQueue =  new PriorityQueue<ExpireEntry>();
+	
+	// View of keyLookup with direct values
+	private Map<K, V> valueView = Maps.transformValues(keyLookup, new Function<ExpireEntry, V>() {
+		@Override
+		public V apply(ExpireEntry entry) {
+			return entry.expireValue;
+		}
+	});
+	
+	// Supplied by the constructor
+	private Ticker ticker;
+	
+	/**
+	 * Construct a new hash map where each entry may expire at a given time.
+	 */
+	public ExpireHashMap() {
+		this(Ticker.systemTicker());
+	}
+	
+	/**
+	 * Construct a new hash map where each entry may expire at a given time.
+	 * @param ticker - supplier of the current time.
+	 */
+	public ExpireHashMap(Ticker ticker) {
+		this.ticker = ticker;
+	}
+	
+	/**
+	 * Retrieve the value associated with the given key, if it has not expired.
+	 * @param key - the key.
+	 * @return The value, or NULL if not found or it has expired.
+	 */
+	public V get(K key) {
+		evictExpired();
+		
+		ExpireEntry entry = keyLookup.get(key);
+		return entry != null ? entry.expireValue : null;
+	}
+	
+	/**
+	 * Associate the given key with the given value, until the expire delay have elapsed.
+	 * @param key - the key.
+	 * @param value - the value.
+	 * @param expireDelay - the amount of time until this association expires. Must be greater than zero.
+	 * @param expireUnit - the unit of the expiration.
+	 * @return Any previously unexpired association with this key, or NULL.
+	 */
+	public V put(K key, V value, long expireDelay, TimeUnit expireUnit) {
+		Preconditions.checkNotNull(expireUnit, "expireUnit cannot be NULL");
+		Preconditions.checkState(expireDelay > 0, "expireDelay cannot be equal or less than zero.");
+		evictExpired();
+		
+		ExpireEntry entry = new ExpireEntry(
+			ticker.read() + TimeUnit.NANOSECONDS.convert(expireDelay, expireUnit), 
+			key, value
+		); 
+		ExpireEntry previous = keyLookup.put(key, entry);
+		
+		// We enqueue its removal
+		expireQueue.add(entry);
+		return previous != null ? previous.expireValue : null;
+	}
+	
+	/**
+	 * Determine if the given key is referring to an unexpired association in the map.
+ 	 * @param key - the key.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean containsKey(K key) {
+		evictExpired();
+		return keyLookup.containsKey(key);
+	}
+	
+	/**
+	 * Determine if the given value is referring to an unexpired association in the map.
+ 	 * @param value - the value.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean containsValue(V value) {
+		evictExpired();
+		
+		// Linear scan is the best we've got
+		for (ExpireEntry entry : keyLookup.values()) {
+			if (Objects.equal(value, entry.expireValue)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Remove a key and its associated value from the map.
+	 * @param key - the key to remove.
+	 * @return Value of the removed association, NULL otherwise.
+	 */
+	public V removeKey(K key) {
+		evictExpired();
+		
+		ExpireEntry entry = keyLookup.remove(key);
+		return entry != null ? entry.expireValue : null;
+	}
+	
+	/**
+	 * Retrieve the number of entries in the map.
+	 * @return The number of entries.
+	 */
+	public int size() {
+		evictExpired();
+		return keyLookup.size();
+	}
+	
+	/**
+	 * Retrieve a view of the keys in the current map.
+	 * @return View of the keys.
+	 */
+	public Set<K> keySet() {
+		evictExpired();
+		return keyLookup.keySet();
+	}
+	
+	/**
+	 * Retrieve a view of all the values in the current map.
+	 * @return All the values.
+	 */
+	public Collection<V> values() {
+		evictExpired();
+		return valueView.values();
+	}
+	
+	/**
+	 * Retrieve a view of all the entries in the set.
+	 * @return All the entries.
+	 */
+	public Set<Entry<K, V>> entrySet() {
+		evictExpired();
+		return valueView.entrySet();
+	}
+	
+	/**
+	 * Retrieve a view of this expire map as an ordinary map that does not support insertion.
+	 * @return The map.
+	 */
+	public Map<K, V> asMap() {
+		evictExpired();
+		return valueView;
+	}
+	
+	/**
+	 * Clear all references to key-value pairs that have been removed or replaced before they were naturally evicted.
+	 * <p>
+	 * This operation requires a linear scan of the current entries in the map.
+	 */
+	public void collect() {
+		// First evict what we can
+		evictExpired();
+		
+		// Recreate the eviction queue - this is faster than removing entries in the old queue
+		expireQueue.clear();
+		expireQueue.addAll(keyLookup.values());
+	}
+	
+	/**
+	 * Clear all the entries in the current map.
+	 */
+	public void clear() {
+		keyLookup.clear();
+		expireQueue.clear();
+	}
+	
+	/**
+	 * Evict any expired entries in the map.
+	 * <p>
+	 * This is called automatically by any of the read or write operations.
+	 */
+	protected void evictExpired() {
+		long currentTime = ticker.read();
+		
+		// Remove expired entries
+		while (expireQueue.size() > 0 && expireQueue.peek().expireTime <= currentTime) {
+			ExpireEntry entry = expireQueue.poll();
+
+			if (entry == keyLookup.get(entry.expireKey)) {
+				keyLookup.remove(entry.expireKey);
+			}
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return valueView.toString();
+	}
+}
+ 

ProtocolLib/src/main/java/com/comphenix/protocol/collections/IntegerMap.java

@@ -0,0 +1,139 @@
+package com.comphenix.protocol.collections;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+
+/**
+ * Represents a very quick integer-based lookup map, with a fixed key space size.
+ * <p>
+ * Integers must be non-negative.
+ * @author Kristian
+ */
+public class IntegerMap<T> {
+	private T[] array;
+	private int size;
+	
+	/**
+	 * Construct a new integer map.
+	 * @return A new integer map.
+	 */
+	public static <T> IntegerMap<T> newMap() {
+		return new IntegerMap<T>();
+	}
+	
+	/**
+	 * Construct a new integer map with a default capacity.
+	 */
+	public IntegerMap() {
+		this(8);
+	}
+	
+	/**
+	 * Construct a new integer map with a given capacity.
+	 * @param initialCapacity - the capacity.
+	 */
+	public IntegerMap(int initialCapacity) {
+		@SuppressWarnings("unchecked")
+		T[] backingArray = (T[]) new Object[initialCapacity];
+		this.array = backingArray;
+		this.size = 0;
+	}
+
+	/**
+	 * Associate an integer key with the given value.
+	 * @param key - the integer key. Cannot be negative.
+	 * @param value - the value. Cannot be NULL.
+	 * @return The previous association, or NULL if not found.
+	 */
+	public T put(int key, T value) {
+		ensureCapacity(key);
+		
+		T old = array[key];	
+		array[key] = Preconditions.checkNotNull(value, "value cannot be NULL");
+		
+		if (old == null)
+			size++;
+		return old;
+	}
+	
+	/**
+	 * Remove an association from the map.
+	 * @param key - the key of the association to remove.
+	 * @return The old associated value, or NULL.
+	 */
+	public T remove(int key) {
+		T old = array[key];
+		array[key] = null;
+		
+		if (old != null)
+			size--;
+		return old;
+	}
+	
+	/**
+	 * Resize the backing array to fit the given key.
+	 * @param key - the key.
+	 */
+	protected void ensureCapacity(int key) {
+		int newLength = array.length;
+
+		// Don't resize if the key fits
+		if (key < 0)
+			throw new IllegalArgumentException("Negative key values are not permitted.");
+		if (key < newLength)
+			return;
+		
+		while (newLength <= key) {
+			int next = newLength * 2;
+			// Handle overflow
+			newLength = next > newLength ? next : Integer.MAX_VALUE;
+		}
+		this.array = Arrays.copyOf(array, newLength);
+	}
+	
+	/**
+	 * Retrieve the number of mappings in this map.
+	 * @return The number of mapping.
+	 */
+	public int size() {
+		return size;
+	}
+
+	/**
+	 * Retrieve the value associated with a given key.
+	 * @param key - the key.
+	 * @return The value, or NULL if not found.
+	 */
+	public T get(int key) {
+		if (key >= 0 && key < array.length)
+			return array[key];
+		return null;
+	}
+	
+	/**
+	 * Determine if the given key exists in the map.
+	 * @param key - the key to check.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public boolean containsKey(int key) {
+		return get(key) != null;
+	}
+	
+	/**
+	 * Convert the current map to an Integer map.
+	 * @return The Integer map.
+	 */
+	public Map<Integer, Object> toMap() {
+		Map<Integer, Object> map = Maps.newHashMap();
+		
+		for (int i = 0; i < array.length; i++) {
+			if (array[i] != null) {
+				map.put(i, array[i]);
+			}
+		}
+		return map;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java

@@ -24,6 +24,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.injector.PrioritizedListener;
 import com.google.common.collect.Iterables;
@@ -34,40 +35,39 @@ import com.google.common.collect.Iterables;
  * @author Kristian
  */
 public abstract class AbstractConcurrentListenerMultimap<TListener> {
-
 	// The core of our map
-	private ConcurrentMap<Integer, SortedCopyOnWriteArray<PrioritizedListener<TListener>>> listeners = 
-		new ConcurrentHashMap<Integer, SortedCopyOnWriteArray<PrioritizedListener<TListener>>>();
+	private ConcurrentMap<PacketType, SortedCopyOnWriteArray<PrioritizedListener<TListener>>> mapListeners;
+	
+	public AbstractConcurrentListenerMultimap() {
+		mapListeners =   new ConcurrentHashMap<PacketType, SortedCopyOnWriteArray<PrioritizedListener<TListener>>>();
+	}
 	
 	/**
-	 * Adds a listener to its requested list of packet recievers.
-	 * @param listener - listener with a list of packets to recieve notifcations for.
+	 * Adds a listener to its requested list of packet receivers.
+	 * @param listener - listener with a list of packets to receive notifications for.
 	 * @param whitelist - the packet whitelist to use.
 	 */
 	public void addListener(TListener listener, ListeningWhitelist whitelist) {
-		
 		PrioritizedListener<TListener> prioritized = new PrioritizedListener<TListener>(listener, whitelist.getPriority());
 		
-		for (Integer packetID : whitelist.getWhitelist()) {
-			addListener(packetID, prioritized);
+		for (PacketType type : whitelist.getTypes()) {
+			addListener(type, prioritized);
 		}
 	}
 	
 	// Add the listener to a specific packet notifcation list
-	private void addListener(Integer packetID, PrioritizedListener<TListener> listener) {
-		
-		SortedCopyOnWriteArray<PrioritizedListener<TListener>> list = listeners.get(packetID);
+	private void addListener(PacketType type, PrioritizedListener<TListener> listener) {
+		SortedCopyOnWriteArray<PrioritizedListener<TListener>> list = mapListeners.get(type);
 		
 		// We don't want to create this for every lookup
 		if (list == null) {
 			// It would be nice if we could use a PriorityBlockingQueue, but it doesn't preseve iterator order,
 			// which is a essential feature for our purposes.
 			final SortedCopyOnWriteArray<PrioritizedListener<TListener>> value = new SortedCopyOnWriteArray<PrioritizedListener<TListener>>();
-			
-			list = listeners.putIfAbsent(packetID, value);
-			
-			// We may end up creating multiple multisets, but we'll agree 
-			// on the one to use.
+
+			// We may end up creating multiple multisets, but we'll agree on which to use
+			list = mapListeners.putIfAbsent(type, value);
+		
 			if (list == null) {
 				list = value;
 			}
@@ -83,14 +83,12 @@ public abstract class AbstractConcurrentListenerMultimap<TListener> {
 	 * @param whitelist - the packet whitelist that was used.
 	 * @return Every packet ID that was removed due to no listeners.
 	 */
-	public List<Integer> removeListener(TListener listener, ListeningWhitelist whitelist) {
-	
-		List<Integer> removedPackets = new ArrayList<Integer>();
+	public List<PacketType> removeListener(TListener listener, ListeningWhitelist whitelist) {
+		List<PacketType> removedPackets = new ArrayList<PacketType>();
 		
 		// Again, not terribly efficient. But adding or removing listeners should be a rare event.
-		for (Integer packetID : whitelist.getWhitelist()) {
-			
-			SortedCopyOnWriteArray<PrioritizedListener<TListener>> list = listeners.get(packetID);
+		for (PacketType type : whitelist.getTypes()) {
+			SortedCopyOnWriteArray<PrioritizedListener<TListener>> list = mapListeners.get(type);
 			
 			// Remove any listeners
 			if (list != null) {
@@ -100,15 +98,13 @@ public abstract class AbstractConcurrentListenerMultimap<TListener> {
 					list.remove(new PrioritizedListener<TListener>(listener, whitelist.getPriority()));
 					
 					if (list.size() == 0) {
-						listeners.remove(packetID);
-						removedPackets.add(packetID);
+						mapListeners.remove(type);
+						removedPackets.add(type);
 					}
 				}
 			}
-			
 			// Move on to the next
 		}
-		
 		return removedPackets;
 	}
 	
@@ -116,11 +112,11 @@ public abstract class AbstractConcurrentListenerMultimap<TListener> {
 	 * Retrieve the registered listeners, in order from the lowest to the highest priority.
 	 * <p>
 	 * The returned list is thread-safe and doesn't require synchronization.
-	 * @param packetID - packet ID.
+	 * @param type - packet type.
 	 * @return Registered listeners.
 	 */
-	public Collection<PrioritizedListener<TListener>> getListener(int packetID) {
-		return listeners.get(packetID);
+	public Collection<PrioritizedListener<TListener>> getListener(PacketType type) {
+		return mapListeners.get(type);
 	}
 	
 	/**
@@ -128,21 +124,21 @@ public abstract class AbstractConcurrentListenerMultimap<TListener> {
 	 * @return Every listener.
 	 */
 	public Iterable<PrioritizedListener<TListener>> values() {
-		return Iterables.concat(listeners.values());
+		return Iterables.concat(mapListeners.values());
 	}
 	
 	/**
-	 * Retrieve every registered packet ID:
-	 * @return Registered packet ID.
+	 * Retrieve every registered packet type:
+	 * @return Registered packet type.
 	 */
-	public Set<Integer> keySet() {
-		return listeners.keySet();
+	public Set<PacketType> keySet() {
+		return mapListeners.keySet();
 	}
 	
 	/**
 	 * Remove all packet listeners.
 	 */
 	protected void clearListeners() {
-		listeners.clear();
+		mapListeners.clear();
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java

@@ -0,0 +1,493 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol.concurrency;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Range;
+import com.google.common.collect.Ranges;
+
+/**
+ * Represents a generic store of intervals and associated values. No two intervals
+ * can overlap in this representation.
+ * <p>
+ * Note that this implementation is not thread safe.
+ * 
+ * @author Kristian
+ *
+ * @param <TKey> - type of the key. Must implement Comparable.
+ * @param <TValue> - type of the value to associate.
+ */
+public abstract class AbstractIntervalTree<TKey extends Comparable<TKey>, TValue> {
+	
+	protected enum State {
+		OPEN,
+		CLOSE,
+		BOTH
+	}
+	
+	/**
+	 * Represents a range and a value in this interval tree.
+	 */
+	public class Entry implements Map.Entry<Range<TKey>, TValue> {
+		private EndPoint left;
+		private EndPoint right;
+
+		Entry(EndPoint left, EndPoint right) {
+			if (left == null)
+				throw new IllegalAccessError("left cannot be NUll");
+			if (right == null)
+				throw new IllegalAccessError("right cannot be NUll");
+			if (left.key.compareTo(right.key) > 0)
+				throw new IllegalArgumentException(
+						"Left key (" + left.key + ") cannot be greater than the right key (" + right.key + ")");
+			
+			this.left = left;
+			this.right = right;
+		}
+
+		@Override
+		public Range<TKey> getKey() {
+			return Ranges.closed(left.key, right.key);
+		}
+
+		@Override
+		public TValue getValue() {
+			return left.value;
+		}
+
+		@Override
+		public TValue setValue(TValue value) {
+			TValue old = left.value;
+			
+			// Set both end points
+			left.value = value;
+			right.value = value;
+			return old;
+		}
+		
+		@SuppressWarnings("rawtypes")
+		@Override
+		public boolean equals(Object obj) {
+			// Quick equality check
+			if (obj == this) {
+				return true;
+			} else if (obj instanceof AbstractIntervalTree.Entry) {
+				return Objects.equal(left.key, ((AbstractIntervalTree.Entry) obj).left.key) &&
+					   Objects.equal(right.key, ((AbstractIntervalTree.Entry) obj).right.key) &&
+					   Objects.equal(left.value, ((AbstractIntervalTree.Entry) obj).left.value);
+			} else {
+				return false;
+			}
+		}
+		
+		@Override
+		public int hashCode() {
+			return Objects.hashCode(left.key, right.key, left.value);
+		}
+		
+		@Override
+		public String toString() {
+			return String.format("Value %s at [%s, %s]", left.value, left.key, right.key);
+		}
+	}
+	
+	/**
+	 * Represents a single end point (open, close or both) of a range.
+	 */
+	protected class EndPoint {
+		
+		// Whether or not the end-point is opening a range, closing a range or both.
+		public State state;
+		
+		// The value this range contains
+		public TValue value;
+		
+		// The key of this end point
+		public TKey key;
+
+		public EndPoint(State state, TKey key, TValue value) {
+			this.state = state;
+			this.key = key;
+			this.value = value;
+		}	
+	}
+	
+	// To quickly look up ranges we'll index them by endpoints
+	protected NavigableMap<TKey, EndPoint> bounds = new TreeMap<TKey, EndPoint>();
+	
+	/**
+	 * Removes every interval that intersects with the given range.
+	 * @param lowerBound - lowest value to remove.
+	 * @param upperBound - highest value to remove.
+	 */
+	public Set<Entry> remove(TKey lowerBound, TKey upperBound) {
+		return remove(lowerBound, upperBound, false);
+	}
+	
+	/**
+	 * Removes every interval that intersects with the given range.
+	 * @param lowerBound - lowest value to remove.
+	 * @param upperBound - highest value to remove.
+	 * @param preserveDifference - whether or not to preserve the intervals that are partially outside.
+	 */
+	public Set<Entry> remove(TKey lowerBound, TKey upperBound, boolean preserveDifference) {
+		checkBounds(lowerBound, upperBound);
+		NavigableMap<TKey, EndPoint> range = bounds.subMap(lowerBound, true, upperBound, true);
+		
+		EndPoint first = getNextEndPoint(lowerBound, true); 
+		EndPoint last = getPreviousEndPoint(upperBound, true);
+		
+		// Used while resizing intervals
+		EndPoint previous = null;
+		EndPoint next = null;
+		
+		Set<Entry> resized = new HashSet<Entry>();
+		Set<Entry> removed = new HashSet<Entry>();
+		
+		// Remove the previous element too. A close end-point must be preceded by an OPEN end-point.
+		if (first != null && first.state == State.CLOSE) {
+			previous = getPreviousEndPoint(first.key, false);
+			
+			// Add the interval back
+			if (previous != null) {
+				removed.add(getEntry(previous, first));
+			}
+		}
+		
+		// Get the closing element too.
+		if (last != null && last.state == State.OPEN) {
+			next = getNextEndPoint(last.key, false);
+		
+			if (next != null) {
+				removed.add(getEntry(last, next));
+			} 
+		}
+		
+		// Now remove both ranges
+		removeEntrySafely(previous, first);
+		removeEntrySafely(last, next);
+		
+		// Add new resized intervals
+		if (preserveDifference) {
+			if (previous != null) {
+				resized.add(putUnsafe(previous.key, decrementKey(lowerBound), previous.value));
+			}
+			if (next != null) {
+				resized.add(putUnsafe(incrementKey(upperBound), next.key, next.value));
+			}
+		}
+		
+		// Get the removed entries too
+		getEntries(removed, range);
+		invokeEntryRemoved(removed);
+		
+		if (preserveDifference) {
+			invokeEntryAdded(resized);
+		}
+		
+		// Remove the range as well
+		range.clear();
+		return removed;
+	}
+	
+	/**
+	 * Retrieve the entry from a given set of end points.
+	 * @param left - leftmost end point.
+	 * @param right - rightmost end point.
+	 * @return The associated entry.
+	 */
+	protected Entry getEntry(EndPoint left, EndPoint right) {
+		if (left == null)
+			throw new IllegalArgumentException("left endpoint cannot be NULL.");
+		if (right == null)
+			throw new IllegalArgumentException("right endpoint cannot be NULL.");
+		
+		// Make sure the order is correct
+		if (right.key.compareTo(left.key) < 0) {
+			return getEntry(right, left);
+		} else {
+			return new Entry(left, right);
+		}
+	}
+	
+	private void removeEntrySafely(EndPoint left, EndPoint right) {
+		if (left != null && right != null) {
+			bounds.remove(left.key);
+			bounds.remove(right.key);
+		}
+	}
+	
+	// Adds a given end point
+	protected EndPoint addEndPoint(TKey key, TValue value, State state) {
+		EndPoint endPoint = bounds.get(key);
+		
+		if (endPoint != null) {
+			endPoint.state = State.BOTH;
+		} else {
+			endPoint = new EndPoint(state, key, value);
+			bounds.put(key, endPoint);
+		}
+		return endPoint;
+	}
+	
+	/**
+	 * Associates a given interval of keys with a certain value. Any previous
+	 * association will be overwritten in the given interval. 
+	 * <p>
+	 * Overlapping intervals are not permitted. A key can only be associated with a single value.
+	 * 
+	 * @param lowerBound - the minimum key (inclusive).
+	 * @param upperBound - the maximum key (inclusive).
+	 * @param value - the value, or NULL to reset this range.
+	 */
+	public void put(TKey lowerBound, TKey upperBound, TValue value) {
+		// While we don't permit overlapping intervals, we'll still allow overwriting existing intervals. 
+		remove(lowerBound, upperBound, true);
+		invokeEntryAdded(putUnsafe(lowerBound, upperBound, value));
+	}
+	
+	/**
+	 * Associates a given interval without performing any interval checks.
+	 * @param lowerBound - the minimum key (inclusive).
+	 * @param upperBound - the maximum key (inclusive).
+	 * @param value - the value, or NULL to reset the range.
+	 */
+	private Entry putUnsafe(TKey lowerBound, TKey upperBound, TValue value) {
+		// OK. Add the end points now
+		if (value != null) {
+			EndPoint left = addEndPoint(lowerBound, value, State.OPEN);
+			EndPoint right = addEndPoint(upperBound, value, State.CLOSE);
+
+			return new Entry(left, right);
+		} else {
+			return null;
+		}
+	}
+	
+	/**
+	 * Used to verify the validity of the given interval.
+	 * @param lowerBound - lower bound (inclusive).
+	 * @param upperBound - upper bound (inclusive).
+	 */
+	private void checkBounds(TKey lowerBound, TKey upperBound) {
+		if (lowerBound == null)
+			throw new IllegalAccessError("lowerbound cannot be NULL.");
+		if (upperBound == null)
+			throw new IllegalAccessError("upperBound cannot be NULL.");
+		if (upperBound.compareTo(lowerBound) < 0)
+			throw new IllegalArgumentException("upperBound cannot be less than lowerBound.");
+	}
+	
+	/**
+	 * Determines if the given key is within an interval.
+	 * @param key - key to check.
+	 * @return TRUE if the given key is within an interval in this tree, FALSE otherwise.
+	 */
+	public boolean containsKey(TKey key) {
+		return getEndPoint(key) != null;
+	}
+	
+	/**
+	 * Enumerates over every range in this interval tree.
+	 * @return Number of ranges.
+	 */
+	public Set<Entry> entrySet() {
+		// Don't mind the Java noise
+		Set<Entry> result = new HashSet<Entry>();
+		getEntries(result, bounds);
+		return result;
+	}
+	
+	/**
+	 * Remove every interval.
+	 */
+	public void clear() {
+		if (!bounds.isEmpty()) {
+			remove(bounds.firstKey(), bounds.lastKey());
+		}
+	}
+	
+	/**
+	 * Converts a map of end points into a set of entries.
+	 * @param destination - set of entries.
+	 * @param map - a map of end points.
+	 */
+	private void getEntries(Set<Entry> destination, NavigableMap<TKey, EndPoint> map) {
+		Map.Entry<TKey, EndPoint> last = null;
+		
+		for (Map.Entry<TKey, EndPoint> entry : map.entrySet()) {
+			switch (entry.getValue().state) {
+			case BOTH:
+				EndPoint point = entry.getValue();
+				destination.add(new Entry(point, point));
+				break;
+			case CLOSE:
+				if (last != null) {
+					destination.add(new Entry(last.getValue(), entry.getValue()));
+				}
+				break;
+			case OPEN:
+				// We don't know the full range yet
+				last = entry;
+				break;
+			default:
+				throw new IllegalStateException("Illegal open/close state detected.");
+			}
+		}
+	}
+	
+	/**
+	 * Inserts every range from the given tree into the current tree.
+	 * @param other - the other tree to read from.
+	 */
+	public void putAll(AbstractIntervalTree<TKey, TValue> other) {
+		// Naively copy every range.
+		for (Entry entry : other.entrySet()) {
+			put(entry.left.key, entry.right.key, entry.getValue());
+		}
+	}
+	
+	/**
+	 * Retrieves the value of the range that matches the given key, or NULL if nothing was found.
+	 * @param key - the level to read for.
+	 * @return The correct amount of experience, or NULL if nothing was recorded.
+	 */
+	public TValue get(TKey key) {
+		EndPoint point = getEndPoint(key);
+
+		if (point != null)
+			return point.value;
+		else
+			return null;
+	}
+	
+	/**
+	 * Get the left-most end-point associated with this key.
+	 * @param key - key to search for.
+	 * @return The end point found, or NULL.
+	 */
+	protected EndPoint getEndPoint(TKey key) {
+		EndPoint ends = bounds.get(key);
+		
+		if (ends != null) {
+			// Always return the end point to the left
+			if (ends.state == State.CLOSE) {
+				Map.Entry<TKey, EndPoint> left = bounds.floorEntry(decrementKey(key));
+				return left != null ? left.getValue() : null;
+				
+			} else {
+				return ends;
+			}
+			
+		} else {
+			// We need to determine if the point intersects with a range
+			Map.Entry<TKey, EndPoint> left = bounds.floorEntry(key);
+			
+			// We only need to check to the left
+			if (left != null && left.getValue().state == State.OPEN) {
+				return left.getValue();
+			} else {
+				return null;
+			}
+		}
+	}
+	
+	/**
+	 * Get the previous end point of a given key.
+	 * @param point - the point to search with.
+	 * @param inclusive - whether or not to include the current point in the search.
+	 * @return The previous end point of a given given key, or NULL if not found.
+	 */
+	protected EndPoint getPreviousEndPoint(TKey point, boolean inclusive) {
+		if (point != null) {
+			Map.Entry<TKey, EndPoint> previous = bounds.floorEntry(inclusive ? point : decrementKey(point));
+		
+			if (previous != null) 
+				return previous.getValue();
+		}
+		return null;
+	}
+	
+	/**
+	 * Get the next end point of a given key.
+	 * @param point - the point to search with.
+	 * @param inclusive - whether or not to include the current point in the search.
+	 * @return The next end point of a given given key, or NULL if not found.
+	 */
+	protected EndPoint getNextEndPoint(TKey point, boolean inclusive) {
+		if (point != null) {
+			Map.Entry<TKey, EndPoint> next = bounds.ceilingEntry(inclusive ? point : incrementKey(point));
+		
+			if (next != null) 
+				return next.getValue();
+		}
+		return null;
+	}
+
+	private void invokeEntryAdded(Entry added) {
+		if (added != null) {
+			onEntryAdded(added);
+		}
+	}
+	
+	private void invokeEntryAdded(Set<Entry> added) {
+		for (Entry entry : added) {
+			onEntryAdded(entry);
+		}
+	}
+
+	private void invokeEntryRemoved(Set<Entry> removed) {
+		for (Entry entry : removed) {
+			onEntryRemoved(entry);
+		}
+	}
+	
+	// Listeners for added or removed entries
+	/**
+	 * Invoked when an entry is added.
+	 * @param added - the entry that was added.
+	 */
+	protected void onEntryAdded(Entry added) { }
+	
+	/**
+	 * Invoked when an entry is removed.
+	 * @param removed - the removed entry.
+	 */
+	protected void onEntryRemoved(Entry removed) { }
+	
+	// Helpers for decrementing or incrementing key values
+	/**
+	 * Decrement the given key by one unit.
+	 * @param key - the key that should be decremented.
+	 * @return The new decremented key.
+	 */
+	protected abstract TKey decrementKey(TKey key);
+	
+	/**
+	 * Increment the given key by one unit.
+	 * @param key - the key that should be incremented.
+	 * @return The new incremented key.
+	 */
+	protected abstract TKey incrementKey(TKey key);
+}

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java

@@ -0,0 +1,262 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol.concurrency;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
+import com.comphenix.protocol.utility.SafeCacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.RemovalCause;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
+
+/**
+ * A map that supports blocking on read operations. Null keys are not supported.
+ * <p>
+ * Values are stored as weak references, and will be automatically removed once they've all been dereferenced.
+ * <p>
+ * @author Kristian
+ *
+ * @param <TKey> - type of the key.
+ * @param <TValue> - type of the value.
+ */
+public class BlockingHashMap<TKey, TValue> {
+	// Map of values
+	private final ConcurrentMap<TKey, TValue> backingMap;
+	
+	// Map of locked objects
+	private final ConcurrentMap<TKey, Object> locks;
+	
+	/**
+	 * Retrieve a cache loader that will always throw an exception.
+	 * @return An invalid cache loader.
+	 */
+	public static <TKey, TValue> CacheLoader<TKey, TValue> newInvalidCacheLoader() {
+		return new CacheLoader<TKey, TValue>() {
+			@Override
+			public TValue load(TKey key) throws Exception {
+				throw new IllegalStateException("Illegal use. Access the map directly instead.");
+			}
+		};
+	}
+	
+	/**
+	 * Initialize a new map.
+	 */
+	public BlockingHashMap() {
+		backingMap = SafeCacheBuilder.<TKey, TValue>newBuilder().
+			weakValues().
+			removalListener(
+				new RemovalListener<TKey, TValue>() {
+					@Override
+					public void onRemoval(RemovalNotification<TKey, TValue> entry) {
+						// Clean up locks too
+						if (entry.getCause() != RemovalCause.REPLACED) {
+							locks.remove(entry.getKey());
+						}
+					}
+				}).
+			build(BlockingHashMap.<TKey, TValue> newInvalidCacheLoader());
+		
+		// Normal concurrent hash map
+		locks = new ConcurrentHashMap<TKey, Object>();
+	}
+	
+	/**
+	 * Initialize a new map.
+	 * @return The created map.
+	 */
+	public static <TKey, TValue> BlockingHashMap<TKey, TValue> create() {
+		return new BlockingHashMap<TKey, TValue>();
+	}
+	
+	/**
+	 * Waits until a value has been associated with the given key, and then retrieves that value.
+	 * @param key - the key whose associated value is to be returned 
+	 * @return The value to which the specified key is mapped.
+	 * @throws InterruptedException If the current thread got interrupted while waiting.
+	 */
+	public TValue get(TKey key) throws InterruptedException {
+		if (key == null)
+			throw new IllegalArgumentException("key cannot be NULL.");
+		
+		TValue value = backingMap.get(key);
+		
+		// Only lock if no value is available
+		if (value == null) {
+			final Object lock = getLock(key);
+			
+			synchronized (lock) {
+				while (value == null) {
+					lock.wait();
+					value = backingMap.get(key);
+				}
+			}
+		}
+		
+		return value;
+	}
+	
+	/**
+	 * Waits until a value has been associated with the given key, and then retrieves that value.
+	 * @param key - the key whose associated value is to be returned 
+	 * @param timeout - the amount of time to wait until an association has been made.
+	 * @param unit - unit of timeout.
+	 * @return The value to which the specified key is mapped, or NULL if the timeout elapsed.
+	 * @throws InterruptedException If the current thread got interrupted while waiting.
+	 */
+	public TValue get(TKey key, long timeout, TimeUnit unit) throws InterruptedException {
+		return get(key, timeout, unit, false);
+	}
+	
+	/**
+	 * Waits until a value has been associated with the given key, and then retrieves that value.
+	 * <p>
+	 * If timeout is zero, this method will return immediately if it can't find an socket injector.
+	 * 
+	 * @param key - the key whose associated value is to be returned 
+	 * @param timeout - the amount of time to wait until an association has been made.
+	 * @param unit - unit of timeout.
+	 * @param ignoreInterrupted - TRUE if we should ignore the thread being interrupted, FALSE otherwise.
+	 * @return The value to which the specified key is mapped, or NULL if the timeout elapsed.
+	 * @throws InterruptedException If the current thread got interrupted while waiting.
+	 */
+	public TValue get(TKey key, long timeout, TimeUnit unit, boolean ignoreInterrupted) throws InterruptedException {
+		if (key == null)
+			throw new IllegalArgumentException("key cannot be NULL.");
+		if (unit == null)
+			throw new IllegalArgumentException("Unit cannot be NULL.");
+		if (timeout < 0)
+			throw new IllegalArgumentException("Timeout cannot be less than zero.");
+		
+		TValue value = backingMap.get(key);
+		
+		// Only lock if no value is available
+		if (value == null && timeout > 0) {
+			final Object lock = getLock(key);
+			final long stopTimeNS = System.nanoTime() + unit.toNanos(timeout);
+			
+			// Don't exceed the timeout
+			synchronized (lock) {
+				while (value == null) {
+					try {
+						long remainingTime = stopTimeNS - System.nanoTime();
+						
+						if (remainingTime > 0) {
+							TimeUnit.NANOSECONDS.timedWait(lock, remainingTime);
+							value = backingMap.get(key);
+						} else {
+							// Timeout elapsed
+							break;
+						}
+					} catch (InterruptedException e) {
+						// This is fairly dangerous - but we might HAVE to block the thread
+						if (!ignoreInterrupted)
+							throw e;
+					}
+				}
+			}
+		}
+		return value;
+	}
+	
+	/**
+	 * Associate a given key with the given value.
+	 * <p>
+	 * Wakes up any blocking getters on this specific key.
+	 * 
+	 * @param key - the key to associate.
+	 * @param value - the value.
+	 * @return The previously associated value.
+	 */
+	public TValue put(TKey key, TValue value) {
+		if (value == null)
+			throw new IllegalArgumentException("This map doesn't support NULL values.");
+		
+		final TValue previous = backingMap.put(key, value);
+		final Object lock = getLock(key);
+		
+		// Inform our readers about this change
+		synchronized (lock) {
+			lock.notifyAll();
+			return previous;
+		}
+	}
+	
+	/**
+	 * If and only if a key is not present in the map will it be associated with the given value.
+	 * @param key - the key to associate.
+	 * @param value - the value to associate.
+	 * @return The previous value this key has been associated with.
+	 */
+	public TValue putIfAbsent(TKey key, TValue value) {
+		if (value == null)
+			throw new IllegalArgumentException("This map doesn't support NULL values.");
+		
+		final TValue previous = backingMap.putIfAbsent(key, value);
+		
+		// No need to unlock readers if we haven't changed anything
+		if (previous == null) {
+			final Object lock = getLock(key);
+			
+			synchronized (lock) {
+				lock.notifyAll();
+			}
+		}
+		return previous;
+	}
+	
+	public int size() {
+		return backingMap.size();
+	}
+	
+	public Collection<TValue> values() {
+		return backingMap.values();
+	}
+	
+	public Set<TKey> keys() {
+		return backingMap.keySet();
+	}
+	
+	/**
+	 * Atomically retrieve the lock associated with a given key.
+	 * @param key - the current key.
+	 * @return An asssociated lock.
+	 */
+	private Object getLock(TKey key) {
+		Object lock = locks.get(key);
+		
+		if (lock == null) {
+			Object created = new Object();
+			
+			// Do this atomically
+			lock = locks.putIfAbsent(key, created);
+			
+			// If we succeeded, use the latch we created - otherwise, use the already inserted latch
+			if (lock == null) {
+				lock = created;
+			}
+		}
+		
+		return lock;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java

@@ -0,0 +1,329 @@
+package com.comphenix.protocol.concurrency;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.comphenix.protocol.utility.SafeCacheBuilder;
+import com.google.common.base.Function;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+
+/**
+ * Represents a concurrent player map.
+ * <p>
+ * This map may use player addresses as keys.
+ * @author Kristian
+ */
+public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> implements ConcurrentMap<Player, TValue> {
+	/**
+	 * Represents the different standard player keys,
+	 * @author Kristian
+	 */
+	public enum PlayerKey implements Function<Player, Object> {
+		/**
+		 * Use a player's {@link Player#getAddress()} as key in the map.
+		 */
+		ADDRESS {
+			@Override
+			public Object apply(Player player) {
+				return player.getAddress();
+			}
+		},
+		
+		/**
+		 * Use a player's {@link Player#getName()} as key in the map.
+		 */
+		NAME {
+			@Override
+			public Object apply(Player player) {
+				return player.getName();
+			}
+		},
+	}
+	
+	/**
+	 * An internal map of player keys to values.
+	 */
+	protected ConcurrentMap<Object, TValue> valueLookup = createValueMap();
+	
+	/**
+	 * A cache of the associated keys for each player.
+	 */
+	
+	protected ConcurrentMap<Object, Player> keyLookup = createKeyCache();
+	/**
+	 * The method used to retrieve a unique key for a player.
+	 */
+	protected final Function<Player, Object> keyMethod;
+	
+	/**
+	 * Construct a new concurrent player map that uses each player's address as key.
+	 * @return Concurrent player map.
+	 */
+	public static <T> ConcurrentPlayerMap<T> usingAddress() {
+		return new ConcurrentPlayerMap<T>(PlayerKey.ADDRESS);
+	}
+	
+	/**
+	 * Construct a new concurrent player map that uses each player's name as key.
+	 * @return Concurrent player map.
+	 */
+	public static <T> ConcurrentPlayerMap<T> usingName() {
+		return new ConcurrentPlayerMap<T>(PlayerKey.NAME);
+	}
+	
+	/**
+	 * Construct a new concurrent player map using the given standard key method.
+	 * @param standardMethod - the standard key method.
+	 */
+	public ConcurrentPlayerMap(PlayerKey standardMethod) {
+		this.keyMethod = standardMethod;
+	}
+	
+	/**
+	 * Construct a new concurrent player map using the given custom key method.
+	 * @param method - custom key method.
+	 */
+	public ConcurrentPlayerMap(Function<Player, Object> method) {
+		this.keyMethod = method;
+	}
+	
+	/**
+	 * Construct the map that will store the associated values.
+	 * <p>
+	 * The default implementation uses a {@link ConcurrentHashMap}.
+	 * @return The value map.
+	 */
+	protected ConcurrentMap<Object, TValue> createValueMap() {
+		return Maps.newConcurrentMap();
+	}
+	
+	/**
+	 * Construct a cache of keys and the associated player.
+	 * @return The key map.
+	 */
+	protected ConcurrentMap<Object, Player> createKeyCache() {
+		return SafeCacheBuilder.newBuilder().
+			weakValues().
+			removalListener(
+			  new RemovalListener<Object, Player>() {
+				@Override
+				public void onRemoval(RemovalNotification<Object, Player> removed) {
+					// We ignore explicit removal
+					if (removed.wasEvicted()) {
+						onCacheEvicted(removed.getKey());
+					}
+				}
+			}).
+			build(
+			  new CacheLoader<Object, Player>() {
+				@Override
+				public Player load(Object key) throws Exception {
+					Player player = findOnlinePlayer(key);
+					
+					if (player != null)
+						return player;
+					
+					// Per the contract, this method should not return NULL
+					throw new IllegalArgumentException(
+							"Unable to find a player associated with: " + key);
+				}
+			});
+	}
+	
+	/**
+	 * Invoked when an entry in the cache has been evicted, typically by the garbage collector.
+	 * @param key - the key.
+	 * @param player - the value that was evicted or collected.
+	 */
+	private void onCacheEvicted(Object key) {
+		Player newPlayer = findOnlinePlayer(key);
+		
+		if (newPlayer != null) {
+			// Update the reference
+			keyLookup.put(key, newPlayer);
+		} else {
+			valueLookup.remove(key);
+		}
+	}
+	
+	/**
+	 * Find an online player from the given key.
+	 * @param key - a non-null key.
+	 * @return The player with the given key, or NULL if not found.
+	 */
+	protected Player findOnlinePlayer(Object key) {
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			if (key.equals(keyMethod.apply(player))) {
+				return player;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Lookup a player by key in the cache, optionally searching every online player.
+	 * @param key - the key of the player we are locating.
+	 * @return The player, or NULL if not found.
+	 * @throws ExecutionException
+	 */
+	protected Player lookupPlayer(Object key) {
+		try {
+			return keyLookup.get(key);
+		} catch (UncheckedExecutionException e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Retrieve the key of a particular player, ensuring it is cached.
+	 * @param player - the player whose key we want to retrieve.
+	 * @return The key.
+	 */
+	protected Object cachePlayerKey(Player player) {
+		Object key = keyMethod.apply(player);
+		
+		keyLookup.put(key, player);
+		return key;
+	}
+	
+	@Override
+	public TValue put(Player key, TValue value) {
+		return valueLookup.put(cachePlayerKey(key), value);
+	}
+	
+	@Override
+	public TValue putIfAbsent(Player key, TValue value) {
+		return valueLookup.putIfAbsent(cachePlayerKey(key), value);
+	}
+	
+	@Override
+	public TValue replace(Player key, TValue value) {
+		return valueLookup.replace(cachePlayerKey(key), value);
+	}
+	
+	@Override
+	public boolean replace(Player key, TValue oldValue, TValue newValue) {
+		return valueLookup.replace(cachePlayerKey(key), oldValue, newValue);
+	}
+
+	@Override
+	public TValue remove(Object key) {
+		if (key instanceof Player) {
+			Object playerKey = keyMethod.apply((Player) key);
+			
+			if (playerKey != null) {
+				TValue value = valueLookup.remove(playerKey);
+			
+				keyLookup.remove(playerKey);
+				return value;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public boolean remove(Object key, Object value) {
+		if (key instanceof Player) {
+			Object playerKey = keyMethod.apply((Player) key);
+			
+			if (playerKey != null && valueLookup.remove(playerKey, value)) {
+				keyLookup.remove(playerKey);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public TValue get(Object key) {
+		if (key instanceof Player) {
+			Object playerKey = keyMethod.apply((Player) key);
+			return playerKey != null ? valueLookup.get(playerKey) : null;
+		}
+		return null;
+	}
+	
+	@Override
+	public boolean containsKey(Object key) {
+		if (key instanceof Player) {
+			Object playerKey = keyMethod.apply((Player) key);
+			return playerKey != null && valueLookup.containsKey(playerKey);
+		}
+		return false;
+	}
+		
+	@Override
+	public Set<Entry<Player, TValue>> entrySet() {
+		return new AbstractSet<Entry<Player,TValue>>() {
+			@Override
+			public Iterator<Entry<Player, TValue>> iterator() {
+				return entryIterator();
+			}
+		
+			@Override
+			public int size() {
+				return valueLookup.size();
+			}
+			
+			@Override
+			public void clear() {
+				valueLookup.clear();
+				keyLookup.clear();
+			}
+		};
+	}
+
+	/**
+	 * Retrieve an iterator of entries that supports removal of elements.
+	 * @return Entry iterator.
+	 */
+	private Iterator<Entry<Player, TValue>> entryIterator() {
+		// Skip entries with stale data
+		final Iterator<Entry<Object, TValue>> source = valueLookup.entrySet().iterator();
+		final AbstractIterator<Entry<Player,TValue>> filtered = 
+		  new AbstractIterator<Entry<Player,TValue>>() {
+			@Override
+			protected Entry<Player, TValue> computeNext() {
+				while (source.hasNext()) {
+					Entry<Object, TValue> entry = source.next();
+					Player player = lookupPlayer(entry.getKey());
+					
+					if (player == null) {
+						// Remove entries that cannot be found
+						source.remove();
+						keyLookup.remove(entry.getKey());
+					} else {
+						return new SimpleEntry<Player, TValue>(player, entry.getValue());
+					}
+				}
+				return endOfData();
+			}
+		};
+		
+		// We can't return AbstractIterator directly, as it doesn't permitt the remove() method
+		return new Iterator<Entry<Player, TValue>>() {
+			public boolean hasNext() {
+				return filtered.hasNext();
+			}
+			public Entry<Player, TValue> next() {
+				return filtered.next();
+			}
+			public void remove() {
+				source.remove();
+			}
+		};
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/IntegerSet.java

@@ -1,6 +1,24 @@
-package com.comphenix.protocol.injector.player;
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
+package com.comphenix.protocol.concurrency;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -10,7 +28,7 @@ import java.util.Set;
  * This class is intentionally missing a size method. 
  * @author Kristian
  */
-class IntegerSet {
+public class IntegerSet {
 	private final boolean[] array;
 
 	/**
@@ -25,9 +43,21 @@ class IntegerSet {
 		this.array = new boolean[maximumCount];
 	}
 	
+	/**
+	 * Initialize a lookup table with a given maximum and value list.
+	 * <p>
+	 * The provided elements must be in the range [0, count).
+	 * @param maximumCount - the maximum element value and count.
+	 * @param values - the elements to add to the set.
+	 */
+	public IntegerSet(int maximumCount, Collection<Integer> values) {
+		this.array = new boolean[maximumCount];
+		addAll(values);
+	}
+	
 	/**
 	 * Determine whether or not the given element exists in the set.
-	 * @param value - the element to check. Must be in the range [0, count).
+	 * @param element - the element to check. Must be in the range [0, count).
 	 * @return TRUE if the given element exists, FALSE otherwise.
 	 */
 	public boolean contains(int element) {
@@ -43,6 +73,16 @@ class IntegerSet {
 		array[element] = true;
 	}
 	
+	/**
+	 * Add the given collection of elements to the set.
+	 * @param packets - elements to add.
+	 */
+	public void addAll(Collection<Integer> packets) {
+		for (Integer id : packets) {
+			add(id);
+		}
+	}
+	
 	/**
 	 * Remove the given element from the set, or do nothing if it's already removed.
 	 * @param element - element to remove.

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java

@@ -0,0 +1,134 @@
+package com.comphenix.protocol.concurrency;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+
+/**
+ * Represents a concurrent set of packet types.
+ * @author Kristian
+ */
+public class PacketTypeSet {
+	private Set<PacketType> types = Collections.newSetFromMap(Maps.<PacketType, Boolean>newConcurrentMap());
+	private Set<Class<?>> classes = Collections.newSetFromMap(Maps.<Class<?>, Boolean>newConcurrentMap());
+	
+	public PacketTypeSet() {
+		// Do nothing
+	}
+	
+	public PacketTypeSet(Collection<? extends PacketType> values) {
+		for (PacketType type : values) {
+			addType(type);
+		}
+	}
+	
+	/**
+	 * Add a particular type to the set.
+	 * @param type - the type to add.
+	 */
+	public synchronized void addType(PacketType type) {
+		Class<?> packetClass = getPacketClass(type);
+		types.add(Preconditions.checkNotNull(type, "type cannot be NULL."));
+		
+		if (packetClass != null) {
+			classes.add(getPacketClass(type));
+		}
+	}
+	
+	/**
+	 * Add the given types to the set of packet types.
+	 * @param types - the types to add.
+	 */
+	public synchronized void addAll(Iterable<? extends PacketType> types) {
+		for (PacketType type : types) {
+			addType(type);
+		}
+	}
+	
+	/**
+	 * Remove a particular type to the set.
+	 * @param type - the type to remove.
+	 */
+	public synchronized void removeType(PacketType type) {
+		Class<?> packetClass = getPacketClass(type);
+		types.remove(Preconditions.checkNotNull(type, "type cannot be NULL."));
+		
+		if (packetClass != null) {
+			classes.remove(getPacketClass(type));
+		}
+	}
+	
+	/**
+	 * Remove the given types from the set.
+	 * @param type - the types to remove.
+	 */
+	public synchronized void removeAll(Iterable<? extends PacketType> types) {
+		for (PacketType type : types) {
+			removeType(type);
+		}
+	}
+	
+	/**
+	 * Retrieve the packet class associated with a particular type.
+	 * @param type - the packet type.
+	 * @return The associated packet type.
+	 */
+	protected Class<?> getPacketClass(PacketType type) {
+		return PacketRegistry.getPacketClassFromType(type);
+	}
+	
+	/**
+	 * Determine if the given packet type exists in the set.
+	 * @param type - the type to find.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public boolean contains(PacketType type) {
+		return types.contains(type);
+	}
+	
+	/**
+	 * Determine if a packet type with the given packet class exists in the set.
+	 * @param packetClass - the class to find.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public boolean contains(Class<?> packetClass) {
+		return classes.contains(packetClass);
+	}
+	
+	/**
+	 * Determine if the type of a packet is in the current set. 
+	 * @param packet - the packet.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean containsPacket(Object packet) {
+		if (packet == null)
+			return false;
+		return classes.contains(packet.getClass());
+	}
+	
+	/**
+	 * Retrieve a view of this packet type set.
+	 * @return The packet type values.
+	 */
+	public Set<PacketType> values() {
+		return types;
+	}
+	
+	/**
+	 * Retrieve the number of entries in the set.
+	 * @return The number of entries.
+	 */
+	public int size() {
+		return types.size();
+	}
+	
+	public synchronized void clear() {
+		types.clear();
+		classes.clear();
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java

@@ -30,7 +30,7 @@ import com.google.common.collect.Iterables;
  * An implicitly sorted array list that preserves insertion order and maintains duplicates.
  * @param <T> - type of the elements in the list.
  */
-public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable<T>, Collection<T> {
+public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Collection<T> {
 	// Prevent reordering
 	private volatile List<T> list;
 	
@@ -68,7 +68,6 @@ public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable
 	 */
 	@Override
 	public synchronized boolean add(T value) {
-    	
     	// We use NULL as a special marker, so we don't allow it
     	if (value == null)
     		throw new IllegalArgumentException("value cannot be NULL");
@@ -94,7 +93,6 @@ public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable
     
 	@Override
     public synchronized boolean addAll(Collection<? extends T> values) {
-		
 		if (values == null)
 			throw new IllegalArgumentException("values cannot be NULL");
 		if (values.size() == 0)
@@ -120,20 +118,22 @@ public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable
 	@Override
     public synchronized boolean remove(Object value) {
     	List<T> copy = new ArrayList<T>();
+    	boolean result = false;
     	
     	// Note that there's not much to be gained from using BinarySearch, as we
     	// have to copy (and thus read) the entire list regardless.
     	
     	// Copy every element except the one given to us. 
     	for (T element : list) {
-    		if (value != null && !Objects.equal(value, element)) {
-    			copy.add(element);
-    			value = null;
+    		if (!Objects.equal(value, element)) {
+    			copy.add(element);    			
+    		} else {
+    			result = true;
     		}
     	}
 
     	list = copy;
-    	return value == null;
+    	return result;
     }
     
 	@Override
@@ -175,7 +175,6 @@ public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable
      * @param index - index of the element to remove.
      */
     public synchronized void remove(int index) {
-    	
     	List<T> copy = new ArrayList<T>(list);
     	
     	copy.remove(index);
@@ -237,4 +236,9 @@ public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable
 	public <T> T[] toArray(T[] a) {
 		return list.toArray(a);
 	}
+	
+	@Override
+	public String toString() {
+		return list.toString();
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java

@@ -0,0 +1,107 @@
+package com.comphenix.protocol.error;
+
+import java.io.PrintStream;
+
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.error.Report.ReportBuilder;
+import com.comphenix.protocol.reflect.PrettyPrinter;
+
+/**
+ * Represents a basic error reporter that prints error reports to the standard error stream.
+ * <p>
+ * Note that this implementation doesn't distinguish between {@link #reportWarning(Object, Report)} 
+ * and {@link #reportDetailed(Object, Report)} - they both have the exact same behavior.
+ * @author Kristian
+ */
+public class BasicErrorReporter implements ErrorReporter {
+	private final PrintStream output;
+	
+	/**
+	 * Construct a new basic error reporter that prints directly the standard error stream.
+	 */
+	public BasicErrorReporter() {
+		 this(System.err);
+	}
+	
+	/**
+	 * Construct a error reporter that prints to the given output stream.
+	 * @param output - the output stream.
+	 */
+	public BasicErrorReporter(PrintStream output) {
+		this.output = output;
+	}
+
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error) {
+		output.println("Unhandled exception occured in " +  methodName + " for " + sender.getName());
+		error.printStackTrace(output);
+	}
+
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error, Object... parameters) {
+		reportMinimal(sender, methodName, error);
+		
+		// Also print parameters
+		printParameters(parameters);
+	}
+
+	@Override
+	public void reportDebug(Object sender, Report report) {
+		// We just have to swallow it
+	}
+
+	@Override
+	public void reportDebug(Object sender, ReportBuilder builder) {
+		// As above
+	}
+	
+	@Override
+	public void reportWarning(Object sender, Report report) {
+		// Basic warning
+		output.println("[" + sender.getClass().getSimpleName() + "] " + report.getReportMessage());
+		
+		if (report.getException() != null) {
+			report.getException().printStackTrace(output);
+		}
+		printParameters(report.getCallerParameters());
+	}
+
+	@Override
+	public void reportWarning(Object sender, ReportBuilder reportBuilder) {
+		reportWarning(sender, reportBuilder.build());
+	}
+
+	@Override
+	public void reportDetailed(Object sender, Report report) {
+		// No difference from warning
+		reportWarning(sender, report);
+	}
+
+	@Override
+	public void reportDetailed(Object sender, ReportBuilder reportBuilder) {
+		reportWarning(sender, reportBuilder);
+	}
+	
+	/**
+	 * Print the given parameters to the standard error stream.
+	 * @param parameters - the output parameters.
+	 */
+	private void printParameters(Object[] parameters) {
+		if (parameters != null && parameters.length > 0) {
+			output.println("Parameters: ");
+			
+			try {
+				for (Object parameter : parameters) {
+					if (parameter == null)
+						output.println("[NULL]");
+					else
+						output.println(PrettyPrinter.printObject(parameter));
+				}
+			} catch (IllegalAccessException e) {
+				// Damn it
+				e.printStackTrace();
+			}
+		}
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java

@@ -0,0 +1,94 @@
+package com.comphenix.protocol.error;
+
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.error.Report.ReportBuilder;
+
+/**
+ * Construct an error reporter that delegates to another error reporter.
+ * @author Kristian
+ */
+public class DelegatedErrorReporter implements ErrorReporter {
+	private final ErrorReporter delegated;
+
+	/**
+	 * Construct a new error reporter that forwards all reports to a given reporter.
+	 * @param delegated - the delegated reporter.
+	 */
+	public DelegatedErrorReporter(ErrorReporter delegated) {
+		this.delegated = delegated;
+	}
+	
+	/**
+	 * Retrieve the underlying error reporter.
+	 * @return Underlying error reporter.
+	 */
+	public ErrorReporter getDelegated() {
+		return delegated;
+	}
+
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error) {
+		delegated.reportMinimal(sender, methodName, error);
+	}
+
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error, Object... parameters) {
+		delegated.reportMinimal(sender, methodName, error, parameters);
+	}
+
+	@Override
+	public void reportDebug(Object sender, Report report) {
+		Report transformed = filterReport(sender, report, false);
+		
+		if (transformed != null) {
+			delegated.reportDebug(sender, transformed);
+		}
+	}
+	
+	@Override
+	public void reportWarning(Object sender, Report report) {
+		Report transformed = filterReport(sender, report, false);
+		
+		if (transformed != null) {
+			delegated.reportWarning(sender, transformed);
+		}
+	}
+
+	@Override
+	public void reportDetailed(Object sender, Report report) {
+		Report transformed = filterReport(sender, report, true);
+		
+		if (transformed != null) {
+			delegated.reportDetailed(sender, transformed);
+		}
+	}
+
+	/**
+	 * Invoked before an error report is passed on to the underlying error reporter.
+	 * <p>
+	 * To cancel a report, return NULL.
+	 * @param sender - the sender instance or class.
+	 * @param report - the error report.
+	 * @param detailed - whether or not the report will be displayed in detail.
+	 * @return The report to pass on, or NULL to cancel it.
+	 */
+	protected Report filterReport(Object sender, Report report, boolean detailed) {
+		return report;
+	}
+	
+	@Override
+	public void reportWarning(Object sender, ReportBuilder reportBuilder) {
+		reportWarning(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportDetailed(Object sender, ReportBuilder reportBuilder) {
+		reportDetailed(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportDebug(Object sender, ReportBuilder builder) {
+		reportDebug(sender, builder.build());
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java

@@ -1,10 +1,32 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol.error;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -13,7 +35,11 @@ import org.apache.commons.lang.builder.ToStringStyle;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 
+import com.comphenix.protocol.collections.ExpireHashMap;
+import com.comphenix.protocol.error.Report.ReportBuilder;
 import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.reflect.PrettyPrinter;
+import com.google.common.base.Preconditions;
 import com.google.common.primitives.Primitives;
 
 /**
@@ -22,97 +48,282 @@ import com.google.common.primitives.Primitives;
  * @author Kristian
  */
 public class DetailedErrorReporter implements ErrorReporter {
+	/**
+	 * Report format for printing the current exception count. 
+	 */
+	public static final ReportType REPORT_EXCEPTION_COUNT = new ReportType("Internal exception count: %s!");
 	
 	public static final String SECOND_LEVEL_PREFIX = "  ";
 	public static final String DEFAULT_PREFIX = "  ";
 	public static final String DEFAULT_SUPPORT_URL = "http://dev.bukkit.org/server-mods/protocollib/";
-	public static final String PLUGIN_NAME = "ProtocolLib";
+
+	// Users that are informed about errors in the chat
+	public static final String ERROR_PERMISSION = "protocol.info";
 	
 	// We don't want to spam the server
 	public static final int DEFAULT_MAX_ERROR_COUNT = 20;
 	
+	// Prevent spam per plugin too
+	private ConcurrentMap<String, AtomicInteger> warningCount = new ConcurrentHashMap<String, AtomicInteger>();
+	
 	protected String prefix;
 	protected String supportURL;
 	
-	protected int errorCount;
+	protected AtomicInteger internalErrorCount = new AtomicInteger();
+	
 	protected int maxErrorCount;
 	protected Logger logger;
-
+	
+	protected WeakReference<Plugin> pluginReference;
+	protected String pluginName;
+	
 	// Whether or not Apache Commons is not present
 	protected boolean apacheCommonsMissing;
 	
+	// Whether or not detailed errror reporting is enabled
+	protected boolean detailedReporting;
+	
 	// Map of global objects
 	protected Map<String, Object> globalParameters = new HashMap<String, Object>();
 	
+	// Reports to ignore
+	private ExpireHashMap<Report, Boolean> rateLimited = new ExpireHashMap<Report, Boolean>();
+	private Object rateLock = new Object();
+	
 	/**
 	 * Create a default error reporting system.
 	 */
-	public DetailedErrorReporter() {
-		this(DEFAULT_PREFIX, DEFAULT_SUPPORT_URL);
+	public DetailedErrorReporter(Plugin plugin) {
+		this(plugin, DEFAULT_PREFIX, DEFAULT_SUPPORT_URL);
 	}
 	
 	/**
 	 * Create a central error reporting system.
+	 * @param plugin - the plugin owner.
 	 * @param prefix - default line prefix.
 	 * @param supportURL - URL to report the error.
 	 */
-	public DetailedErrorReporter(String prefix, String supportURL) {
-		this(prefix, supportURL, DEFAULT_MAX_ERROR_COUNT, getBukkitLogger());
-	}
-	
-	// Attempt to get the logger.
-	private static Logger getBukkitLogger() {
-		try {
-			return Bukkit.getLogger();
-		} catch (Throwable e) {
-			return Logger.getLogger("Minecraft");
-		}
+	public DetailedErrorReporter(Plugin plugin, String prefix, String supportURL) {
+		this(plugin, prefix, supportURL, DEFAULT_MAX_ERROR_COUNT, getBukkitLogger());
 	}
 
 	/**
 	 * Create a central error reporting system.
+	 * @param plugin - the plugin owner.
 	 * @param prefix - default line prefix.
 	 * @param supportURL - URL to report the error.
 	 * @param maxErrorCount - number of errors to print before giving up.
 	 * @param logger - current logger.
 	 */
-	public DetailedErrorReporter(String prefix, String supportURL, int maxErrorCount, Logger logger) {
+	public DetailedErrorReporter(Plugin plugin, String prefix, String supportURL, int maxErrorCount, Logger logger) {
+		if (plugin == null)
+			throw new IllegalArgumentException("Plugin cannot be NULL.");
+		
+		this.pluginReference = new WeakReference<Plugin>(plugin);
+		this.pluginName = plugin.getName();
 		this.prefix = prefix;
 		this.supportURL = supportURL;
 		this.maxErrorCount = maxErrorCount;
 		this.logger = logger;
 	}
 
+	// Attempt to get the logger.
+	private static Logger getBukkitLogger() {
+		try {
+			return Bukkit.getLogger();
+		} catch (LinkageError e) {
+			return Logger.getLogger("Minecraft");
+		}
+	}
+	
+	/**
+	 * Determine if we're using detailed error reporting.
+	 * @return TRUE if we are, FALSE otherwise.
+	 */
+	public boolean isDetailedReporting() {
+		return detailedReporting;
+	}
+	
+	/**
+	 * Set whether or not to use detailed error reporting.
+	 * @param detailedReporting - TRUE to enable it, FALSE otherwise.
+	 */
+	public void setDetailedReporting(boolean detailedReporting) {
+		this.detailedReporting = detailedReporting;
+	}
+	
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error, Object... parameters) {
+		if (reportMinimalNoSpam(sender, methodName, error)) {
+			// Print parameters, if they are given
+			if (parameters != null && parameters.length > 0) {
+				logger.log(Level.SEVERE, printParameters(parameters));
+			}
+		}
+	}
+	
 	@Override
 	public void reportMinimal(Plugin sender, String methodName, Throwable error) {
-		logger.log(Level.SEVERE, "[" + PLUGIN_NAME + "] Unhandled exception occured in " + methodName + " for " + 
-					PacketAdapter.getPluginName(sender), error);
+		reportMinimalNoSpam(sender, methodName, error);
+	}
+	
+	/**
+	 * Report a problem with a given method and plugin, ensuring that we don't exceed the maximum number of error reports.
+	 * @param sender - the component that observed this exception.
+	 * @param methodName - the method name.
+	 * @param error - the error itself.
+	 * @return TRUE if the error was printed, FALSE if it was suppressed.
+	 */
+	public boolean reportMinimalNoSpam(Plugin sender, String methodName, Throwable error) {
+		String pluginName = PacketAdapter.getPluginName(sender);
+		AtomicInteger counter = warningCount.get(pluginName);
+		
+		// Thread safe pattern
+		if (counter == null) {
+			AtomicInteger created = new AtomicInteger();
+			counter = warningCount.putIfAbsent(pluginName, created);
+			
+			if (counter == null) {
+				counter = created;
+			}
+		}
+		
+		final int errorCount = counter.incrementAndGet();
+		
+		// See if we should print the full error
+		if (errorCount < getMaxErrorCount()) {
+			logger.log(Level.SEVERE, "[" + pluginName + "] Unhandled exception occured in " +
+					 methodName + " for " + pluginName, error);
+			return true;
+			
+		} else {
+			// Nope - only print the error count occationally
+			if (isPowerOfTwo(errorCount)) {
+				logger.log(Level.SEVERE, "[" + pluginName + "] Unhandled exception number " + errorCount + " occured in " +
+						 methodName + " for " + pluginName, error);
+			}
+			return false;
+		}
+	}
+	
+	/**
+	 * Determine if a given number is a power of two.
+	 * <p>
+	 * That is, if there exists an N such that 2^N = number.
+	 * @param number - the number to check.
+	 * @return TRUE if the given number is a power of two, FALSE otherwise.
+	 */
+	private boolean isPowerOfTwo(int number) {
+	    return (number & (number - 1)) == 0;
 	}
 	
 	@Override
-	public void reportWarning(Object sender, String message) {
-		logger.log(Level.WARNING, "[" + PLUGIN_NAME + "] [" + getSenderName(sender) + "] " + message);
+	public void reportDebug(Object sender, ReportBuilder builder) {
+		reportDebug(sender, Preconditions.checkNotNull(builder, "builder cannot be NULL").build());
 	}
 	
 	@Override
-	public void reportWarning(Object sender, String message, Throwable error) {
-		logger.log(Level.WARNING, "[" + PLUGIN_NAME + "] [" + getSenderName(sender) + "] " + message, error);
+	public void reportDebug(Object sender, Report report) {
+		if (logger.isLoggable(Level.FINE) && canReport(report)) {
+			reportLevel(Level.FINE, sender, report);
+		}
 	}
 	
+	@Override
+	public void reportWarning(Object sender, ReportBuilder reportBuilder) {
+		if (reportBuilder == null)
+			throw new IllegalArgumentException("reportBuilder cannot be NULL.");
+		
+		reportWarning(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportWarning(Object sender, Report report) {
+		if (logger.isLoggable(Level.WARNING) && canReport(report)) {
+			reportLevel(Level.WARNING, sender, report);
+		}
+	}
+	
+	/**
+	 * Determine if we should print the given report.
+	 * <p>
+	 * The default implementation will check for rate limits.
+	 * @param report - the report to check.
+	 * @return TRUE if we should print it, FALSE otherwise.
+	 */
+	protected boolean canReport(Report report) {
+		long rateLimit = report.getRateLimit();
+		
+		// Check for rate limit
+		if (rateLimit > 0) {
+			synchronized (rateLock) {
+				if (rateLimited.containsKey(report)) {
+					return false;
+				}
+				rateLimited.put(report, true, rateLimit, TimeUnit.NANOSECONDS);
+			}
+		}
+		return true;
+	}
+	
+	private void reportLevel(Level level, Object sender, Report report) {
+		String message = "[" + pluginName + "] [" + getSenderName(sender) + "] " + report.getReportMessage();
+		
+		// Print the main warning
+		if (report.getException() != null) {
+			logger.log(level, message, report.getException());
+		} else {			
+			logger.log(level, message);
+			
+			// Remember the call stack
+			if (detailedReporting) {
+				printCallStack(level, logger);
+			}
+		}
+		
+		// Parameters?
+		if (report.hasCallerParameters()) {
+			// Write it
+			logger.log(level, printParameters(report.getCallerParameters()));
+		}
+	}
+	
+	/**
+	 * Retrieve the name of a sender class.
+	 * @param sender - sender object.
+	 * @return The name of the sender's class.
+	 */
 	private String getSenderName(Object sender) {
 		if (sender != null)
-			return sender.getClass().getSimpleName();
+			return ReportType.getSenderClass(sender).getSimpleName();
 		else
 			return "NULL";
 	}
 	
 	@Override
-	public void reportDetailed(Object sender, String message, Throwable error, Object... parameters) {
-
+	public void reportDetailed(Object sender, ReportBuilder reportBuilder) {
+		reportDetailed(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportDetailed(Object sender, Report report) {
+		final Plugin plugin = pluginReference.get();
+		final int errorCount = internalErrorCount.incrementAndGet();
+		
 		// Do not overtly spam the server!
-		if (++errorCount > maxErrorCount) {
-			String maxReached = String.format("Reached maxmimum error count. Cannot pass error %s from %s.", error, sender);
-			logger.severe(maxReached);
+		if (errorCount > getMaxErrorCount()) {
+			// Only allow the error count at rare occations
+			if (isPowerOfTwo(errorCount)) {
+				// Permit it - but print the number of exceptions first
+				reportWarning(this, Report.newBuilder(REPORT_EXCEPTION_COUNT).messageParam(errorCount).build());
+			} else {
+				// NEVER SPAM THE CONSOLE
+				return;
+			}
+		}
+		
+		// Secondary rate limit
+		if (!canReport(report)) {
 			return;
 		}
 		
@@ -120,27 +331,26 @@ public class DetailedErrorReporter implements ErrorReporter {
 		PrintWriter writer = new PrintWriter(text);
 
 		// Helpful message
-		writer.println("[ProtocolLib] INTERNAL ERROR: " + message);
+		writer.println("[" + pluginName + "] INTERNAL ERROR: " + report.getReportMessage());
 	    writer.println("If this problem hasn't already been reported, please open a ticket");
 	    writer.println("at " + supportURL + " with the following data:");
 	    
 	    // Now, let us print important exception information
 		writer.println("          ===== STACK TRACE =====");
 
-		if (error != null) 
-			error.printStackTrace(writer);
+		if (report.getException() != null) {
+			report.getException().printStackTrace(writer);
+			
+		} else if (detailedReporting) {
+			printCallStack(writer);
+		}
 		
 		// Data dump!
 		writer.println("          ===== DUMP =====");
 		
 		// Relevant parameters
-		if (parameters != null && parameters.length > 0) {
-			writer.println("Parameters:");
-			
-			// We *really* want to get as much information as possible
-			for (Object param : parameters) {
-				writer.println(addPrefix(getStringDescription(param), SECOND_LEVEL_PREFIX));
-			}
+		if (report.hasCallerParameters()) {
+			printParameters(writer, report.getCallerParameters());
 		}
 		
 		// Global parameters
@@ -154,16 +364,68 @@ public class DetailedErrorReporter implements ErrorReporter {
 		writer.println("Sender:");
 		writer.println(addPrefix(getStringDescription(sender), SECOND_LEVEL_PREFIX));
 		
+		// And plugin
+		if (plugin != null) {
+			writer.println("Version:");
+			writer.println(addPrefix(plugin.toString(), SECOND_LEVEL_PREFIX));
+		}
+		
 		// Add the server version too
 		if (Bukkit.getServer() != null) {
 			writer.println("Server:");
 			writer.println(addPrefix(Bukkit.getServer().getVersion(), SECOND_LEVEL_PREFIX));
+			
+			// Inform of this occurrence
+			if (ERROR_PERMISSION != null) {	
+				Bukkit.getServer().broadcast(
+						String.format("Error %s (%s) occured in %s.", report.getReportMessage(), report.getException(), sender),
+						ERROR_PERMISSION
+				);
+			}
 		}
-				
+		
 		// Make sure it is reported
 		logger.severe(addPrefix(text.toString(), prefix));
 	}
 	
+	/**
+	 * Print the call stack to the given logger.
+	 * @param logger - the logger.
+	 */
+	private void printCallStack(Level level, Logger logger) {
+		StringWriter text = new StringWriter();
+		printCallStack(new PrintWriter(text));
+		
+		// Print the exception
+		logger.log(level, text.toString());
+	}
+	
+	/**
+	 * Print the current call stack.
+	 * @param writer - the writer.
+	 */
+	private void printCallStack(PrintWriter writer) {
+		Exception current = new Exception("Not an error! This is the call stack.");
+		current.printStackTrace(writer);
+	}
+	
+	private String printParameters(Object... parameters) {
+		StringWriter writer = new StringWriter();
+		
+		// Print and retrieve the string buffer
+		printParameters(new PrintWriter(writer), parameters);
+		return writer.toString();
+	}
+
+	private void printParameters(PrintWriter writer, Object[] parameters) {
+		writer.println("Parameters: ");
+		
+		// We *really* want to get as much information as possible
+		for (Object param : parameters) {
+			writer.println(addPrefix(getStringDescription(param), SECOND_LEVEL_PREFIX));
+		}
+	}
+	
 	/**
 	 * Adds the given prefix to every line in the text.
 	 * @param text - text to modify.
@@ -174,25 +436,35 @@ public class DetailedErrorReporter implements ErrorReporter {
 		return text.replaceAll("(?m)^", prefix);
 	}
 	
+	/**
+	 * Retrieve a string representation of the given object.
+	 * @param value - object to convert.
+	 * @return String representation.
+	 */
 	protected String getStringDescription(Object value) {
-		
 		// We can't only rely on toString.
 		if (value == null) {
 			return "[NULL]";
-		} if (isSimpleType(value)) {
+		} if (isSimpleType(value) || value instanceof Class<?>) {
 			return value.toString();
 		} else {
 			try {
 				if (!apacheCommonsMissing)
 					return (ToStringBuilder.reflectionToString(value, ToStringStyle.MULTI_LINE_STYLE, false, null));
-			} catch (Throwable ex) {
+			} catch (LinkageError ex) {
 				// Apache is probably missing
-				logger.warning("Cannot find Apache Commons. Object introspection disabled.");
 				apacheCommonsMissing = true;
+			} catch (Exception e) {
+				// Don't use the error logger to log errors in error logging (that could lead to infinite loops)
+				System.err.print("[ProtocolLib] Warning: Cannot convert to a String with Apache: " + e.getMessage());
 			}
 			
-			// Just use toString()
-			return String.format("%s", value);
+			// Use our custom object printer instead
+			try {
+				return PrettyPrinter.printObject(value, value.getClass(), Object.class);
+			} catch (IllegalAccessException e) {
+				return "[Error: " + e.getMessage() + "]";
+			}
 		}
 	}
 	
@@ -205,63 +477,125 @@ public class DetailedErrorReporter implements ErrorReporter {
 		return test instanceof String || Primitives.isWrapperType(test.getClass());
 	}
 	
+	/**
+	 * Retrieve the current number of errors printed through {@link #reportDetailed(Object, Report)}.
+	 * @return Number of errors printed.
+	 */
 	public int getErrorCount() {
-		return errorCount;
+		return internalErrorCount.get();
 	}
 
+	/**
+	 * Set the number of errors printed.
+	 * @param errorCount - new number of errors printed.
+	 */
 	public void setErrorCount(int errorCount) {
-		this.errorCount = errorCount;
+		internalErrorCount.set(errorCount);
 	}
 
+	/**
+	 * Retrieve the maximum number of errors we can print before we begin suppressing errors.
+	 * @return Maximum number of errors.
+	 */
 	public int getMaxErrorCount() {
 		return maxErrorCount;
 	}
 
+	/**
+	 * Set the maximum number of errors we can print before we begin suppressing errors.
+	 * @param maxErrorCount - new max count.
+	 */
 	public void setMaxErrorCount(int maxErrorCount) {
 		this.maxErrorCount = maxErrorCount;
 	}
 	
 	/**
 	 * Adds the given global parameter. It will be included in every error report.
+	 * <p>
+	 * Both key and value must be non-null.
 	 * @param key - name of parameter.
 	 * @param value - the global parameter itself.
 	 */
 	public void addGlobalParameter(String key, Object value) {
+		if (key == null)
+			throw new IllegalArgumentException("key cannot be NULL.");
+		if (value == null)
+			throw new IllegalArgumentException("value cannot be NULL.");
+		
 		globalParameters.put(key, value);
 	}
 	
+	/**
+	 * Retrieve a global parameter by its key.
+	 * @param key - key of the parameter to retrieve.
+	 * @return The value of the global parameter, or NULL if not found.
+	 */
 	public Object getGlobalParameter(String key) {
+		if (key == null)
+			throw new IllegalArgumentException("key cannot be NULL.");
+		
 		return globalParameters.get(key);
 	}
 	
+	/**
+	 * Reset all global parameters.
+	 */
 	public void clearGlobalParameters() {
 		globalParameters.clear();
 	}
 	
+	/**
+	 * Retrieve a set of every registered global parameter.
+	 * @return Set of all registered global parameters.
+	 */
 	public Set<String> globalParameters() {
 		return globalParameters.keySet();
 	}
 	
+	/**
+	 * Retrieve the support URL that will be added to all detailed reports.
+	 * @return Support URL.
+	 */
 	public String getSupportURL() {
 		return supportURL;
 	}
 
+	/**
+	 * Set the support URL that will be added to all detailed reports.
+	 * @param supportURL - the new support URL.
+	 */
 	public void setSupportURL(String supportURL) {
 		this.supportURL = supportURL;
 	}
 	
+	/**
+	 * Retrieve the prefix to apply to every line in the error reports.
+	 * @return Error report prefix.
+	 */
 	public String getPrefix() {
 		return prefix;
 	}
 
+	/**
+	 * Set the prefix to apply to every line in the error reports.
+	 * @param prefix - new prefix.
+	 */
 	public void setPrefix(String prefix) {
 		this.prefix = prefix;
 	}
 	
+	/**
+	 * Retrieve the current logger that is used to print all reports.
+	 * @return The current logger.
+	 */
 	public Logger getLogger() {
 		return logger;
 	}
 
+	/**
+	 * Set the current logger that is used to print all reports.
+	 * @param logger - new logger.
+	 */
 	public void setLogger(Logger logger) {
 		this.logger = logger;
 	}

ProtocolLib/src/main/java/com/comphenix/protocol/error/ErrorReporter.java

@@ -1,11 +1,34 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol.error;
 
 import org.bukkit.plugin.Plugin;
 
-public interface ErrorReporter {
+import com.comphenix.protocol.error.Report.ReportBuilder;
 
+/**
+ * Represents an object that can forward an error {@link Report} to the display and permanent storage.
+ * 
+ * @author Kristian
+ */
+public interface ErrorReporter {
 	/**
-	 * Prints a small minimal error report about an exception from another plugin.
+	 * Prints a small minimal error report regarding an exception from another plugin.
 	 * @param sender - the other plugin.
 	 * @param methodName - name of the caller method.
 	 * @param error - the exception itself.
@@ -13,27 +36,55 @@ public interface ErrorReporter {
 	public abstract void reportMinimal(Plugin sender, String methodName, Throwable error);
 
 	/**
-	 * Prints a warning message from the current plugin.
-	 * @param sender - the object containing the caller method. 
-	 * @param message - error message. 
+	 * Prints a small minimal error report regarding an exception from another plugin.
+	 * @param sender - the other plugin.
+	 * @param methodName - name of the caller method.
+	 * @param error - the exception itself.
+	 * @param parameters - any relevant parameters to print.
 	 */
-	public abstract void reportWarning(Object sender, String message);
-
+	public abstract void reportMinimal(Plugin sender, String methodName, Throwable error, Object... parameters);
+	
+	/**
+	 * Prints a debug message from the current sender.
+	 * <p>
+	 * Most users will not see this message.
+	 * @param sender - the sender.
+	 * @param report - the report.
+	 */
+	public abstract void reportDebug(Object sender, Report report);
+	
+	/**
+	 * Prints a debug message from the current sender.
+	 * @param sender - the sender.
+	 * @param report - the report builder.
+	 */
+	public abstract void reportDebug(Object sender, ReportBuilder builder);
+	
 	/**
 	 * Prints a warning message from the current plugin.
 	 * @param sender - the object containing the caller method. 
-	 * @param message - error message. 
-	 * @param error - the exception that was thrown.
+	 * @param report - an error report to include.
 	 */
-	public abstract void reportWarning(Object sender, String message, Throwable error);
+	public abstract void reportWarning(Object sender, Report report);
+	
+	/**
+	 * Prints a warning message from the current plugin.
+	 * @param sender - the object containing the caller method. 
+	 * @param reportBuilder - an error report builder that will be used to get the report.
+	 */
+	public abstract void reportWarning(Object sender, ReportBuilder reportBuilder);
 
 	/**
 	 * Prints a detailed error report about an unhandled exception.
 	 * @param sender - the object containing the caller method.
-	 * @param message - an error message to include.
-	 * @param error - the exception that was thrown in the caller method.
-	 * @param parameters - parameters from the caller method.
+	 * @param report - an error report to include.
 	 */
-	public abstract void reportDetailed(Object sender, String message, Throwable error, Object... parameters);
-
+	public abstract void reportDetailed(Object sender, Report report);
+	
+	/**
+	 * Prints a detailed error report about an unhandled exception.
+	 * @param sender - the object containing the caller method.
+	 * @param reportBuilder - an error report builder that will be used to get the report.
+	 */
+	public abstract void reportDetailed(Object sender, ReportBuilder reportBuilder);
 }

ProtocolLib/src/main/java/com/comphenix/protocol/error/PluginContext.java

@@ -0,0 +1,109 @@
+package com.comphenix.protocol.error;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.security.CodeSource;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+import com.google.common.base.Preconditions;
+
+public final class PluginContext {
+	// Determine plugin folder
+	private static File pluginFolder;
+	
+	private PluginContext() {
+		// Not constructable
+	}
+	
+	/**
+	 * Retrieve the name of the plugin that called the last method(s) in the exception.
+	 * @param ex - the exception.
+	 * @return The name of the plugin, or NULL.
+	 */
+	public static String getPluginCaller(Exception ex) {
+		StackTraceElement[] elements = ex.getStackTrace();
+		String current = getPluginName(elements[0]);
+		
+		for (int i = 1; i < elements.length; i++) {
+			String caller = getPluginName(elements[i]);
+			
+			if (caller != null && !caller.equals(current)) {
+				return caller;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Lookup the plugin that this method invocation belongs to, and return its file name.
+	 * @param element - the method invocation.
+	 * @return Plugin name, or NULL if not found.
+	 * 
+	 */
+	public static String getPluginName(StackTraceElement element) {
+		try {
+			if (Bukkit.getServer() == null)
+				return null;
+			CodeSource codeSource = Class.forName(element.getClassName()).getProtectionDomain().getCodeSource();
+
+			if (codeSource != null) {
+				String encoding = codeSource.getLocation().getPath();
+				File path = new File(URLDecoder.decode(encoding, "UTF-8"));
+				File plugins = getPluginFolder();
+				
+				if (plugins != null && folderContains(plugins, path)) {
+					return path.getName();
+				}
+			}
+			return null; // Cannot find it
+			
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException("Cannot lookup plugin name.", e);
+		} catch (ClassNotFoundException e) {
+			throw new RuntimeException("Cannot lookup plugin name.", e);
+		}
+	}
+	
+	/**
+	 * Determine if a folder contains the given file.
+	 * @param folder - the folder.
+	 * @param file - the file.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	private static boolean folderContains(File folder, File file) {
+		Preconditions.checkNotNull(folder, "folder cannot be NULL");
+		Preconditions.checkNotNull(file, "file cannot be NULL");
+		
+		// Get absolute versions
+		folder = folder.getAbsoluteFile();
+		file = file.getAbsoluteFile();
+
+		while (file != null) {
+		    if (folder.equals(file))
+		        return true;
+		    file = file.getParentFile();
+		}
+		return false;
+	}
+	
+	/**
+	 * Retrieve the folder that contains every plugin on the server.
+	 * @return Folder with every plugin, or NULL if Bukkit has not been initialized yet.
+	 */
+	private static File getPluginFolder() {
+		File folder = pluginFolder;
+		
+		if (folder == null && Bukkit.getServer() != null) { 
+			Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
+			
+			if (plugins.length > 0) {
+				folder = plugins[0].getDataFolder().getParentFile();
+				pluginFolder = folder;
+			}
+		}
+		return folder;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/error/Report.java

@@ -0,0 +1,240 @@
+package com.comphenix.protocol.error;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nullable;
+
+/**
+ * Represents a error or warning report.
+ * 
+ * @author Kristian
+ */
+public class Report {	
+	private final ReportType type;
+	private final Throwable exception;
+	private final Object[] messageParameters;
+	private final Object[] callerParameters;
+	
+	// Used to rate limit reports that are similar
+	private final long rateLimit;
+	
+	/**
+	 * Must be constructed through the factory method in Report.
+	 */
+	public static class ReportBuilder {
+		private ReportType type;
+		private Throwable exception;
+		private Object[] messageParameters;
+		private Object[] callerParameters;
+		private long rateLimit;
+	
+		private ReportBuilder() {
+			// Don't allow
+		}
+		
+		/**
+		 * Set the current report type. Cannot be NULL.
+		 * @param type - report type.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder type(ReportType type) {
+			if (type == null)
+				throw new IllegalArgumentException("Report type cannot be set to NULL.");
+			this.type = type;
+			return this;
+		}
+		
+		/**
+		 * Set the current exception that occurred.
+		 * @param exception - exception that occurred.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder error(@Nullable Throwable exception) {
+			this.exception = exception;
+			return this;
+		}
+		
+		/**
+		 * Set the message parameters that are used to construct a message text.
+		 * @param messageParameters - parameters for the report type.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder messageParam(@Nullable Object... messageParameters) {
+			this.messageParameters = messageParameters;
+			return this;
+		}
+		
+		/**
+		 * Set the parameters in the caller method. This is optional.
+		 * @param callerParameters - parameters of the caller method.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder callerParam(@Nullable Object... callerParameters) {
+			this.callerParameters = callerParameters;
+			return this;
+		}
+		
+		/**
+		 * Set the minimum number of nanoseconds to wait until a report of equal type and parameters 
+		 * is allowed to be printed again.
+		 * @param rateLimit - number of nanoseconds, or 0 to disable. Cannot be negative.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder rateLimit(long rateLimit) {
+			if (rateLimit < 0)
+				throw new IllegalArgumentException("Rate limit cannot be less than zero.");
+			this.rateLimit = rateLimit;
+			return this;
+		}
+		
+		/**
+		 * Set the minimum time to wait until a report of equal type and parameters is allowed to be printed again.
+		 * @param rateLimit - the time, or 0 to disable. Cannot be negative.
+		 * @param rateUnit - the unit of the rate limit.
+		 * @return This builder, for chaining.
+		 */
+		public ReportBuilder rateLimit(long rateLimit, TimeUnit rateUnit) {
+			return rateLimit(TimeUnit.NANOSECONDS.convert(rateLimit, rateUnit));
+		}
+		
+		/**
+		 * Construct a new report with the provided input.
+		 * @return A new report.
+		 */
+		public Report build() {
+			return new Report(type, exception, messageParameters, callerParameters, rateLimit);
+		}
+	}
+	
+	/**
+	 * Construct a new report builder.
+	 * @param type - the initial report type.
+	 * @return Report builder.
+	 */
+	public static ReportBuilder newBuilder(ReportType type) {
+		return new ReportBuilder().type(type);
+	}
+	
+	/**
+	 * Construct a new report with the given type and parameters.
+	 * @param exception - exception that occured in the caller method.
+	 * @param type - the report type that will be used to construct the message.
+	 * @param messageParameters - parameters used to construct the report message.
+	 * @param callerParameters - parameters from the caller method.
+	 */ 
+	protected Report(ReportType type, @Nullable Throwable exception, 
+			@Nullable Object[] messageParameters, @Nullable Object[] callerParameters) {
+		this(type, exception, messageParameters, callerParameters, 0);
+	}
+
+	/**
+	 * Construct a new report with the given type and parameters.
+	 * @param exception - exception that occurred in the caller method.
+	 * @param type - the report type that will be used to construct the message.
+	 * @param messageParameters - parameters used to construct the report message.
+	 * @param callerParameters - parameters from the caller method.
+	 * @param rateLimit - minimum number of nanoseconds to wait until a report of equal type and parameters is allowed to be printed again.
+	 */ 
+	protected Report(ReportType type, @Nullable Throwable exception, 
+			@Nullable Object[] messageParameters, @Nullable Object[] callerParameters, long rateLimit) {
+		if (type == null)
+			throw new IllegalArgumentException("type cannot be NULL.");
+		this.type = type;
+		this.exception = exception;
+		this.messageParameters = messageParameters;
+		this.callerParameters = callerParameters;
+		this.rateLimit = rateLimit;
+	}
+	
+	/**
+	 * Format the current report type with the provided message parameters.
+	 * @return The formated report message.
+	 */
+	public String getReportMessage() {
+		return type.getMessage(messageParameters);
+	}
+	
+	/**
+	 * Retrieve the message parameters that will be used to construc the report message.
+	 * <p<
+	 * This should not be confused with the method parameters of the caller method.
+	 * @return Message parameters.
+	 */
+	public Object[] getMessageParameters() {
+		return messageParameters;
+	}
+	
+	/**
+	 * Retrieve the parameters of the caller method. Optional - may be NULL.
+	 * @return Parameters or the caller method.
+	 */
+	public Object[] getCallerParameters() {
+		return callerParameters;
+	}
+	
+	/**
+	 * Retrieve the report type.
+	 * @return Report type.
+	 */
+	public ReportType getType() {
+		return type;
+	}
+	
+	/**
+	 * Retrieve the associated exception, or NULL if not found.
+	 * @return Associated exception, or NULL.
+	 */
+	public Throwable getException() {
+		return exception;
+	}
+	
+	/**
+	 * Determine if we have any message parameters.
+	 * @return TRUE if there are any message parameters, FALSE otherwise.
+	 */
+	public boolean hasMessageParameters() {
+		return messageParameters != null && messageParameters.length > 0;
+	}
+	
+	/**
+	 * Determine if we have any caller parameters.
+	 * @return TRUE if there are any caller parameters, FALSE otherwise.
+	 */
+	public boolean hasCallerParameters() {
+		return callerParameters != null && callerParameters.length > 0;
+	}
+
+	/**
+	 * Retrieve desired  minimum number of nanoseconds until a report of the same type and parameters should be reprinted.
+	 * <p>
+	 * Note that this may be ignored or modified by the error reporter. Zero indicates no rate limit.
+	 * @return The number of nanoseconds. Never negative.
+	 */
+	public long getRateLimit() {
+		return rateLimit;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Arrays.hashCode(callerParameters);
+		result = prime * result + Arrays.hashCode(messageParameters);
+		result = prime * result + ((type == null) ? 0 : type.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj instanceof Report) {
+			Report other = (Report) obj;
+			return type == other.type && 
+				   Arrays.equals(callerParameters, other.callerParameters) && 
+				   Arrays.equals(messageParameters, other.messageParameters);
+		}
+		return false;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/error/ReportType.java

@@ -0,0 +1,148 @@
+package com.comphenix.protocol.error;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
+
+/**
+ * Represents a strongly-typed report. Subclasses should be immutable.
+ * <p>
+ * By convention, a report must be declared as a static field publicly accessible from the sender class.
+ * @author Kristian
+ */
+public class ReportType {
+	private final String errorFormat;
+	
+	// Used to store the report name
+	protected String reportName;
+	
+	/**
+	 * Construct a new report type.
+	 * @param errorFormat - string used to format the underlying report.
+	 */
+	public ReportType(String errorFormat) {
+		this.errorFormat = errorFormat;
+	}
+	
+	/**
+	 * Convert the given report to a string, using the provided parameters.
+	 * @param parameters - parameters to insert, or NULL to insert nothing.
+	 * @return The full report in string format.
+	 */
+	public String getMessage(Object[] parameters) {
+		if (parameters == null || parameters.length == 0)
+			return toString();
+		else
+			return String.format(errorFormat, parameters);
+	}
+	
+	@Override
+	public String toString() {
+		return errorFormat;
+	}
+	
+	/**
+	 * Retrieve the class of the given sender.
+	 * <p>
+	 * If the sender is already a Class, we return it.
+	 * @param sender - the sender to look up.
+	 * @return The class of the sender.
+	 */
+	public static Class<?> getSenderClass(Object sender) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NUll.");
+		else if (sender instanceof Class<?>)
+			return (Class<?>) sender;
+		else
+			return sender.getClass();
+	}
+	
+	/**
+	 * Retrieve the full canonical name of a given report type.
+	 * <p>
+	 * Note that the sender may be a class (for static callers), in which 
+	 * case it will be used directly instead of its getClass() method.
+	 * <p>
+	 * It is thus not advisable for class classes to report reports.
+	 * @param sender - the sender, or its class.
+	 * @param type - the report type.
+	 * @return The full canonical name.
+	 */
+	public static String getReportName(Object sender, ReportType type) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NUll.");
+		return getReportName(getSenderClass(sender), type);
+	}
+	
+	/**
+	 * Retrieve the full canonical name of a given report type.
+	 * <p>
+	 * This is in the format <i>canonical_name_of_class#report_type</i>
+	 * @param clazz - the sender class.
+	 * @param type - the report instance.
+	 * @return The full canonical name.
+	 */
+	private static String getReportName(Class<?> sender, ReportType type) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NUll.");
+		
+		// Whether or not we need to retrieve the report name again
+		if (type.reportName == null) {
+			for (Field field : getReportFields(sender)) {
+				try {
+					field.setAccessible(true);
+					
+					if (field.get(null) == type) {
+						// We got the right field!
+						return type.reportName = field.getDeclaringClass().getCanonicalName() + "#" + field.getName();
+					}
+				} catch (IllegalAccessException e) {
+					throw new FieldAccessException("Unable to read field " + field, e);
+				}
+			}
+			throw new IllegalArgumentException("Cannot find report name for " + type);
+		}
+		return type.reportName;
+	}
+	
+	/**
+	 * Retrieve all publicly associated reports.
+	 * @param sender - sender class.
+	 * @return All associated reports.
+	 */
+	public static ReportType[] getReports(Class<?> sender) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NULL.");
+		List<ReportType> result = new ArrayList<ReportType>();
+		
+		// Go through all the fields
+		for (Field field : getReportFields(sender)) {
+			try {
+				field.setAccessible(true);
+				result.add((ReportType) field.get(null));
+			} catch (IllegalAccessException e) {
+				throw new FieldAccessException("Unable to read field " + field, e);
+			}
+		}
+		return result.toArray(new ReportType[0]);
+	}
+	
+	/**
+	 * Retrieve all publicly associated report fields.
+	 * @param clazz - sender class.
+	 * @return All associated report fields.
+	 */
+	private static List<Field> getReportFields(Class<?> clazz) {
+		return FuzzyReflection.fromClass(clazz).getFieldList(
+				FuzzyFieldContract.newBuilder().
+					requireModifier(Modifier.STATIC).
+					typeDerivedOf(ReportType.class).
+					build()
+		);
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java

@@ -0,0 +1,53 @@
+package com.comphenix.protocol.error;
+
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.error.Report.ReportBuilder;
+import com.google.common.base.Joiner;
+
+/**
+ * Represents an error reporter that rethrows every exception instead.
+ * @author Kristian
+ */
+public class RethrowErrorReporter implements ErrorReporter {
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error) {
+		throw new RuntimeException("Minimal error by " + sender + " in " + methodName, error);
+	}
+
+	@Override
+	public void reportMinimal(Plugin sender, String methodName, Throwable error, Object... parameters) {
+		throw new RuntimeException(
+				"Minimal error by " + sender + " in " + methodName + " with " + Joiner.on(",").join(parameters), error);
+	}
+
+	@Override
+	public void reportDebug(Object sender, Report report) {
+		// Do nothing - this is just a debug
+	}
+
+	@Override
+	public void reportDebug(Object sender, ReportBuilder builder) {
+		// As above
+	}
+	
+	@Override
+	public void reportWarning(Object sender, ReportBuilder reportBuilder) {
+		reportWarning(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportWarning(Object sender, Report report) {
+		throw new RuntimeException("Warning by " + sender + ": " + report);
+	}
+
+	@Override
+	public void reportDetailed(Object sender, ReportBuilder reportBuilder) {
+		reportDetailed(sender, reportBuilder.build());
+	}
+	
+	@Override
+	public void reportDetailed(Object sender, Report report) {
+		throw new RuntimeException("Detailed error " + sender + ": " + report, report.getException());
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/ConnectionSide.java

@@ -17,6 +17,8 @@
 
 package com.comphenix.protocol.events;
 
+import com.comphenix.protocol.PacketType.Sender;
+
 /**
  * Used to set a packet filter.
  * 
@@ -45,4 +47,44 @@ public enum ConnectionSide {
 	public boolean isForServer() {
 		return this == SERVER_SIDE || this == BOTH;
 	}
+	
+	/**
+	 * Retrieve the sender of this connection side.
+	 * <p>
+	 * This is NULL for {@link #BOTH}.
+	 * @return The sender.
+	 */
+	public Sender getSender() {
+		if (this == SERVER_SIDE)
+			return Sender.SERVER;
+		else if (this == CLIENT_SIDE)
+			return Sender.CLIENT;
+		return null;
+	}
+	
+	/**
+	 * If both connection sides are present, return {@link #BOTH} - otherwise, return the one valud connection side.
+	 * <p>
+	 * NULL is not a valid connection side.
+	 * @param a - the first connection side.
+	 * @param b - the second connection side.
+	 * @return BOTH or the one valid side, or NULL.
+	 */
+	public static ConnectionSide add(ConnectionSide a, ConnectionSide b) {
+		if (a == null)
+			return b;
+		if (b == null)
+			return a;
+		
+		// Now merge them together
+		boolean client = a.isForClient() || b.isForClient();
+		boolean server = a.isForServer() || b.isForServer();
+		
+		if (client && server)
+			return BOTH;
+		else if (client)
+			return CLIENT_SIDE;
+		else
+			return SERVER_SIDE;
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/events/ListenerOptions.java

@@ -0,0 +1,31 @@
+package com.comphenix.protocol.events;
+
+import com.comphenix.protocol.injector.GamePhase;
+
+/**
+ * Represents additional options a listener may require.
+ * 
+ * @author Kristian
+ */
+public enum ListenerOptions {
+	/**
+	 * Retrieve the serialized client packet as it appears on the network stream.
+	 */
+	INTERCEPT_INPUT_BUFFER,
+	
+	/**
+	 * Disable the automatic game phase detection that will normally force {@link GamePhase#LOGIN} when
+	 * a packet ID is known to be transmitted during login.
+	 */
+	DISABLE_GAMEPHASE_DETECTION,
+	
+	/**
+	 * Do not verify that the owning plugin has a vaid plugin.yml.
+	 */
+	SKIP_PLUGIN_VERIFIER,
+	
+	/**
+	 * Notify ProtocolLib that {@link PacketListener#onPacketSending(PacketEvent)} is thread safe.
+	 */
+	ASYNC;
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java

@@ -17,9 +17,15 @@
 
 package com.comphenix.protocol.events;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Set;
 
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.injector.GamePhase;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.google.common.base.Objects;
 import com.google.common.collect.Sets;
 
@@ -29,68 +35,110 @@ import com.google.common.collect.Sets;
  * @author Kristian 
  */
 public class ListeningWhitelist {
-
 	/**
 	 * A whitelist with no packets - indicates that the listener shouldn't observe any packets.
 	 */
 	public static final ListeningWhitelist EMPTY_WHITELIST = new ListeningWhitelist(ListenerPriority.LOW);
-	
-	private ListenerPriority priority;
-	private Set<Integer> whitelist;
-	private GamePhase gamePhase;
 
-	/**
-	 * Creates a packet whitelist for a given priority with a set of packet IDs.
-	 * @param priority - the listener priority.
-	 * @param whitelist - set of IDs to observe/enable. 
-	 */
-	public ListeningWhitelist(ListenerPriority priority, Set<Integer> whitelist) {
-		this(priority, whitelist, GamePhase.PLAYING);
+	private final ListenerPriority priority;
+	private final GamePhase gamePhase;
+	private final Set<ListenerOptions> options;
+	private final Set<PacketType> types;
+	
+	// Cache whitelist
+	private transient Set<Integer> intWhitelist;
+	
+	private ListeningWhitelist(Builder builder) {
+		this.priority = builder.priority;
+		this.types = builder.types;
+		this.gamePhase = builder.gamePhase;
+		this.options = builder.options;
 	}
 	
 	/**
 	 * Creates a packet whitelist for a given priority with a set of packet IDs.
+	 * <p>
+	 * Deprecated: Use {@link #newBuilder()} instead.
+	 * @param priority - the listener priority.
+	 * @param whitelist - set of IDs to observe/enable. 
+	 */
+	@Deprecated
+	public ListeningWhitelist(ListenerPriority priority, Set<Integer> whitelist) {
+		this(priority, whitelist, GamePhase.PLAYING);
+	}
+
+	/**
+	 * Creates a packet whitelist for a given priority with a set of packet IDs.
+	 * <p>
+	 * Deprecated: Use {@link #newBuilder()} instead.
 	 * @param priority - the listener priority.
 	 * @param whitelist - set of IDs to observe/enable.
 	 * @param gamePhase - which game phase to receieve notifications on.
 	 */
+	@Deprecated
 	public ListeningWhitelist(ListenerPriority priority, Set<Integer> whitelist, GamePhase gamePhase) {
 		this.priority = priority;
-		this.whitelist = whitelist;
+		this.types = PacketRegistry.toPacketTypes(safeSet(whitelist));
 		this.gamePhase = gamePhase;
+		this.options = EnumSet.noneOf(ListenerOptions.class);
 	}
-	
+
 	/**
 	 * Creates a packet whitelist of a given priority for a list of packets.
+	 * <p>
+	 * Deprecated: Use {@link #newBuilder()} instead.
 	 * @param priority - the listener priority.
 	 * @param whitelist - list of packet IDs to observe/enable.
 	 */
+	@Deprecated
 	public ListeningWhitelist(ListenerPriority priority, Integer... whitelist) {
 		this.priority = priority;
-		this.whitelist = Sets.newHashSet(whitelist);
+		this.types = PacketRegistry.toPacketTypes(Sets.newHashSet(whitelist));
 		this.gamePhase = GamePhase.PLAYING;
+		this.options = EnumSet.noneOf(ListenerOptions.class);
 	}
-	
+
 	/**
 	 * Creates a packet whitelist for a given priority with a set of packet IDs.
+	 * <p>
+	 * Deprecated: Use {@link #newBuilder()} instead.
 	 * @param priority - the listener priority.
 	 * @param whitelist - list of packet IDs to observe/enable.
 	 * @param gamePhase - which game phase to receieve notifications on.
 	 */
+	@Deprecated
 	public ListeningWhitelist(ListenerPriority priority, Integer[] whitelist, GamePhase gamePhase) {
 		this.priority = priority;
-		this.whitelist = Sets.newHashSet(whitelist);
+		this.types = PacketRegistry.toPacketTypes(Sets.newHashSet(whitelist));
 		this.gamePhase = gamePhase;
+		this.options = EnumSet.noneOf(ListenerOptions.class);
 	}
-	
+
+	/**
+	 * Creates a packet whitelist for a given priority with a set of packet IDs and options.
+	 * <p>
+	 * Deprecated: Use {@link #newBuilder()} instead.
+	 * @param priority - the listener priority.
+	 * @param whitelist - list of packet IDs to observe/enable.
+	 * @param gamePhase - which game phase to receieve notifications on.
+	 * @param options - every special option associated with this whitelist.
+	 */
+	@Deprecated
+	public ListeningWhitelist(ListenerPriority priority, Integer[] whitelist, GamePhase gamePhase, ListenerOptions... options) {
+		this.priority = priority;
+		this.types = PacketRegistry.toPacketTypes(Sets.newHashSet(whitelist));
+		this.gamePhase = gamePhase;
+		this.options = safeEnumSet(Arrays.asList(options), ListenerOptions.class);
+	}
+
 	/**
 	 * Whether or not this whitelist has any enabled packets.
 	 * @return TRUE if there are any packets, FALSE otherwise.
 	 */
 	public boolean isEnabled() {
-		return whitelist != null && whitelist.size() > 0;
+		return types != null && types.size() > 0;
 	}
-	
+
 	/**
 	 * Retrieve the priority in the execution order of the packet listener. Highest priority will be executed last.
 	 * @return Execution order in terms of priority.
@@ -98,15 +146,28 @@ public class ListeningWhitelist {
 	public ListenerPriority getPriority() {
 		return priority;
 	}
-	
+
 	/**
 	 * Retrieves the list of packets that will be observed by the listeners.
+	 * <p>
+	 * Deprecated: Use {@link #getTypes()} instead.
 	 * @return Packet whitelist.
 	 */
+	@Deprecated
 	public Set<Integer> getWhitelist() {
-		return whitelist;
+		if (intWhitelist == null)
+			intWhitelist = PacketRegistry.toLegacy(types);
+		return intWhitelist;
 	}
 
+	/**
+	 * Retrieves a set of the packets that will be observed by the listeners.
+	 * @return Packet whitelist.
+	 */
+	public Set<PacketType> getTypes() {
+		return types;
+	}
+	
 	/**
 	 * Retrieve which game phase this listener is active under.
 	 * @return The active game phase.
@@ -115,9 +176,17 @@ public class ListeningWhitelist {
 		return gamePhase;
 	}
 	
+	/**
+	 * Retrieve every special option associated with this whitelist.
+	 * @return Every special option.
+	 */
+	public Set<ListenerOptions> getOptions() {
+		return Collections.unmodifiableSet(options);
+	}
+
 	@Override
-	public int hashCode(){
-	    return Objects.hashCode(priority, whitelist, gamePhase);
+	public int hashCode() {
+		return Objects.hashCode(priority, types, gamePhase, options);
 	}
 
 	/**
@@ -133,29 +202,283 @@ public class ListeningWhitelist {
 					return true;
 			}
 		}
-		
+
 		return false;
 	}
-	
-	@Override
-	public boolean equals(final Object obj){
-	    if(obj instanceof ListeningWhitelist){
-	        final ListeningWhitelist other = (ListeningWhitelist) obj;
-	        return Objects.equal(priority, other.priority)
-	            && Objects.equal(whitelist, other.whitelist);
-	    } else{
-	        return false;
-	    }
+
+	/**
+	 * Determine if the given whitelist is empty or not.
+	 * @param whitelist - the whitelist to test.
+	 * @return TRUE if the whitelist is empty, FALSE otherwise.
+	 */
+	public static boolean isEmpty(ListeningWhitelist whitelist) {
+		if (whitelist == EMPTY_WHITELIST)
+			return true;
+		else if (whitelist == null)
+			return true;
+		else
+			return whitelist.getTypes().isEmpty();
 	}
-	
+
+	@Override
+	public boolean equals(final Object obj) {
+		if (obj instanceof ListeningWhitelist) {
+			final ListeningWhitelist other = (ListeningWhitelist) obj;
+			return Objects.equal(priority, other.priority)
+					&& Objects.equal(types, other.types)
+					&& Objects.equal(gamePhase, other.gamePhase)
+					&& Objects.equal(options, other.options);
+		} else {
+			return false;
+		}
+	}
+
 	@Override
 	public String toString() {
 		if (this == EMPTY_WHITELIST)
 			return "EMPTY_WHITELIST";
 		else
-			return Objects.toStringHelper(this)
-				.add("priority", priority)
-				.add("packets", whitelist).toString();
+			return Objects.toStringHelper(this).
+				add("priority", priority).
+				add("packets", types).
+				add("gamephase", gamePhase).
+				add("options", options).
+				toString();
 	}
 	
+	/**
+	 * Construct a new builder of whitelists.
+	 * @return New whitelist builder.
+	 */
+	public static Builder newBuilder() {
+		return new Builder(null);
+	}
+	
+	/**
+	 * Construct a new builder of whitelists initialized to the same values as the template.
+	 * @param template - the template object.
+	 * @return New whitelist builder.
+	 */
+	public static Builder newBuilder(ListeningWhitelist template) {
+		return new Builder(template);
+	}
+	
+	/**
+	 * Construct a copy of a given enum.
+	 * @param options - the options to copy, or NULL to indicate the empty set.
+	 * @return A copy of the enum set.
+	 */
+	private static <T extends Enum<T>> EnumSet<T> safeEnumSet(Collection<T> options, Class<T> enumClass) {
+		if (options != null && !options.isEmpty()) {
+			return EnumSet.copyOf(options);
+		} else {
+			return EnumSet.noneOf(enumClass);
+		}
+	}
+	
+	/**
+	 * Construct a copy of a given set.
+	 * @param list - the set to copy.
+	 * @return The copied set.
+	 */
+	private static <T> Set<T> safeSet(Collection<T> set) {
+		if (set != null)
+			return Sets.newHashSet(set);
+		else
+			return Collections.emptySet();
+	}
+
+	/**
+	 * Represents a builder of whitelists.
+	 * @author Kristian
+	 */
+	public static class Builder {
+		// Default values
+		private ListenerPriority priority = ListenerPriority.NORMAL;
+		private Set<PacketType> types = Sets.newHashSet();
+		private GamePhase gamePhase = GamePhase.PLAYING;
+		private Set<ListenerOptions> options = Sets.newHashSet();
+		
+		/**
+		 * Construct a new listening whitelist template.
+		 * @param template - the template.
+		 */
+		private Builder(ListeningWhitelist template) {
+			if (template != null) {
+				priority(template.getPriority());
+				gamePhase(template.getGamePhase());
+				types(template.getTypes());
+				options(template.getOptions());
+			}
+		}
+		
+		/**
+		 * Set the priority to use when constructing new whitelists.
+		 * @param priority - the priority.
+		 * @return This builder, for chaining.
+		 */
+		public Builder priority(ListenerPriority priority) {
+			this.priority = priority;
+			return this;
+		}
+		
+		/**
+		 * Set the priority of the whitelist to monitor.
+		 * @return This builder, for chaining.
+		 */
+		public Builder monitor() {
+			return priority(ListenerPriority.MONITOR);
+		}
+		
+		/**
+		 * Set the priority of the whitelist to normal.
+		 * @return This builder, for chaining.
+		 */
+		public Builder normal() {
+			return priority(ListenerPriority.NORMAL);
+		}
+		
+		/**
+		 * Set the priority of the whitelist to lowest.
+		 * @return This builder, for chaining.
+		 */
+		public Builder lowest() {
+			return priority(ListenerPriority.LOWEST);
+		}
+		
+		/**
+		 * Set the priority of the whitelist to low.
+		 * @return This builder, for chaining.
+		 */
+		public Builder low() {
+			return priority(ListenerPriority.LOW);
+		}
+		
+		/**
+		 * Set the priority of the whitelist to highest.
+		 * @return This builder, for chaining.
+		 */
+		public Builder highest() {
+			return priority(ListenerPriority.HIGHEST);
+		}
+		
+		/**
+		 * Set the priority of the whitelist to high.
+		 * @return This builder, for chaining.
+		 */
+		public Builder high() {
+			return priority(ListenerPriority.HIGH);
+		}
+		
+		/**
+		 * Set the whitelist of packet IDs to copy when constructing new whitelists.
+		 * <p>
+		 * Deprecated: Use {@link #types(Collection)} instead.
+		 * @param whitelist - the whitelist of packets.
+		 * @return This builder, for chaining.
+		 */
+		@Deprecated
+		public Builder whitelist(Collection<Integer> whitelist) {
+			this.types = PacketRegistry.toPacketTypes(safeSet(whitelist));
+			return this;
+		}
+		
+		/**
+		 * Set the whitelist of packet types to copy when constructing new whitelists.
+		 * @param types - the whitelist of packets.
+		 * @return This builder, for chaining.
+		 */
+		public Builder types(PacketType... types) {
+			this.types = safeSet(Sets.newHashSet(types));
+			return this;
+		}
+		
+		/**
+		 * Set the whitelist of packet types to copy when constructing new whitelists.
+		 * @param types - the whitelist of packets.
+		 * @return This builder, for chaining.
+		 */
+		public Builder types(Collection<PacketType> types) {
+			this.types = safeSet(types);
+			return this;
+		}
+		
+		/**
+		 * Set the gamephase to use when constructing new whitelists.
+		 * @param gamePhase - the gamephase.
+		 * @return This builder, for chaining.
+		 */
+		public Builder gamePhase(GamePhase gamePhase) {
+			this.gamePhase = gamePhase;
+			return this;
+		}
+		
+		/**
+		 * Set the gamephase to {@link GamePhase#BOTH}.
+		 * @return This builder, for chaining.
+		 */
+		public Builder gamePhaseBoth() {
+			return gamePhase(GamePhase.BOTH);
+		}
+		/**
+		 * Set the options to copy when constructing new whitelists.
+		 * @param options - the options.
+		 * @return This builder, for chaining.
+		 */
+		public Builder options(Set<ListenerOptions> options) {
+			this.options = safeSet(options);
+			return this;
+		}
+		
+		/**
+		 * Set the options to copy when constructing new whitelists.
+		 * @param options - the options.
+		 * @return This builder, for chaining.
+		 */
+		public Builder options(Collection<ListenerOptions> options) {
+			this.options = safeSet(options);
+			return this;
+		}
+		
+		/**
+		 * Set the options to copy when constructing new whitelists.
+		 * @param options - the options array.
+		 * @return This builder, for chaining.
+		 */
+		public Builder options(ListenerOptions[] serverOptions) {
+			this.options = safeSet(Sets.newHashSet(serverOptions));
+			return this;
+		}
+		
+		/**
+		 * Options to merge into the current set of options.
+		 * @param options - the options array.
+		 * @return This builder, for chaining.
+		 */
+		public Builder mergeOptions(ListenerOptions... serverOptions) {
+			return mergeOptions(Arrays.asList(serverOptions));
+		}
+		
+		/**
+		 * Options to merge into the current set of options.
+		 * @param options - the options array.
+		 * @return This builder, for chaining.
+		 */
+		public Builder mergeOptions(Collection<ListenerOptions> serverOptions) {
+			if (options == null)
+				return options(serverOptions);
+			
+			// Merge the options
+			this.options.addAll(serverOptions);
+			return this;
+		}
+		
+		/**
+		 * Construct a new whitelist from the values in this builder.
+		 * @return The new whitelist.
+		 */
+		public ListeningWhitelist build() {
+			return new ListeningWhitelist(this);
+		}
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/events/MonitorAdapter.java

@@ -1,3 +1,20 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol.events;
 
 import java.util.logging.Level;
@@ -6,15 +23,12 @@ import java.util.logging.Logger;
 import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.Packets;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.ListeningWhitelist;
-import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.GamePhase;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.reflect.FieldAccessException;
 
 /**
- * Represents a listener that is notified of every sent and recieved packet.
+ * Represents a listener that is notified of every sent and received packet.
  * 
  * @author Kristian
  */
@@ -32,15 +46,16 @@ public abstract class MonitorAdapter implements PacketListener {
 		initialize(plugin, side, logger);
 	}
 	
+	@SuppressWarnings("deprecation")
 	private void initialize(Plugin plugin, ConnectionSide side, Logger logger) {
 		this.plugin = plugin;
 
 		// Recover in case something goes wrong
 		try {
 			if (side.isForServer())
-				this.sending = new ListeningWhitelist(ListenerPriority.MONITOR, Packets.Server.getSupported(), GamePhase.BOTH);
+				this.sending = ListeningWhitelist.newBuilder().monitor().types(PacketRegistry.getServerPacketTypes()).gamePhaseBoth().build();
 			if (side.isForClient())
-				this.receiving = new ListeningWhitelist(ListenerPriority.MONITOR, Packets.Client.getSupported(), GamePhase.BOTH);
+				this.receiving = ListeningWhitelist.newBuilder().monitor().types(PacketRegistry.getClientPacketTypes()).gamePhaseBoth().build();
 		} catch (FieldAccessException e) {
 			if (side.isForServer())
 				this.sending = new ListeningWhitelist(ListenerPriority.MONITOR, Packets.Server.getRegistry().values(), GamePhase.BOTH);

ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java

@@ -0,0 +1,415 @@
+package com.comphenix.protocol.events;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.PriorityQueue;
+
+import javax.annotation.Nonnull;
+
+import org.bukkit.entity.Player;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.utility.ByteBufferInputStream;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.StreamSerializer;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Ints;
+
+/**
+ * Marker containing the serialized packet data seen from the network, 
+ * or output handlers that will serialize the current packet.
+ * 
+ * @author Kristian
+ */
+public abstract class NetworkMarker {	
+	public static class EmptyBufferMarker extends NetworkMarker {
+		public EmptyBufferMarker(@Nonnull ConnectionSide side) {
+			super(side, (byte[]) null, null);
+		}
+
+		@Override
+		protected DataInputStream skipHeader(DataInputStream input) throws IOException {
+			throw new IllegalStateException("Buffer is empty.");
+		}
+
+		@Override
+		protected ByteBuffer addHeader(ByteBuffer buffer, PacketType type) {
+			throw new IllegalStateException("Buffer is empty.");
+		}
+
+		@Override
+		protected DataInputStream addHeader(DataInputStream input, PacketType type) {
+			throw new IllegalStateException("Buffer is empty.");
+		}		
+	}
+	
+	// Custom network handler
+	private PriorityQueue<PacketOutputHandler> outputHandlers;
+	// Post listeners
+	private List<PacketPostListener> postListeners;
+	// Post packets
+	private List<ScheduledPacket> scheduledPackets;
+	
+	// The input buffer
+	private ByteBuffer inputBuffer;
+	private final ConnectionSide side;
+	private final PacketType type;
+	
+	// Cache serializer too
+	private StreamSerializer serializer;
+	
+	/**
+	 * Construct a new network marker.
+	 * @param side - whether or not this marker belongs to a client or server packet. 
+	 * @param inputBuffer - the read serialized packet data.
+	 */
+	public NetworkMarker(@Nonnull ConnectionSide side, ByteBuffer inputBuffer, PacketType type) {
+		this.side = Preconditions.checkNotNull(side, "side cannot be NULL.");
+		this.inputBuffer = inputBuffer;
+		this.type = type;
+	}
+	
+	/**
+	 * Construct a new network marker.
+	 * <p>
+	 * The input buffer is only non-null for client-side packets.
+	 * @param side - whether or not this marker belongs to a client or server packet. 
+	 * @param inputBuffer - the read serialized packet data.
+	 * @param handler - handle skipping headers.
+	 */
+	public NetworkMarker(@Nonnull ConnectionSide side, byte[] inputBuffer, PacketType type) {
+		this.side = Preconditions.checkNotNull(side, "side cannot be NULL.");
+		this.type = type;
+			
+		if (inputBuffer != null) {
+			this.inputBuffer = ByteBuffer.wrap(inputBuffer);
+		}
+	}
+	
+	/**
+	 * Retrieve whether or not this marker belongs to a client or a server side packet.
+	 * @return The side the parent packet belongs to.
+	 */
+	public ConnectionSide getSide() {
+		return side;
+	}
+
+	/**
+	 * Retrieve a utility class for serializing and deserializing Minecraft objects.
+	 * @return Serialization utility class.
+	 */
+	public StreamSerializer getSerializer() {
+		if (serializer == null)
+			serializer = new StreamSerializer();
+		return serializer;
+	}
+	
+	/**
+	 * Retrieve the serialized packet data (excluding the header by default) from the network input stream.
+	 * <p>
+	 * The returned buffer is read-only. If the parent event is a server side packet this 
+	 * method throws {@link IllegalStateException}.
+	 * <p>
+	 * It returns NULL if the packet was transmitted by a plugin locally.
+	 * @return A byte buffer containing the raw packet data read from the network.
+	 */
+	public ByteBuffer getInputBuffer() {
+		return getInputBuffer(true);
+	}
+		
+	/**
+	 * Retrieve the serialized packet data from the network input stream.
+	 * <p>
+	 * The returned buffer is read-only. If the parent event is a server side packet this 
+	 * method throws {@link IllegalStateException}.
+	 * <p>
+	 * It returns NULL if the packet was transmitted by a plugin locally.
+	 * @param excludeHeader - whether or not to exclude the packet ID header.
+	 * @return A byte buffer containing the raw packet data read from the network.
+	 */
+	public ByteBuffer getInputBuffer(boolean excludeHeader) {
+		if (side.isForServer())
+			throw new IllegalStateException("Server-side packets have no input buffer.");
+		
+		if (inputBuffer != null) {
+			ByteBuffer result = inputBuffer.asReadOnlyBuffer();
+			
+			try {
+				if (excludeHeader) 
+					result = skipHeader(result);
+				else
+					result = addHeader(result, type);
+			} catch (IOException e) {
+				throw new RuntimeException("Cannot skip packet header.", e);
+			}
+			return result;
+		}
+		return null;
+	}
+	
+	/**
+	 * Retrieve the serialized packet data (excluding the header by default) as an input stream.
+	 * <p>
+	 * The data is exactly the same as in {@link #getInputBuffer()}. 
+	 * @see #getInputBuffer()
+	 * @return The incoming serialized packet data as a stream, or NULL if the packet was transmitted locally.
+	 */
+	public DataInputStream getInputStream() {
+		return getInputStream(true);
+	}
+	
+	/**
+	 * Retrieve the serialized packet data as an input stream.
+	 * <p>
+	 * The data is exactly the same as in {@link #getInputBuffer()}. 
+	 * @see #getInputBuffer()
+	 * @param excludeHeader - whether or not to exclude the packet ID header.
+	 * @return The incoming serialized packet data as a stream, or NULL if the packet was transmitted locally.
+	 */
+	@SuppressWarnings("resource")
+	public DataInputStream getInputStream(boolean excludeHeader) {
+		if (side.isForServer())
+			throw new IllegalStateException("Server-side packets have no input buffer.");
+		if (inputBuffer == null)
+			return null;
+		
+		DataInputStream input = new DataInputStream(
+				new ByteArrayInputStream(inputBuffer.array())
+		);
+		
+		try {
+			if (excludeHeader) 
+				input = skipHeader(input);
+			else
+				input = addHeader(input, type);
+		} catch (IOException e) {
+			throw new RuntimeException("Cannot skip packet header.", e);
+		}
+		return input;
+	}
+	
+	/**
+	 * Whether or not the output handlers have to write a packet header.
+	 * @return TRUE if they do, FALSE otherwise.
+	 */
+	public boolean requireOutputHeader() {
+		return MinecraftReflection.isUsingNetty();
+	}
+	
+	/**
+	 * Enqueue the given output handler for managing how the current packet will be written to the network stream.
+	 * <p>
+	 * Note that output handlers are not serialized, as most consumers will probably implement them using anonymous classes. 
+	 * It is not safe to serialize anonymous classes, as their name depend on the order in which they are declared in the parent class.
+	 * <p>
+	 * This can only be invoked on server side packet events.
+	 * @param handler - the handler that will take part in serializing the packet.
+	 * @return TRUE if it was added, FALSE if it has already been added.
+	 */
+	public boolean addOutputHandler(@Nonnull PacketOutputHandler handler) {
+		checkServerSide();
+		Preconditions.checkNotNull(handler, "handler cannot be NULL.");
+		
+		// Lazy initialization - it's imperative that we save space and time here
+		if (outputHandlers == null) {
+			outputHandlers = new PriorityQueue<PacketOutputHandler>(10, new Comparator<PacketOutputHandler>() {
+				@Override
+				public int compare(PacketOutputHandler o1, PacketOutputHandler o2) {
+					return Ints.compare(o1.getPriority().getSlot(), o2.getPriority().getSlot());
+				}
+			});
+		}
+		return outputHandlers.add(handler);
+	}
+	
+	/**
+	 * Remove a given output handler from the serialization queue.
+	 * <p>
+	 * This can only be invoked on server side packet events.
+	 * @param handler - the handler to remove.
+	 * @return TRUE if the handler was removed, FALSE otherwise.
+	 */
+	public boolean removeOutputHandler(@Nonnull PacketOutputHandler handler) {
+		checkServerSide();
+		Preconditions.checkNotNull(handler, "handler cannot be NULL.");
+		
+		if (outputHandlers != null) {
+			return outputHandlers.remove(handler);
+		}
+		return false;
+	}
+	
+	/**
+	 * Retrieve every registered output handler in no particular order.
+	 * @return Every registered output handler.
+	 */
+	@Nonnull
+	public Collection<PacketOutputHandler> getOutputHandlers() {
+		if (outputHandlers != null) {
+			return outputHandlers;
+		} else {
+			return Collections.emptyList();
+		}
+	}
+	
+	/**
+	 * Add a listener that is invoked after a packet has been successfully sent to the client, or received 
+	 * by the server. 
+	 * <p>
+	 * Received packets are not guarenteed to have been fully processed, but packets passed 
+	 * to {@link ProtocolManager#recieveClientPacket(Player, PacketContainer)} will be processed after the
+	 * current packet event.
+	 * <p>
+	 * Note that post listeners will be executed asynchronously off the main thread. They are not executed
+	 * in any defined order.
+	 * @param listener - the listener that will be invoked.
+	 * @return TRUE if it was added.
+	 */
+	public boolean addPostListener(PacketPostListener listener) {
+		if (postListeners == null)
+			postListeners = Lists.newArrayList();
+		return postListeners.add(listener);
+	}
+	
+	/**
+	 * Remove the first instance of the given listener.
+	 * @param listener - listener to remove.
+	 * @return TRUE if it was removed, FALSE otherwise.
+	 */
+	public boolean removePostListener(PacketPostListener listener) {
+		if (postListeners != null) {
+			return postListeners.remove(listener);
+		}
+		return false;
+	}
+	
+	/**
+	 * Retrieve an immutable view of all the listeners that will be invoked once the packet has been sent or received.
+	 * @return Every post packet listener. Never NULL.
+	 */
+	public List<PacketPostListener> getPostListeners() {
+		return postListeners != null ? Collections.unmodifiableList(postListeners) : Collections.<PacketPostListener>emptyList();
+	}
+	
+	/**
+	 * Retrieve a list of packets that will be schedule (in-order) when the current packet has been successfully transmitted.
+	 * <p>
+	 * This list is modifiable.
+	 * @return List of packets that will be scheduled.
+	 */
+	public List<ScheduledPacket> getScheduledPackets() {
+		if (scheduledPackets == null)
+			scheduledPackets = Lists.newArrayList();
+		return scheduledPackets;
+	}
+	
+	/**
+	 * Ensure that the packet event is server side.
+	 */
+	private void checkServerSide() {
+		if (side.isForClient()) {
+			throw new IllegalStateException("Must be a server side packet.");
+		}
+	}
+	
+	/**
+	 * Return a byte buffer without the header in the current packet.
+	 * <p>
+	 * It's safe to modify the position of the buffer.
+	 * @param buffer - a read-only byte source. 
+	 */
+	protected ByteBuffer skipHeader(ByteBuffer buffer) throws IOException {
+		skipHeader(new DataInputStream(new ByteBufferInputStream(buffer)));
+		return buffer;
+	}
+	
+	/**
+	 * Return an input stream without the header in the current packet.
+	 * <p>
+	 * It's safe to modify the input stream.
+	 */
+	protected abstract DataInputStream skipHeader(DataInputStream input) throws IOException;
+	
+	/**
+	 * Return the byte buffer prepended with the packet header.
+	 * @param buffer - the read-only byte buffer. 
+	 * @param type - the current packet. 
+	 * @return The byte buffer.
+	 */
+	protected abstract ByteBuffer addHeader(ByteBuffer buffer, PacketType type);
+	
+	/**
+	 * Return the input stream prepended with the packet header.
+	 * @param input - the input stream.
+	 * @param type - the current packet. 
+	 * @return The byte buffer.
+	 */
+	protected abstract DataInputStream addHeader(DataInputStream input, PacketType type);
+	
+	/**
+	 * Determine if the given marker has any output handlers.
+	 * @param marker - the marker to check.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public static boolean hasOutputHandlers(NetworkMarker marker) {
+		return marker != null && !marker.getOutputHandlers().isEmpty();
+	}
+	
+	/**
+	 * Determine if the given marker has any post listeners.
+	 * @param marker - the marker to check.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	public static boolean hasPostListeners(NetworkMarker marker) {
+		return marker != null && !marker.getPostListeners().isEmpty();
+	}
+	
+	/**
+	 * Retrieve the byte buffer stored in the given marker.
+	 * @param marker - the marker.
+	 * @return The byte buffer, or NULL if not found.
+	 */
+	public static byte[] getByteBuffer(NetworkMarker marker) {
+		if (marker != null) {
+			ByteBuffer buffer = marker.getInputBuffer();
+			
+			if (buffer != null) {
+				byte[] data = new byte[buffer.remaining()];
+				
+				buffer.get(data, 0, data.length);
+				return data;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Retrieve the network marker of a particular event without creating it.
+	 * <p>
+	 * This is an internal method that should not be used by API users.
+	 * @param event - the event.
+	 * @return The network marker.
+	 */
+	public static NetworkMarker getNetworkMarker(PacketEvent event) {
+		return event.networkMarker;
+	}
+	
+	/**
+	 * Retrieve the scheduled packets of a particular network marker without constructing the list.
+	 * <p>
+	 * This is an internal method that should not be used by API users.
+	 * @param marker - the marker.
+	 * @return The list, or NULL if not found or initialized.
+	 */
+	public static List<ScheduledPacket> readScheduledPackets(NetworkMarker marker) {
+		return marker.scheduledPackets;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java

@@ -17,11 +17,20 @@
 
 package com.comphenix.protocol.events;
 
+import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.bukkit.plugin.Plugin;
 
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.injector.GamePhase;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 /**
  * Represents a packet listener with useful constructors.
@@ -30,29 +39,95 @@ import com.comphenix.protocol.injector.GamePhase;
  * @author Kristian
  */
 public abstract class PacketAdapter implements PacketListener {
-	
 	protected Plugin plugin;
 	protected ConnectionSide connectionSide;
 	protected ListeningWhitelist receivingWhitelist = ListeningWhitelist.EMPTY_WHITELIST;
 	protected ListeningWhitelist sendingWhitelist = ListeningWhitelist.EMPTY_WHITELIST;
 
+	/**
+	 * Initialize a packet adapter using a collection of parameters. Use {@link #params()} to get an instance to this builder.
+	 * @param params - the parameters.
+	 */
+	public PacketAdapter(@Nonnull AdapterParameteters params) {
+		this(
+			checkValidity(params).plugin, params.connectionSide, params.listenerPriority, 
+			params.gamePhase, params.options, params.packets
+		);
+	}
+	
+	/**
+	 * Initialize a packet listener with the given parameters.
+	 * @param plugin - the plugin.
+	 * @param listenerPriority - the priority.
+	 * @param types - the packet types.
+	 */
+	public PacketAdapter(Plugin plugin, PacketType... types) {
+		this(plugin, ListenerPriority.NORMAL, types);
+	}
+	
+	/**
+	 * Initialize a packet listener with the given parameters.
+	 * @param plugin - the plugin.
+	 * @param types - the packet types.
+	 */
+	public PacketAdapter(Plugin plugin, Iterable<? extends PacketType> types) {
+		this(params(plugin, Iterables.toArray(types, PacketType.class)));
+	}
+	
+	/**
+	 * Initialize a packet listener with the given parameters.
+	 * @param plugin - the plugin.
+	 * @param listenerPriority - the priority.
+	 * @param types - the packet types.
+	 */
+	public PacketAdapter(Plugin plugin, ListenerPriority listenerPriority, Iterable<? extends PacketType> types) {
+		this(params(plugin, Iterables.toArray(types, PacketType.class)).listenerPriority(listenerPriority));
+	}
+	
+	/**
+	 * Initialize a packet listener with the given parameters.
+	 * @param plugin - the plugin.
+	 * @param listenerPriority - the priority.
+	 * @param types - the packet types.
+	 * @param options - the options.
+	 */
+	public PacketAdapter(Plugin plugin, ListenerPriority listenerPriority, Iterable<? extends PacketType> types, ListenerOptions... options) {
+		this(params(plugin, Iterables.toArray(types, PacketType.class)).listenerPriority(listenerPriority).options(options));
+	}
+	
+	/**
+	 * Initialize a packet listener with the given parameters.
+	 * @param plugin - the plugin.
+	 * @param listenerPriority - the priority.
+	 * @param types - the packet types.
+	 */
+	public PacketAdapter(Plugin plugin, ListenerPriority listenerPriority, PacketType... types) {
+		this(params(plugin, types).listenerPriority(listenerPriority));
+	}
+	
 	/**
 	 * Initialize a packet listener with default priority.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, Integer... packets) {
 		this(plugin, connectionSide, ListenerPriority.NORMAL, packets);
 	}
 	
 	/**
 	 * Initialize a packet listener for a single connection side.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param listenerPriority - the event priority.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, Set<Integer> packets) {
 		this(plugin, connectionSide, listenerPriority, GamePhase.PLAYING, packets.toArray(new Integer[0]));
 	}
@@ -60,12 +135,15 @@ public abstract class PacketAdapter implements PacketListener {
 	/**
 	 * Initialize a packet listener for a single connection side.
 	 * <p>
-	 * The game phase is used to optmize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * The game phase is used to optimize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param gamePhase - which game phase this listener is active under.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, GamePhase gamePhase, Set<Integer> packets) {
 		this(plugin, connectionSide, ListenerPriority.NORMAL, gamePhase, packets.toArray(new Integer[0]));
 	}
@@ -73,51 +151,109 @@ public abstract class PacketAdapter implements PacketListener {
 	/**
 	 * Initialize a packet listener for a single connection side.
 	 * <p>
-	 * The game phase is used to optmize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * The game phase is used to optimize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param listenerPriority - the event priority.
 	 * @param gamePhase - which game phase this listener is active under.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, GamePhase gamePhase, Set<Integer> packets) {
 		this(plugin, connectionSide, listenerPriority, gamePhase, packets.toArray(new Integer[0]));
 	}
 	
 	/**
 	 * Initialize a packet listener for a single connection side.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param listenerPriority - the event priority.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, Integer... packets) {
 		this(plugin, connectionSide, listenerPriority, GamePhase.PLAYING, packets);
 	}
 	
 	/**
 	 * Initialize a packet listener for a single connection side.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
-	 * @param listenerPriority - the event priority.
-	 * @param gamePhase - which game phase this listener is active under.
+	 * @param options - which listener options to use.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
-	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, GamePhase gamePhase, Integer... packets) {
-		this(plugin, connectionSide, ListenerPriority.NORMAL, GamePhase.PLAYING, packets);
+	@Deprecated
+	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, ListenerOptions[] options, Integer... packets) {
+		this(plugin, connectionSide, ListenerPriority.NORMAL, GamePhase.PLAYING, options, packets);
 	}
 	
 	/**
 	 * Initialize a packet listener for a single connection side.
 	 * <p>
-	 * The game phase is used to optmize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * Deprecated: Use {@link #params()} instead.
+	 * @param plugin - the plugin that spawned this listener.
+	 * @param connectionSide - the packet type the listener is looking for.
+	 * @param gamePhase - which game phase this listener is active under.
+	 * @param packets - the packet IDs the listener is looking for.
+	 */
+	@Deprecated
+	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, GamePhase gamePhase, Integer... packets) {
+		this(plugin, connectionSide, ListenerPriority.NORMAL, gamePhase, packets);
+	}
+	
+	/**
+	 * Initialize a packet listener for a single connection side.
+	 * <p>
+	 * The game phase is used to optimize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
 	 * @param listenerPriority - the event priority.
 	 * @param gamePhase - which game phase this listener is active under.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */
+	@Deprecated
 	public PacketAdapter(Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, GamePhase gamePhase, Integer... packets) {
+		this(plugin, connectionSide, listenerPriority, gamePhase, new ListenerOptions[0], packets);
+	}
+	
+	/**
+	 * Initialize a packet listener for a single connection side.
+	 * <p>
+	 * The game phase is used to optimize performance. A listener should only choose BOTH or LOGIN if it's absolutely necessary.
+	 * <p>
+	 * Listener options must be specified in order for {@link NetworkMarker#getInputBuffer()} to function correctly.
+	 * <p>
+	 * Deprecated: Use {@link #params()} instead.
+	 * @param plugin - the plugin that spawned this listener.
+	 * @param connectionSide - the packet type the listener is looking for.
+	 * @param listenerPriority - the event priority.
+	 * @param gamePhase - which game phase this listener is active under.
+	 * @param options - which listener options to use.
+	 * @param packets - the packet IDs the listener is looking for.
+	 */
+	@Deprecated
+	public PacketAdapter(
+			Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, 
+			GamePhase gamePhase, ListenerOptions[] options, Integer... packets) {
+		
+		this(plugin, connectionSide, listenerPriority, gamePhase, options,
+			PacketRegistry.toPacketTypes(Sets.newHashSet(packets), connectionSide.getSender()).toArray(new PacketType[0])
+		);
+	}
+	
+	// For internal use only
+	private PacketAdapter(
+			Plugin plugin, ConnectionSide connectionSide, ListenerPriority listenerPriority, 
+			GamePhase gamePhase, ListenerOptions[] options, PacketType... packets) {
+		
 		if (plugin == null)
 			throw new IllegalArgumentException("plugin cannot be null");
 		if (connectionSide == null)
@@ -128,17 +264,47 @@ public abstract class PacketAdapter implements PacketListener {
 			throw new IllegalArgumentException("gamePhase cannot be NULL");
 		if (packets == null)
 			throw new IllegalArgumentException("packets cannot be null");
+		if (options == null)
+			throw new IllegalArgumentException("options cannot be null");
+		
+		ListenerOptions[] serverOptions = options;
+		ListenerOptions[] clientOptions = options;
+		
+		// Special case that allows us to specify optionIntercept().
+		if (connectionSide == ConnectionSide.BOTH) {
+			serverOptions = except(serverOptions, new ListenerOptions[0], 
+					ListenerOptions.INTERCEPT_INPUT_BUFFER);
+		}
 		
 		// Add whitelists
 		if (connectionSide.isForServer())
-			sendingWhitelist = new ListeningWhitelist(listenerPriority, packets, gamePhase);
+			sendingWhitelist = ListeningWhitelist.newBuilder().
+				priority(listenerPriority).
+				types(packets).
+				gamePhase(gamePhase).
+				options(serverOptions).
+				build();
+		
 		if (connectionSide.isForClient())
-			receivingWhitelist = new ListeningWhitelist(listenerPriority, packets, gamePhase);
+			receivingWhitelist = ListeningWhitelist.newBuilder().
+				priority(listenerPriority).
+				types(packets).
+				gamePhase(gamePhase).
+				options(clientOptions).
+				build();
 		
 		this.plugin = plugin;
 		this.connectionSide = connectionSide;
 	}
 	
+	// Remove a given element from an array
+	private static <T> T[] except(T[] values, T[] buffer, T except) {
+		List<T> result = Lists.newArrayList(values);
+		
+		result.remove(except);
+		return result.toArray(buffer);
+	}
+	
 	@Override
 	public void onPacketReceiving(PacketEvent event) {
 		// Lets prevent some bugs
@@ -181,7 +347,6 @@ public abstract class PacketAdapter implements PacketListener {
 	 * @return Name of the given plugin.
 	 */
 	public static String getPluginName(Plugin plugin) {
-
 		// Try to get the plugin name
 		try {
 			if (plugin == null)
@@ -202,4 +367,273 @@ public abstract class PacketAdapter implements PacketListener {
 				sendingWhitelist,
 				receivingWhitelist);
 	}
+	
+	/**
+	 * Construct a helper object for passing parameters to the packet adapter.
+	 * <p>
+	 * This is often simpler and better than passing them directly to each constructor.
+	 * @return Helper object.
+	 */
+	public static AdapterParameteters params() {
+		return new AdapterParameteters();
+	}
+	
+	/**
+	 * Construct a helper object for passing parameters to the packet adapter.
+	 * <p>
+	 * This is often simpler and better than passing them directly to each constructor.
+	 * Deprecated: Use {@link #params(Plugin, PacketType...)} instead.
+	 * @param plugin - the plugin that spawned this listener.
+	 * @param packets - the packet IDs the listener is looking for.
+	 * @return Helper object.
+	 */
+	@Deprecated
+	public static AdapterParameteters params(Plugin plugin, Integer... packets) {
+		return new AdapterParameteters().plugin(plugin).packets(packets);
+	}
+
+	/**
+	 * Construct a helper object for passing parameters to the packet adapter.
+	 * <p>
+	 * This is often simpler and better than passing them directly to each constructor.
+	 * @param plugin - the plugin that spawned this listener.
+	 * @param packets - the packet types the listener is looking for.
+	 * @return Helper object.
+	 */
+	public static AdapterParameteters params(Plugin plugin, PacketType... packets) {
+		return new AdapterParameteters().plugin(plugin).types(packets);
+	}
+	
+	/**
+	 * Represents a builder for passing parameters to the packet adapter constructor.
+	 * <p>
+	 * Note: Never make spelling mistakes in a public API!
+	 * @author Kristian
+	 */
+	public static class AdapterParameteters {
+		private Plugin plugin;
+		private ConnectionSide connectionSide;
+		private PacketType[] packets;
+	
+		// Parameters with default values
+		private GamePhase gamePhase = GamePhase.PLAYING;
+		private ListenerOptions[] options = new ListenerOptions[0];
+		private ListenerPriority listenerPriority = ListenerPriority.NORMAL;
+		
+		/**
+		 * Set the plugin that spawned this listener. This parameter is required.
+		 * @param plugin - the plugin.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters plugin(@Nonnull Plugin plugin) {
+			this.plugin = Preconditions.checkNotNull(plugin, "plugin cannot be NULL.");
+			return this;
+		}
+		
+		/**
+		 * Set the packet types this listener is looking for. This parameter is required.
+		 * @param connectionSide - the new packet type.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters connectionSide(@Nonnull ConnectionSide connectionSide) {
+			this.connectionSide = Preconditions.checkNotNull(connectionSide, "connectionside cannot be NULL.");
+			return this;
+		}
+		
+		/**
+		 * Set this adapter to also look for client-side packets. 
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters clientSide() {
+			return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.CLIENT_SIDE));
+		}
+		
+		/**
+		 * Set this adapter to also look for server-side packets. 
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters serverSide() {
+			return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.SERVER_SIDE));
+		}
+		
+		/**
+		 * Set the the event priority, where the execution is in ascending order from lowest to highest. 
+		 * <p>
+		 * Default is {@link ListenerPriority#NORMAL}.
+		 * @param listenerPriority - the new event priority.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters listenerPriority(@Nonnull ListenerPriority listenerPriority) {
+			this.listenerPriority = Preconditions.checkNotNull(listenerPriority, "listener priority cannot be NULL.");
+			return this;
+		}
+		
+		/**
+		 * Set which game phase this listener is active under. This is a hint for ProtocolLib to start intercepting login packets.
+		 * <p>
+		 * Default is {@link GamePhase#PLAYING}, which will not intercept login packets.
+		 * @param gamePhase - the new game phase.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters gamePhase(@Nonnull GamePhase gamePhase) {
+			this.gamePhase = Preconditions.checkNotNull(gamePhase, "gamePhase cannot be NULL.");
+			return this;
+		}
+		
+		/**
+		 * Set the game phase to {@link GamePhase#LOGIN}, allowing ProtocolLib to intercept login packets.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters loginPhase() {
+			return gamePhase(GamePhase.LOGIN);
+		}
+		
+		/**
+		 * Set listener options that decide whether or not to intercept the raw packet data as read from the network stream.
+		 * <p>
+		 * The default is to disable this raw packet interception.
+		 * @param options - every option to use.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters options(@Nonnull ListenerOptions... options) {
+			this.options = Preconditions.checkNotNull(options, "options cannot be NULL.");
+			return this;
+		}
+
+		/**
+		 * Set listener options that decide whether or not to intercept the raw packet data as read from the network stream.
+		 * <p>
+		 * The default is to disable this raw packet interception.
+		 * @param options - every option to use.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters options(@Nonnull Set<? extends ListenerOptions> options) {
+			Preconditions.checkNotNull(options, "options cannot be NULL.");
+			this.options = options.toArray(new ListenerOptions[0]);
+			return this;
+		}
+		
+		/**
+		 * Add a given option to the current builder.
+		 * @param option - the option to add.
+		 * @return This builder, for chaining.
+		 */
+		private AdapterParameteters addOption(ListenerOptions option) {
+			if (options == null) {
+				return options(option);
+			} else {
+				Set<ListenerOptions> current = Sets.newHashSet(options);
+				current.add(option);
+				return options(current);
+			}
+		}
+		
+		/**
+		 * Set the listener option to {@link ListenerOptions#INTERCEPT_INPUT_BUFFER}, causing ProtocolLib to read the raw packet data from the network stream.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters optionIntercept() {
+			return addOption(ListenerOptions.INTERCEPT_INPUT_BUFFER);
+		}
+		
+		/**
+		 * Set the listener option to {@link ListenerOptions#DISABLE_GAMEPHASE_DETECTION}, causing ProtocolLib to ignore automatic game phase detection.
+		 * <p>
+		 * This is no longer relevant in 1.7.2.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters optionManualGamePhase() {
+			return addOption(ListenerOptions.DISABLE_GAMEPHASE_DETECTION);
+		}
+		
+		/**
+		 * Set the listener option to {@link ListenerOptions#ASYNC}, indicating that our listener is thread safe.
+		 * <p>
+		 * This allows ProtocolLib to perform certain optimizations.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters optionAsync() {
+			return addOption(ListenerOptions.ASYNC);
+		}
+		
+		/**
+		 * Set the packet IDs of the packets the listener is looking for.
+		 * <p>
+		 * This parameter is required.
+		 * <p>
+		 * Deprecated: Use {@link #types(PacketType...)} instead.
+		 * @param packets - the packet IDs to look for.
+		 * @return This builder, for chaining.
+		 */
+		@Deprecated
+		public AdapterParameteters packets(@Nonnull Integer... packets) {
+			Preconditions.checkNotNull(packets, "packets cannot be NULL");
+			PacketType[] types = new PacketType[packets.length];
+			
+			for (int i = 0; i < types.length; i++) {
+				types[i] = PacketType.findLegacy(packets[i]);
+			}
+			this.packets = types;
+			return this;
+		}
+		
+		/**
+		 * Set the packet IDs of the packets the listener is looking for.
+		 * <p>
+		 * This parameter is required.
+		 * @param packets - a set of the packet IDs to look for.
+		 * @return This builder, for chaining.
+		 */
+		@Deprecated
+		public AdapterParameteters packets(@Nonnull Set<Integer> packets) {
+			return packets(packets.toArray(new Integer[0]));
+		}
+		
+		/**
+		 * Set the packet types the listener is looking for.
+		 * <p>
+		 * This parameter is required.
+		 * @param packets - the packet types to look for.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters types(@Nonnull PacketType... packets) {
+			// Set the connection side as well
+			if (connectionSide == null) {
+				for (PacketType type : packets) {
+					this.connectionSide = ConnectionSide.add(this.connectionSide, type.getSender().toSide());
+				}
+			}
+			this.packets = Preconditions.checkNotNull(packets, "packets cannot be NULL");
+			
+			if (packets.length == 0)
+				throw new IllegalArgumentException("Passed an empty packet type array.");
+			return this;
+		}
+		
+		/**
+		 * Set the packet types the listener is looking for.
+		 * <p>
+		 * This parameter is required.
+		 * @param packets - a set of packet types to look for.
+		 * @return This builder, for chaining.
+		 */
+		public AdapterParameteters types(@Nonnull Set<PacketType> packets) {
+			return types(packets.toArray(new PacketType[0]));
+		}
+	}
+	
+	/**
+	 * Determine if the required parameters are set.
+	 */
+	private static AdapterParameteters checkValidity(AdapterParameteters params) {
+		if (params == null)
+			throw new IllegalArgumentException("params cannot be NULL.");
+		if (params.plugin == null)
+			throw new IllegalStateException("Plugin was never set in the parameters.");
+		if (params.connectionSide == null)
+			throw new IllegalStateException("Connection side was never set in the parameters.");
+		if (params.packets == null)
+			throw new IllegalStateException("Packet IDs was never set in the parameters.");
+		return params;
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketEvent.java

@@ -20,26 +20,57 @@ package com.comphenix.protocol.events;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.lang.ref.WeakReference;
 import java.util.EventObject;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import com.comphenix.protocol.Application;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.async.AsyncMarker;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.SetMultimap;
 
+/**
+ * Represents a packet sending or receiving event. Changes to the packet will be 
+ * reflected in the final version to be sent or received. It is also possible to cancel an event.
+ * @author Kristian
+ */
 public class PacketEvent extends EventObject implements Cancellable {
+	public static final ReportType REPORT_CHANGING_PACKET_TYPE_IS_CONFUSING = new ReportType(
+			"Plugin %s changed packet type from %s to %s in packet listener. This is confusing for other plugins! (Not an error, though!)");
+	
+	private static final SetMultimap<PacketType, PacketType> CHANGE_WARNINGS = 
+			Multimaps.synchronizedSetMultimap(HashMultimap.<PacketType, PacketType>create());
+	
 	/**
 	 * Automatically generated by Eclipse.
 	 */
 	private static final long serialVersionUID = -5360289379097430620L;
-
-	private transient Player player;
+	
+	private transient WeakReference<Player> playerReference;
+	private transient Player offlinePlayer;
+	
 	private PacketContainer packet;
 	private boolean serverPacket;
 	private boolean cancel;
 	
 	private AsyncMarker asyncMarker;
 	private boolean asynchronous;
+
+	// Network input and output handlers
+	NetworkMarker networkMarker;
+	
+	// Whether or not a packet event is read only
+	private boolean readOnly;
+	private boolean filtered;
 	
 	/**
 	 * Use the static constructors to create instances of this event.
@@ -47,21 +78,30 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 */
 	public PacketEvent(Object source) {
 		super(source);
+		this.filtered = true;
 	}
 
 	private PacketEvent(Object source, PacketContainer packet, Player player, boolean serverPacket) {
+		this(source, packet, null, player, serverPacket, true);
+	}
+	
+	private PacketEvent(Object source, PacketContainer packet, NetworkMarker marker, Player player, boolean serverPacket, boolean filtered) {
 		super(source);
 		this.packet = packet;
-		this.player = player;
+		this.playerReference = new WeakReference<Player>(player);
+		this.networkMarker = marker;
 		this.serverPacket = serverPacket;
+		this.filtered = filtered;
 	}
 	
 	private PacketEvent(PacketEvent origial, AsyncMarker asyncMarker) {
 		super(origial.source);
 		this.packet = origial.packet;
-		this.player = origial.player;
+		this.playerReference = origial.playerReference;
 		this.cancel = origial.cancel;
 		this.serverPacket = origial.serverPacket;
+		this.filtered = origial.filtered;
+		this.networkMarker = origial.networkMarker;
 		this.asyncMarker = asyncMarker;
 		this.asynchronous = true;
 	}
@@ -77,6 +117,33 @@ public class PacketEvent extends EventObject implements Cancellable {
 		return new PacketEvent(source, packet, client, false);
 	}
 	
+	/**
+	 * Creates an event representing a client packet transmission.
+	 * @param source - the event source.
+	 * @param packet - the packet.
+	 * @param marker - the network marker.
+	 * @param client - the client that sent the packet.
+	 * @return The event.
+	 */
+	public static PacketEvent fromClient(Object source, PacketContainer packet, NetworkMarker marker, Player client) {
+		return new PacketEvent(source, packet, marker, client, false, true);
+	}
+	
+	/**
+	 * Creates an event representing a client packet transmission.
+	 * <p>
+	 * If <i>filtered</i> is FALSE, then this event is only processed by packet monitors.
+	 * @param source - the event source.
+	 * @param packet - the packet.
+	 * @param marker - the network marker.
+	 * @param client - the client that sent the packet.
+	 * @param filtered - whether or not this packet event is processed by every packet listener.
+	 * @return The event.
+	 */
+	public static PacketEvent fromClient(Object source, PacketContainer packet, NetworkMarker marker, Player client, boolean filtered) {
+		return new PacketEvent(source, packet, marker, client, false, filtered);
+	}
+	
 	/**
 	 * Creates an event representing a server packet transmission.
 	 * @param source - the event source.
@@ -88,6 +155,33 @@ public class PacketEvent extends EventObject implements Cancellable {
 		return new PacketEvent(source, packet, recipient, true);
 	}
 	
+	/**
+	 * Creates an event representing a server packet transmission.
+	 * @param source - the event source.
+	 * @param packet - the packet.
+	 * @param marker - the network marker.
+	 * @param recipient - the client that will receieve the packet.
+	 * @return The event.
+	 */
+	public static PacketEvent fromServer(Object source, PacketContainer packet, NetworkMarker marker, Player recipient) {
+		return new PacketEvent(source, packet, marker, recipient, true, true);
+	}
+	
+	/**
+	 * Creates an event representing a server packet transmission.
+	 * <p>
+	 * If <i>filtered</i> is FALSE, then this event is only processed by packet monitors.
+	 * @param source - the event source.
+	 * @param packet - the packet.
+	 * @param marker - the network marker.
+	 * @param recipient - the client that will receieve the packet.
+	 * @param filtered - whether or not this packet event is processed by every packet listener.
+	 * @return The event.
+	 */
+	public static PacketEvent fromServer(Object source, PacketContainer packet, NetworkMarker marker, Player recipient, boolean filtered) {
+		return new PacketEvent(source, packet, marker, recipient, true, filtered);
+	}
+	
 	/**
 	 * Create an asynchronous packet event from a synchronous event and a async marker.
 	 * @param event - the original synchronous event.
@@ -98,6 +192,19 @@ public class PacketEvent extends EventObject implements Cancellable {
 		return new PacketEvent(event, marker);
 	}
 	
+	/**
+	 * Determine if we are executing the packet event in an asynchronous thread.
+	 * <p>
+	 * If so, you must synchronize all calls to the Bukkit API.
+	 * <p>
+	 * Generally, most server packets are executed on the main thread, whereas client packets
+	 * are all executed asynchronously.
+	 * @return TRUE if we are, FALSE otherwise.
+	 */
+	public boolean isAsync() {
+		return !Application.isPrimaryThread();
+	}
+	
 	/**
 	 * Retrieves the packet that will be sent to the player.
 	 * @return Packet to send to the player.
@@ -111,17 +218,45 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 * @param packet - the packet that will be sent instead.
 	 */
 	public void setPacket(PacketContainer packet) {
+		if (readOnly)
+			throw new IllegalStateException("The packet event is read-only.");
+		if (packet == null)
+			throw new IllegalArgumentException("Cannot set packet to NULL. Use setCancelled() instead.");
+		
+		// Change warnings
+		final PacketType oldType = this.packet.getType();
+		final PacketType newType = packet.getType();
+		if (this.packet != null && !Objects.equal(oldType, newType)) {
+			// Only report this once
+			if (CHANGE_WARNINGS.put(oldType, newType)) {
+				ProtocolLibrary.getErrorReporter().reportWarning(this, 
+						Report.newBuilder(REPORT_CHANGING_PACKET_TYPE_IS_CONFUSING).
+						messageParam(oldType, newType).
+						build());
+			}
+		}
 		this.packet = packet;
 	}
-
+	
 	/**
 	 * Retrieves the packet ID.
+	 * <p>
+	 * Deprecated: Use {@link #getPacketType()} instead.
 	 * @return The current packet ID.
 	 */
+	@Deprecated
 	public int getPacketID() {
 		return packet.getID();
 	}
 	
+	/**
+	 * Retrieve the packet type.
+	 * @return The type.
+	 */
+	public PacketType getPacketType() {
+		return packet.getType();
+	}
+	
 	/**
 	 * Retrieves whether or not the packet should be cancelled.
 	 * @return TRUE if it should be cancelled, FALSE otherwise.
@@ -129,12 +264,52 @@ public class PacketEvent extends EventObject implements Cancellable {
 	public boolean isCancelled() {
 		return cancel;
 	}
+	
+	/**
+	 * Retrieve the object responsible for managing the serialized input and output of a packet.
+	 * <p>
+	 * Note that the serialized input data is only available for client-side packets, and the output handlers
+	 * can only be applied to server-side packets.
+	 * @return The network manager.
+	 */
+	public NetworkMarker getNetworkMarker() {
+		if (networkMarker == null) {
+			if (isServerPacket()) {
+				networkMarker = new NetworkMarker.EmptyBufferMarker(
+					serverPacket ? ConnectionSide.SERVER_SIDE : ConnectionSide.CLIENT_SIDE);
+			} else {
+				throw new IllegalStateException("Add the option ListenerOptions.INTERCEPT_INPUT_BUFFER to your listener.");
+			}
+		}
+		return networkMarker;
+	}
 
 	/**
-	 * Sets whether or not the packet should be cancelled.
+	 * Update the network manager.
+	 * <p>
+	 * This method is internal - do not call.
+	 * @param networkMarker - the new network manager.
+	 */
+	public void setNetworkMarker(NetworkMarker networkMarker) {
+		this.networkMarker = Preconditions.checkNotNull(networkMarker, "marker cannot be NULL");
+	}
+	
+	/**
+	 * Sets whether or not the packet should be cancelled. Uncancelling is possible.
+	 * <p>
+	 * <b>Warning</b>: A cancelled packet should never be re-transmitted. Use the asynchronous
+	 * packet manager if you need to perform extensive processing. It should also be used
+	 * if you need to synchronize with the main thread.
+	 * <p>
+	 * This ensures that other plugins can work with the same packet.
+	 * <p>
+	 * An asynchronous listener can also delay a packet indefinitely without having to block its thread.
+	 * 
 	 * @param cancel - TRUE if it should be cancelled, FALSE otherwise.
 	 */
 	public void setCancelled(boolean cancel) {
+		if (readOnly)
+			throw new IllegalStateException("The packet event is read-only.");
 		this.cancel = cancel;
 	}
 
@@ -143,7 +318,17 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 * @return The player associated with this event.
 	 */
 	public Player getPlayer() {
-		return player;
+		return playerReference.get();
+	}
+	
+	/**
+	 * Determine if this packet is filtered by every packet listener.
+	 * <p>
+	 * If not, it will only be intercepted by monitor packets.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean isFiltered() {
+		return filtered;
 	}
 	
 	/**
@@ -181,9 +366,34 @@ public class PacketEvent extends EventObject implements Cancellable {
 	public void setAsyncMarker(AsyncMarker asyncMarker) {
 		if (isAsynchronous())
 			throw new IllegalStateException("The marker is immutable for asynchronous events");
+		if (readOnly)
+			throw new IllegalStateException("The packet event is read-only.");
 		this.asyncMarker = asyncMarker;
 	}
 
+	/**
+	 * Determine if the current packet event is read only.
+	 * <p>
+	 * This is used to ensure that a monitor listener doesn't accidentally alter the state of the event. However,
+	 * it is still possible to modify the packet itself, as it would require too many resources to verify its integrity.
+	 * <p>
+	 * Thus, the packet is considered immutable if the packet event is read only.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+	
+	/**
+	 * Set the read-only state of this packet event.
+	 * <p>
+	 * This will be reset for every packet listener.
+	 * @param readOnly - TRUE if it is read-only, FALSE otherwise.
+	 */
+	public void setReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+	}
+	
 	/**
 	 * Determine if the packet event has been executed asynchronously or not.
 	 * @return TRUE if this packet event is asynchronous, FALSE otherwise.
@@ -191,24 +401,48 @@ public class PacketEvent extends EventObject implements Cancellable {
 	public boolean isAsynchronous() {
 		return asynchronous;
 	}
+
+	/**
+	 * Schedule a packet for sending or receiving after the current packet event is successful.
+	 * <p>
+	 * The packet will be added to {@link NetworkMarker#getScheduledPackets()}.
+	 * @param scheduled - the packet to transmit or receive.
+	 */
+	public void schedule(ScheduledPacket scheduled) {
+		getNetworkMarker().getScheduledPackets().add(scheduled);
+	}
+	
+	/**
+	 * Unschedule a specific packet.
+	 * @param scheduled - the scheduled packet.
+	 * @return TRUE if it was unscheduled, FALSE otherwise.
+	 */
+	public boolean unschedule(ScheduledPacket scheduled) {
+		if (networkMarker != null) {
+			return networkMarker.getScheduledPackets().remove(scheduled);
+		}
+		return false;
+	}
 	
 	private void writeObject(ObjectOutputStream output) throws IOException {
 	    // Default serialization 
 		output.defaultWriteObject();
 
 		// Write the name of the player (or NULL if it's not set)
-		output.writeObject(player != null ? new SerializedOfflinePlayer(player) : null);
+		output.writeObject(playerReference.get() != null ? new SerializedOfflinePlayer(playerReference.get()) : null);
 	}
 
 	private void readObject(ObjectInputStream input) throws ClassNotFoundException, IOException {
 	    // Default deserialization
 		input.defaultReadObject();
 
-		final SerializedOfflinePlayer offlinePlayer = (SerializedOfflinePlayer) input.readObject();
+		final SerializedOfflinePlayer serialized = (SerializedOfflinePlayer) input.readObject();
 		
-	    if (offlinePlayer != null) {
-	    	// Better than nothing
-	    	player = offlinePlayer.getPlayer();
+		// Better than nothing
+	    if (serialized != null) {	    			
+	    	// Store it, to prevent weak reference from cleaning up the reference
+	    	offlinePlayer = serialized.getPlayer();
+	    	playerReference = new WeakReference<Player>(offlinePlayer);
 	    }
 	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketListener.java

@@ -20,7 +20,7 @@ package com.comphenix.protocol.events;
 import org.bukkit.plugin.Plugin;
 
 /**
- * Represents a listener that recieves notifications when packets are sent or recieved.
+ * Represents a listener that receives notifications when packets are sending or being received.
  * <p>
  * Use {@link PacketAdapter} for a simple wrapper around this interface.
  * @author Kristian
@@ -32,20 +32,22 @@ public interface PacketListener {
 	 * <p>
 	 * Note that the packet may be replaced, if needed.
 	 * <p>
-	 * This method is executed on the main thread, and thus the Bukkit API is safe to use.
-	 * 
+	 * This method is executed on the main thread in 1.6.4 and earlier, and thus the Bukkit API is safe to use.
+	 * <p>
+	 * In Minecraft 1.7.2 and later, this method MAY be executed asynchronously, but only if {@link ListenerOptions#ASYNC} 
+	 * have been specified in the listener. This is off by default.
 	 * @param event - the packet that should be sent.
 	 */
 	public void onPacketSending(PacketEvent event);
 
 	/**
-	 * Invoked right before a recieved packet from a client is being processed.
+	 * Invoked right before a received packet from a client is being processed.
 	 * <p>
 	 * <b>WARNING</b>: </br> 
 	 * This method will be called <i>asynchronously</i>! You should synchronize with the main 
 	 * thread using {@link org.bukkit.scheduler.BukkitScheduler#scheduleSyncDelayedTask(Plugin, Runnable, long) scheduleSyncDelayedTask} 
 	 * if you need to call the Bukkit API.
-	 * @param event - the packet that has been recieved.
+	 * @param event - the packet that has been received.
 	 */
 	public void onPacketReceiving(PacketEvent event);
 	

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java

@@ -0,0 +1,32 @@
+package com.comphenix.protocol.events;
+
+import org.bukkit.plugin.Plugin;
+
+/**
+ * Represents an adapter version of the output handler interface.
+ * @author Kristian
+ */
+public abstract class PacketOutputAdapter implements PacketOutputHandler {
+	private final Plugin plugin;
+	private final ListenerPriority priority;
+	
+	/**
+	 * Construct a new packet output adapter with the given values.
+	 * @param priority - the output handler priority.
+	 * @param plugin - the owner plugin.
+	 */
+	public PacketOutputAdapter(Plugin plugin, ListenerPriority priority) {
+		this.priority = priority;
+		this.plugin = plugin;
+	}
+
+	@Override
+	public Plugin getPlugin() {
+		return plugin;
+	}
+	
+	@Override
+	public ListenerPriority getPriority() {
+		return priority;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java

@@ -0,0 +1,37 @@
+package com.comphenix.protocol.events;
+
+import org.bukkit.plugin.Plugin;
+
+/**
+ * Represents a custom packet serializer onto the network stream.
+ * 
+ * @author Kristian
+ */
+public interface PacketOutputHandler {
+	/**
+	 * Retrieve the priority that decides the order each network handler is allowed to manipulate the output buffer.
+	 * <p>
+	 * Higher priority is executed before lower.
+	 * @return The handler priority.
+	 */
+	public ListenerPriority getPriority();
+	
+	/**
+	 * The plugin that owns this output handler.
+	 * @return The owner plugin.
+	 */
+	public Plugin getPlugin();
+	
+	/**
+	 * Invoked when a given packet is to be written to the output stream.
+	 * <p>
+	 * Note that the buffer is initially filled with the output from the default write method.
+	 * <p>
+	 * In Minecraft 1.6.4, the header is always excluded, whereas it MUST be included in Minecraft 1.7.2. Call 
+	 * {@link NetworkMarker#requireOutputHeader()} to determine this.
+	 * @param event - the packet that will be outputted.
+	 * @param buffer - the data that is currently scheduled to be outputted.
+	 * @return The modified byte array to write. NULL is not permitted.
+	 */
+	public byte[] handle(PacketEvent event, byte[] buffer);
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketPostAdapter.java

@@ -0,0 +1,22 @@
+package com.comphenix.protocol.events;
+
+import org.bukkit.plugin.Plugin;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Represents an adapter version of a post listener.
+ * @author Kristian
+ */
+public abstract class PacketPostAdapter implements PacketPostListener {
+	private Plugin plugin;
+	
+	public PacketPostAdapter(Plugin plugin) {
+		this.plugin = Preconditions.checkNotNull(plugin, "plugin cannot be NULL");
+	}
+
+	@Override
+	public Plugin getPlugin() {
+		return plugin;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketPostListener.java

@@ -0,0 +1,23 @@
+package com.comphenix.protocol.events;
+
+import org.bukkit.plugin.Plugin;
+
+/**
+ * Represents a packet listener that is invoked after a packet has been sent or received.
+ * @author Kristian
+ */
+public interface PacketPostListener {
+	/**
+	 * Retrieve the plugin this listener belongs to.
+	 * @return The assoicated plugin.
+	 */
+	public Plugin getPlugin();
+	
+	/**
+	 * Invoked after a packet has been sent or received.
+	 * <p>
+	 * Note that this is invoked asynchronously.
+	 * @param event - the packet event.
+	 */
+	public void onPostEvent(PacketEvent event);
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/ScheduledPacket.java

@@ -0,0 +1,147 @@
+package com.comphenix.protocol.events;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.bukkit.entity.Player;
+
+import com.comphenix.protocol.PacketStream;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+
+/**
+ * Represents a packet that is scheduled for transmission at a later stage.
+ * @author Kristian
+ */
+public class ScheduledPacket {
+	protected PacketContainer packet;
+	protected Player target;
+	protected boolean filtered;
+	
+	/**
+	 * Construct a new scheduled packet.
+	 * <p>
+	 * Note that the sender is infered from the packet type.
+	 * @param packet - the packet.
+	 * @param target - the target player.
+	 * @param filtered - whether or not to 
+	 */
+	public ScheduledPacket(PacketContainer packet, Player target, boolean filtered) {
+		setPacket(packet);
+		setTarget(target);
+		setFiltered(filtered);
+	}
+	
+	/**
+	 * Construct a new scheduled packet that will not be processed by any packet listeners (except MONITOR).
+	 * @param packet - the packet.
+	 * @param target - the target player.
+	 * @return The scheduled packet.
+	 */
+	public static ScheduledPacket fromSilent(PacketContainer packet, Player target) {
+		return new ScheduledPacket(packet, target, false);
+	}
+
+	/**
+	 * Construct a new scheduled packet that will be processed by any packet listeners.
+	 * @param packet - the packet.
+	 * @param target - the target player.
+	 * @return The scheduled packet.
+	 */
+	public static ScheduledPacket fromFiltered(PacketContainer packet, Player target) {
+		return new ScheduledPacket(packet, target, true);
+	}
+	
+	/**
+	 * Retrieve the packet that will be sent or transmitted.
+	 * @return The sent or received packet.
+	 */
+	public PacketContainer getPacket() {
+		return packet;
+	}
+	
+	/**
+	 * Set the packet that will be sent or transmitted.
+	 * @param packet - the new packet, cannot be NULL.
+	 */
+	public void setPacket(PacketContainer packet) {
+		this.packet = Preconditions.checkNotNull(packet, "packet cannot be NULL");
+	}
+	
+	/**
+	 * Retrieve the target player.
+	 * @return The target player.
+	 */
+	public Player getTarget() {
+		return target;
+	}
+	
+	/**
+	 * Set the target player.
+	 * @param target - the new target, cannot be NULL.
+	 */
+	public void setTarget(Player target) {
+		this.target = Preconditions.checkNotNull(target, "target cannot be NULL");
+	}
+	
+	/**
+	 * Determine if this packet will be processed by any of the packet listeners.
+	 * @return TRUE if it will, FALSE otherwise.
+	 */
+	public boolean isFiltered() {
+		return filtered;
+	}
+	
+	/**
+	 * Set whether or not this packet will be processed by packet listeners (except MONITOR listeners).
+	 * @param filtered - TRUE if it should be processed by listeners, FALSE otherwise.
+	 */
+	public void setFiltered(boolean filtered) {
+		this.filtered = filtered;
+	}
+	
+	/**
+	 * Retrieve the sender of this packet.
+	 * @return The sender.
+	 */
+	public Sender getSender() {
+		return packet.getType().getSender();
+	}
+	
+	/**
+	 * Schedule the packet transmission or reception.
+	 */
+	public void schedule() {
+		schedule(ProtocolLibrary.getProtocolManager());
+	}
+	
+	/**
+	 * Schedule the packet transmission or reception.
+	 * @param stream - the packet stream.
+	 */
+	public void schedule(PacketStream stream) {
+		Preconditions.checkNotNull(stream, "stream cannot be NULL");
+		
+		try {
+			if (getSender() == Sender.CLIENT) {
+				stream.recieveClientPacket(getTarget(), getPacket(), isFiltered());
+			} else {
+				stream.sendServerPacket(getTarget(), getPacket(), isFiltered());
+			}
+		} catch (InvocationTargetException e) {
+			throw new RuntimeException("Cannot send packet " + this + " to " + stream);
+		} catch (IllegalAccessException e) {
+			throw new RuntimeException("Cannot send packet " + this + " to " + stream);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return Objects.toStringHelper(this)
+			.add("packet", packet)
+			.add("target", target)
+			.add("filtered", filtered)
+			.toString();
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java

@@ -23,6 +23,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.sf.cglib.proxy.Enhancer;
@@ -35,6 +36,8 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
+import com.comphenix.protocol.utility.EnhancerFactory;
+
 /**
  * Represents a player object that can be serialized by Java.
  * 
@@ -51,6 +54,7 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
 	
 	// Relevant data about an offline player
 	private String name;
+	private UUID uuid;
 	private long firstPlayed;
 	private long lastPlayed;
 	private boolean operator;
@@ -75,6 +79,7 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
 	 */
 	public SerializedOfflinePlayer(OfflinePlayer offline) {
 		this.name = offline.getName();
+		this.uuid = offline.getUniqueId();
 		this.firstPlayed = offline.getFirstPlayed();
 		this.lastPlayed = offline.getLastPlayed();
 		this.operator = offline.isOp();
@@ -114,6 +119,11 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
 		return lastPlayed;
 	}
 
+	@Override
+	public UUID getUniqueId() {
+		return uuid;
+	}
+	
 	@Override
 	public String getName() {
 		return name;
@@ -208,7 +218,7 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
 		}
 		
     	// MORE CGLIB magic!
-    	Enhancer ex = new Enhancer();
+    	Enhancer ex = EnhancerFactory.getInstance().createEnhancer();
     	ex.setSuperclass(Player.class);
     	ex.setCallback(new MethodInterceptor() {
 			@Override

ProtocolLib/src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java

@@ -17,14 +17,21 @@
 
 package com.comphenix.protocol.injector;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.injector.PacketConstructor.Unwrapper;
+import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
+import com.google.common.primitives.Primitives;
 
 /**
  * Represents an object capable of converting wrapped Bukkit objects into NMS objects.
@@ -38,41 +45,77 @@ import com.comphenix.protocol.reflect.instances.DefaultInstances;
  * @author Kristian
  */
 public class BukkitUnwrapper implements Unwrapper {
-	
-	private static Map<Class<?>, Method> cache = new ConcurrentHashMap<Class<?>, Method>();
+	private static BukkitUnwrapper DEFAULT;
 
+	public static final ReportType REPORT_ILLEGAL_ARGUMENT = new ReportType("Illegal argument.");
+	public static final ReportType REPORT_SECURITY_LIMITATION = new ReportType("Security limitation.");
+	public static final ReportType REPORT_CANNOT_FIND_UNWRAP_METHOD = new ReportType("Cannot find method.");
+	
+	public static final ReportType REPORT_CANNOT_READ_FIELD_HANDLE = new ReportType("Cannot read field 'handle'.");
+	
+	private static Map<Class<?>, Unwrapper> unwrapperCache = new ConcurrentHashMap<Class<?>, Unwrapper>();
+	
+	// The current error reporter
+	private final ErrorReporter reporter;
+	
+	/**
+	 * Retrieve the default instance of the Bukkit unwrapper.
+	 * @return The default instance.
+	 */
+	public static BukkitUnwrapper getInstance() {
+		ErrorReporter currentReporter = ProtocolLibrary.getErrorReporter();
+		
+		// Also recreate the unwrapper if the error reporter has changed
+		if (DEFAULT == null || DEFAULT.reporter != currentReporter) {
+			DEFAULT = new BukkitUnwrapper(currentReporter);
+		}
+		return DEFAULT;
+	}
+	
+	/**
+	 * Construct a new Bukkit unwrapper with ProtocolLib's default error reporter.
+	 */
+	public BukkitUnwrapper() {
+		this(ProtocolLibrary.getErrorReporter());
+	}
+	
+	/**
+	 * Construct a new Bukkit unwrapper with the given error reporter.
+	 * @param reporter - the error reporter to use.
+	 */
+	public BukkitUnwrapper(ErrorReporter reporter) {
+		 this.reporter = reporter;
+	}
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public Object unwrapItem(Object wrappedObject) {
-
-		// Special cases
-		if (wrappedObject == null) {
+		// Special case
+		if (wrappedObject == null) 
 			return null;
-		} else if (wrappedObject instanceof Collection) {
+		Class<?> currentClass = PacketConstructor.getClass(wrappedObject);
+		
+		// No need to unwrap primitives
+		if (currentClass.isPrimitive() || currentClass.equals(String.class))
+			return null;
+		
+		// Next, check for types that doesn't have a getHandle()
+		if (wrappedObject instanceof Collection) {
 			return handleCollection((Collection<Object>) wrappedObject);
+		} else if (Primitives.isWrapperType(currentClass) || wrappedObject instanceof String) {
+			return null;
 		}
 		
-		Class<?> currentClass = wrappedObject.getClass();
-		Method cachedMethod = initializeCache(currentClass);
+		Unwrapper specificUnwrapper = getSpecificUnwrapper(currentClass);
 		
-		try {
-			// Retrieve the handle
-			if (cachedMethod != null)
-				return cachedMethod.invoke(wrappedObject);
-			else
-				return null;
-			
-		} catch (IllegalArgumentException e) {
-			// Impossible
+		// Retrieve the handle
+		if (specificUnwrapper != null)
+			return specificUnwrapper.unwrapItem(wrappedObject);
+		else
 			return null;
-		} catch (IllegalAccessException e) {
-			return null;
-		} catch (InvocationTargetException e) {
-			// This is REALLY bad
-			throw new RuntimeException("Minecraft error.", e);
-		}
 	}
 	
+	// Handle a collection of items
 	private Object handleCollection(Collection<Object> wrappedObject) {
 		
 		@SuppressWarnings("unchecked")
@@ -91,25 +134,110 @@ public class BukkitUnwrapper implements Unwrapper {
 		}
 	}
 	
-	private Method initializeCache(Class<?> type) {
-		
+	/**
+	 * Retrieve a cached class unwrapper for the given class.
+	 * @param type - the type of the class.
+	 * @return An unwrapper for the given class.
+	 */
+	private Unwrapper getSpecificUnwrapper(final Class<?> type) {
 		// See if we're already determined this
-		if (cache.containsKey(type)) {
+		if (unwrapperCache.containsKey(type)) {
 			// We will never remove from the cache, so this ought to be thread safe
-			return cache.get(type);
+			return unwrapperCache.get(type);
 		}
 		
 		try {
-			Method find = type.getMethod("getHandle");
+			final Method find = type.getMethod("getHandle");
 			
 			// It's thread safe, as getMethod should return the same handle 
-			cache.put(type, find);
-			return find;
+			Unwrapper methodUnwrapper = new Unwrapper() {
+				@Override
+				public Object unwrapItem(Object wrappedObject) {
+					try {
+						if (wrappedObject instanceof Class)
+							return checkClass((Class<?>) wrappedObject, type, find.getReturnType());
+						return find.invoke(wrappedObject);
+						
+					} catch (IllegalArgumentException e) {
+						reporter.reportDetailed(this, 
+								Report.newBuilder(REPORT_ILLEGAL_ARGUMENT).error(e).callerParam(wrappedObject, find)
+						);
+					} catch (IllegalAccessException e) {
+						// Should not occur either
+						return null;
+					} catch (InvocationTargetException e) {
+						// This is really bad
+						throw new RuntimeException("Minecraft error.", e);
+					}
+					
+					return null;
+				}
+			};
+			
+			unwrapperCache.put(type, methodUnwrapper);
+			return methodUnwrapper;
 			
 		} catch (SecurityException e) {
-			return null;
+			reporter.reportDetailed(this, 
+					Report.newBuilder(REPORT_SECURITY_LIMITATION).error(e).callerParam(type)
+			);
 		} catch (NoSuchMethodException e) {
+			// Try getting the field unwrapper too
+			Unwrapper fieldUnwrapper = getFieldUnwrapper(type);
+			
+			if (fieldUnwrapper != null)
+				return fieldUnwrapper;
+			else
+				reporter.reportDetailed(this, 
+						Report.newBuilder(REPORT_CANNOT_FIND_UNWRAP_METHOD).error(e).callerParam(type));
+		}
+		
+		// Default method
+		return null;
+	}
+	
+	/**
+	 * Retrieve a cached unwrapper using the handle field.
+	 * @param type - a cached field unwrapper.
+	 * @return The cached field unwrapper.
+	 */
+	private Unwrapper getFieldUnwrapper(final Class<?> type) {
+		final Field find = FieldUtils.getField(type, "handle", true);
+		
+		// See if we succeeded
+		if (find != null) {
+			Unwrapper fieldUnwrapper = new Unwrapper() {
+				@Override
+				public Object unwrapItem(Object wrappedObject) {
+					try {
+						if (wrappedObject instanceof Class)
+							return checkClass((Class<?>) wrappedObject, type, find.getType());
+						return FieldUtils.readField(find, wrappedObject, true);
+					} catch (IllegalAccessException e) {
+						reporter.reportDetailed(this, 
+								Report.newBuilder(REPORT_CANNOT_READ_FIELD_HANDLE).error(e).callerParam(wrappedObject, find)
+						);
+						return null;
+					}
+				}
+			};
+			
+			unwrapperCache.put(type, fieldUnwrapper);
+			return fieldUnwrapper;
+			
+		} else {
+			// Inform about this too
+			reporter.reportDetailed(this, 
+					Report.newBuilder(REPORT_CANNOT_READ_FIELD_HANDLE).callerParam(find)
+			);
 			return null;
 		}
 	}
+
+	private static Class<?> checkClass(Class<?> input, Class<?> expected, Class<?> result) {
+		if (expected.isAssignableFrom(input)) {
+			return result;
+		}
+		return null;
+	}
 }

ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java

@@ -0,0 +1,480 @@
+package com.comphenix.protocol.injector;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+import com.comphenix.protocol.AsynchronousManager;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.comphenix.protocol.events.NetworkMarker;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+/**
+ * A protocol manager that delays all packet listener registrations and unregistrations until
+ * an underlying protocol manager can be constructed.
+ * 
+ * @author Kristian
+ */
+public class DelayedPacketManager implements InternalManager {
+	// Registering packet IDs that are not supported
+	public static final ReportType REPORT_CANNOT_SEND_QUEUED_PACKET = new ReportType("Cannot send queued packet %s.");
+	public static final ReportType REPORT_CANNOT_REGISTER_QUEUED_LISTENER = new ReportType("Cannot register queued listener %s.");
+	
+	private volatile InternalManager delegate;
+
+	// Queued actions
+	private final List<Runnable> queuedActions = Collections.synchronizedList(Lists.<Runnable>newArrayList());
+	private final List<PacketListener> queuedListeners = Collections.synchronizedList(Lists.<PacketListener>newArrayList());
+	
+	private AsynchronousManager asyncManager;
+	private ErrorReporter reporter;
+	
+	// The current hook
+	private PlayerInjectHooks hook = PlayerInjectHooks.NETWORK_SERVER_OBJECT;
+	
+	// If we have been closed
+	private boolean closed;
+	private boolean debug;
+	
+	// Queued registration
+	private PluginManager queuedManager;
+	private Plugin queuedPlugin;
+	
+	private MinecraftVersion version;
+	
+	public DelayedPacketManager(@Nonnull ErrorReporter reporter, @Nonnull MinecraftVersion version) {
+		Preconditions.checkNotNull(reporter, "reporter cannot be NULL.");
+		Preconditions.checkNotNull(version, "version cannot be NULL.");
+		
+		this.reporter = reporter;
+		this.version = version;
+	}
+	
+	/**
+	 * Retrieve the underlying protocol manager.
+	 * @return The underlying manager.
+	 */
+	public InternalManager getDelegate() {
+		return delegate;
+	}
+
+	@Override
+	public int getProtocolVersion(Player player) {
+		if (delegate != null)
+			return delegate.getProtocolVersion(player);
+		else
+			return Integer.MIN_VALUE;
+	}
+	
+	@Override
+	public MinecraftVersion getMinecraftVersion() {
+		if (delegate != null)
+			return delegate.getMinecraftVersion();
+		else
+			return version;
+	}
+	
+	/**
+	 * Update the delegate to the underlying manager.
+	 * <p>
+	 * This will prompt this packet manager to immediately transmit and 
+	 * register all queued packets an listeners.
+	 * @param delegate - delegate to the new manager.
+	 */
+	protected void setDelegate(InternalManager delegate) {
+		this.delegate = delegate;
+
+		if (delegate != null) {
+			// Update the hook if needed
+			if (!Objects.equal(delegate.getPlayerHook(), hook)) {
+				delegate.setPlayerHook(hook);
+			}
+			// Register events as well
+			if (queuedManager != null && queuedPlugin != null) {
+				delegate.registerEvents(queuedManager, queuedPlugin);
+			}
+			// And update the debug mode
+			delegate.setDebug(debug);
+			
+			// Add any pending listeners
+			synchronized (queuedListeners) {
+				for (PacketListener listener : queuedListeners) {
+					try {
+						delegate.addPacketListener(listener);
+					} catch (IllegalArgumentException e) {
+						// Inform about this plugin error
+						reporter.reportWarning(this, 
+							Report.newBuilder(REPORT_CANNOT_REGISTER_QUEUED_LISTENER).
+								callerParam(delegate).messageParam(listener).error(e));
+					}
+				}
+			}
+			
+			// Execute any delayed actions
+			synchronized (queuedActions) {
+				for (Runnable action : queuedActions) {
+					action.run();
+				}
+			}
+			
+			// Don't keep this around anymore
+			queuedListeners.clear();
+			queuedActions.clear();
+		}
+	}
+
+	private Runnable queuedAddPacket(final ConnectionSide side, final Player player, final PacketContainer packet, 
+									 final NetworkMarker marker, final boolean filtered) {
+		
+		return new Runnable() {
+			@Override
+			public void run() {
+				try {
+					// Attempt to send it now
+					switch (side) {
+						case CLIENT_SIDE:
+							delegate.recieveClientPacket(player, packet, marker, filtered);
+							break;
+						case SERVER_SIDE:
+							delegate.sendServerPacket(player, packet, marker, filtered);
+							break;
+						default:
+							throw new IllegalArgumentException("side cannot be " + side);
+					}
+				} catch (Exception e) {
+					// Inform about this plugin error
+					reporter.reportWarning(this, 
+						Report.newBuilder(REPORT_CANNOT_SEND_QUEUED_PACKET).
+							callerParam(delegate).messageParam(packet).error(e));
+				} 
+			}
+		};
+	}
+	
+	@Override
+	public void setPlayerHook(PlayerInjectHooks playerHook) {
+		this.hook = playerHook;
+	}
+	
+	@Override
+	public PlayerInjectHooks getPlayerHook() {
+		return hook;
+	}
+	
+	@Override
+	public void sendServerPacket(Player receiver, PacketContainer packet) throws InvocationTargetException {
+		sendServerPacket(receiver, packet, null, true);
+	}
+	
+	@Override
+	public void sendServerPacket(Player receiver, PacketContainer packet, boolean filters) throws InvocationTargetException {
+		sendServerPacket(receiver, packet, null, filters);
+	}
+	
+	@Override
+	public void sendServerPacket(Player receiver, PacketContainer packet, NetworkMarker marker, boolean filters) throws InvocationTargetException {
+		if (delegate != null) {
+			delegate.sendServerPacket(receiver, packet, marker, filters);
+		} else {
+			queuedActions.add(queuedAddPacket(ConnectionSide.SERVER_SIDE, receiver, packet, marker, filters));
+		}
+	}
+
+	@Override
+	public void recieveClientPacket(Player sender, PacketContainer packet) throws IllegalAccessException, InvocationTargetException {
+		recieveClientPacket(sender, packet, null, true);
+	}
+
+	@Override
+	public void recieveClientPacket(Player sender, PacketContainer packet, boolean filters) throws IllegalAccessException, InvocationTargetException {
+		recieveClientPacket(sender, packet, null, filters);
+	}
+	
+	@Override
+	public void recieveClientPacket(Player sender, PacketContainer packet, NetworkMarker marker, boolean filters) throws IllegalAccessException, InvocationTargetException {
+		if (delegate != null) {
+			delegate.recieveClientPacket(sender, packet, marker, filters);
+		} else {
+			queuedActions.add(queuedAddPacket(ConnectionSide.CLIENT_SIDE, sender, packet, marker, filters));
+		}
+	}
+	
+	@Override
+	public void broadcastServerPacket(final PacketContainer packet, final Entity entity, final boolean includeTracker) {
+		if (delegate != null) {
+			delegate.broadcastServerPacket(packet, entity, includeTracker);
+		} else {
+			queuedActions.add(new Runnable() {
+				@Override
+				public void run() {
+					delegate.broadcastServerPacket(packet, entity, includeTracker);
+				}
+			});
+		}
+	}
+
+	@Override
+	public void broadcastServerPacket(final PacketContainer packet, final Location origin, final int maxObserverDistance) {
+		if (delegate != null) {
+			delegate.broadcastServerPacket(packet, origin, maxObserverDistance);
+		} else {
+			queuedActions.add(new Runnable() {
+				@Override
+				public void run() {
+					delegate.broadcastServerPacket(packet, origin, maxObserverDistance);
+				}
+			});
+		}
+	}
+	
+	@Override
+	public void broadcastServerPacket(final PacketContainer packet) {
+		if (delegate != null) {
+			delegate.broadcastServerPacket(packet);
+		} else {
+			queuedActions.add(new Runnable() {
+				@Override
+				public void run() {
+					delegate.broadcastServerPacket(packet);
+				}
+			});
+		}
+	}
+
+	@Override
+	public ImmutableSet<PacketListener> getPacketListeners() {
+		if (delegate != null)
+			return delegate.getPacketListeners();
+		else
+			return ImmutableSet.copyOf(queuedListeners);
+	}
+
+	@Override
+	public void addPacketListener(PacketListener listener) {
+		if (delegate != null)
+			delegate.addPacketListener(listener);
+		else
+			queuedListeners.add(listener);
+	}
+
+	@Override
+	public void removePacketListener(PacketListener listener) {
+		if (delegate != null)
+			delegate.removePacketListener(listener);
+		else
+			queuedListeners.remove(listener);
+	}
+
+	@Override
+	public void removePacketListeners(Plugin plugin) {
+		if (delegate != null) {
+			delegate.removePacketListeners(plugin);
+		} else {
+			for (Iterator<PacketListener> it = queuedListeners.iterator(); it.hasNext(); ) {
+				// Remove listeners of the same plugin
+				if (Objects.equal(it.next().getPlugin(), plugin)) {
+					it.remove();
+				}
+ 			}
+		}
+	}
+
+	@Override
+	@Deprecated
+	public PacketContainer createPacket(int id) {
+		if (delegate != null)
+			return delegate.createPacket(id);
+		return createPacket(id, true);
+	}
+	
+	@Override
+	@Deprecated
+	public PacketContainer createPacket(int id, boolean forceDefaults) {
+		if (delegate != null) {
+			return delegate.createPacket(id);
+		} else {
+			// Fallback implementation
+			PacketContainer packet = new PacketContainer(id);
+			
+			// Use any default values if possible
+			if (forceDefaults) {
+				try {
+					packet.getModifier().writeDefaults();
+				} catch (FieldAccessException e) {
+					throw new RuntimeException("Security exception.", e);
+				}
+			}
+			return packet;
+		}
+	}
+	
+	@SuppressWarnings("deprecation")
+	@Override
+	public PacketConstructor createPacketConstructor(int id, Object... arguments) {
+		if (delegate != null)
+			return delegate.createPacketConstructor(id, arguments);
+		else
+			return PacketConstructor.DEFAULT.withPacket(id, arguments);
+	}
+	
+	@Override
+	public PacketConstructor createPacketConstructor(PacketType type, Object... arguments) {
+		if (delegate != null)
+			return delegate.createPacketConstructor(type, arguments);
+		else
+			return PacketConstructor.DEFAULT.withPacket(type, arguments);
+	}
+
+	@Override
+	@Deprecated
+	public Set<Integer> getSendingFilters() {
+		if (delegate != null) {
+			return delegate.getSendingFilters();
+		} else {
+			// Linear scan is fast enough here
+			Set<Integer> sending = Sets.newHashSet();
+			
+			for (PacketListener listener : queuedListeners) {
+				sending.addAll(listener.getSendingWhitelist().getWhitelist());
+			}
+			return sending;
+		}
+	}
+	
+	@Override
+	@Deprecated
+	public Set<Integer> getReceivingFilters() {
+		if (delegate != null) {
+			return delegate.getReceivingFilters();
+		} else {
+			Set<Integer> recieving = Sets.newHashSet();
+			
+			for (PacketListener listener : queuedListeners) {
+				recieving.addAll(listener.getReceivingWhitelist().getWhitelist());
+			}
+			return recieving;
+		}
+	}
+	
+	@Override
+	public PacketContainer createPacket(PacketType type) {
+		return createPacket(type.getLegacyId());
+	}
+
+	@Override
+	public PacketContainer createPacket(PacketType type, boolean forceDefaults) {
+		return createPacket(type.getLegacyId(), forceDefaults);
+	}
+
+	@Override
+	public Set<PacketType> getSendingFilterTypes() {
+		return PacketRegistry.toPacketTypes(getSendingFilters(), Sender.SERVER);
+	}
+
+	@Override
+	public Set<PacketType> getReceivingFilterTypes() {
+		return PacketRegistry.toPacketTypes(getReceivingFilters(), Sender.CLIENT);
+	}
+	
+	@Override
+	public void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException {
+		if (delegate != null) 
+			delegate.updateEntity(entity, observers);
+		else
+			EntityUtilities.updateEntity(entity, observers);
+	}
+	
+	@Override
+	public Entity getEntityFromID(World container, int id) throws FieldAccessException {
+		if (delegate != null)
+			return delegate.getEntityFromID(container, id);
+		else
+			return EntityUtilities.getEntityFromID(container, id);
+	}
+	
+	@Override
+	public List<Player> getEntityTrackers(Entity entity) throws FieldAccessException {
+		if (delegate != null)
+			return delegate.getEntityTrackers(entity);
+		else
+			return EntityUtilities.getEntityTrackers(entity);
+	}
+
+	@Override
+	public boolean isClosed() {
+		return closed || (delegate != null && delegate.isClosed());
+	}
+
+	@Override
+	public AsynchronousManager getAsynchronousManager() {
+		if (delegate != null)
+			return delegate.getAsynchronousManager();
+		else
+			return asyncManager;
+	}
+	
+	@Override
+	public boolean isDebug() {
+		return debug;
+	}
+
+	@Override
+	public void setDebug(boolean debug) {
+		this.debug = debug;
+		
+		if (delegate != null) {
+			delegate.setDebug(debug);
+		}
+	}
+	
+	/**
+	 * Update the asynchronous manager. This must be set.
+	 * @param asyncManager - the asynchronous manager.
+	 */
+	public void setAsynchronousManager(AsynchronousManager asyncManager) {
+		this.asyncManager = asyncManager;
+	}
+
+	@Override
+	public void registerEvents(PluginManager manager, Plugin plugin) {
+		if (delegate != null) {
+			delegate.registerEvents(manager, plugin);
+		} else {
+			queuedManager = manager;
+			queuedPlugin = plugin;
+		}
+	}
+
+	@Override
+	public void close() {
+		if (delegate != null)
+			delegate.close();
+		closed = true;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java

@@ -1,3 +1,20 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol.injector;
 
 import org.bukkit.plugin.Plugin;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/EntityUtilities.java

@@ -21,20 +21,22 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.bukkit.World;
-import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.WrappedIntHashMap;
 import com.google.common.collect.Lists;
 
 /**
@@ -47,10 +49,21 @@ class EntityUtilities {
 	private static Field entityTrackerField;
 	private static Field trackedEntitiesField;
 	private static Field trackedPlayersField;
+	private static Field trackerField;
 	
-	private static Method hashGetMethod;
 	private static Method scanPlayersMethod;
-	
+
+	// Fix: PaperSpigot changed the trackedPlayers field
+	private static Collection<?> getCollection(Object value) {
+		if (value instanceof Collection<?>) {
+			return (Collection<?>) value;
+		} else if (value instanceof Map<?, ?>) {
+			return ((Map<?, ?>) value).keySet();
+		} else {
+			throw new IllegalArgumentException("Expected Collection or Map but got " + value.getClass());
+		}
+	}
+
 	/*
 	 * While this function may look pretty bad, it's essentially just a reflection-warped 
 	 * version of the following:
@@ -83,13 +96,94 @@ class EntityUtilities {
 	 *
 	 */
 	public static void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException {
-		
-		World world = entity.getWorld();
-		Object worldServer = ((CraftWorld) world).getHandle();
+		try {
+			// Fix: Throw a more informative error
+			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+			if (trackerEntry == null) {
+				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + (entity.isDead() ? " - entity is dead." : "."));
+			}
+			
+			if (trackedPlayersField == null) {
+				// This one is fairly easy
+				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
+			}
+			
+			// Phew, finally there.
+			Collection<?> trackedPlayers = getCollection(FieldUtils.readField(trackedPlayersField, trackerEntry, false));
+			List<Object> nmsPlayers = unwrapBukkit(observers);
+			
+			trackedPlayers.removeAll(nmsPlayers);
+			
+			// We have to rely on a NAME once again. Damn it.
+			if (scanPlayersMethod == null) {
+				scanPlayersMethod = trackerEntry.getClass().getMethod("scanPlayers", List.class);
+			}
+			
+			scanPlayersMethod.invoke(trackerEntry, nmsPlayers);
+			
+		} catch (IllegalArgumentException e) {
+			throw e;
+		} catch (IllegalAccessException e) {
+			throw new FieldAccessException("Security limitation prevents access to 'get' method in IntHashMap", e);
+		} catch (InvocationTargetException e) {
+			throw new RuntimeException("Exception occurred in Minecraft.", e);
+		} catch (SecurityException e) {
+			throw new FieldAccessException("Security limitation prevents access to 'scanPlayers' method in trackerEntry.", e);
+		} catch (NoSuchMethodException e) {
+			throw new FieldAccessException("Cannot find 'scanPlayers' method. Is ProtocolLib up to date?", e);
+		}
+	}
+
+	/**
+	 * Retrieve every client that is receiving information about a given entity.
+	 * @param entity - the entity that is being tracked.
+	 * @return Every client/player that is tracking the given entity.
+	 * @throws FieldAccessException If reflection failed.
+	 */
+	public static List<Player> getEntityTrackers(Entity entity) {
+		try {
+			List<Player> result = new ArrayList<Player>();
+			
+			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+			if (trackerEntry == null) {
+				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + (entity.isDead() ? " - entity is dead." : "."));
+			}
+			
+			if (trackedPlayersField == null) {
+				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
+			}
+			
+			Collection<?> trackedPlayers = getCollection(FieldUtils.readField(trackedPlayersField, trackerEntry, false));
+			
+			// Wrap every player - we also ensure that the underlying tracker list is immutable
+			for (Object tracker : trackedPlayers) {
+				if (MinecraftReflection.isMinecraftPlayer(tracker)) {
+					result.add((Player) MinecraftReflection.getBukkitEntity(tracker));
+				}
+			}
+			return result;
+			
+		} catch (IllegalAccessException e) {
+			throw new FieldAccessException("Security limitation prevented access to the list of tracked players.", e);
+		} catch (InvocationTargetException e) {
+			throw new FieldAccessException("Exception occurred in Minecraft.", e);
+		}
+	}
+	
+	/**
+	 * Retrieve the entity tracker entry given a ID.
+	 * @param world - world server.
+	 * @param entityID - entity ID.
+	 * @return The entity tracker entry.
+	 * @throws FieldAccessException 
+	 */
+	private static Object getEntityTrackerEntry(World world, int entityID) throws FieldAccessException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
+		Object worldServer = unwrapper.unwrapItem(world);
 
-		// We have to rely on the class naming here.
 		if (entityTrackerField == null)
-			entityTrackerField = FuzzyReflection.fromObject(worldServer).getFieldByType(".*Tracker");
+			entityTrackerField = FuzzyReflection.fromObject(worldServer).
+									getFieldByType("tracker", MinecraftReflection.getEntityTrackerClass());
 		
 		// Get the tracker
 		Object tracker = null;
@@ -102,7 +196,7 @@ class EntityUtilities {
 		
 		if (trackedEntitiesField == null) {
 			@SuppressWarnings("rawtypes")
-			Set<Class> ignoredTypes = new HashSet<Class>();
+			Set<Class> ignoredTypes = new HashSet<Class>(); 
 			
 			// Well, this is more difficult. But we're looking for a Minecraft object that is not 
 			// created by the constructor(s).
@@ -114,75 +208,54 @@ class EntityUtilities {
 			
 			// The Minecraft field that's NOT filled in by the constructor
 			trackedEntitiesField = FuzzyReflection.fromObject(tracker, true).
-						getFieldByType(FuzzyReflection.MINECRAFT_OBJECT, ignoredTypes);
+						getFieldByType(MinecraftReflection.getMinecraftObjectRegex(), ignoredTypes);
 		}
 		
 		// Read the entity hashmap
 		Object trackedEntities = null;
-
+		
 		try {
 			trackedEntities = FieldUtils.readField(trackedEntitiesField, tracker, true);
 		} catch (IllegalAccessException e) {
 			throw new FieldAccessException("Cannot access 'trackedEntities' field due to security limitations.", e);
 		}
 		
-		// Getting the "get" method is pretty hard, but first - try to just get it by name
-		if (hashGetMethod == null) {
-			
-			Class<?> type = trackedEntities.getClass();
-			
-			try {
-				hashGetMethod = type.getMethod("get", int.class);
-			} catch (NoSuchMethodException e) {
-			
-				Class<?>[] params = { int.class };
-				
-				// Then it's probably the lowest named method that takes an int-parameter
-				for (Method method : type.getMethods()) {
-					if (Arrays.equals(params, method.getParameterTypes())) {
-						if (hashGetMethod == null ||
-							method.getName().compareTo(hashGetMethod.getName()) < 0) {
-							hashGetMethod = method;
-						}
+		return WrappedIntHashMap.fromHandle(trackedEntities).get(entityID);
+	}
+	
+	/**
+	 * Retrieve entity from a ID, even it it's newly created.
+	 * @return The asssociated entity.
+	 * @throws FieldAccessException Reflection error.
+	 */
+	public static Entity getEntityFromID(World world, int entityID) throws FieldAccessException {
+		try {
+			Object trackerEntry = getEntityTrackerEntry(world, entityID);
+			Object tracker = null;
+
+			// Handle NULL cases
+			if (trackerEntry != null) {
+				if (trackerField == null) {
+					try {
+						trackerField = trackerEntry.getClass().getField("tracker");
+					} catch (NoSuchFieldException e) {
+						// Assume it's the first public entity field then
+						trackerField = FuzzyReflection.fromObject(trackerEntry).getFieldByType(
+								"tracker", MinecraftReflection.getEntityClass());
 					}
 				}
-			}
-		}
-	
-		try {
-			//EntityTrackerEntry trackEntity = (EntityTrackerEntry) tracker.trackedEntities.get(entity.getEntityId());
-			 Object trackerEntry = hashGetMethod.invoke(trackedEntities, entity.getEntityId());
-
-			if (trackedPlayersField == null) {
-				// This one is fairly easy
-				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
+				
+				tracker = FieldUtils.readField(trackerField, trackerEntry, true);
 			}
 			
-			// Phew, finally there.
-			Collection<?> trackedPlayers = (Collection<?>) FieldUtils.readField(trackedPlayersField, trackerEntry, false);
-			List<Object> nmsPlayers = unwrapBukkit(observers);
+			// If the tracker is NULL, we'll just assume this entity doesn't exist
+			if (tracker != null)
+				return (Entity) MinecraftReflection.getBukkitEntity(tracker);
+			else
+				return null;
 			
-			// trackEntity.trackedPlayers.clear();
-			trackedPlayers.removeAll(nmsPlayers);
-			
-			// We have to rely on a NAME once again. Damn it.
-			if (scanPlayersMethod == null) {
-				scanPlayersMethod = trackerEntry.getClass().getMethod("scanPlayers", List.class);
-			}
-			
-			//trackEntity.scanPlayers(server.players);
-			scanPlayersMethod.invoke(trackerEntry, nmsPlayers);
-			
-		} catch (IllegalArgumentException e) {
-			throw e;
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Security limitation prevents access to 'get' method in IntHashMap", e);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("Exception occurred in Minecraft.", e);
-		} catch (SecurityException e) {
-			throw new FieldAccessException("Security limitation prevents access to 'scanPlayers' method in trackerEntry.", e);
-		} catch (NoSuchMethodException e) {
-			throw new FieldAccessException("Canot find 'scanPlayers' method. Is ProtocolLib up to date?", e);
+		} catch (Exception e) {
+			throw new FieldAccessException("Cannot find entity from ID " + entityID + ".", e);
 		}
 	}
 	

ProtocolLib/src/main/java/com/comphenix/protocol/injector/GamePhase.java

@@ -1,3 +1,20 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *  02111-1307 USA
+ */
+
 package com.comphenix.protocol.injector;
 
 /**

ProtocolLib/src/main/java/com/comphenix/protocol/injector/InternalManager.java

@@ -0,0 +1,50 @@
+package com.comphenix.protocol.injector;
+
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+
+/**
+ * Yields access to the internal hook configuration.
+ * 
+ * @author Kristian
+ */
+public interface InternalManager extends ProtocolManager {
+	/**
+	 * Retrieves how the server packets are read.
+	 * @return Injection method for reading server packets.
+	 */
+	public PlayerInjectHooks getPlayerHook();
+
+	/**
+	 * Sets how the server packets are read.
+	 * @param playerHook - the new injection method for reading server packets.
+	 */
+	public void setPlayerHook(PlayerInjectHooks playerHook);
+
+	/**
+	 * Register this protocol manager on Bukkit.
+	 * @param manager - Bukkit plugin manager that provides player join/leave events.
+	 * @param plugin - the parent plugin.
+	 */
+	public void registerEvents(PluginManager manager, final Plugin plugin);
+	
+	/**
+	 * Called when ProtocolLib is closing.
+	 */
+	public void close();
+
+	/**
+	 * Determine if debug mode is enabled.
+	 * @return TRUE if it is, FALSE otherwise.
+	 */
+	public boolean isDebug();
+	
+	/**
+	 * Set whether or not debug mode is enabled.
+	 * @param debug - TRUE if it is, FALSE otherwise.
+	 */
+	public void setDebug(boolean debug);
+}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java

@@ -17,9 +17,9 @@
 
 package com.comphenix.protocol.injector;
 
-import net.minecraft.server.Packet;
-
+import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.injector.packet.InterceptWritePacket;
 
 /**
  * Represents an object that initiate the packet listeners.
@@ -45,19 +45,42 @@ public interface ListenerInvoker {
 	 * @param packet - the packet.
 	 * @return The packet ID.
 	 */
-	public abstract int getPacketID(Packet packet);
+	@Deprecated
+	public abstract int getPacketID(Object packet);
 
+	/**
+	 * Retrieve the associated type of a packet.
+	 * @param packet - the packet.
+	 * @return The packet type.
+	 */
+	public abstract PacketType getPacketType(Object packet);
+	
+	/**
+	 * Retrieve the object responsible for intercepting write packets.
+	 * @return Object that intercepts write packets.
+	 */
+	public InterceptWritePacket getInterceptWritePacket();
+	
+	/**
+	 * Determine if a given packet requires input buffering.
+	 * @param packetId - the packet to check.
+	 * @return TRUE if it does, FALSE otherwise.
+	 */
+	@Deprecated
+	public boolean requireInputBuffer(int packetId);
+	
 	/**
 	 * Associate a given class with the given packet ID. Internal method.
 	 * @param clazz - class to associate.
-	 * @param packetID - the packet ID.
 	 */
 	public abstract void unregisterPacketClass(Class<?> clazz);
 
 	/**
-	 * Remove a given class from the packet registry. Internal method.
-	 * @param clazz - class to remove.
+	 * Register a given class in the packet registry. Internal method.
+	 * @param clazz - class to register.
+	 * @param packetID - the the new associated packet ID.
 	 */
+	@Deprecated
 	public abstract void registerPacketClass(Class<?> clazz, int packetID);
 
 	/**
@@ -66,5 +89,6 @@ public interface ListenerInvoker {
  	 * @param forceVanilla - whether or not to look for vanilla classes, not injected classes.
 	 * @return The associated class.
 	 */
+	@Deprecated
 	public abstract Class<?> getPacketClassFromID(int packetID, boolean forceVanilla);
 }

ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java

@@ -0,0 +1,91 @@
+package com.comphenix.protocol.injector;
+
+import org.bukkit.Bukkit;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.Packets;
+import com.comphenix.protocol.concurrency.IntegerSet;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+
+/**
+ * Packets that are known to be transmitted during login. 
+ * <p>
+ * This may be dynamically extended later.
+ * @author Kristian
+ */
+class LoginPackets {
+	private IntegerSet clientSide = new IntegerSet(Packets.PACKET_COUNT);
+	private IntegerSet serverSide = new IntegerSet(Packets.PACKET_COUNT);
+	
+	@SuppressWarnings("deprecation")
+	public LoginPackets(MinecraftVersion version) {
+		// Ordinary login
+		clientSide.add(Packets.Client.HANDSHAKE);
+		serverSide.add(Packets.Server.KEY_REQUEST);
+		clientSide.add(Packets.Client.KEY_RESPONSE);
+		serverSide.add(Packets.Server.KEY_RESPONSE);
+		clientSide.add(Packets.Client.CLIENT_COMMAND);
+		serverSide.add(Packets.Server.LOGIN);
+		
+		// List ping
+		clientSide.add(Packets.Client.GET_INFO);
+		
+		// In 1.6.2, Minecraft started sending CUSTOM_PAYLOAD in the server list protocol
+		if (version.compareTo(MinecraftVersion.HORSE_UPDATE) >= 0 || triesForgeIntegration()) {
+			clientSide.add(Packets.Client.CUSTOM_PAYLOAD);
+		}
+		serverSide.add(Packets.Server.KICK_DISCONNECT);
+		
+		// Forge uses packet 250 during login
+		if (triesForgeIntegration()) {
+			serverSide.add(Packets.Client.CUSTOM_PAYLOAD);
+		}
+	}
+	
+	/**
+	 * Determine if we are runnign MCPC.
+	 * @return TRUE if we are, FALSE otherwise.
+	 */
+	private static boolean triesForgeIntegration() {
+		String version = Bukkit.getVersion();
+		return version.contains("MCPC-Plus") || version.contains("Cauldron") || version.contains("Thermos");
+	}
+	
+	/**
+	 * Determine if a packet may be sent during login from a given direction.
+	 * @param packetId - the ID of the packet.
+	 * @param side - the direction.
+	 * @return TRUE if it may, FALSE otherwise.
+	 */
+	@Deprecated
+	public boolean isLoginPacket(int packetId, ConnectionSide side) {
+		switch (side) {
+			case CLIENT_SIDE:
+				return clientSide.contains(packetId);
+			case SERVER_SIDE:
+				return serverSide.contains(packetId);
+			case BOTH:
+				return clientSide.contains(packetId) || 
+					   serverSide.contains(packetId);
+			default:
+				throw new IllegalArgumentException("Unknown connection side: " + side);
+		}
+	}	
+	
+	/**
+	 * Determine if a given packet may be sent during login.
+	 * @param type - the packet type.
+	 * @return TRUE if it may, FALSE otherwise.
+	 */
+	public boolean isLoginPacket(PacketType type) {
+		if (!MinecraftReflection.isUsingNetty())
+			return isLoginPacket(type.getLegacyId(), type.getSender().toSide());
+		
+		return PacketType.Login.Client.getInstance().hasMember(type) || 
+			   PacketType.Login.Server.getInstance().hasMember(type) ||
+			   PacketType.Status.Client.getInstance().hasMember(type) || 
+			   PacketType.Status.Server.getInstance().hasMember(type);
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/MinecraftRegistry.java

@@ -1,183 +0,0 @@
-/*
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2012 Kristian S. Stangeland
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the 
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program; 
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
- *  02111-1307 USA
- */
-
-package com.comphenix.protocol.injector;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.minecraft.server.Packet;
-
-import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.FieldUtils;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Static registries in Minecraft.
- * 
- * @author Kristian
- */
-@SuppressWarnings("rawtypes")
-class MinecraftRegistry {
-
-	// Fuzzy reflection
-	private static FuzzyReflection packetRegistry;
-	
-	// The packet class to packet ID translator
-	private static Map<Class, Integer> packetToID;
-	
-	// Whether or not certain packets are sent by the client or the server
-	private static Set<Integer> serverPackets;
-	private static Set<Integer> clientPackets;
-	
-	// New proxy values
-	private static Map<Integer, Class> overwrittenPackets = new HashMap<Integer, Class>();
-	
-	// Vanilla packets
-	private static Map<Integer, Class> previousValues = new HashMap<Integer, Class>();
-	
-	@SuppressWarnings({ "unchecked" })
-	public static Map<Class, Integer> getPacketToID() {
-		// Initialize it, if we haven't already
-		if (packetToID == null) {
-			try {
-				Field packetsField = getPacketRegistry().getFieldByType("packetsField", Map.class);
-				packetToID = (Map<Class, Integer>) FieldUtils.readStaticField(packetsField, true);
-				
-			} catch (IllegalAccessException e) {
-				throw new RuntimeException("Unable to retrieve the packetClassToIdMap", e);
-			}
-		}
-		
-		return packetToID;
-	}
-	
-	/**
-	 * Retrieve the cached fuzzy reflection instance allowing access to the packet registry.
-	 * @return Reflected packet registry.
-	 */ 
-	private static FuzzyReflection getPacketRegistry() {
-		if (packetRegistry == null)
-			packetRegistry = FuzzyReflection.fromClass(Packet.class, true);
-		return packetRegistry;
-	}
-	
-	/**
-	 * Retrieve the injected proxy classes handlig each packet ID.
-	 * @return Injected classes.
-	 */
-	public static Map<Integer, Class> getOverwrittenPackets() {
-		return overwrittenPackets;
-	}
-	
-	/**
-	 * Retrieve the vanilla classes handling each packet ID.
-	 * @return Vanilla classes.
-	 */
-	public static Map<Integer, Class> getPreviousPackets() {
-		return previousValues;
-	}
-	
-	/**
-	 * Retrieve every known and supported server packet.
-	 * @return An immutable set of every known server packet.
-	 * @throws FieldAccessException If we're unable to retrieve the server packet data from Minecraft.
-	 */
-	public static Set<Integer> getServerPackets() throws FieldAccessException {
-		initializeSets();
-		return serverPackets;
-	}
-	
-	/**
-	 * Retrieve every known and supported client packet.
-	 * @return An immutable set of every known client packet.
-	 * @throws FieldAccessException If we're unable to retrieve the client packet data from Minecraft.
-	 */
-	public static Set<Integer> getClientPackets() throws FieldAccessException {
-		initializeSets();
-		return clientPackets;
-	}
-	
-	@SuppressWarnings("unchecked")
-	private static void initializeSets() throws FieldAccessException {
-		if (serverPackets == null || clientPackets == null) {
-			List<Field> sets = getPacketRegistry().getFieldListByType(Set.class);
-			
-			try {
-				if (sets.size() > 1) {
-					serverPackets = (Set<Integer>) FieldUtils.readStaticField(sets.get(0), true);
-					clientPackets = (Set<Integer>) FieldUtils.readStaticField(sets.get(1), true);
-					
-					// Impossible
-					if (serverPackets == null || clientPackets == null)
-						throw new FieldAccessException("Packet sets are in an illegal state.");
-					
-					// NEVER allow callers to modify the underlying sets
-					serverPackets = ImmutableSet.copyOf(serverPackets);
-					clientPackets = ImmutableSet.copyOf(clientPackets);
-					
-				} else {
-					throw new FieldAccessException("Cannot retrieve packet client/server sets.");
-				}
-				
-			} catch (IllegalAccessException e) {
-				throw new FieldAccessException("Cannot access field.", e);
-			}
-		}
-	}
-	
-	/**
-	 * Retrieves the correct packet class from a given packet ID.
-	 * @param packetID - the packet ID.
-	 * @return The associated class.
-	 */
-	public static Class getPacketClassFromID(int packetID) {
-		return getPacketClassFromID(packetID, false);
-	}
-	
-	/**
-	 * Retrieves the correct packet class from a given packet ID.
-	 * @param packetID - the packet ID.
- 	 * @param forceVanilla - whether or not to look for vanilla classes, not injected classes.
-	 * @return The associated class.
-	 */
-	public static Class getPacketClassFromID(int packetID, boolean forceVanilla) {
-		
-		Map<Integer, Class> lookup = forceVanilla ? previousValues : overwrittenPackets;
-		
-		// Optimized lookup
-		if (lookup.containsKey(packetID)) {
-			return lookup.get(packetID);
-		}
-
-		// Will most likely not be used
-		for (Map.Entry<Class, Integer> entry : getPacketToID().entrySet()) {
-			if (Objects.equal(entry.getValue(), packetID)) {
-				// Attempt to get the vanilla class here too
-				if (!forceVanilla || entry.getKey().getName().startsWith("net.minecraft.server"))
-					return entry.getKey();
-			}
-		}
-		
-		throw new IllegalArgumentException("The packet ID " + packetID + " is not registered.");
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java

@@ -0,0 +1,107 @@
+package com.comphenix.protocol.injector;
+
+import java.util.List;
+import java.util.PriorityQueue;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.events.NetworkMarker;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.events.PacketOutputHandler;
+import com.comphenix.protocol.events.PacketPostListener;
+import com.comphenix.protocol.events.ScheduledPacket;
+
+/**
+ * Represents a processor for network markers.
+ * @author Kristian
+ */
+public class NetworkProcessor {
+	private ErrorReporter reporter;
+	
+	/**
+	 * Construct a new network processor.
+	 * @param reporter - the reporter.
+	 */
+	public NetworkProcessor(ErrorReporter reporter) {
+		this.reporter = reporter;
+	}
+	
+	/**
+	 * Process the serialized packet byte array with the given network marker.
+	 * @param event - current packet event.
+	 * @param marker - the network marker.
+	 * @param input - the input array.
+	 * @return The output array.
+	 */
+	public byte[] processOutput(PacketEvent event, NetworkMarker marker, final byte[] input) {
+		// Bit of a hack - but we need the performance
+		PriorityQueue<PacketOutputHandler> handlers = (PriorityQueue<PacketOutputHandler>) 
+			marker.getOutputHandlers();
+		byte[] output = input;
+		
+		// Let each handler prepare the actual output
+		while (!handlers.isEmpty()) {
+			PacketOutputHandler handler = handlers.poll();
+			
+			try {
+				byte[] changed = handler.handle(event, output);
+				
+				// Don't break just because a plugin returned NULL
+				if (changed != null) {
+					output = changed;
+				} else {
+					throw new IllegalStateException("Handler cannot return a NULL array.");
+				}
+			} catch (OutOfMemoryError e) {
+				throw e;
+			} catch (ThreadDeath e) {
+				throw e;
+			} catch (Throwable e) {
+				reporter.reportMinimal(handler.getPlugin(), "PacketOutputHandler.handle()", e);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Invoke the post listeners and packet transmission, if any.
+	 * @param marker - the network marker, or NULL.
+	 */
+	public void invokePostEvent(PacketEvent event, NetworkMarker marker) {
+		if (marker == null)
+			return;
+		
+		if (NetworkMarker.hasPostListeners(marker)) {
+			// Invoke every sent listener
+			for (PacketPostListener listener : marker.getPostListeners()) {
+				try {
+					listener.onPostEvent(event);
+				} catch (OutOfMemoryError e) {
+					throw e;
+				} catch (ThreadDeath e) {
+					throw e;
+				} catch (Throwable e) {
+					reporter.reportMinimal(listener.getPlugin(), "SentListener.run()", e);
+				}
+			}
+		}
+		sendScheduledPackets(marker);
+	}
+	
+	/**
+	 * Send any scheduled packets.
+	 * @param marker - the network marker.
+	 */
+	private void sendScheduledPackets(NetworkMarker marker) {
+		// Next, invoke post packet transmission
+		List<ScheduledPacket> scheduled = NetworkMarker.readScheduledPackets(marker);
+		ProtocolManager manager = ProtocolLibrary.getProtocolManager();
+		
+		if (scheduled != null) {
+			for (ScheduledPacket packet : scheduled) {
+				packet.schedule(manager);
+			}
+		}
+	}
+ }

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java

@@ -21,13 +21,15 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import net.minecraft.server.Packet;
-
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.error.RethrowErrorReporter;
 import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.PrimitiveUtils;
+import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.common.primitives.Primitives;
 
 /**
  * A packet constructor that uses an internal Minecraft.
@@ -35,7 +37,6 @@ import com.google.common.collect.Lists;
  *
  */
 public class PacketConstructor {
-
 	/**
 	 * A packet constructor that automatically converts Bukkit types to their NMS conterpart. 
 	 * <p>
@@ -47,20 +48,25 @@ public class PacketConstructor {
 	private Constructor<?> constructorMethod;
 	
 	// The packet ID
-	private int packetID;
+	private PacketType type;
 	
 	// Used to unwrap Bukkit objects
 	private List<Unwrapper> unwrappers;
 	
+	// Parameters that need to be unwrapped
+	private Unwrapper[] paramUnwrapper;
+	
 	private PacketConstructor(Constructor<?> constructorMethod) {
 		this.constructorMethod = constructorMethod;
-		this.unwrappers = Lists.newArrayList((Unwrapper) new BukkitUnwrapper());
+		this.unwrappers = Lists.newArrayList((Unwrapper) new BukkitUnwrapper(new RethrowErrorReporter() ));
+		this.unwrappers.addAll(BukkitConverters.getUnwrappers()); 
 	}
 	
-	private PacketConstructor(int packetID, Constructor<?> constructorMethod, List<Unwrapper> unwrappers) {
-		this.packetID = packetID;
+	private PacketConstructor(PacketType type, Constructor<?> constructorMethod, List<Unwrapper> unwrappers, Unwrapper[] paramUnwrapper) {
+		this.type = type;
 		this.constructorMethod = constructorMethod;
 		this.unwrappers = unwrappers;
+		this.paramUnwrapper = paramUnwrapper;
 	}
 	
 	public ImmutableList<Unwrapper> getUnwrappers() {
@@ -69,10 +75,21 @@ public class PacketConstructor {
 	
 	/**
 	 * Retrieve the id of the packets this constructor creates.
+	 * <p>
+	 * Deprecated: Use {@link #getType()} instead.
 	 * @return The ID of the packets this constructor will create.
 	 */
+	@Deprecated
 	public int getPacketID() {
-		return packetID;
+		return type.getLegacyId();
+	}
+	
+	/**
+	 * Retrieve the type of the packets this constructor creates.
+	 * @return The type of the created packets.
+	 */
+	public PacketType getType() {
+		return type;
 	}
 	
 	/**
@@ -81,31 +98,61 @@ public class PacketConstructor {
 	 * @return A constructor with a different set of unwrappers.
 	 */
 	public PacketConstructor withUnwrappers(List<Unwrapper> unwrappers) {
-		return new PacketConstructor(packetID, constructorMethod, unwrappers);
+		return new PacketConstructor(type, constructorMethod, unwrappers, paramUnwrapper);
 	}
 
 	/**
-	 * Create a packet constructor that creates packets using the given types.
-	 * @param id - packet ID.
-	 * @param values - types to create.
+	 * Create a packet constructor that creates packets using the given ID.
+	 * <p>
+	 * Note that if you pass a Class<?> as a value, it will use its type directly.
+	 * <p>
+	 * Deprecated: Use {@link #withPacket(PacketType, Object[])} instead.
+	 * @param id - legacy (1.6.4) packet ID.
+	 * @param values - the values that will match each parameter in the desired constructor.
 	 * @return A packet constructor with these types.
 	 * @throws IllegalArgumentException If no packet constructor could be created with these types.
 	 */
+	@Deprecated
 	public PacketConstructor withPacket(int id, Object[] values) {
-		
+		return withPacket(PacketType.findLegacy(id), values);
+	}
+	
+	/**
+	 * Create a packet constructor that creates packets using the given types.
+	 * <p>
+	 * Note that if you pass a Class<?> as a value, it will use its type directly.
+	 * @param type - the type of the packet to create.
+	 * @param values - the values that will match each parameter in the desired constructor.
+	 * @return A packet constructor with these types.
+	 * @throws IllegalArgumentException If no packet constructor could be created with these types.
+	 */
+	public PacketConstructor withPacket(PacketType type, Object[] values) {
 		Class<?>[] types = new Class<?>[values.length];
+		Throwable lastException = null;
+		Unwrapper[] paramUnwrapper = new Unwrapper[values.length];		
 		
 		for (int i = 0; i < types.length; i++) {
 			// Default type
 			if (values[i] != null) {
-				types[i] = values[i].getClass();
+				types[i] = PacketConstructor.getClass(values[i]);
 				
 				for (Unwrapper unwrapper : unwrappers) {
-					Object result = unwrapper.unwrapItem(values[i]);
+					Object result = null;
+					
+					try {
+						result = unwrapper.unwrapItem(values[i]);
+					} catch (OutOfMemoryError e) {
+						throw e;
+					} catch (ThreadDeath e) {
+						throw e;
+					} catch (Throwable e) {
+						lastException = e;
+					}
 					
 					// Update type we're searching for
 					if (result != null) {
-						types[i] = result.getClass();
+						types[i] = PacketConstructor.getClass(result);
+						paramUnwrapper[i] = unwrapper;
 						break;
 					}
 				}
@@ -115,11 +162,10 @@ public class PacketConstructor {
 				types[i] = Object.class;
 			}
 		}
-		
-		Class<?> packetType = MinecraftRegistry.getPacketClassFromID(id);
+		Class<?> packetType = PacketRegistry.getPacketClassFromType(type, true);
 		
 		if (packetType == null)
-			throw new IllegalArgumentException("Could not find a packet by the id " + id);
+			throw new IllegalArgumentException("Could not find a packet by the type " + type);
 		
 		// Find the correct constructor
 		for (Constructor<?> constructor : packetType.getConstructors()) {
@@ -127,11 +173,10 @@ public class PacketConstructor {
 
 			if (isCompatible(types, params)) {
 				// Right, we've found our type
-				return new PacketConstructor(id, constructor, unwrappers);
+				return new PacketConstructor(type, constructor, unwrappers, paramUnwrapper);
 			}
 		}
-		
-		throw new IllegalArgumentException("No suitable constructor could be found.");
+		throw new IllegalArgumentException("No suitable constructor could be found.", lastException);
 	}
 	
 	/**
@@ -143,22 +188,16 @@ public class PacketConstructor {
 	 * @throws RuntimeException Minecraft threw an exception.
 	 */
 	public PacketContainer createPacket(Object... values) throws FieldAccessException {
-		
 		try {
-			// Convert types
+			// Convert types that needs to be converted
 			for (int i = 0; i < values.length; i++) {
-				for (Unwrapper unwrapper : unwrappers) {
-					Object converted = unwrapper.unwrapItem(values[i]);
-					
-					if (converted != null) {
-						values[i] = converted;
-						break;
-					}
+				if (paramUnwrapper[i] != null) {
+					values[i] = paramUnwrapper[i].unwrapItem(values[i]);
 				}
 			}
 			
-			Packet nmsPacket = (Packet) constructorMethod.newInstance(values);
-			return new PacketContainer(packetID, nmsPacket);
+			Object nmsPacket = constructorMethod.newInstance(values);
+			return new PacketContainer(type, nmsPacket);
 			
 		} catch (IllegalArgumentException e) {
 			throw e;
@@ -181,9 +220,9 @@ public class PacketConstructor {
 				Class<?> paramType = params[i];
 				
 				// The input type is always wrapped
-				if (PrimitiveUtils.isPrimitive(paramType)) {
+				if (!inputType.isPrimitive() && paramType.isPrimitive()) {
 					// Wrap it
-					paramType = PrimitiveUtils.wrap(paramType);
+					paramType = Primitives.wrap(paramType);
 				}
 				
 				// Compare assignability
@@ -198,6 +237,17 @@ public class PacketConstructor {
 		// Parameter count must match
 		return false;
 	}
+	
+	/**
+	 * Retrieve the class of an object, or just the class if it already is a class object.
+	 * @param obj - the object.
+	 * @return The class of an object.
+	 */
+	public static Class<?> getClass(Object obj) {
+		if (obj instanceof Class)
+			return (Class<?>) obj;
+		return obj.getClass();
+	}
 
 	/**
 	 * Represents a unwrapper for a constructor parameter.
@@ -207,8 +257,11 @@ public class PacketConstructor {
 	public static interface Unwrapper {
 		/**
 		 * Convert the given wrapped object to the equivalent net.minecraft.server object.
-		 * @param wrappedObject - wrapped object.
-		 * @return The net.minecraft.server object.
+		 * <p>
+		 * Note that we may pass in a class instead of object - in that case, the unwrapper should 
+		 * return the equivalent NMS class.
+		 * @param wrappedObject - wrapped object or class.
+		 * @return The equivalent net.minecraft.server object or class.
 		 */
 		public Object unwrapItem(Object wrappedObject);
 	}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java

@@ -0,0 +1,256 @@
+package com.comphenix.protocol.injector;
+
+import javax.annotation.Nonnull;
+
+import org.bukkit.Server;
+import org.bukkit.event.world.WorldInitEvent;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.executors.BukkitFutures;
+import com.comphenix.protocol.async.AsyncFilterManager;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.injector.player.InjectedServerConnection;
+import com.comphenix.protocol.injector.spigot.SpigotPacketInjector;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+
+public class PacketFilterBuilder {
+	public static final ReportType REPORT_TEMPORARY_EVENT_ERROR = new ReportType("Unable to register or handle temporary event.");
+	public static final ReportType REPORT_SPIGOT_IS_DELAYING_INJECTOR = new ReportType("Delaying due to Spigot.");
+	
+	private ClassLoader classLoader;
+	private Server server;
+	private Plugin library;
+	private MinecraftVersion mcVersion;
+	private DelayedSingleTask unhookTask;
+	private ErrorReporter reporter;
+	
+	// Whether or not we need to enable Netty
+	private AsyncFilterManager asyncManager;
+	private boolean nettyEnabled;
+
+	/**
+	 * Update the current class loader.
+	 * @param classLoader - current class loader.
+	 * @return This builder, for chaining.
+	 */
+	public PacketFilterBuilder classLoader(@Nonnull ClassLoader classLoader) {
+		if (classLoader == null)
+			throw new IllegalArgumentException("classLoader cannot be NULL.");
+		this.classLoader = classLoader;
+		return this;
+	}
+	
+	/**
+	 * Set the current server.
+	 * @param server - current server.
+	 * @return This builder, for chaining.
+	 */
+	public PacketFilterBuilder server(@Nonnull Server server) {
+		if (server == null)
+			throw new IllegalArgumentException("server cannot be NULL.");
+		this.server = server;
+		return this;
+	}
+	
+	/**
+	 * Set a reference to the plugin instance of ProtocolLib.
+	 * @param library - plugin instance.
+	 * @return This builder, for chaining.
+	 */
+	public PacketFilterBuilder library(@Nonnull Plugin library) {
+		if (library == null)
+			throw new IllegalArgumentException("library cannot be NULL.");
+		this.library = library;
+		return this;
+	}
+	
+	/**
+	 * Set the current Minecraft version.
+	 * @param mcVersion - Minecraft version.
+	 * @return This builder, for chaining. 
+	 */
+	public PacketFilterBuilder minecraftVersion(@Nonnull MinecraftVersion mcVersion) {
+		if (mcVersion == null)
+			throw new IllegalArgumentException("minecraftVersion cannot be NULL.");
+		this.mcVersion = mcVersion;
+		return this;
+	}
+	
+	/**
+	 * Set the task used to delay unhooking when ProtocolLib is no in use.
+	 * @param unhookTask - the unhook task.
+	 * @return This builder, for chaining.
+	 */
+	public PacketFilterBuilder unhookTask(@Nonnull DelayedSingleTask unhookTask) {
+		if (unhookTask == null)
+			throw new IllegalArgumentException("unhookTask cannot be NULL.");
+		this.unhookTask = unhookTask;
+		return this;
+	}
+	
+	/**
+	 * Set the error reporter.
+	 * @param reporter - new error reporter.
+	 * @return This builder, for chaining.
+	 */
+	public PacketFilterBuilder reporter(@Nonnull ErrorReporter reporter) {
+		if (reporter == null)
+			throw new IllegalArgumentException("reporter cannot be NULL.");
+		this.reporter = reporter;
+		return this;
+	}
+	
+	/**
+	 * Determine if we should prepare to hook Netty in Spigot.
+	 * <p>
+	 * This is calculated in the {@link #build()} method.
+	 * @return TRUE if we should, FALSE otherwise.
+	 */
+	public boolean isNettyEnabled() {
+		return nettyEnabled;
+	}
+	
+	/**
+	 * Retrieve the class loader set in this builder.
+	 * @return The class loader.
+	 */
+	public ClassLoader getClassLoader() {
+		return classLoader;
+	}
+
+	/**
+	 * Retrieve the current CraftBukkit server.
+	 * @return Current server.
+	 */
+	public Server getServer() {
+		return server;
+	}
+
+	/**
+	 * Retrieve a reference to the current ProtocolLib instance.
+	 * @return ProtocolLib.
+	 */
+	public Plugin getLibrary() {
+		return library;
+	}
+
+	/**
+	 * Retrieve the current Minecraft version.
+	 * @return Current version.
+	 */
+	public MinecraftVersion getMinecraftVersion() {
+		return mcVersion;
+	}
+
+	/**
+	 * Retrieve the task that is used to delay unhooking when ProtocolLib is no in use.
+	 * @return The unhook task.
+	 */
+	public DelayedSingleTask getUnhookTask() {
+		return unhookTask;
+	}
+
+	/**
+	 * Retrieve the error reporter.
+	 * @return Error reporter.
+	 */
+	public ErrorReporter getReporter() {
+		return reporter;
+	}
+
+	/**
+	 * Retrieve the asynchronous manager.
+	 * <p>
+	 * This is first constructed the {@link #build()} method.
+	 * @return The asynchronous manager.
+	 */
+	public AsyncFilterManager getAsyncManager() {
+		return asyncManager;
+	}
+	
+	/**
+	 * Create a new packet filter manager.
+	 * @return A new packet filter manager.
+	 */
+	public InternalManager build() {
+		if (reporter == null)
+			throw new IllegalArgumentException("reporter cannot be NULL.");
+		if (classLoader == null)
+			throw new IllegalArgumentException("classLoader cannot be NULL.");
+		
+		asyncManager = new AsyncFilterManager(reporter, server.getScheduler());
+		nettyEnabled = false;
+		
+		// Spigot
+		if (SpigotPacketInjector.canUseSpigotListener()) {
+			// If the server hasn't loaded yet - wait
+			if (InjectedServerConnection.getServerConnection(reporter, server) == null) {
+				// We need to delay this until we know if Netty is enabled
+				final DelayedPacketManager delayed = new DelayedPacketManager(reporter, mcVersion);
+
+				// They must reference each other
+				delayed.setAsynchronousManager(asyncManager);
+				asyncManager.setManager(delayed);
+				
+				Futures.addCallback(BukkitFutures.nextEvent(library, WorldInitEvent.class),
+						new FutureCallback<WorldInitEvent>() {
+							@Override
+							public void onSuccess(WorldInitEvent event) {
+								// Nevermind
+								if (delayed.isClosed())
+									return;
+
+								try {
+									registerSpigot(delayed);
+								} catch (Exception e) {
+									onFailure(e);
+								}
+							}
+
+							@Override
+							public void onFailure(Throwable error) {
+								reporter.reportWarning(PacketFilterBuilder.this, Report
+										.newBuilder(REPORT_TEMPORARY_EVENT_ERROR).error(error));
+							}
+						});
+				
+				reporter.reportWarning(this, Report.newBuilder(REPORT_SPIGOT_IS_DELAYING_INJECTOR));
+
+				// Let plugins use this version instead
+				return delayed;
+			} else {
+				nettyEnabled = !MinecraftReflection.isMinecraftObject(
+						InjectedServerConnection.getServerConnection(reporter, server));
+			}
+		}
+		
+		// Otherwise - construct the packet filter manager right away
+		return buildInternal();
+	}
+	
+	private void registerSpigot(DelayedPacketManager delayed) {
+		// Use netty if we have a non-standard ServerConnection class
+		nettyEnabled = !MinecraftReflection.isMinecraftObject(
+				InjectedServerConnection.getServerConnection(reporter, server));
+
+		// Switch to the standard manager
+		delayed.setDelegate(buildInternal());
+	}
+	
+	/**
+	 * Construct a new packet filter manager without checking for Netty.
+	 * @return A new packet filter manager.
+	 */
+	private PacketFilterManager buildInternal() {
+		PacketFilterManager manager = new PacketFilterManager(this);
+		
+		// It's a cyclic reference, but it's too late to fix now
+		asyncManager.setManager(manager);
+		return manager;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketInjector.java

@@ -1,249 +0,0 @@
-/*
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2012 Kristian S. Stangeland
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the 
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program; 
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
- *  02111-1307 USA
- */
-
-package com.comphenix.protocol.injector;
-
-import java.io.DataInputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.bukkit.entity.Player;
-
-import net.minecraft.server.Packet;
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
-
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
-import com.comphenix.protocol.reflect.FieldUtils;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-
-/**
- * This class is responsible for adding or removing proxy objects that intercepts recieved packets.
- * 
- * @author Kristian
- */
-class PacketInjector {
-
-	// The "put" method that associates a packet ID with a packet class
-	private static Method putMethod;
-	private static Object intHashMap;
-	
-	// The packet filter manager
-	private ListenerInvoker manager;
-	
-	// Error reporter
-	private ErrorReporter reporter;
-	
-	// Allows us to determine the sender
-	private PlayerInjectionHandler playerInjection;
-	
-	// Allows us to look up read packet injectors
-	private Map<Integer, ReadPacketModifier> readModifier;
-	
-	// Class loader
-	private ClassLoader classLoader;
-			
-	public PacketInjector(ClassLoader classLoader, ListenerInvoker manager, 
-						  PlayerInjectionHandler playerInjection, ErrorReporter reporter) throws IllegalAccessException {
-		
-		this.classLoader = classLoader;
-		this.manager = manager;
-		this.playerInjection = playerInjection;
-		this.reporter = reporter;
-		this.readModifier = new ConcurrentHashMap<Integer, ReadPacketModifier>();
-		initialize();
-	}
-	
-	/**
-	 * Undo a packet cancel.
-	 * @param id - the id of the packet.
-	 * @param packet - packet to uncancel.
-	 */
-	public void undoCancel(Integer id, Packet packet) {
-		ReadPacketModifier modifier = readModifier.get(id);
-		
-		// Cancelled packets are represented with NULL
-		if (modifier != null && modifier.getOverride(packet) == null) {
-			modifier.removeOverride(packet);
-		}
-	}
-	
-	private void initialize() throws IllegalAccessException {
-		if (intHashMap == null) {
-			// We're looking for the first static field with a Minecraft-object. This should be a IntHashMap.
-			Field intHashMapField = FuzzyReflection.fromClass(Packet.class, true).getFieldByType(FuzzyReflection.MINECRAFT_OBJECT);
-			
-			try {
-				intHashMap = FieldUtils.readField(intHashMapField, (Object) null, true);
-			} catch (IllegalArgumentException e) {
-				throw new RuntimeException("Minecraft is incompatible.", e);
-			}
-			
-			// Now, get the "put" method.
-			putMethod = FuzzyReflection.fromObject(intHashMap).getMethodByParameters("put", int.class, Object.class);
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public boolean addPacketHandler(int packetID) {
-		if (hasPacketHandler(packetID))
-			return false;
-		
-		Enhancer ex = new Enhancer();
-		
-		// Unfortunately, we can't easily distinguish between these two functions:
-		//   * Object lookup(int par1)
-		//   * Object removeObject(int par1)
-		
-		// So, we'll use the classMapToInt registry instead.
-		Map<Integer, Class> overwritten = MinecraftRegistry.getOverwrittenPackets();
-		Map<Integer, Class> previous = MinecraftRegistry.getPreviousPackets();
-		Map<Class, Integer> registry = MinecraftRegistry.getPacketToID();
-		Class old = MinecraftRegistry.getPacketClassFromID(packetID);
-		
-		// If this packet is not known
-		if (old == null) {
-			throw new IllegalStateException("Packet ID " + packetID + " is not a valid packet ID in this version.");
-		}
-		// Check for previous injections
-		if (!old.getName().startsWith("net.minecraft.")) {
-			throw new IllegalStateException("Packet " + packetID + " has already been injected.");
-		}
-		
-		// Subclass the specific packet class
-		ex.setSuperclass(old);
-		ex.setCallbackType(ReadPacketModifier.class);
-		ex.setClassLoader(classLoader);
-		Class proxy = ex.createClass();
-		
-		// Create the proxy handler
-		ReadPacketModifier modifier = new ReadPacketModifier(packetID, this, reporter);
-		readModifier.put(packetID, modifier);
-		
-		// Add a static reference
-		Enhancer.registerStaticCallbacks(proxy, new Callback[] { modifier });
-		
-		try {
-			// Override values
-			previous.put(packetID, old);
-			registry.put(proxy, packetID);
-			overwritten.put(packetID, proxy);
-			putMethod.invoke(intHashMap, packetID, proxy);
-			return true;
-			
-		} catch (IllegalArgumentException e) {
-			throw new RuntimeException("Illegal argument.", e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException("Cannot access method.", e);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("Exception occured in IntHashMap.put.", e);
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public boolean removePacketHandler(int packetID) {
-		if (!hasPacketHandler(packetID))
-			return false;
-		
-		Map<Class, Integer> registry = MinecraftRegistry.getPacketToID();
-		Map<Integer, Class> previous = MinecraftRegistry.getPreviousPackets();
-		Map<Integer, Class> overwritten = MinecraftRegistry.getOverwrittenPackets();
-		
-		// Use the old class definition
-		try {
-			Class old = previous.get(packetID);
-			Class proxy = MinecraftRegistry.getPacketClassFromID(packetID);
-			
-			putMethod.invoke(intHashMap, packetID, old);
-			previous.remove(packetID);
-			readModifier.remove(packetID);
-			registry.remove(proxy);
-			overwritten.remove(packetID);
-			return true;
-			
-			// Handle some problems
-		} catch (IllegalArgumentException e) {
-			return false;
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException("Cannot access method.", e);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("Exception occured in IntHashMap.put.", e);
-		}
-	}
-	
-	public boolean hasPacketHandler(int packetID) {
-		return MinecraftRegistry.getPreviousPackets().containsKey(packetID);
-	}
-	
-	public Set<Integer> getPacketHandlers() {
-		return MinecraftRegistry.getPreviousPackets().keySet();
-	}
-	
-	// Called from the ReadPacketModified monitor
-	PacketEvent packetRecieved(PacketContainer packet, DataInputStream input) {
-		Player client = playerInjection.getPlayerByConnection(input);
-		
-		// Never invoke a event if we don't know where it's from
-		if (client != null)
-			return packetRecieved(packet, client);
-		else
-			return null;
-	}
-	
-	/**
-	 * Let the packet listeners process the given packet.
-	 * @param packet - a packet to process.
-	 * @param client - the client that sent the packet.
-	 * @return The resulting packet event.
-	 */
-	public PacketEvent packetRecieved(PacketContainer packet, Player client) {
-	
-		PacketEvent event = PacketEvent.fromClient((Object) manager, packet, client);
-		
-		manager.invokePacketRecieving(event);
-		return event;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public synchronized void cleanupAll() {
-		Map<Integer, Class> overwritten = MinecraftRegistry.getOverwrittenPackets();
-		Map<Integer, Class> previous = MinecraftRegistry.getPreviousPackets();
-		
-		// Remove every packet handler
-		for (Integer id : previous.keySet().toArray(new Integer[0])) {
-			removePacketHandler(id);
-		}
-		
-		overwritten.clear();
-		previous.clear();
-	}
-
-	/**
-	 * Inform the current PlayerInjector that it should update the DataInputStream next.
-	 * @param player - the player to update.
-	 */
-	public void scheduleDataInputRefresh(Player player) {
-		playerInjection.scheduleDataInputRefresh(player);
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PluginVerifier.java

@@ -0,0 +1,231 @@
+package com.comphenix.protocol.injector;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginLoadOrder;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Determine if a plugin using ProtocolLib is correct.
+ * 
+ * @author Kristian
+ */
+class PluginVerifier {
+	/**
+	 * A named plugin cannot be found.
+	 * @author Kristian
+	 */
+	public static class PluginNotFoundException extends RuntimeException {
+		/**
+		 * Generated by Eclipse.
+		 */
+		private static final long serialVersionUID = 8956699101336877611L;
+
+		public PluginNotFoundException() {
+			super();
+		}
+
+		public PluginNotFoundException(String message) {
+			super(message);
+		}
+	}
+	
+	public enum VerificationResult {
+		VALID,
+		
+		/**
+		 * The plugin doesn't depend on ProtocolLib directly or indirectly.
+		 */
+		NO_DEPEND;
+		
+		/**
+		 * Determine if the verification was valid.
+		 */
+		public boolean isValid() {
+			return this == VALID;
+		}
+	}
+	
+	/**
+	 * Contains a list of plugins that will detect and use ProtocolLib dynamically, instead of relying on the dependency system.
+	 */
+	private static final Set<String> DYNAMIC_DEPENDENCY = Sets.newHashSet("mcore", "MassiveCore");
+	
+	/**
+	 * Set of plugins that have been loaded after ProtocolLib.
+	 */
+	private final Set<String> loadedAfter = new HashSet<String>();
+	
+	/**
+	 * Reference to ProtocolLib.
+	 */
+	private final Plugin dependency;
+	
+	/**
+	 * Construct a new plugin verifier.
+	 * @param dependency - reference to ProtocolLib, a dependency we require of plugins.
+	 */
+	public PluginVerifier(Plugin dependency) {
+		if (dependency == null)
+			throw new IllegalArgumentException("dependency cannot be NULL.");
+		// This would screw with the assumption in hasDependency(Plugin, Plugin)
+		if (safeConversion(dependency.getDescription().getLoadBefore()).size() > 0)
+			throw new IllegalArgumentException("dependency cannot have a load directives.");
+		
+		this.dependency = dependency;
+	}
+
+	/**
+	 * Retrieve a plugin by name.
+	 * @param pluginName - the non-null name of the plugin to retrieve.
+	 * @return The retrieved plugin.
+	 * @throws PluginNotFoundException If a plugin with the given name cannot be found.
+	 */
+	private Plugin getPlugin(String pluginName) {
+		Plugin plugin = getPluginOrDefault(pluginName);
+		
+		// Ensure that the plugin exists
+		if (plugin != null)
+			return plugin;
+		else
+			throw new PluginNotFoundException("Cannot find plugin " + pluginName); 
+	}
+	
+	/**
+	 * Retrieve a plugin by name.
+	 * @param pluginName - the non-null name of the plugin to retrieve.
+	 * @return The retrieved plugin, or NULL if not found.
+	 */
+	private Plugin getPluginOrDefault(String pluginName) {
+		return dependency.getServer().getPluginManager().getPlugin(pluginName);
+	}
+	
+	/**
+	 * Performs simple verifications on the given plugin.
+	 * <p>
+	 * Results may be cached.
+	 * @param pluginName - the plugin to verify.
+	 * @return A verification result.
+	 * @throws IllegalArgumentException If plugin name is NULL.
+	 * @throws PluginNotFoundException If a plugin with the given name cannot be found.
+	 */
+	public VerificationResult verify(String pluginName) {
+		if (pluginName == null)
+			throw new IllegalArgumentException("pluginName cannot be NULL.");
+		return verify(getPlugin(pluginName));
+	}
+	
+	/**
+	 * Performs simple verifications on the given plugin.
+	 * <p>
+	 * Results may be cached.
+	 * @param plugin - the plugin to verify.
+	 * @return A verification result.
+	 * @throws IllegalArgumentException If plugin name is NULL.
+	 * @throws PluginNotFoundException If a plugin with the given name cannot be found.
+	 */
+	public VerificationResult verify(Plugin plugin) {
+		if (plugin == null)
+			throw new IllegalArgumentException("plugin cannot be NULL.");
+		String name = plugin.getName();
+		
+		// Skip the load order check for ProtocolLib itself
+		if (!dependency.equals(plugin)) {
+			if (!loadedAfter.contains(name) && !DYNAMIC_DEPENDENCY.contains(name)) {
+				if (verifyLoadOrder(dependency, plugin)) {
+					// Memorize
+					loadedAfter.add(plugin.getName());
+				} else {
+					return VerificationResult.NO_DEPEND;
+				}
+			}
+		}
+		
+		// Everything seems to be in order
+		return VerificationResult.VALID;
+	}
+	
+	/**
+	 * Determine if a given plugin is guarenteed to be loaded before the other.
+	 * <p>
+	 * Note that the before plugin is assumed to have no "load" directives - that is, plugins to be 
+	 * loaded after itself. The after plugin may have "load" directives, but it is irrelevant for our purposes.
+	 * @param beforePlugin - the plugin that is loaded first.
+	 * @param afterPlugin - the plugin that is loaded last.
+	 * @return TRUE if it will, FALSE if it may or must load in the opposite other.
+	 */
+	private boolean verifyLoadOrder(Plugin beforePlugin, Plugin afterPlugin) {
+		// If a plugin has a dependency, it will be loaded after its dependency
+		if (hasDependency(afterPlugin, beforePlugin)) {
+			return true;
+		}
+		
+		// No dependency - check the load order
+		if (beforePlugin.getDescription().getLoad() == PluginLoadOrder.STARTUP && 
+			afterPlugin.getDescription().getLoad() == PluginLoadOrder.POSTWORLD) {
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Determine if a plugin has a given dependency, either directly or indirectly.
+	 * @param plugin - the plugin to check.
+	 * @param dependency - the dependency to find.
+	 * @return TRUE if the plugin has the given dependency, FALSE otherwise. 
+	 */
+	private boolean hasDependency(Plugin plugin, Plugin dependency) {
+		return hasDependency(plugin, dependency, Sets.<String>newHashSet());
+	}
+	
+	/**
+	 * Convert a list to a set. 
+	 * <p>
+	 * A null list will be converted to an empty set.
+	 * @param list - the list to convert.
+	 * @return The converted list.
+	 */
+	private Set<String> safeConversion(List<String> list) {
+		if (list == null)
+			return Collections.emptySet();
+		else
+			return Sets.newHashSet(list);
+	}
+	
+	// Avoid cycles. DFS.
+	private boolean hasDependency(Plugin plugin, Plugin dependency, Set<String> checking) {
+		Set<String> childNames = Sets.union(
+				 safeConversion(plugin.getDescription().getDepend()),
+				 safeConversion(plugin.getDescription().getSoftDepend())
+		);
+		
+		// Ensure that the same plugin isn't processed twice
+		if (!checking.add(plugin.getName())) {
+			throw new IllegalStateException("Cycle detected in dependency graph: " + plugin);
+		}
+		// Look for the dependency in the immediate children
+		if (childNames.contains(dependency.getName())) {
+			return true;
+		}
+		
+		// Recurse through their dependencies
+		for (String childName : childNames) {
+			Plugin childPlugin = getPluginOrDefault(childName);
+			
+			if (childPlugin != null && hasDependency(childPlugin, dependency, checking)) {
+				return true;
+			}
+		}
+		
+		// Cross edges are permitted
+		checking.remove(plugin.getName());
+		
+		// No dependency found!
+		return false;
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/ReadPacketModifier.java

@@ -1,145 +0,0 @@
-/*
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2012 Kristian S. Stangeland
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the 
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program; 
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
- *  02111-1307 USA
- */
-
-package com.comphenix.protocol.injector;
-
-import java.io.DataInputStream;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import com.comphenix.protocol.Packets;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-
-import net.minecraft.server.Packet;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-class ReadPacketModifier implements MethodInterceptor {
-
-	@SuppressWarnings("rawtypes")
-	private static Class[] parameters = { DataInputStream.class };
-
-	// A cancel marker
-	private static final Object CANCEL_MARKER = new Object();
-	
-	// Common for all packets of the same type
-	private PacketInjector packetInjector;
-	private int packetID;
-	
-	// Report errors
-	private ErrorReporter reporter;
-	
-	// Whether or not a packet has been cancelled
-	private static Map<Object, Object> override = Collections.synchronizedMap(new WeakHashMap<Object, Object>());
-	
-	public ReadPacketModifier(int packetID, PacketInjector packetInjector, ErrorReporter reporter) {
-		this.packetID = packetID;
-		this.packetInjector = packetInjector;
-		this.reporter = reporter;
-	}
-	
-	/**
-	 * Remove any packet overrides.
-	 * @param packet - the packet to rever
-	 */
-	public void removeOverride(Packet packet) {
-		override.remove(packet);
-	}
-	
-	/**
-	 * Retrieve the packet that overrides the methods of the given packet.
-	 * @param packet - the given packet.
-	 * @return Overriden object.
-	 */
-	public Object getOverride(Packet packet) {
-		return override.get(packet);
-	}
-
-	@Override
-	public Object intercept(Object thisObj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
-		
-		Object returnValue = null;
-		String methodName = method.getName();
-
-		// We always pass these down (otherwise, we'll end up with a infinite loop)
-		if (methodName.equals("hashCode") || methodName.equals("equals") || methodName.equals("toString")) {
-			return proxy.invokeSuper(thisObj, args);
-		}
-		
-		// Atomic retrieval
-		Object overridenObject = override.get(thisObj);
-		
-		if (overridenObject != null) {
-			// This packet has been cancelled
-			if (overridenObject == CANCEL_MARKER) {
-				// So, cancel all void methods
-				if (method.getReturnType().equals(Void.TYPE))
-					return null;
-				else // Revert to normal for everything else
-					overridenObject = thisObj;
-			}
-			
-			returnValue = proxy.invokeSuper(overridenObject, args);
-		} else {
-			returnValue = proxy.invokeSuper(thisObj, args);
-		}
-		
-		// Is this a readPacketData method?
-		if (returnValue == null && 
-				Arrays.equals(method.getParameterTypes(), parameters)) {
-			
-			try {
-				// We need this in order to get the correct player
-				DataInputStream input = (DataInputStream) args[0];
-	
-				// Let the people know
-				PacketContainer container = new PacketContainer(packetID, (Packet) thisObj);
-				PacketEvent event = packetInjector.packetRecieved(container, input);
-				
-				// Handle override
-				if (event != null) {
-					Packet result = event.getPacket().getHandle();
-					
-					if (event.isCancelled()) {
-						override.put(thisObj, CANCEL_MARKER);
-					} else if (!objectEquals(thisObj, result)) {
-						override.put(thisObj, result);
-					}
-					
-					// Update DataInputStream next time
-					if (!event.isCancelled() && packetID == Packets.Server.KEY_RESPONSE) {
-						packetInjector.scheduleDataInputRefresh(event.getPlayer());
-					}
-				}
-			} catch (Throwable e) {
-				// Minecraft cannot handle this error
-				reporter.reportDetailed(this, "Cannot handle clienet packet.", e, args[0]);
-			}
-		}
-		
-		return returnValue;
-	}
-	
-	private boolean objectEquals(Object a, Object b) {
-		return System.identityHashCode(a) != System.identityHashCode(b);
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java

@@ -21,35 +21,106 @@ import java.util.Collection;
 
 import com.comphenix.protocol.concurrency.AbstractConcurrentListenerMultimap;
 import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.timing.TimedListenerManager;
+import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
+import com.comphenix.protocol.timing.TimedTracker;
 
 /**
  * Registry of synchronous packet listeners.
  * 
  * @author Kristian
  */
-class SortedPacketListenerList extends AbstractConcurrentListenerMultimap<PacketListener> {
+public final class SortedPacketListenerList extends AbstractConcurrentListenerMultimap<PacketListener> {
+	// The current listener manager
+	private TimedListenerManager timedManager = TimedListenerManager.getInstance();
 	
+	public SortedPacketListenerList() {
+		super();
+	}
+
 	/**
 	 * Invokes the given packet event for every registered listener.
 	 * @param reporter - the error reporter that will be used to inform about listener exceptions.
 	 * @param event - the packet event to invoke.
 	 */
 	public void invokePacketRecieving(ErrorReporter reporter, PacketEvent event) {
-		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketID());
+		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
 		
 		if (list == null)
 			return;
 
 		// The returned list is thread-safe
-		for (PrioritizedListener<PacketListener> element : list) {
-			try {
-				element.getListener().onPacketReceiving(event);
-			} catch (Throwable e) {
-				// Minecraft doesn't want your Exception.
-				reporter.reportMinimal(element.getListener().getPlugin(), "onPacketReceiving()", e);
+		if (timedManager.isTiming()) {
+			for (PrioritizedListener<PacketListener> element : list) {
+				TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_CLIENT_SIDE);
+				long token = tracker.beginTracking();
+				
+				// Measure and record the execution time
+				invokeReceivingListener(reporter, event, element);
+				tracker.endTracking(token, event.getPacketType());
 			}
+		} else {
+			for (PrioritizedListener<PacketListener> element : list) {
+				invokeReceivingListener(reporter, event, element);
+			}
+		}
+	}
+	
+	/**
+	 * Invokes the given packet event for every registered listener of the given priority.
+	 * @param reporter - the error reporter that will be used to inform about listener exceptions.
+	 * @param event - the packet event to invoke.
+	 * @param priorityFilter - the required priority for a listener to be invoked.
+	 */
+	public void invokePacketRecieving(ErrorReporter reporter, PacketEvent event, ListenerPriority priorityFilter) {
+		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
+		
+		if (list == null)
+			return;
+
+		// The returned list is thread-safe
+		if (timedManager.isTiming()) {
+			for (PrioritizedListener<PacketListener> element : list) {
+				if (element.getPriority() == priorityFilter) {
+					TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_CLIENT_SIDE);
+					long token = tracker.beginTracking();
+					
+					// Measure and record the execution time
+					invokeReceivingListener(reporter, event, element);
+					tracker.endTracking(token, event.getPacketType());
+				}
+			}
+		} else {
+			for (PrioritizedListener<PacketListener> element : list) {
+				if (element.getPriority() == priorityFilter) {
+					invokeReceivingListener(reporter, event, element);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Invoke a particular receiving listener.
+	 * @param reporter - the error reporter.
+	 * @param event - the related packet event.
+	 * @param element - the listener to invoke.
+	 */
+	private final void invokeReceivingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
+		try {
+			event.setReadOnly(element.getPriority() == ListenerPriority.MONITOR);
+			element.getListener().onPacketReceiving(event);
+			
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
+		} catch (Throwable e) {
+			// Minecraft doesn't want your Exception.
+			reporter.reportMinimal(element.getListener().getPlugin(), "onPacketReceiving(PacketEvent)", e, 
+					event.getPacket().getHandle());
 		}
 	}
 	
@@ -59,19 +130,78 @@ class SortedPacketListenerList extends AbstractConcurrentListenerMultimap<Packet
 	 * @param event - the packet event to invoke.
 	 */
 	public void invokePacketSending(ErrorReporter reporter, PacketEvent event) {
-		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketID());
+		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
 		
 		if (list == null)
 			return;
 		
-		for (PrioritizedListener<PacketListener> element : list) {
-			try {
-				element.getListener().onPacketSending(event);
-			} catch (Throwable e) {
-				// Minecraft doesn't want your Exception.
-				reporter.reportMinimal(element.getListener().getPlugin(), "onPacketSending()", e);
+		if (timedManager.isTiming()) {
+			for (PrioritizedListener<PacketListener> element : list) {
+				TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_SERVER_SIDE);
+				long token = tracker.beginTracking();
+				
+				// Measure and record the execution time
+				invokeSendingListener(reporter, event, element);
+				tracker.endTracking(token, event.getPacketType());
+			}
+		} else {
+			for (PrioritizedListener<PacketListener> element : list) {
+				invokeSendingListener(reporter, event, element);
 			}
 		}
 	}
 	
+	/**
+	 * Invokes the given packet event for every registered listener of the given priority.
+	 * @param reporter - the error reporter that will be used to inform about listener exceptions.
+	 * @param event - the packet event to invoke.
+	 * @param priorityFilter - the required priority for a listener to be invoked.
+	 */
+	public void invokePacketSending(ErrorReporter reporter, PacketEvent event, ListenerPriority priorityFilter) {
+		Collection<PrioritizedListener<PacketListener>> list = getListener(event.getPacketType());
+		
+		if (list == null)
+			return;
+		
+		if (timedManager.isTiming()) {
+			for (PrioritizedListener<PacketListener> element : list) {
+				if (element.getPriority() == priorityFilter) {
+				TimedTracker tracker = timedManager.getTracker(element.getListener(), ListenerType.SYNC_SERVER_SIDE);
+				long token = tracker.beginTracking();
+				
+				// Measure and record the execution time
+				invokeSendingListener(reporter, event, element);
+				tracker.endTracking(token, event.getPacketType());
+				}
+			}
+		} else {
+			for (PrioritizedListener<PacketListener> element : list) {
+				if (element.getPriority() == priorityFilter) {
+					invokeSendingListener(reporter, event, element);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Invoke a particular sending listener.
+	 * @param reporter - the error reporter.
+	 * @param event - the related packet event.
+	 * @param element - the listener to invoke.
+	 */
+	private final void invokeSendingListener(ErrorReporter reporter, PacketEvent event, PrioritizedListener<PacketListener> element) {
+		try {
+			event.setReadOnly(element.getPriority() == ListenerPriority.MONITOR);
+			element.getListener().onPacketSending(event);
+			
+		} catch (OutOfMemoryError e) {
+			throw e;
+		} catch (ThreadDeath e) {
+			throw e;
+		} catch (Throwable e) {
+			// Minecraft doesn't want your Exception.
+			reporter.reportMinimal(element.getListener().getPlugin(), "onPacketSending(PacketEvent)", e, 
+					event.getPacket().getHandle());
+		}
+	}
 }