Update version to 4.5.1 for release

Use the map to check for indices instead of getting the object

Addresses #850

.github/ISSUE_TEMPLATE.md

@@ -4,7 +4,8 @@ Make sure you've done the following:
 - [ ] You're using the latest build for your server version
 - [ ] This isn't an issue caused by another plugin
 - [ ] You've checked for duplicate issues
+- [ ] You didn't use `/reload`
 
 Debug paste link:
 
-Description and relevant errors:
+Description and relevant errors:

.github/ISSUE_TEMPLATE/api-question.md

@@ -0,0 +1,29 @@
+---
+name: API question
+about: Questions related to using ProtocolLib in your plugins
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Make sure you're doing the following**
+- [ ] You're using the latest build for your server version
+- [ ] This isn't an issue caused by another plugin
+- [ ] You've checked for duplicate issues
+- [ ] You didn't use `/reload`
+
+**Describe the question**
+A clear and concise description of what your question is.
+
+**API method(s) used**
+List what API method(s) you're using
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Code**
+If applicable, add relevant code from your project
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version Info**
+Provide your ProtocolLib install info with `/protocol dump` through pastebin.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -175,4 +175,8 @@ pip-log.txt
 .DS_Store
 
 # Log4J files
+logs/
+
+.gradle/
+build/
 logs/

.travis.yml

@@ -1,12 +1,11 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 script: mvn clean test
-#before_install: cd ProtocolLib
 install: true
 notifications:
   email:
     recipients:
       - "dmulloy2@live.com"
     on_success: change
-    on_failure: always
+    on_failure: always

Readme.md

@@ -1,163 +1,169 @@
-# ProtocolLib [![Travis Status](https://travis-ci.org/dmulloy2/ProtocolLib.svg?branch=master)](https://travis-ci.org/dmulloy2/ProtocolLib)
-
-Certain tasks are impossible to perform with the standard Bukkit API, and may require 
-working with and even modify Minecraft directly. A common technique is to modify incoming 
-and outgoing [packets](http://www.wiki.vg/Protocol), or inject custom packets into the
-stream. This is quite cumbersome to do, however, and most implementations will break 
-as soon as a new version of Minecraft has been released, mostly due to obfuscation.
-
-Critically, different plugins that use this approach may _hook_ into the same classes, 
-with unpredictable outcomes. More than often this causes plugins to crash, but it may also 
-lead to more subtle bugs.
-
-Currently maintained by dmulloy2 on behalf of [Spigot](http://www.spigotmc.org/).
-
-### Resources
-
-* [Resource Page](http://www.spigotmc.org/resources/protocollib.1997/)
-* [Dev Builds](http://ci.dmulloy2.net/job/ProtocolLib)
-* [JavaDoc](http://ci.dmulloy2.net/job/ProtocolLib/javadoc)
-
-### Compilation
-
-ProtocolLib is built with Maven and requires Spigot and SpigotAPI, which can be found [here](http://www.spigotmc.org/wiki/buildtools/).
-
-### A new API
-
-__ProtocolLib__ attempts to solve this problem by providing a event API, much like Bukkit, 
-that allows plugins to monitor, modify, or cancel packets sent and received. But, more importantly, 
-the API also hides all the gritty, obfuscated classes with a simple index based read/write system. 
-You no longer have to reference CraftBukkit!
-
-### Using ProtocolLib
-
-To use this library, first add ProtocolLib.jar to your Java build path. Then, add ProtocolLib
-as a dependency or soft dependency to your plugin.yml file like any other plugin:
-
-````yml
-depend: [ProtocolLib]
-````
-
-You can also add ProtocolLib as a Maven dependency:
-
-````xml
-<repositories>
-  <repository>
-    <id>dmulloy2-repo</id>
-    <url>http://repo.dmulloy2.net/content/groups/public/</url>
-  </repository>
-  ...
-</repositories>
-
-<dependencies>
-  <dependency>
-    <groupId>com.comphenix.protocol</groupId>
-    <artifactId>ProtocolLib</artifactId>
-    <version>3.6.5</version>
-  </dependency>
-</dependencies>
-````
-
-Then get a reference to ProtocolManager in onLoad() or onEnable() and you're good to go.
-
-````java
-private ProtocolManager protocolManager;
-
-public void onLoad() {
-    protocolManager = ProtocolLibrary.getProtocolManager();
-}
-````
-
-To listen for packets sent by the server to a client, add a server-side listener:
-
-````java
-// Disable all sound effects
-protocolManager.addPacketListener(
-  new PacketAdapter(this, ListenerPriority.NORMAL, 
-          PacketType.Play.Server.NAMED_SOUND_EFFECT) {
-    @Override
-    public void onPacketSending(PacketEvent event) {
-        // Item packets (id: 0x29)
-        if (event.getPacketType() == 
-                PacketType.Play.Server.NAMED_SOUND_EFFECT) {
-            event.setCancelled(true);
-        }
-    }
-});
-````
-
-It's also possible to read and modify the content of these packets. For instance, you can create a global
-censor by listening for Packet3Chat events:
-
-````java
-// Censor
-protocolManager.addPacketListener(new PacketAdapter(this,
-        ListenerPriority.NORMAL, 
-        PacketType.Play.Client.CHAT) {
-    @Override
-    public void onPacketReceiving(PacketEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CHAT) {
-            PacketContainer packet = event.getPacket();
-            String message = packet.getStrings().read(0);
-
-            if (message.contains("shit")
-                    || message.contains("damn")) {
-                event.setCancelled(true);
-                event.getPlayer().sendMessage("Bad manners!");
-            }
-        }
-    }
-});
-````
-
-### Sending packets
-
-Normally, you might have to do something ugly like the following:
-
-````java
-Packet60Explosion fakeExplosion = new Packet60Explosion();
-	
-fakeExplosion.a = player.getLocation().getX();
-fakeExplosion.b = player.getLocation().getY();
-fakeExplosion.c = player.getLocation().getZ();
-fakeExplosion.d = 3.0F;
-fakeExplosion.e = new ArrayList<Object>();
-
-((CraftPlayer) player).getHandle().netServerHandler.sendPacket(fakeExplosion);
-````
-
-But with ProtocolLib, you can turn that into something more manageable. Notice that 
-you don't have to create an ArrayList with this version:
-
-````java
-
-PacketContainer fakeExplosion = new PacketContainer(PacketType.Play.Server.EXPLOSION);
-fakeExplosion.getDoubles().
-    write(0, player.getLocation().getX()).
-    write(1, player.getLocation().getY()).
-    write(2, player.getLocation().getZ());
-fakeExplosion.getFloat().write(0, 3.0F);
-
-try {
-    protocolManager.sendServerPacket(player, fakeExplosion);
-} catch (InvocationTargetException e) {
-    throw new RuntimeException(
-        "Cannot send packet " + fakeExplosion, e);
-}
-````
-
-### Compatibility
-
-One of the main goals of this project was to achieve maximum compatibility with CraftBukkit. And the end
-result is quite flexible. Aside from netty package changes, it should be resilient against future changes.
-It's likely that I won't have to update ProtocolLib for anything but bug fixes and new features.
-
-How is this possible? It all comes down to reflection in the end. Essentially, no name is hard coded - 
-every field, method and class is deduced by looking at field types, package names or parameter
-types. It's remarkably consistent across different versions.
-
-
-### Incompatibility
-
-The following plugins (to be expanded) are not compatible with ProtocolLib:
-* TagAPI
+# ProtocolLib [![Travis Status](https://travis-ci.org/dmulloy2/ProtocolLib.svg?branch=master)](https://travis-ci.org/dmulloy2/ProtocolLib)
+
+Certain tasks are impossible to perform with the standard Bukkit API, and may require
+working with and even modify Minecraft directly. A common technique is to modify incoming
+and outgoing [packets](https://www.wiki.vg/Protocol), or inject custom packets into the
+stream. This is quite cumbersome to do, however, and most implementations will break
+as soon as a new version of Minecraft has been released, mostly due to obfuscation.
+
+Critically, different plugins that use this approach may _hook_ into the same classes,
+with unpredictable outcomes. More than often this causes plugins to crash, but it may also
+lead to more subtle bugs.
+
+Currently maintained by dmulloy2 on behalf of [Spigot](https://www.spigotmc.org/).
+
+### Resources
+
+* [Resource Page](https://www.spigotmc.org/resources/protocollib.1997/)
+* [Dev Builds](https://ci.dmulloy2.net/job/ProtocolLib)
+* [JavaDoc](https://ci.dmulloy2.net/job/ProtocolLib/javadoc)
+
+### Compilation
+
+ProtocolLib is built with Maven and requires Spigot and SpigotAPI, which can be found [here](https://www.spigotmc.org/wiki/buildtools/).
+
+### A new API
+
+__ProtocolLib__ attempts to solve this problem by providing a event API, much like Bukkit,
+that allows plugins to monitor, modify, or cancel packets sent and received. But, more importantly,
+the API also hides all the gritty, obfuscated classes with a simple index based read/write system.
+You no longer have to reference CraftBukkit!
+
+### Using ProtocolLib
+
+To use this library, first add ProtocolLib.jar to your Java build path. Then, add ProtocolLib
+as a dependency or soft dependency to your plugin.yml file like any other plugin:
+
+````yml
+depend: [ProtocolLib]
+````
+
+You can also add ProtocolLib as a Maven dependency:
+
+````xml
+<repositories>
+  <repository>
+    <id>dmulloy2-repo</id>
+    <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+  </repository>
+  ...
+</repositories>
+
+<dependencies>
+  <dependency>
+    <groupId>com.comphenix.protocol</groupId>
+    <artifactId>ProtocolLib</artifactId>
+    <version>4.5.0</version>
+  </dependency>
+</dependencies>
+````
+
+Or use the maven dependency with gradle:
+
+```gradle
+repositories {
+    maven { url "https://repo.dmulloy2.net/nexus/repository/public/" }
+}
+
+dependencies {
+    compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "4.5.0";
+}
+```
+
+Then get a reference to ProtocolManager in onLoad() or onEnable() and you're good to go.
+
+````java
+private ProtocolManager protocolManager;
+
+public void onLoad() {
+    protocolManager = ProtocolLibrary.getProtocolManager();
+}
+````
+
+To listen for packets sent by the server to a client, add a server-side listener:
+
+````java
+// Disable all sound effects
+protocolManager.addPacketListener(
+  new PacketAdapter(this, ListenerPriority.NORMAL,
+          PacketType.Play.Server.NAMED_SOUND_EFFECT) {
+    @Override
+    public void onPacketSending(PacketEvent event) {
+        // Item packets (id: 0x29)
+        if (event.getPacketType() ==
+                PacketType.Play.Server.NAMED_SOUND_EFFECT) {
+            event.setCancelled(true);
+        }
+    }
+});
+````
+
+It's also possible to read and modify the content of these packets. For instance, you can create a global
+censor by listening for Packet3Chat events:
+
+````java
+// Censor
+protocolManager.addPacketListener(new PacketAdapter(this,
+        ListenerPriority.NORMAL,
+        PacketType.Play.Client.CHAT) {
+    @Override
+    public void onPacketReceiving(PacketEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.CHAT) {
+            PacketContainer packet = event.getPacket();
+            String message = packet.getStrings().read(0);
+
+            if (message.contains("shit")
+                    || message.contains("damn")) {
+                event.setCancelled(true);
+                event.getPlayer().sendMessage("Bad manners!");
+            }
+        }
+    }
+});
+````
+
+### Sending packets
+
+Normally, you might have to do something ugly like the following:
+
+````java
+Packet60Explosion fakeExplosion = new Packet60Explosion();
+
+fakeExplosion.a = player.getLocation().getX();
+fakeExplosion.b = player.getLocation().getY();
+fakeExplosion.c = player.getLocation().getZ();
+fakeExplosion.d = 3.0F;
+fakeExplosion.e = new ArrayList<Object>();
+
+((CraftPlayer) player).getHandle().netServerHandler.sendPacket(fakeExplosion);
+````
+
+But with ProtocolLib, you can turn that into something more manageable. Notice that
+you don't have to create an ArrayList with this version:
+
+````java
+
+PacketContainer fakeExplosion = new PacketContainer(PacketType.Play.Server.EXPLOSION);
+fakeExplosion.getDoubles().
+    write(0, player.getLocation().getX()).
+    write(1, player.getLocation().getY()).
+    write(2, player.getLocation().getZ());
+fakeExplosion.getFloat().write(0, 3.0F);
+
+try {
+    protocolManager.sendServerPacket(player, fakeExplosion);
+} catch (InvocationTargetException e) {
+    throw new RuntimeException(
+        "Cannot send packet " + fakeExplosion, e);
+}
+````
+
+### Compatibility
+
+One of the main goals of this project was to achieve maximum compatibility with CraftBukkit. And the end
+result is quite flexible. Aside from netty package changes, it should be resilient against future changes.
+It's likely that I won't have to update ProtocolLib for anything but bug fixes and new features.
+
+How is this possible? It all comes down to reflection in the end. Essentially, no name is hard coded -
+every field, method and class is deduced by looking at field types, package names or parameter
+types. It's remarkably consistent across different versions.

modules/API/pom.xml

@@ -1,195 +0,0 @@
-<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>
-  <artifactId>ProtocolLib-API</artifactId>
-  <name>ProtocolLib-API</name>
-  <version>${minorVersion}</version>
-
-  <description>Provides read/write access to the Minecraft protocol.</description>
-  <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
-  <packaging>jar</packaging>
-
-  <parent>
-    <groupId>com.comphenix.protocol</groupId>
-    <artifactId>ProtocolLib-Parent</artifactId>
-    <version>v4-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.number></project.build.number>
-    <project.fullVersion>${project.version}</project.fullVersion>
-    <spigotVersion>1.12-pre2-SNAPSHOT</spigotVersion>
-  </properties>
-
-  <build>
-    <defaultGoal>clean install</defaultGoal>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <testSourceDirectory>src/test/java</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Main-Class>com.comphenix.protocol.Application</Main-Class>
-              <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.fullVersion}</Implementation-Version>
-              <Implementation-Vendor>dmulloy2</Implementation-Vendor>
-            </manifestEntries>
-          </archive>
-          <finalName>ProtocolLib</finalName>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>projectVersion</name>
-              <value>${project.version}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>jenkins</id>
-      <activation>
-        <property>
-          <name>env.BUILD_NUMBER</name>
-        </property>
-      </activation>
-      <properties>
-        <project.build.number>-b${env.BUILD_NUMBER}</project.build.number>
-        <project.fullVersion>${project.version}${project.build.number}</project.fullVersion>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <properties>
-        <project.fullVersion>${project.version}</project.fullVersion>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.0</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.10.3</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <!-- TODO: Look into signing releases
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          -->
-
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <scm>
-    <connection>scm:git:git://github.com/dmulloy2/ProtocolLib.git</connection>
-    <developerConnection>scm:git:git@github.com:dmulloy2/ProtocolLib.git</developerConnection>
-    <url>https://github.com/dmulloy2/ProtocolLib</url>
-  </scm>
-
-  <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>
-
-  <developers>
-    <developer>
-      <id>dmulloy2</id>
-      <name>Dan Mulloy</name>
-      <url>http://dmulloy2.net/</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>former author</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-</project>

modules/API/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java

@@ -1,108 +0,0 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2015 dmulloy2
- *
- *  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.netty;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLogger;
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.injector.netty.ProtocolRegistry;
-import com.comphenix.protocol.injector.packet.MapContainer;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.google.common.collect.Maps;
-
-/**
- * @author dmulloy2
- */
-
-public class NettyProtocolRegistry extends ProtocolRegistry {
-
-	public NettyProtocolRegistry() {
-		super();
-	}
-
-	@Override
-	protected synchronized void initialize() {
-		Object[] protocols = enumProtocol.getEnumConstants();
-
-		// ID to Packet class maps
-		Map<Object, Map<Integer, Class<?>>> serverMaps = Maps.newLinkedHashMap();
-		Map<Object, Map<Integer, Class<?>>> clientMaps = Maps.newLinkedHashMap();
-
-		Register result = new Register();
-		StructureModifier<Object> modifier = null;
-
-		// Iterate through the protocols
-		for (Object protocol : protocols) {
-			if (modifier == null)
-				modifier = new StructureModifier<Object>(protocol.getClass().getSuperclass(), false);
-			StructureModifier<Map<Object, Map<Integer, Class<?>>>> maps = modifier.withTarget(protocol).withType(Map.class);
-			for (Entry<Object, Map<Integer, Class<?>>> entry : maps.read(0).entrySet()) {
-				String direction = entry.getKey().toString();
-				if (direction.contains("CLIENTBOUND")) { // Sent by Server
-					serverMaps.put(protocol, entry.getValue());
-				} else if (direction.contains("SERVERBOUND")) { // Sent by Client
-					clientMaps.put(protocol, entry.getValue());
-				}
-			}
-		}
-
-		// Maps we have to occasionally check have changed
-		for (Map<Integer, Class<?>> map : serverMaps.values()) {
-			result.containers.add(new MapContainer(map));
-		}
-
-		for (Map<Integer, Class<?>> map : clientMaps.values()) {
-			result.containers.add(new MapContainer(map));
-		}
-
-		for (Object protocol : protocols) {
-			Enum<?> enumProtocol = (Enum<?>) protocol;
-			Protocol equivalent = Protocol.fromVanilla(enumProtocol);
-			
-			// Associate known types
-			if (serverMaps.containsKey(protocol))
-				associatePackets(result, serverMaps.get(protocol), equivalent, Sender.SERVER);
-			if (clientMaps.containsKey(protocol))
-				associatePackets(result, clientMaps.get(protocol), equivalent, Sender.CLIENT);
-		}
-
-		// Exchange (thread safe, as we have only one writer)
-		this.register = result;
-	}
-
-	@Override
-	protected void associatePackets(Register register, Map<Integer, Class<?>> lookup, Protocol protocol, Sender sender) {
-		for (Entry<Integer, Class<?>> entry : lookup.entrySet()) {
-			PacketType type = PacketType.fromCurrent(protocol, sender, entry.getKey(), entry.getValue());
-
-			try {
-				register.typeToClass.put(type, entry.getValue());
-
-				if (sender == Sender.SERVER)
-					register.serverPackets.add(type);
-				if (sender == Sender.CLIENT)
-					register.clientPackets.add(type);
-			} catch (Exception ex) {
-				ProtocolLogger.debug("Encountered an exception associating packet " + type, ex);
-			}
-		}
-	}
-}

modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java

@@ -1,173 +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.reflect.cloning;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.BlockPosition;
-import com.comphenix.protocol.wrappers.BukkitConverters;
-import com.comphenix.protocol.wrappers.ChunkPosition;
-import com.comphenix.protocol.wrappers.MinecraftKey;
-import com.comphenix.protocol.wrappers.WrappedBlockData;
-import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import com.comphenix.protocol.wrappers.WrappedServerPing;
-import com.google.common.collect.Maps;
-
-/**
- * Represents an object that can clone a specific list of Bukkit- and Minecraft-related objects.
- * 
- * @author Kristian
- */
-public class BukkitCloner implements Cloner {
-	// List of classes we support
-	private final Map<Integer, Class<?>> clonableClasses = Maps.newConcurrentMap();
-
-	public BukkitCloner() {
-		addClass(0, MinecraftReflection.getItemStackClass());
-		addClass(1, MinecraftReflection.getDataWatcherClass());
-
-		// Try to add position classes
-		try {
-			addClass(2, MinecraftReflection.getBlockPositionClass());
-		} catch (Throwable ex) {
-		}
-
-		try {
-			addClass(3, MinecraftReflection.getChunkPositionClass());
-		} catch (Throwable ex) {
-		}
-
-		if (MinecraftReflection.isUsingNetty()) {
-			addClass(4, MinecraftReflection.getServerPingClass());
-		}
-
-		if (MinecraftReflection.watcherObjectExists()) {
-			addClass(5, MinecraftReflection.getDataWatcherSerializerClass());
-			addClass(6, MinecraftReflection.getMinecraftKeyClass());
-		}
-
-		try {
-			addClass(7, MinecraftReflection.getIBlockDataClass());
-		} catch (Throwable ex) {
-		}
-
-		try {
-			addClass(8, MinecraftReflection.getNonNullListClass());
-		} catch (Throwable ex) {
-		}
-	}
-
-	private void addClass(int id, Class<?> clazz) {
-		if (clazz != null)
-			clonableClasses.put(id, clazz);
-	}
-
-	private int findMatchingClass(Class<?> type) {
-		// See if is a subclass of any of our supported superclasses
-		for (Entry<Integer, Class<?>> entry : clonableClasses.entrySet()) {
-			if (entry.getValue().isAssignableFrom(type)) {
-				return entry.getKey();
-			}
-		}
-
-		return -1;
-	}
-
-	@Override
-	public boolean canClone(Object source) {
-		if (source == null)
-			return false;
-
-		return findMatchingClass(source.getClass()) >= 0;
-	}
-
-	@Override
-	public Object clone(Object source) {
-		if (source == null)
-			throw new IllegalArgumentException("source cannot be NULL.");
-
-		// Convert to a wrapper
-		switch (findMatchingClass(source.getClass())) {
-			case 0:
-				return MinecraftReflection.getMinecraftItemStack(MinecraftReflection.getBukkitItemStack(source).clone());
-			case 1:
-				EquivalentConverter<WrappedDataWatcher> dataConverter = BukkitConverters.getDataWatcherConverter();
-				return dataConverter.getGeneric(clonableClasses.get(1), dataConverter.getSpecific(source).deepClone());
-			case 2:
-				EquivalentConverter<BlockPosition> blockConverter = BlockPosition.getConverter();
-				return blockConverter.getGeneric(clonableClasses.get(2), blockConverter.getSpecific(source));
-			case 3:
-				EquivalentConverter<ChunkPosition> chunkConverter = ChunkPosition.getConverter();
-				return chunkConverter.getGeneric(clonableClasses.get(3), chunkConverter.getSpecific(source));
-			case 4:
-				EquivalentConverter<WrappedServerPing> serverConverter = BukkitConverters.getWrappedServerPingConverter();
-				return serverConverter.getGeneric(clonableClasses.get(4), serverConverter.getSpecific(source).deepClone());
-			case 5:
-				return source;
-			case 6:
-				EquivalentConverter<MinecraftKey> keyConverter = MinecraftKey.getConverter();
-				return keyConverter.getGeneric(clonableClasses.get(6), keyConverter.getSpecific(source));
-			case 7:
-				EquivalentConverter<WrappedBlockData> blockDataConverter = BukkitConverters.getWrappedBlockDataConverter();
-				return blockDataConverter.getGeneric(clonableClasses.get(7), blockDataConverter.getSpecific(source).deepClone());
-			case 8:
-				return nonNullListCloner().clone(source);
-			default:
-				throw new IllegalArgumentException("Cannot clone objects of type " + source.getClass());
-		}
-	}
-
-	private static Constructor<?> nonNullList = null;
-
-	private static final Cloner nonNullListCloner() {
-		return new Cloner() {
-			@Override
-			public boolean canClone(Object source) {
-				return MinecraftReflection.is(MinecraftReflection.getNonNullListClass(), source);
-			}
-
-			@Override
-			public Object clone(Object source) {
-				StructureModifier<Object> modifier = new StructureModifier<>(source.getClass(), true).withTarget(source);
-				List<?> list = (List<?>) modifier.read(0);
-				Object empty = modifier.read(1);
-
-				if (nonNullList == null) {
-					try {
-						nonNullList = source.getClass().getDeclaredConstructor(List.class, Object.class);
-						nonNullList.setAccessible(true);
-					} catch (ReflectiveOperationException ex) {
-						throw new RuntimeException("Could not find NonNullList constructor", ex);
-					}
-				}
-
-				try {
-					return nonNullList.newInstance(new ArrayList<>(list), empty);
-				} catch (ReflectiveOperationException ex) {
-					throw new RuntimeException("Could not create new NonNullList", ex);
-				}
-			}
-		};
-	}
-}

modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/EmptyClassVisitor.java

@@ -1,57 +0,0 @@
-package com.comphenix.protocol.reflect.compiler;
-
-import net.sf.cglib.asm.AnnotationVisitor;
-import net.sf.cglib.asm.Attribute;
-import net.sf.cglib.asm.ClassVisitor;
-import net.sf.cglib.asm.FieldVisitor;
-import net.sf.cglib.asm.MethodVisitor;
-
-public abstract class EmptyClassVisitor implements ClassVisitor {
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-		// NOP
-	}
-
-	@Override
-	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public void visitAttribute(Attribute attr) {
-		// NOP
-	}
-
-	@Override
-	public void visitEnd() {
-		// NOP
-	}
-
-	@Override
-	public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public void visitInnerClass(String name, String outerName, String innerName, int access) {
-		// NOP
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public void visitOuterClass(String owner, String name, String desc) {
-		// NOP
-	}
-
-	@Override
-	public void visitSource(String source, String debug) {
-		// NOP
-	}
-}

modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/EmptyMethodVisitor.java

@@ -1,132 +0,0 @@
-package com.comphenix.protocol.reflect.compiler;
-
-import net.sf.cglib.asm.AnnotationVisitor;
-import net.sf.cglib.asm.Attribute;
-import net.sf.cglib.asm.Label;
-import net.sf.cglib.asm.MethodVisitor;
-
-public class EmptyMethodVisitor implements MethodVisitor {
-	@Override
-	public AnnotationVisitor visitAnnotationDefault() {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
-		// NOP
-		return null;
-	}
-
-	@Override
-	public void visitAttribute(Attribute attr) {
-		// NOP
-	}
-
-	@Override
-	public void visitCode() {
-		// NOP
-	}
-
-	@Override
-	public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
-		// NOP
-	}
-
-	@Override
-	public void visitInsn(int opcode) {
-		// NOP
-	}
-
-	@Override
-	public void visitIntInsn(int opcode, int operand) {
-		// NOP
-	}
-
-	@Override
-	public void visitVarInsn(int opcode, int var) {
-		// NOP
-	}
-
-	@Override
-	public void visitTypeInsn(int opcode, String type) {
-		// NOP
-	}
-
-	@Override
-	public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-		// NOP
-	}
-
-	@Override
-	public void visitMethodInsn(int opcode, String owner, String name, String desc) {
-		// NOP
-	}
-
-	@Override
-	public void visitJumpInsn(int opcode, Label label) {
-		// NOP
-	}
-
-	@Override
-	public void visitLabel(Label label) {
-		// NOP
-	}
-
-	@Override
-	public void visitLdcInsn(Object cst) {
-		// NOP
-	}
-
-	@Override
-	public void visitIincInsn(int var, int increment) {
-		// NOP
-	}
-
-	@Override
-	public void visitTableSwitchInsn(int min, int max, Label dflt, Label[] labels) {
-		// NOP
-	}
-
-	@Override
-	public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
-		// NOP
-	}
-
-	@Override
-	public void visitMultiANewArrayInsn(String desc, int dims) {
-		// NOP
-	}
-
-	@Override
-	public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
-		// NOP
-	}
-
-	@Override
-	public void visitLocalVariable(String name, String desc, String signature, Label start,
-			Label end, int index) {
-		// NOP
-	}
-
-	@Override
-	public void visitLineNumber(int line, Label start) {
-		// NOP
-	}
-
-	@Override
-	public void visitMaxs(int maxStack, int maxLocals) {
-		// NOP
-	}
-
-	@Override
-	public void visitEnd() {
-		// NOP
-	}
-}

modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java

@@ -1,183 +0,0 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2015 dmulloy2
- *
- *  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.wrappers;
-
-import java.lang.reflect.Modifier;
-
-import org.bukkit.Material;
-
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.MethodAccessor;
-import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
-import com.comphenix.protocol.utility.MinecraftReflection;
-
-/**
- * Represents a wrapper around IBlockData.
- *
- * @author dmulloy2
- */
-
-public class WrappedBlockData extends AbstractWrapper {
-	private static final Class<?> MAGIC_NUMBERS = MinecraftReflection.getCraftBukkitClass("util.CraftMagicNumbers");
-	private static final Class<?> IBLOCK_DATA = MinecraftReflection.getIBlockDataClass();
-	private static final Class<?> BLOCK = MinecraftReflection.getBlockClass();
-
-	private static MethodAccessor FROM_LEGACY_DATA = null;
-	private static MethodAccessor TO_LEGACY_DATA = null;
-	private static MethodAccessor GET_NMS_BLOCK = null;
-	private static MethodAccessor GET_BLOCK = null;
-
-	static {
-		FuzzyReflection fuzzy = FuzzyReflection.fromClass(BLOCK);
-		FuzzyMethodContract contract = FuzzyMethodContract.newBuilder()
-				.banModifier(Modifier.STATIC)
-				.parameterExactArray(int.class)
-				.returnTypeExact(IBLOCK_DATA)
-				.build();
-		FROM_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract));
-
-		contract = FuzzyMethodContract.newBuilder()
-				.banModifier(Modifier.STATIC)
-				.parameterExactArray(IBLOCK_DATA)
-				.returnTypeExact(int.class)
-				.build();
-		TO_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract, "toLegacyData"));
-
-		fuzzy = FuzzyReflection.fromClass(MAGIC_NUMBERS);
-		GET_NMS_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
-				new Class<?>[] { Material.class }));
-
-		fuzzy = FuzzyReflection.fromClass(IBLOCK_DATA);
-		GET_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
-				new Class<?>[0]));
-	}
-
-	public WrappedBlockData(Object handle) {
-		super(IBLOCK_DATA);
-		setHandle(handle);
-	}
-
-	/**
-	 * Retrieves the type of this BlockData.
-	 * @return The type of this BlockData.
-	 */
-	public Material getType() {
-		Object block = GET_BLOCK.invoke(handle);
-		return BukkitConverters.getBlockConverter().getSpecific(block);
-	}
-
-	/**
-	 * Retrieves the type id of this BlockData.
-	 * @return The type id of this BlockData.
-	 * @deprecated ID's are deprecated
-	 */
-	@Deprecated
-	public int getTypeId() {
-		Object block = GET_BLOCK.invoke(handle);
-		return BukkitConverters.getBlockIDConverter().getSpecific(block);
-	}
-
-	/**
-	 * Retrieves the data of this BlockData.
-	 * @return The data of this BlockData.
-	 */
-	public int getData() {
-		Object block = GET_BLOCK.invoke(handle);
-		return (Integer) TO_LEGACY_DATA.invoke(block, handle);
-	}
-
-	/**
-	 * Sets the type of this BlockData.
-	 * @param type New type
-	 */
-	public void setType(Material type) {
-		setTypeAndData(type, 0);
-	}
-
-	/**
-	 * Sets the data of this BlockData.
-	 * @param data New data
-	 */
-	public void setData(int data) {
-		setTypeAndData(getType(), data);
-	}
-
-	/**
-	 * Sets the type and data of this BlockData.
-	 * @param type New type
-	 * @param data New data
-	 */
-	public void setTypeAndData(Material type, int data) {
-		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
-		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
-		setHandle(blockData);
-	}
-
-	/**
-	 * Creates a new BlockData instance with the given type and no data.
-	 * @param type Block type
-	 * @return New BlockData
-	 */
-	public static WrappedBlockData createData(Material type) {
-		return createData(type, 0);
-	}
-
-	/**
-	 * Creates a new BlockData instance with the given type and data.
-	 * @param type Block type
-	 * @param data Block data
-	 * @return New BlockData
-	 */
-	public static WrappedBlockData createData(Material type, int data) {
-		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
-		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
-		return new WrappedBlockData(blockData);
-	}
-
-	/**
-	 * Retrieve a deep copy of the current wrapper object.
-	 * @return The cloned object.
-	 */
-	public WrappedBlockData deepClone() {
-		return WrappedBlockData.createData(getType(), getData());
-	}
-
-	@Override
-	public String toString() {
-		return "WrappedBlockData[handle=" + handle + "]";
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + getType().hashCode();
-		result = prime * result + getData();
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof WrappedBlockData) {
-			WrappedBlockData that = (WrappedBlockData) o;
-			return this.getType() == that.getType() && getData() == that.getData();
-		}
-
-		return false;
-	}
-}

modules/ProtocolLib/pom.xml

@@ -1,263 +0,0 @@
-<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>
-  <artifactId>ProtocolLib</artifactId>
-  <name>ProtocolLib</name>
-  <version>${minorVersion}</version>
-
-  <description>Provides read/write access to the Minecraft protocol.</description>
-  <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
-  <packaging>jar</packaging>
-
-  <parent>
-    <groupId>com.comphenix.protocol</groupId>
-    <artifactId>ProtocolLib-Parent</artifactId>
-    <version>v4-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.number></project.build.number>
-    <project.fullVersion>${project.version}</project.fullVersion>
-  </properties>
-
-  <build>
-    <defaultGoal>clean install</defaultGoal>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <testSourceDirectory>src/test/java</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <shadedArtifactAttached>false</shadedArtifactAttached>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-
-              <relocations>
-                <relocation>
-                  <pattern>net.sf</pattern>
-                  <shadedPattern>com.comphenix.net.sf</shadedPattern>
-                </relocation>
-              </relocations>
-
-              <artifactSet>
-                <excludes>
-                  <exclude>org.spigotmc:spigot</exclude>
-                  <exclude>org.spigotmc:spigot-api</exclude>
-                  <exclude>junit:junit</exclude>
-                  <exclude>io.netty:*</exclude>
-                </excludes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Main-Class>com.comphenix.protocol.Application</Main-Class>
-              <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.fullVersion}</Implementation-Version>
-              <Implementation-Vendor>dmulloy2</Implementation-Vendor>
-            </manifestEntries>
-          </archive>
-          <finalName>${project.name}</finalName>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>projectVersion</name>
-              <value>${project.version}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>jenkins</id>
-      <activation>
-        <property>
-          <name>env.BUILD_NUMBER</name>
-        </property>
-      </activation>
-      <properties>
-        <project.build.number>-b${env.BUILD_NUMBER}</project.build.number>
-        <project.fullVersion>${project.version}${project.build.number}</project.fullVersion>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <properties>
-        <project.fullVersion>${project.version}</project.fullVersion>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.0</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.10.3</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <!-- TODO: Look into signing releases
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          -->
-
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <scm>
-    <connection>scm:git:git://github.com/dmulloy2/ProtocolLib.git</connection>
-    <developerConnection>scm:git:git@github.com:dmulloy2/ProtocolLib.git</developerConnection>
-    <url>https://github.com/dmulloy2/ProtocolLib</url>
-  </scm>
-
-  <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>
-
-  <developers>
-    <developer>
-      <id>dmulloy2</id>
-      <name>Dan Mulloy</name>
-      <url>http://dmulloy2.net/</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>former author</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.comphenix.protocol</groupId>
-      <artifactId>ProtocolLib-API</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- Testing dependencies -->
-    <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>1.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

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

@@ -1,256 +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.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.Validate;
-import org.bukkit.World;
-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;
-
-/**
- * Used to perform certain operations on entities.
- * 
- * @author Kristian
- */
-class EntityUtilities {
-
-	private static Field entityTrackerField;
-	private static Field trackedEntitiesField;
-	private static Field trackedPlayersField;
-	private static Field trackerField;
-	
-	private static Method scanPlayersMethod;
-
-	/*
-	public static void updateEntity2(Entity entity, List<Player> observers) {
-		EntityTrackerEntry entry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
-
-		List<EntityPlayer> nmsPlayers = getNmsPlayers(observers);
-
-		entry.trackedPlayers.removeAll(nmsPlayers);
-		entry.scanPlayers(nmsPlayers);
-	}
-	*/
-
-	public static void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException {
-		if (entity == null || !entity.isValid()) {
-			return;
-		}
-
-		try {
-			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
-			if (trackerEntry == null) {
-				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + ".");
-			}
-
-			if (trackedPlayersField == null) {
-				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
-			}
-			
-			// Phew, finally there.
-			Collection<?> trackedPlayers = getTrackedPlayers(trackedPlayersField, trackerEntry);
-			List<Object> nmsPlayers = unwrapBukkit(observers);
-
-			trackedPlayers.removeAll(nmsPlayers);
-			
-			// We have to rely on a NAME once again. Damn it.
-			// TODO: Make sure this stays up to date with version changes - 1.8 - 1.10
-			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) {
-		if (entity == null || !entity.isValid()) {
-			return new ArrayList<>();
-		}
-
-		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 + ".");
-			}
-
-			if (trackedPlayersField == null) {
-				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
-			}
-
-			Collection<?> trackedPlayers = getTrackedPlayers(trackedPlayersField, trackerEntry);
-
-			// 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);
-		}
-	}
-
-	// Damn you, Paper
-	private static Collection<?> getTrackedPlayers(Field field, Object entry) throws IllegalAccessException {
-		Validate.notNull(field, "Cannot find 'trackedPlayers' field.");
-		Validate.notNull(entry, "entry cannot be null!");
-
-		Object value = FieldUtils.readField(field, entry, false);
-
-		if (value instanceof Collection) {
-			return (Collection<?>) value;
-		} else if (value instanceof Map) {
-			return ((Map<?, ?>) value).keySet();
-		} else {
-			// Please. No more changes.
-			throw new IllegalStateException("trackedPlayers field was an unknown type: expected Collection or Map, but got " + value.getClass());
-		}
-	}
-
-	/*
-	private static EntityTrackerEntry getEntityTrackerEntry2(World world, int entityID) {
-		WorldServer worldServer = ((CraftWorld) world).getHandle();
-		EntityTracker tracker = worldServer.tracker;
-		return tracker.trackedEntities.get(entityID);
-	}
-	*/
-
-	private static Object getEntityTrackerEntry(World world, int entityID) throws FieldAccessException, IllegalArgumentException {
-		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
-		Object worldServer = unwrapper.unwrapItem(world);
-
-		if (entityTrackerField == null)
-			entityTrackerField = FuzzyReflection.fromObject(worldServer).
-									getFieldByType("tracker", MinecraftReflection.getEntityTrackerClass());
-		
-		// Get the tracker
-		Object tracker = null;
-		
-		try {
-			tracker = FieldUtils.readField(entityTrackerField, worldServer, false);
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Cannot access 'tracker' field due to security limitations.", e);
-		}
-
-		// Looking for an IntHashMap in the tracker entry
-		if (trackedEntitiesField == null) {
-			trackedEntitiesField = FuzzyReflection.fromObject(tracker, false)
-					.getFieldByType("trackedEntities", MinecraftReflection.getIntHashMapClass());
-		}
-
-		// Read the map
-		Object trackedEntities = null;
-
-		try {
-			trackedEntities = FieldUtils.readField(trackedEntitiesField, tracker, false);
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Cannot access 'trackedEntities' field due to security limitations.", e);
-		}
-
-		return WrappedIntHashMap.fromHandle(trackedEntities).get(entityID);
-	}
-
-	/**
-	 * Retrieve entity from a ID, even it it's newly created.
-	 * @return The associated 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 {
-						Class<?> entryClass = MinecraftReflection.getMinecraftClass("EntityTrackerEntry");
-						trackerField = entryClass.getDeclaredField("tracker");
-					} catch (NoSuchFieldException e) {
-						// Assume it's the first entity field then
-						trackerField = FuzzyReflection.fromObject(trackerEntry, true)
-								.getFieldByType("tracker", MinecraftReflection.getEntityClass());
-					}
-				}
-
-				tracker = FieldUtils.readField(trackerField, trackerEntry, true);
-			}
-
-			// 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;
-		} catch (Exception e) {
-			throw new FieldAccessException("Cannot find entity from ID " + entityID + ".", e);
-		}
-	}
-
-	private static List<Object> unwrapBukkit(List<Player> players) {
-		List<Object> output = Lists.newArrayList();
-		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
-		
-		// Get the NMS equivalent
-		for (Player player : players) {
-			Object result = unwrapper.unwrapItem(player);
-			
-			if (result != null)
-				output.add(result);
-			else
-				throw new IllegalArgumentException("Cannot unwrap item " + player);
-		}
-		
-		return output;
-	}
-}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Metrics.java

@@ -1,741 +0,0 @@
-/*
- * Copyright 2011-2013 Tyler Blair. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and contributors and should not be interpreted as representing official policies,
- * either expressed or implied, of anybody else.
- */
-package com.comphenix.protocol.metrics;
-
-import java.io.*;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-import com.comphenix.protocol.utility.Util;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-
-public class Metrics {
-
-    /**
-     * The current revision number
-     */
-    private final static int REVISION = 7;
-
-    /**
-     * The base url of the metrics domain
-     */
-    private static final String BASE_URL = "http://report.mcstats.org";
-
-    /**
-     * The url used to report a server's status
-     */
-    private static final String REPORT_URL = "/plugin/%s";
-
-    /**
-     * Interval of time to ping (in minutes)
-     */
-    private static final int PING_INTERVAL = 15;
-
-    /**
-     * The plugin this metrics submits for
-     */
-    private final Plugin plugin;
-
-    /**
-     * All of the custom graphs to submit to metrics
-     */
-    private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
-
-    /**
-     * The plugin configuration file
-     */
-    private final YamlConfiguration configuration;
-
-    /**
-     * The plugin configuration file
-     */
-    private final File configurationFile;
-
-    /**
-     * Unique server id
-     */
-    private final String guid;
-
-    /**
-     * Debug mode
-     */
-    private final boolean debug;
-
-    /**
-     * Lock for synchronization
-     */
-    private final Object optOutLock = new Object();
-
-    /**
-     * The scheduled task
-     */
-    private volatile BukkitTask task;
-
-    public Metrics(final Plugin plugin) throws IOException {
-        if (plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null");
-        }
-
-        this.plugin = plugin;
-
-        // load the config
-        configurationFile = getConfigFile();
-        configuration = YamlConfiguration.loadConfiguration(configurationFile);
-
-        // add some defaults
-        configuration.addDefault("opt-out", false);
-        configuration.addDefault("guid", UUID.randomUUID().toString());
-        configuration.addDefault("debug", false);
-
-        // Do we need to create the file?
-        if (configuration.get("guid", null) == null) {
-            configuration.options().header("http://mcstats.org").copyDefaults(true);
-            configuration.save(configurationFile);
-        }
-
-        // Load the guid then
-        guid = configuration.getString("guid");
-        debug = configuration.getBoolean("debug", false);
-    }
-
-    /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
-     * website. Plotters can be added to the graph object returned.
-     *
-     * @param name The name of the graph
-     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-     */
-    public Graph createGraph(final String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Graph name cannot be null");
-        }
-
-        // Construct the graph object
-        final Graph graph = new Graph(name);
-
-        // Now we can add our graph
-        graphs.add(graph);
-
-        // and return back
-        return graph;
-    }
-
-    /**
-     * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
-     *
-     * @param graph The name of the graph
-     */
-    public void addGraph(final Graph graph) {
-        if (graph == null) {
-            throw new IllegalArgumentException("Graph cannot be null");
-        }
-
-        graphs.add(graph);
-    }
-
-    /**
-     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
-     * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
-     * ticks.
-     *
-     * @return True if statistics measuring is running, otherwise false.
-     */
-    public boolean start() {
-        synchronized (optOutLock) {
-            // Did we opt out?
-            if (isOptOut()) {
-                return false;
-            }
-
-            // Is metrics already running?
-            if (task != null) {
-                return true;
-            }
-
-            // Begin hitting the server with glorious data
-            task = new BukkitRunnable() {
-                private boolean firstPost = true;
-
-                @Override
-				public void run() {
-                    try {
-                        // This has to be synchronized or it can collide with the disable method.
-                        synchronized (optOutLock) {
-                            // Disable Task, if it is running and the server owner decided to opt-out
-                            if (isOptOut() && task != null) {
-                                task.cancel();
-                                task = null;
-                                // Tell all plotters to stop gathering information.
-                                for (Graph graph : graphs) {
-                                    graph.onOptOut();
-                                }
-                            }
-                        }
-
-                        // We use the inverse of firstPost because if it is the first time we are posting,
-                        // it is not a interval ping, so it evaluates to FALSE
-                        // Each time thereafter it will evaluate to TRUE, i.e PING!
-                        postPlugin(!firstPost);
-
-                        // After the first post we set firstPost to false
-                        // Each post thereafter will be a ping
-                        firstPost = false;
-                    } catch (IOException e) {
-                        if (debug) {
-                            Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
-                        }
-                    }
-                }
-            }.runTaskTimerAsynchronously(plugin, 0, PING_INTERVAL * 1200);
-            return true;
-        }
-    }
-
-    /**
-     * Has the server owner denied plugin metrics?
-     *
-     * @return true if metrics should be opted out of it
-     */
-    public boolean isOptOut() {
-        synchronized (optOutLock) {
-            try {
-                // Reload the metrics file
-                configuration.load(getConfigFile());
-            } catch (IOException ex) {
-                if (debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            } catch (InvalidConfigurationException ex) {
-                if (debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            }
-            return configuration.getBoolean("opt-out", false);
-        }
-    }
-
-    /**
-     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
-     *
-     * @throws IOException If configuration saving fails
-     */
-    public void enable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if (isOptOut()) {
-                configuration.set("opt-out", false);
-                configuration.save(configurationFile);
-            }
-
-            // Enable Task, if it is not running
-            if (task == null) {
-                start();
-            }
-        }
-    }
-
-    /**
-     * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
-     *
-     * @throws IOException If configuration saving fails
-     */
-    public void disable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if (!isOptOut()) {
-                configuration.set("opt-out", true);
-                configuration.save(configurationFile);
-            }
-
-            // Disable Task, if it is running
-            if (task != null) {
-                task.cancel();
-                task = null;
-            }
-        }
-    }
-
-    /**
-     * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
-     *
-     * @return the File object for the config file
-     */
-    public File getConfigFile() {
-        // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
-        // is to abuse the plugin object we already have
-        // plugin.getDataFolder() => base/plugins/PluginA/
-        // pluginsFolder => base/plugins/
-        // The base is not necessarily relative to the startup directory.
-        File pluginsFolder = plugin.getDataFolder().getParentFile();
-
-        // return => base/plugins/PluginMetrics/config.yml
-        return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
-    }
-
-    /**
-     * Generic method that posts a plugin to the metrics website
-     * 
-     * @throws IOException If posting fails
-     */
-    private void postPlugin(final boolean isPing) throws IOException {
-        // Server software specific section
-        PluginDescriptionFile description = plugin.getDescription();
-        String pluginName = description.getName();
-        boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-        String pluginVersion = trimVersion(description.getVersion()); // ProtocolLib
-        String serverVersion = Bukkit.getVersion();
-        int playersOnline = Util.getOnlinePlayers().size(); // ProtocolLib
-
-        // END server software specific section -- all code below does not use any code outside of this class / Java
-
-        // Construct the post data
-        StringBuilder json = new StringBuilder(1024);
-        json.append('{');
-
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        appendJSONPair(json, "guid", guid);
-        appendJSONPair(json, "plugin_version", pluginVersion);
-        appendJSONPair(json, "server_version", serverVersion);
-        appendJSONPair(json, "players_online", Integer.toString(playersOnline));
-
-        // New data as of R6
-        String osname = System.getProperty("os.name");
-        String osarch = System.getProperty("os.arch");
-        String osversion = System.getProperty("os.version");
-        String java_version = System.getProperty("java.version");
-        int coreCount = Runtime.getRuntime().availableProcessors();
-
-        // normalize os arch .. amd64 -> x86_64
-        if (osarch.equals("amd64")) {
-            osarch = "x86_64";
-        }
-
-        appendJSONPair(json, "osname", osname);
-        appendJSONPair(json, "osarch", osarch);
-        appendJSONPair(json, "osversion", osversion);
-        appendJSONPair(json, "cores", Integer.toString(coreCount));
-        appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0");
-        appendJSONPair(json, "java_version", java_version);
-
-        // If we're pinging, append it
-        if (isPing) {
-            appendJSONPair(json, "ping", "1");
-        }
-
-        if (graphs.size() > 0) {
-            synchronized (graphs) {
-                json.append(',');
-                json.append('"');
-                json.append("graphs");
-                json.append('"');
-                json.append(':');
-                json.append('{');
-
-                boolean firstGraph = true;
-
-                final Iterator<Graph> iter = graphs.iterator();
-
-                while (iter.hasNext()) {
-                    Graph graph = iter.next();
-
-                    StringBuilder graphJson = new StringBuilder();
-                    graphJson.append('{');
-
-                    for (Plotter plotter : graph.getPlotters()) {
-                        appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
-                    }
-
-                    graphJson.append('}');
-
-                    if (!firstGraph) {
-                        json.append(',');
-                    }
-
-                    json.append(escapeJSON(graph.getName()));
-                    json.append(':');
-                    json.append(graphJson);
-
-                    firstGraph = false;
-                }
-
-                json.append('}');
-            }
-        }
-
-        // close json
-        json.append('}');
-
-        // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
-
-        // Connect to the website
-        URLConnection connection;
-
-        // Mineshafter creates a socks proxy, so we can safely bypass it
-        // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
-            connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
-            connection = url.openConnection();
-        }
-
-
-        byte[] uncompressed = json.toString().getBytes();
-        byte[] compressed = gzip(json.toString());
-
-        // Headers
-        connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
-        connection.addRequestProperty("Content-Type", "application/json");
-        connection.addRequestProperty("Content-Encoding", "gzip");
-        connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
-        connection.addRequestProperty("Accept", "application/json");
-        connection.addRequestProperty("Connection", "close");
-
-        connection.setDoOutput(true);
-
-        if (debug) {
-            System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
-        }
-
-        // Write the data
-        OutputStream os = connection.getOutputStream();
-        os.write(compressed);
-        os.flush();
-
-        // Now read the response
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
-
-        // close resources
-        os.close();
-        reader.close();
-
-        if (response == null || response.startsWith("ERR") || response.startsWith("7")) {
-            if (response == null) {
-                response = "null";
-            } else if (response.startsWith("7")) {
-                response = response.substring(response.startsWith("7,") ? 2 : 1);
-            }
-
-            throw new IOException(response);
-        } else {
-            // Is this the first update this hour?
-            if (response.equals("1") || response.contains("This is your first update this hour")) {
-                synchronized (graphs) {
-                    final Iterator<Graph> iter = graphs.iterator();
-
-                    while (iter.hasNext()) {
-                        final Graph graph = iter.next();
-
-                        for (Plotter plotter : graph.getPlotters()) {
-                            plotter.reset();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Trim the version string to not include the build number
-    // Not doing this has an interesting effect on the version graph
-    private String trimVersion(String version) {
-    	return version.contains("-b") ? version.substring(0, version.indexOf("-b")) : version;
-    }
-
-    /**
-     * GZip compress a string of bytes
-     *
-     * @param input Input to compress
-     * @return Compressed string
-     */
-    public static byte[] gzip(String input) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        GZIPOutputStream gzos = null;
-
-        try {
-            gzos = new GZIPOutputStream(baos);
-            gzos.write(input.getBytes("UTF-8"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (gzos != null) try {
-                gzos.close();
-            } catch (IOException ignore) {
-            }
-        }
-
-        return baos.toByteArray();
-    }
-
-    /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-     *
-     * @return true if mineshafter is installed on the server
-     */
-    private boolean isMineshafterPresent() {
-        try {
-            Class.forName("mineshafter.MineServer");
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    // Appends a json encoded key/value pair to the given string builder.
-    private static void appendJSONPair(StringBuilder json, String key, String value) {
-        boolean isValueNumeric = false;
-
-        try {
-            if (value.equals("0") || !value.endsWith("0")) {
-                Double.parseDouble(value);
-                isValueNumeric = true;
-            }
-        } catch (NumberFormatException e) {
-            isValueNumeric = false;
-        }
-
-        if (json.charAt(json.length() - 1) != '{') {
-            json.append(',');
-        }
-
-        json.append(escapeJSON(key));
-        json.append(':');
-
-        if (isValueNumeric) {
-            json.append(value);
-        } else {
-            json.append(escapeJSON(value));
-        }
-    }
-
-    // Escape a string to create a valid JSON string
-    private static String escapeJSON(String text) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append('"');
-        for (int index = 0; index < text.length(); index++) {
-            char chr = text.charAt(index);
-
-            switch (chr) {
-                case '"':
-                case '\\':
-                    builder.append('\\');
-                    builder.append(chr);
-                    break;
-                case '\b':
-                    builder.append("\\b");
-                    break;
-                case '\t':
-                    builder.append("\\t");
-                    break;
-                case '\n':
-                    builder.append("\\n");
-                    break;
-                case '\r':
-                    builder.append("\\r");
-                    break;
-                default:
-                    if (chr < ' ') {
-                        String t = "000" + Integer.toHexString(chr);
-                        builder.append("\\u" + t.substring(t.length() - 4));
-                    } else {
-                        builder.append(chr);
-                    }
-                    break;
-            }
-        }
-        builder.append('"');
-
-        return builder.toString();
-    }
-
-    // Encode text as UTF-8
-    private static String urlEncode(final String text) throws UnsupportedEncodingException {
-        return URLEncoder.encode(text, "UTF-8");
-    }
-
-    /**
-     * Represents a custom graph on the website
-     */
-    public static class Graph {
-
-        /**
-         * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
-         * rejected
-         */
-        private final String name;
-
-        /**
-         * The set of plotters that are contained within this graph
-         */
-        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-        private Graph(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Gets the graph's name
-         *
-         * @return the Graph's name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Add a plotter to the graph, which will be used to plot entries
-         *
-         * @param plotter the plotter to add to the graph
-         */
-        public void addPlotter(final Plotter plotter) {
-            plotters.add(plotter);
-        }
-
-        /**
-         * Remove a plotter from the graph
-         *
-         * @param plotter the plotter to remove from the graph
-         */
-        public void removePlotter(final Plotter plotter) {
-            plotters.remove(plotter);
-        }
-
-        /**
-         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
-         *
-         * @return an unmodifiable {@link java.util.Set} of the plotter objects
-         */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(plotters);
-        }
-
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Graph)) {
-                return false;
-            }
-
-            final Graph graph = (Graph) object;
-            return graph.name.equals(name);
-        }
-
-        /**
-         * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
-         */
-        protected void onOptOut() {
-        }
-    }
-
-    /**
-     * Interface used to collect custom data for a plugin
-     */
-    public static abstract class Plotter {
-
-        /**
-         * The plot's name
-         */
-        private final String name;
-
-        /**
-         * Construct a plotter with the default plot name
-         */
-        public Plotter() {
-            this("Default");
-        }
-
-        /**
-         * Construct a plotter with a specific plot name
-         *
-         * @param name the name of the plotter to use, which will show up on the website
-         */
-        public Plotter(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the current value for the plotted point. Since this function defers to an external function it may or may
-         * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
-         * from any thread so care should be taken when accessing resources that need to be synchronized.
-         *
-         * @return the current value for the point to be plotted.
-         */
-        public abstract int getValue();
-
-        /**
-         * Get the column name for the plotted point
-         *
-         * @return the plotted point's column name
-         */
-        public String getColumnName() {
-            return name;
-        }
-
-        /**
-         * Called after the website graphs have been updated
-         */
-        public void reset() {
-        }
-
-        @Override
-        public int hashCode() {
-            return getColumnName().hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Plotter)) {
-                return false;
-            }
-
-            final Plotter plotter = (Plotter) object;
-            return plotter.name.equals(name) && plotter.getValue() == getValue();
-        }
-    }
-}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Statistics.java

@@ -1,82 +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.metrics;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketListener;
-import com.comphenix.protocol.metrics.Metrics.Graph;
-
-public class Statistics {
-
-	// Metrics
-	private Metrics metrics;
-	
-	public Statistics(Plugin plugin) throws IOException {
-		metrics = new Metrics(plugin);
-		
-		// Determine who is using this library
-		addPluginUserGraph(metrics);
-		
-		metrics.start();
-	}
-	
-	private void addPluginUserGraph(Metrics metrics) {
-	
-		Graph pluginUsers = metrics.createGraph("Plugin Users");
-		
-		for (Map.Entry<String, Integer> entry : getPluginUsers(ProtocolLibrary.getProtocolManager()).entrySet()) {
-			final int count = entry.getValue();
-			
-			// Plot plugins of this type
-			pluginUsers.addPlotter(new Metrics.Plotter(entry.getKey()) {
-				@Override
-				public int getValue() {
-					return count;
-				}
-			});
-		}
-	}
-	
-	// Retrieve loaded plugins
-	private Map<String, Integer> getPluginUsers(ProtocolManager manager) {
-		
-		Map<String, Integer> users = new HashMap<String, Integer>();
-			
-		for (PacketListener listener : manager.getPacketListeners()) {
-			
-			String name = PacketAdapter.getPluginName(listener);
-			
-			// Increment occurence
-			if (!users.containsKey(name)) {
-				users.put(name, 1);
-			} else {
-				users.put(name, users.get(name) + 1);
-			}
-		}
-		
-		return users;
-	}
-}

modules/ProtocolLib/src/test/java/com/comphenix/protocol/PacketTypeTest.java

@@ -1,96 +0,0 @@
-/**
- * ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- * Copyright (C) 2016 dmulloy2
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * 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;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.injector.packet.PacketRegistry;
-
-import net.minecraft.server.v1_12_R1.EnumProtocol;
-import net.minecraft.server.v1_12_R1.EnumProtocolDirection;
-import net.minecraft.server.v1_12_R1.PacketLoginInStart;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * @author dmulloy2
- */
-public class PacketTypeTest {
-
-	@BeforeClass
-	public static void initializeReflection() {
-		BukkitInitialization.initializePackage();
-	}
-
-	@Test
-	public void testFindCurrent() {
-		assertEquals(PacketType.Play.Client.STEER_VEHICLE, PacketType.findCurrent(Protocol.PLAY, Sender.CLIENT, "SteerVehicle"));
-	}
-
-	@Test
-	public void testLoginStart() {
-		// This packet is critical for handleLoin
-		assertEquals(PacketLoginInStart.class, PacketType.Login.Client.START.getPacketClass());
-	}
-
-	@Test
-	public void testDeprecation() {
-		assertTrue("Packet isn't properly deprecated", PacketType.Status.Server.OUT_SERVER_INFO.isDeprecated());
-		assertTrue("Deprecated packet isn't properly included",
-				PacketRegistry.getServerPacketTypes().contains(PacketType.Status.Server.OUT_SERVER_INFO));
-		assertFalse("Packet isn't properly deprecated", PacketType.Play.Server.CHAT.isDeprecated());
-		assertEquals("Deprecated packets aren't equal", PacketType.Status.Server.OUT_SERVER_INFO,
-				PacketType.Status.Server.SERVER_INFO);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void ensureTypesAreCorrect() throws Exception {
-		boolean fail = false;
-
-		EnumProtocol[] protocols = EnumProtocol.values();
-		for (EnumProtocol protocol : protocols) {
-			Field field = EnumProtocol.class.getDeclaredField("h");
-			field.setAccessible(true);
-
-			Map<EnumProtocolDirection, Map<Integer, Class<?>>> map = (Map<EnumProtocolDirection, Map<Integer, Class<?>>>) field.get(protocol);
-			for (Entry<EnumProtocolDirection, Map<Integer, Class<?>>> entry : map.entrySet()) {
-				Map<Integer, Class<?>> treeMap = new TreeMap<>(entry.getValue());
-				for (Entry<Integer, Class<?>> entry1 : treeMap.entrySet()) {
-					try {
-						PacketType type = PacketType.fromClass(entry1.getValue());
-						if (type.getCurrentId() != entry1.getKey())
-							throw new IllegalStateException("Packet ID for " + type + " is incorrect. Expected " + entry1.getKey() + ", but got " + type.getCurrentId());
-					} catch (Throwable ex) {
-						ex.printStackTrace();
-						fail = true;
-					}
-				}
-			}
-		}
-
-		assertTrue("Packet type(s) were incorrect!", !fail);
-	}
-}

modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedWatchableObjectTest.java

@@ -1,25 +0,0 @@
-package com.comphenix.protocol.wrappers;
-
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-
-import com.comphenix.protocol.BukkitInitialization;
-
-@RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
-@PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })
-//@PrepareForTest(CraftItemFactory.class)
-public class WrappedWatchableObjectTest {
-	//@BeforeClass
-	public static void initializeBukkit() throws IllegalAccessException {
-		BukkitInitialization.initializeItemMeta();
-	}
-	
-	//@Test
-	/* public void testItemStack() {
-		final ItemStack stack = new ItemStack(Material.GOLD_AXE);
-		final WrappedWatchableObject test = new WrappedWatchableObject(0, stack);
-	
-		ItemStack value = (ItemStack) test.getValue();
-		assertEquals(value.getType(), stack.getType());
-	} */
-}

pom.xml

@@ -1,130 +1,335 @@
-<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-Parent</artifactId>
-  <version>v4-SNAPSHOT</version>
-  <name>ProtocolLib-Parent</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <minorVersion>4.3.0</minorVersion>
-    <spigotVersion>1.12-R0.1-SNAPSHOT</spigotVersion>
-  </properties>
-
-  <modules>
-    <module>modules/API</module>
-    <module>modules/ProtocolLib</module>
-  </modules>
-
-  <description>Provides read/write access to the Minecraft protocol.</description>
-  <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
-  <packaging>pom</packaging>
-  <inceptionYear>2012</inceptionYear>
-
-  <distributionManagement>
-    <repository>
-      <id>dmulloy2-releases</id>
-      <url>http://repo.dmulloy2.net/content/repositories/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>dmulloy2-snapshots</id>
-      <url>http://repo.dmulloy2.net/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>dmulloy2-repo</id>
-      <url>http://repo.dmulloy2.net/content/groups/public/</url>
-    </repository>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-    </repository>
-  </repositories>
-  
-  <dependencies>
-      <!-- Compile with the old version of Netty -->
-    <dependency>
-	  <groupId>io.netty</groupId>
-	  <artifactId>netty-all</artifactId>
-	  <version>4.0.23.Final</version>
-	  <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>${spigotVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>${spigotVersion}</version>
-      <scope>provided</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>
-  </dependencies>
-
-  <build>
-    <defaultGoal>clean package install</defaultGoal>
-    <finalName>${project.name}</finalName>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <!--
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>src/main/resources/</directory>
-        <includes>
-          <include>*.yml</include>
-        </includes>
-      </resource>
-    </resources>
-    -->
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.3</version>
-        <configuration>
-          <failOnError>false</failOnError>
-          <encoding>ISO-8859-1</encoding>
-          <doctitle>ProtocolLib JavaDocs</doctitle>
-          <windowtitle>ProtocolLib JavaDocs</windowtitle>
-          <bottom>Copyright &#169; {inceptionYear}&#x2013;{currentYear}
-            Comphenix and dmulloy2. Licensed under the GNU GPL v2.</bottom>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>install</phase>
-            <goals>
-              <goal>aggregate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<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>
+	<name>ProtocolLib</name>
+	<version>4.5.1</version>
+
+	<description>Provides read/write access to the Minecraft protocol.</description>
+	<url>https://github.com/dmulloy2/ProtocolLib</url>
+	<packaging>jar</packaging>
+	<inceptionYear>2012</inceptionYear>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.build.number></project.build.number>
+		<project.fullVersion>${project.version}</project.fullVersion>
+
+		<powermock.version>2.0.4</powermock.version>
+		<spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
+	</properties>
+
+	<build>
+		<defaultGoal>clean install</defaultGoal>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<testSourceDirectory>src/test/java</testSourceDirectory>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<shadedArtifactAttached>false</shadedArtifactAttached>
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+
+							<relocations>
+								<relocation>
+									<pattern>net.sf</pattern>
+									<shadedPattern>com.comphenix.net.sf</shadedPattern>
+								</relocation>
+							</relocations>
+
+							<artifactSet>
+								<excludes>
+									<exclude>org.spigotmc:spigot</exclude>
+									<exclude>org.spigotmc:spigot-api</exclude>
+									<exclude>junit:junit</exclude>
+									<exclude>io.netty:*</exclude>
+								</excludes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Main-Class>com.comphenix.protocol.Application</Main-Class>
+							<Implementation-Title>ProtocolLib</Implementation-Title>
+							<Implementation-Version>${project.fullVersion}</Implementation-Version>
+							<Implementation-Vendor>dmulloy2</Implementation-Vendor>
+						</manifestEntries>
+					</archive>
+					<finalName>${project.name}</finalName>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M4</version>
+				<configuration>
+					<systemProperties>
+						<property>
+							<name>projectVersion</name>
+							<value>${project.version}</value>
+						</property>
+					</systemProperties>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.1.1</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<encoding>ISO-8859-1</encoding>
+					<doctitle>ProtocolLib JavaDocs</doctitle>
+					<windowtitle>ProtocolLib JavaDocs</windowtitle>
+					<bottom>Copyright &#169; {inceptionYear}&#x2013;{currentYear}
+						Comphenix and dmulloy2. Licensed under the GNU GPL v2.</bottom>
+					<additionalOptions>
+						<additionalOption>-Xdoclint:none</additionalOption>
+					</additionalOptions>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>aggregate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>jenkins</id>
+			<activation>
+				<property>
+					<name>env.BUILD_NUMBER</name>
+				</property>
+			</activation>
+			<properties>
+				<project.build.number>-b${env.BUILD_NUMBER}</project.build.number>
+				<!--<project.fullVersion>${project.version}${project.build.number}</project.fullVersion>-->
+				<project.fullVersion>${project.version}</project.fullVersion>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>release-sign-artifacts</id>
+			<activation>
+				<property>
+					<name>performRelease</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<properties>
+				<project.fullVersion>${project.version}</project.fullVersion>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.2.0</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>3.1.1</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- TODO: Look into signing releases
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					-->
+
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<scm>
+		<connection>scm:git:git://github.com/dmulloy2/ProtocolLib.git</connection>
+		<developerConnection>scm:git:git@github.com:dmulloy2/ProtocolLib.git</developerConnection>
+		<url>https://github.com/dmulloy2/ProtocolLib</url>
+	</scm>
+
+	<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>
+
+	<developers>
+		<developer>
+			<id>dmulloy2</id>
+			<name>Dan Mulloy</name>
+			<url>http://dmulloy2.net/</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>former author</role>
+			</roles>
+			<timezone>1</timezone>
+		</developer>
+	</developers>
+
+	<distributionManagement>
+		<repository>
+			<id>dmulloy2-releases</id>
+			<url>https://repo.dmulloy2.net/nexus/repository/releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>dmulloy2-snapshots</id>
+			<url>https://repo.dmulloy2.net/nexus/repository/snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<repositories>
+		<repository>
+			<id>dmulloy2-repo</id>
+			<url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+		</repository>
+		<repository>
+			<id>spigot-repo</id>
+			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<!-- Compile with the old version of Netty for backwards compat -->
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-all</artifactId>
+			<version>4.0.23.Final</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spigotmc</groupId>
+			<artifactId>spigot-api</artifactId>
+			<version>${spigot.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spigotmc</groupId>
+			<artifactId>spigot</artifactId>
+			<version>${spigot.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>3.2.5</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- TODO fold BukkitExecutors into ProtocolLib -->
+		<dependency>
+			<groupId>com.comphenix.executors</groupId>
+			<artifactId>BukkitExecutors</artifactId>
+			<version>1.1-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- Testing dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>3.2.0</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-mockito2</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>

src/main/java/com/comphenix/protocol/PacketLogging.java

@@ -33,11 +33,11 @@ import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.google.common.base.Charsets;
 
-import org.apache.commons.io.HexDump;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.libs.org.apache.commons.io.HexDump;
 import org.bukkit.plugin.Plugin;
 
 /**

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

@@ -5,17 +5,10 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
-
-import org.apache.commons.lang.WordUtils;
-import org.bukkit.Bukkit;
+import java.util.function.Consumer;
 
 import com.comphenix.protocol.PacketTypeLookup.ClassLookup;
 import com.comphenix.protocol.events.ConnectionSide;
@@ -29,6 +22,9 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 
+import org.apache.commons.lang.WordUtils;
+import org.bukkit.Bukkit;
+
 /**
  * Represents the type of a packet in a specific protocol.
  * <p>
@@ -109,85 +105,99 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Server extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.SERVER;
 
-			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x00, 0x0E, "SpawnEntity");
-			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x01, 0x11, "SpawnEntityExperienceOrb");
-			public static final PacketType SPAWN_ENTITY_WEATHER =         new PacketType(PROTOCOL, SENDER, 0x02, 0x2C, "SpawnEntityWeather");
-			public static final PacketType SPAWN_ENTITY_LIVING =          new PacketType(PROTOCOL, SENDER, 0x03, 0x0F, "SpawnEntityLiving");
-			public static final PacketType SPAWN_ENTITY_PAINTING =        new PacketType(PROTOCOL, SENDER, 0x04, 0x10, "SpawnEntityPainting");
-			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x05, 0x0C, "NamedEntitySpawn");
-			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x06, 0x0B, "Animation");
-			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x07, 0x37, "Statistic");
-			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x08, 0x25, "BlockBreakAnimation");
-			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x09, 0x35, "TileEntityData");
-			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x0A, 0x24, "BlockAction");
-			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x0B, 0x23, "BlockChange");
-			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0C, 0xFF, "Boss");
-			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0D, 0x41, "ServerDifficulty");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0E, 0x3A, "TabComplete");
-			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x0F, 0x02, "Chat");
-			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x10, 0x22, "MultiBlockChange");
-			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x11, 0x32, "Transaction");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x12, 0x2E, "CloseWindow");
-			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x13, 0x2D, "OpenWindow");
-			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x14, 0x30, "WindowItems");
-			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x15, 0x31, "WindowData");
-			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x16, 0x2F, "SetSlot");
-			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x17, 0xFC, "SetCooldown");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x18, 0x3F, "CustomPayload");
-			public static final PacketType CUSTOM_SOUND_EFFECT =          new PacketType(PROTOCOL, SENDER, 0x19, 0xFD, "CustomSoundEffect");
-			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1A, 0x40, "KickDisconnect");
-			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1B, 0x1A, "EntityStatus");
-			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1C, 0x27, "Explosion");
-			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1D, 0xFA, "UnloadChunk");
-			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1E, 0x2B, "GameStateChange");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1F, 0x00, "KeepAlive");
-			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x20, 0x21, "MapChunk");
-			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x21, 0x28, "WorldEvent");
-			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x22, 0x2A, "WorldParticles");
-			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x23, 0x01, "Login");
-			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x24, 0x34, "Map");
-			public static final PacketType ENTITY =                       new PacketType(PROTOCOL, SENDER, 0x25, 0x14, "Entity");
-			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x26, 0x15, "RelEntityMove");
-			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x27, 0x17, "RelEntityMoveLook");
-			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x28, 0x16, "EntityLook");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x29, 0xFE, "VehicleMove");
-			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x2A, 0x36, "OpenSignEditor");
-			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x2B, 0x39, "Abilities");
-			public static final PacketType COMBAT_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x2C, 0x42, "CombatEvent");
-			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x2D, 0x38, "PlayerInfo");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x2E, 0x08, "Position");
-			public static final PacketType BED =                          new PacketType(PROTOCOL, SENDER, 0x2F, 0x0A, "Bed");
-			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x30, -1,   "Recipes");
-			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x31, 0x13, "EntityDestroy");
-			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x32, 0x1E, "RemoveEntityEffect");
-			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x33, 0x48, "ResourcePackSend");
-			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x34, 0x07, "Respawn");
-			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x35, 0x19, "EntityHeadRotation");
-			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x36, -1,   "SelectAdvancementTab");
-			public static final PacketType WORLD_BORDER =                 new PacketType(PROTOCOL, SENDER, 0x37, 0x44, "WorldBorder");
-			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x38, 0x43, "Camera");
-			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x39, 0x09, "HeldItemSlot");
-			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x3A, 0x3D, "ScoreboardDisplayObjective");
-			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x3B, 0x1C, "EntityMetadata");
-			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x3C, 0x1B, "AttachEntity");
-			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x3D, 0x12, "EntityVelocity");
-			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x3E, 0x04, "EntityEquipment");
-			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x3F, 0x1F, "Experience");
-			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x40, 0x06, "UpdateHealth");
-			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x41, 0x3B, "ScoreboardObjective");
-			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x42, 0xFB, "Mount");
-			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x43, 0x3E, "ScoreboardTeam");
-			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x44, 0x3C, "ScoreboardScore");
-			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x45, 0x05, "SpawnPosition");
-			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x46, 0x03, "UpdateTime");
-			public static final PacketType TITLE =                        new PacketType(PROTOCOL, SENDER, 0x47, 0x45, "Title");
-			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x48, 0x29, "NamedSoundEffect");
-			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x49, 0x47, "PlayerListHeaderFooter");
-			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x4A, 0x0D, "Collect");
-			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x4B, 0x18, "EntityTeleport");
-			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x4C, -1,   "Advancements");
-			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x4D, 0x20, "UpdateAttributes");
-			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x4E, 0x1D, "EntityEffect");
+			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "SpawnEntity");
+			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "SpawnEntityExperienceOrb");
+			public static final PacketType SPAWN_ENTITY_WEATHER =         new PacketType(PROTOCOL, SENDER, 0x02, 0xFF, "SpawnEntityWeather");
+			public static final PacketType SPAWN_ENTITY_LIVING =          new PacketType(PROTOCOL, SENDER, 0x03, 0xFF, "SpawnEntityLiving");
+			public static final PacketType SPAWN_ENTITY_PAINTING =        new PacketType(PROTOCOL, SENDER, 0x04, 0xFF, "SpawnEntityPainting");
+			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x05, 0xFF, "NamedEntitySpawn");
+			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x06, 0xFF, "Animation");
+			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x07, 0xFF, "Statistic");
+			public static final PacketType BLOCK_BREAK =                  new PacketType(PROTOCOL, SENDER, 0x08, 0xFF, "BlockBreak");
+			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x09, 0xFF, "BlockBreakAnimation");
+			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x0A, 0xFF, "TileEntityData");
+			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x0B, 0xFF, "BlockAction");
+			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x0C, 0xFF, "BlockChange");
+			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0D, 0xFF, "Boss");
+			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0E, 0xFF, "ServerDifficulty");
+			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x0F, 0xFF, "Chat");
+			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x10, 0xFF, "MultiBlockChange");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x11, 0xFF, "TabComplete");
+			public static final PacketType COMMANDS =                     new PacketType(PROTOCOL, SENDER, 0x12, 0xFF, "Commands");
+			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x13, 0xFF, "Transaction");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x14, 0xFF, "CloseWindow");
+			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x15, 0xFF, "WindowItems");
+			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x16, 0xFF, "WindowData");
+			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x17, 0xFF, "SetSlot");
+			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x18, 0xFF, "SetCooldown");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x19, 0xFF, "CustomPayload");
+			public static final PacketType CUSTOM_SOUND_EFFECT =          new PacketType(PROTOCOL, SENDER, 0x1A, 0xFF, "CustomSoundEffect");
+			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1B, 0xFF, "KickDisconnect");
+			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1C, 0xFF, "EntityStatus");
+			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1D, 0xFF, "Explosion");
+			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1E, 0xFF, "UnloadChunk");
+			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1F, 0xFF, "GameStateChange");
+			public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x20, 0xFF, "OpenWindowHorse");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x21, 0xFF, "KeepAlive");
+			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x22, 0xFF, "MapChunk");
+			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x23, 0xFF, "WorldEvent");
+			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x24, 0xFF, "WorldParticles");
+			public static final PacketType LIGHT_UPDATE =                 new PacketType(PROTOCOL, SENDER, 0x25, 0xFF, "LightUpdate");
+			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x26, 0xFF, "Login");
+			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x27, 0xFF, "Map");
+			public static final PacketType OPEN_WINDOW_MERCHANT =         new PacketType(PROTOCOL, SENDER, 0x28, 0xFF, "OpenWindowMerchant");
+			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x29, 0xFF, "Entity$RelEntityMove");
+			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x2A, 0xFF, "Entity$RelEntityMoveLook");
+			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x2B, 0xFF, "Entity$EntityLook");
+			public static final PacketType ENTITY =                       new PacketType(PROTOCOL, SENDER, 0x2C, 0xFF, "Entity");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x2D, 0xFF, "VehicleMove");
+			public static final PacketType OPEN_BOOK =                    new PacketType(PROTOCOL, SENDER, 0x2E, 0xFF, "OpenBook");
+			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x2F, 0xFF, "OpenWindow");
+			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x30, 0xFF, "OpenSignEditor");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x31, 0xFF, "AutoRecipe");
+			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x32, 0xFF, "Abilities");
+			public static final PacketType COMBAT_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x33, 0xFF, "CombatEvent");
+			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x34, 0xFF, "PlayerInfo");
+			public static final PacketType LOOK_AT =                      new PacketType(PROTOCOL, SENDER, 0x35, 0xFF, "LookAt");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x36, 0xFF, "Position");
+			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x37, 0xFF, "Recipes");
+			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x38, 0xFF, "EntityDestroy");
+			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x39, 0xFF, "RemoveEntityEffect");
+			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x3A, 0xFF, "ResourcePackSend");
+			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x3B, 0xFF, "Respawn");
+			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x3C, 0xFF, "EntityHeadRotation");
+			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x3D, 0xFF, "SelectAdvancementTab");
+			public static final PacketType WORLD_BORDER =                 new PacketType(PROTOCOL, SENDER, 0x3E, 0xFF, "WorldBorder");
+			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x3F, 0xFF, "Camera");
+			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x40, 0xFF, "HeldItemSlot");
+			public static final PacketType VIEW_CENTRE =                  new PacketType(PROTOCOL, SENDER, 0x41, 0xFF, "ViewCentre");
+			public static final PacketType VIEW_DISTANCE =                new PacketType(PROTOCOL, SENDER, 0x42, 0xFF, "ViewDistance");
+			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x43, 0xFF, "ScoreboardDisplayObjective");
+			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x44, 0xFF, "EntityMetadata");
+			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x45, 0xFF, "AttachEntity");
+			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x46, 0xFF, "EntityVelocity");
+			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x47, 0xFF, "EntityEquipment");
+			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x48, 0xFF, "Experience");
+			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x49, 0xFF, "UpdateHealth");
+			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x4A, 0xFF, "ScoreboardObjective");
+			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x4B, 0xFF, "Mount");
+			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x4C, 0xFF, "ScoreboardTeam");
+			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x4D, 0xFF, "ScoreboardScore");
+			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x4E, 0xFF, "SpawnPosition");
+			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x4F, 0xFF, "UpdateTime");
+			public static final PacketType TITLE =                        new PacketType(PROTOCOL, SENDER, 0x50, 0xFF, "Title");
+			public static final PacketType ENTITY_SOUND =                 new PacketType(PROTOCOL, SENDER, 0x51, 0xFF, "EntitySound");
+			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x52, 0xFF, "NamedSoundEffect");
+			public static final PacketType STOP_SOUND =                   new PacketType(PROTOCOL, SENDER, 0x53, 0xFF, "StopSound");
+			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x54, 0xFF, "PlayerListHeaderFooter");
+			public static final PacketType NBT_QUERY =                    new PacketType(PROTOCOL, SENDER, 0x55, 0xFF, "NBTQuery");
+			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x56, 0xFF, "Collect");
+			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x57, 0xFF, "EntityTeleport");
+			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x58, 0xFF, "Advancements");
+			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x59, 0xFF, "UpdateAttributes");
+			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x5A, 0xFF, "EntityEffect");
+			public static final PacketType RECIPE_UPDATE =                new PacketType(PROTOCOL, SENDER, 0x5B, 0xFF, "RecipeUpdate");
+			public static final PacketType TAGS =                         new PacketType(PROTOCOL, SENDER, 0x5C, 0xFF, "Tags");
 
 			// ---- Removed in 1.9
 
@@ -244,6 +254,20 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			public static final PacketType UPDATE_SIGN =                  MinecraftReflection.signUpdateExists() ? new PacketType(PROTOCOL, SENDER, 252, 252, "UpdateSign") :
 																			  TILE_ENTITY_DATA.clone();
 
+			// ---- Removed in 1.14
+
+			/**
+			 * @deprecated Removed in 1.14
+			 */
+			@Deprecated
+			public static final PacketType BED =                          new PacketType(PROTOCOL, SENDER, 0x33, 0x33, "Bed");
+
+			/**
+			 * @deprecated Renamed to {@link #BED}
+			 */
+			@Deprecated
+			public static final PacketType USE_BED =                      BED.clone();
+
 			private final static Server INSTANCE = new Server();
 
 			// Prevent accidental construction
@@ -264,39 +288,52 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Client extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.CLIENT;
 
-			public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, 0xF9, "TeleportAccept");
-			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x01, -1,   "AutoRecipe");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x02, 0x14, "TabComplete");
-			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x03, 0x01, "Chat");
-			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x04, 0x16, "ClientCommand");
-			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x05, 0x15, "Settings");
-			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x06, 0x0F, "Transaction");
-			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x07, 0x11, "EnchantItem");
-			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x08, 0x0E, "WindowClick");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x09, 0x0D, "CloseWindow");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x0A, 0x17, "CustomPayload");
-			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x0B, 0x02, "UseEntity");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x0C, 0x00, "KeepAlive");
-			public static final PacketType FLYING =                       new PacketType(PROTOCOL, SENDER, 0x0D, 0x03, "Flying");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x0E, 0x04, "Position");
-			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x0F, 0x06, "PositionLook");
-			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x10, 0x05, "Look");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x11, 0xF8, "VehicleMove");
-			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x12, 0xF7, "BoatMove");
-			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x13, 0x13, "Abilities");
-			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x14, 0x07, "BlockDig");
-			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x15, 0x0B, "EntityAction");
-			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x16, 0x0C, "SteerVehicle");
-			public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x17, -1,   "RecipeDisplayed");
-			public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x18, 0x19, "ResourcePackStatus");
-			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x19, -1,   "Advancements");
-			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x1A, 0x09, "HeldItemSlot");
-			public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x1B, 0x10, "SetCreativeSlot");
-			public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x1C, 0x12, "UpdateSign");
-			public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x1D, 0x0A, "ArmAnimation");
-			public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x1E, 0x18, "Spectate");
-			public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x1F, 0xF6, "UseItem");
-			public static final PacketType BLOCK_PLACE =                  new PacketType(PROTOCOL, SENDER, 0x20, 0x08, "BlockPlace");
+			public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "TeleportAccept");
+			public static final PacketType TILE_NBT_QUERY =               new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "TileNBTQuery");
+			public static final PacketType DIFFICULTY_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x02, 0xFF, "DifficultyChange");
+			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x03, 0xFF, "Chat");
+			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x04, 0xFF, "ClientCommand");
+			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x05, 0xFF, "Settings");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x06, 0xFF, "TabComplete");
+			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x07, 0xFF, "Transaction");
+			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x08, 0xFF, "EnchantItem");
+			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x09, 0xFF, "WindowClick");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x0A, 0xFF, "CloseWindow");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x0B, 0xFF, "CustomPayload");
+			public static final PacketType B_EDIT =                       new PacketType(PROTOCOL, SENDER, 0x0C, 0xFF, "BEdit");
+			public static final PacketType ENTITY_NBT_QUERY =             new PacketType(PROTOCOL, SENDER, 0x0D, 0xFF, "EntityNBTQuery");
+			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x0E, 0xFF, "UseEntity");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x0F, 0xFF, "KeepAlive");
+			public static final PacketType DIFFICULTY_LOCK =              new PacketType(PROTOCOL, SENDER, 0x10, 0xFF, "DifficultyLock");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x11, 0xFF, "Flying$Position");
+			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x12, 0xFF, "Flying$PositionLook");
+			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x13, 0xFF, "Flying$Look");
+			public static final PacketType FLYING =                       new PacketType(PROTOCOL, SENDER, 0x14, 0xFF, "Flying");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x15, 0xFF, "VehicleMove");
+			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x16, 0xFF, "BoatMove");
+			public static final PacketType PICK_ITEM =                    new PacketType(PROTOCOL, SENDER, 0x17, 0xFF, "PickItem");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x18, 0xFF, "AutoRecipe");
+			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x19, 0xFF, "Abilities");
+			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x1A, 0xFF, "BlockDig");
+			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x1B, 0xFF, "EntityAction");
+			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x1C, 0xFF, "SteerVehicle");
+			public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x1D, 0xFF, "RecipeDisplayed");
+			public static final PacketType ITEM_NAME =                    new PacketType(PROTOCOL, SENDER, 0x1E, 0xFF, "ItemName");
+			public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x1F, 0xFF, "ResourcePackStatus");
+			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x20, 0xFF, "Advancements");
+			public static final PacketType TR_SEL =                       new PacketType(PROTOCOL, SENDER, 0x21, 0xFF, "TrSel");
+			public static final PacketType BEACON =                       new PacketType(PROTOCOL, SENDER, 0x22, 0xFF, "Beacon");
+			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x23, 0xFF, "HeldItemSlot");
+			public static final PacketType SET_COMMAND_BLOCK =            new PacketType(PROTOCOL, SENDER, 0x24, 0xFF, "SetCommandBlock");
+			public static final PacketType SET_COMMAND_MINECART =         new PacketType(PROTOCOL, SENDER, 0x25, 0xFF, "SetCommandMinecart");
+			public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x26, 0xFF, "SetCreativeSlot");
+			public static final PacketType SET_JIGSAW =                   new PacketType(PROTOCOL, SENDER, 0x27, 0xFF, "SetJigsaw");
+			public static final PacketType STRUCT =                       new PacketType(PROTOCOL, SENDER, 0x28, 0xFF, "Struct");
+			public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x29, 0xFF, "UpdateSign");
+			public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x2A, 0xFF, "ArmAnimation");
+			public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x2B, 0xFF, "Spectate");
+			public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x2C, 0xFF, "UseItem");
+			public static final PacketType BLOCK_PLACE =                  new PacketType(PROTOCOL, SENDER, 0x2D, 0xFF, "BlockPlace");
 
 			private final static Client INSTANCE = new Client();
 
@@ -331,8 +368,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 			private final static Sender SENDER = Sender.SERVER;
 
 			@ForceAsync
-			public static final PacketType SERVER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "ServerInfo");
-			public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "Pong");
+			public static final PacketType SERVER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "ServerInfo");
+			public static final PacketType PONG =                         new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "Pong");
 
 			/**
 			 * @deprecated Renamed to {@link #SERVER_INFO}
@@ -361,8 +398,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Client extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.CLIENT;
 
-			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "Start");
-			public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "Ping");
+			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "Start");
+			public static final PacketType PING =                         new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "Ping");
 
 			private final static Client INSTANCE = new Client();
 
@@ -396,10 +433,11 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Server extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.SERVER;
 
-			public static final PacketType DISCONNECT =                   new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "Disconnect");
-			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "EncryptionBegin");
-			public static final PacketType SUCCESS =                      new PacketType(PROTOCOL, SENDER, 0x02, 0x02, "Success");
-			public static final PacketType SET_COMPRESSION =              new PacketType(PROTOCOL, SENDER, 0x03, 0x03, "SetCompression");
+			public static final PacketType DISCONNECT =                   new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "Disconnect");
+			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "EncryptionBegin");
+			public static final PacketType SUCCESS =                      new PacketType(PROTOCOL, SENDER, 0x02, 0xFF, "Success");
+			public static final PacketType SET_COMPRESSION =              new PacketType(PROTOCOL, SENDER, 0x03, 0xFF, "SetCompression");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x04, 0xFF, "CustomPayload");
 
 			private final static Server INSTANCE = new Server();
 
@@ -421,8 +459,9 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Client extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.CLIENT;
 
-			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "Start");
-			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "EncryptionBegin");
+			public static final PacketType START =                        new PacketType(PROTOCOL, SENDER, 0x00, 0xFF, "Start");
+			public static final PacketType ENCRYPTION_BEGIN =             new PacketType(PROTOCOL, SENDER, 0x01, 0xFF, "EncryptionBegin");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x02, 0xFF, "CustomPayload");
 
 			private final static Client INSTANCE = new Client();
 
@@ -600,7 +639,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	/**
 	 * Protocol version of all the current IDs.
 	 */
-	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.EXPLORATION_UPDATE;
+	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.VILLAGE_UPDATE;
 
 	private final Protocol protocol;
 	private final Sender sender;
@@ -608,12 +647,14 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	private final int legacyId;
 	private final MinecraftVersion version;
 	private final String[] classNames;
+	String[] names;
 
 	private String name;
 	private boolean deprecated;
 	private boolean forceAsync;
 
 	private boolean dynamic;
+	private int hashCode;
 
 	/**
 	 * Retrieve the current packet/legacy lookup.
@@ -731,7 +772,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	}
 
 	public static PacketType findCurrent(Protocol protocol, Sender sender, String name) {
-		name = format(protocol, sender, name);
+		name = formatClassName(protocol, sender, name);
 		PacketType type = getLookup().getFromCurrent(protocol, sender, name);
 
 		if (type != null) {
@@ -742,11 +783,21 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		}
 	}
 
-	private static String format(Protocol protocol, Sender sender, String name) {
-		if (name.contains("Packet"))
+	private static String formatClassName(Protocol protocol, Sender sender, String name) {
+		String base = MinecraftReflection.getMinecraftPackage() + ".Packet";
+		if (name.startsWith(base)) {
 			return name;
+		}
 
-		return String.format("Packet%s%s%s", protocol.getPacketName(), sender.getPacketName(), WordUtils.capitalize(name));
+		if (name.contains("$")) {
+			String[] split = name.split("\\$");
+			String parent = split[0];
+			String child = split[1];
+			return base + protocol.getPacketName() + sender.getPacketName() + WordUtils.capitalize(parent)
+					+ "$Packet" + protocol.getPacketName() + sender.getPacketName() + WordUtils.capitalize(child);
+		}
+
+		return base + protocol.getPacketName() + sender.getPacketName() + WordUtils.capitalize(name);
 	}
 
 	/**
@@ -809,6 +860,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		return type;
 	}
 
+	static Consumer<String> onDynamicCreate = x -> {};
+
 	/**
 	 * Retrieve a packet type from a protocol, sender, ID, and class for 1.8+
 	 * <p>
@@ -824,15 +877,16 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		Map<String, PacketType> map = lookup.getMap(protocol, sender);
 
 		// Check the map first
-		String clazz = packetClass.getSimpleName();
-		PacketType type = find(map, clazz);
+		String className = packetClass.getName();
+		PacketType type = find(map, className);
 		if (type == null) {
 			// Guess we don't support this packet :/
-			type = new PacketType(protocol, sender, packetId, -1, PROTOCOL_VERSION, clazz);
+			type = new PacketType(protocol, sender, packetId, -1, PROTOCOL_VERSION, className);
 			type.dynamic = true;
 
 			// Many may be scheduled, but only the first will be executed
 			scheduleRegister(type, "Dynamic-" + UUID.randomUUID().toString());
+			onDynamicCreate.accept(className);
 		}
 
 		return type;
@@ -979,8 +1033,10 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		
 		this.classNames = new String[names.length];
 		for (int i = 0; i < classNames.length; i++) {
-			classNames[i] = format(protocol, sender, names[i]);
+			classNames[i] = formatClassName(protocol, sender, names[i]);
 		}
+
+		this.names = names;
 	}
 
 	/**
@@ -1040,7 +1096,9 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 	 * <p>
 	 * It is unknown if the packet was removed at any point.
 	 * @return The current ID, or {@link #UNKNOWN_PACKET} if unknown.
+	 * @deprecated Don't rely on packet IDs, they change every version
 	 */
+	@Deprecated
 	public int getCurrentId() {
 		return currentId;
 	}
@@ -1134,7 +1192,14 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 
 	@Override
 	public int hashCode() {
-		return Objects.hashCode(protocol, sender, currentId);
+		int hash = hashCode;
+		if (hash == 0) {
+			hash = protocol.hashCode();
+			hash = 31 * hash + sender.hashCode();
+			hash = 31 * hash + Integer.hashCode(currentId);
+			hashCode = hash;
+		}
+		return hash;
 	}
 
 	@Override

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

@@ -654,4 +654,8 @@ public class ProtocolLib extends JavaPlugin {
 	public Statistics getStatistics() {
 		return statistics;
 	}
+
+	public ProtocolConfig getProtocolConfig() {
+		return config;
+	}
 }

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

@@ -39,12 +39,12 @@ public class ProtocolLibrary {
 	/**
 	 * The maximum version ProtocolLib has been tested with.
 	 */
-	public static final String MAXIMUM_MINECRAFT_VERSION = "1.12";
+	public static final String MAXIMUM_MINECRAFT_VERSION = "1.15.1";
 
 	/**
-	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.12) was released.
+	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.14.4) was released.
 	 */
-	public static final String MINECRAFT_LAST_RELEASE_DATE = "2017-06-07";
+	public static final String MINECRAFT_LAST_RELEASE_DATE = "2019-12-17";
 
 	/**
 	 * Plugins that are currently incompatible with ProtocolLib.

src/main/java/com/comphenix/protocol/ProtocolLogger.java

@@ -18,6 +18,7 @@ package com.comphenix.protocol;
 
 import java.text.MessageFormat;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.bukkit.plugin.Plugin;
 
@@ -25,18 +26,20 @@ import org.bukkit.plugin.Plugin;
  * @author dmulloy2
  */
 public class ProtocolLogger {
-	private static Plugin plugin;
+	private static boolean debugEnabled = false;
+	private static Logger logger = Logger.getLogger("Minecraft");
 
-	protected static void init(Plugin plugin) {
-		ProtocolLogger.plugin = plugin;
-	}
+	/**
+	 * Don't call this method from any plugin. Currently only public to test if it fixes a weird error.
+	 * See GH-740
+	 * @param plugin ProtocolLib
+	 */
+	public static void init(ProtocolLib plugin) {
+		logger = plugin.getLogger();
 
-	private static boolean isDebugEnabled() {
 		try {
-			return plugin.getConfig().getBoolean("global.debug", false);
-		} catch (Throwable ex) { // Maybe we're testing or something
-			return false;
-		}
+			debugEnabled = plugin.getConfig().getBoolean("global.debug", false);
+		} catch (Throwable ignored) { }
 	}
 
 	/**
@@ -46,7 +49,7 @@ public class ProtocolLogger {
 	 * @param args Arguments to format in
 	 */
 	public static void log(Level level, String message, Object... args) {
-		plugin.getLogger().log(level, MessageFormat.format(message, args));
+		logger.log(level, MessageFormat.format(message, args));
 	}
 
 	/**
@@ -65,18 +68,18 @@ public class ProtocolLogger {
 	 * @param ex Exception to log
 	 */
 	public static void log(Level level, String message, Throwable ex) {
-		plugin.getLogger().log(level, message, ex);
+		logger.log(level, message, ex);
 	}
 
 	public static void debug(String message, Object... args) {
-		if (isDebugEnabled()) {
+		if (debugEnabled) {
 			log("[Debug] " + message, args);
 		}
 	}
 
 	public static void debug(String message, Throwable ex) {
-		if (isDebugEnabled()) {
-			plugin.getLogger().log(Level.WARNING, "[Debug] " + message, ex);
+		if (debugEnabled) {
+			logger.log(Level.WARNING, "[Debug] " + message, ex);
 		}
 	}
 }

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

@@ -318,12 +318,12 @@ public class AsyncFilterManager implements AsynchronousManager {
 
 		// The player is only be null when they're logged out,
 		// so this should be a pretty safe check
-		Player player = newEvent.getPlayer();
+		Player player = syncPacket.getPlayer();
 		if (player != null) {
 			// Start the process
 			getSendingQueue(syncPacket).enqueue(newEvent);
 
-			// We know this is occuring on the main thread, so pass TRUE
+			// We know this is occurring on the main thread, so pass TRUE
 			getProcessingQueue(syncPacket).enqueue(newEvent, true);
 		}
 	}

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

@@ -1,5 +1,17 @@
 package com.comphenix.protocol.concurrency;
 
+import com.comphenix.protocol.utility.SafeCacheBuilder;
+import com.comphenix.protocol.utility.Util;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.RemovalListener;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+
+import org.bukkit.entity.Player;
+
 import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Iterator;
@@ -7,18 +19,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.bukkit.entity.Player;
-
-import com.comphenix.protocol.utility.SafeCacheBuilder;
-import com.comphenix.protocol.utility.Util;
-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>
@@ -37,7 +37,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 		ADDRESS {
 			@Override
 			public Object apply(Player player) {
-				return player.getAddress();
+				return player == null ? null : player.getAddress();
 			}
 		},
 		
@@ -47,7 +47,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 		NAME {
 			@Override
 			public Object apply(Player player) {
-				return player.getName();
+				return player == null ? null : player.getName();
 			}
 		},
 	}
@@ -55,17 +55,17 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	/**
 	 * An internal map of player keys to values.
 	 */
-	protected ConcurrentMap<Object, TValue> valueLookup = createValueMap();
+	private ConcurrentMap<Object, TValue> valueLookup = createValueMap();
 	
 	/**
 	 * A cache of the associated keys for each player.
 	 */
-	
-	protected ConcurrentMap<Object, Player> keyLookup = createKeyCache();
+
+	private ConcurrentMap<Object, Player> keyLookup = createKeyCache();
 	/**
 	 * The method used to retrieve a unique key for a player.
 	 */
-	protected final Function<Player, Object> keyMethod;
+	private final Function<Player, Object> keyMethod;
 	
 	/**
 	 * Construct a new concurrent player map that uses each player's address as key.
@@ -89,7 +89,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * Construct a new concurrent player map using the given standard key method.
 	 * @param standardMethod - the standard key method.
 	 */
-	public ConcurrentPlayerMap(PlayerKey standardMethod) {
+	private ConcurrentPlayerMap(PlayerKey standardMethod) {
 		this.keyMethod = standardMethod;
 	}
 	
@@ -107,7 +107,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * The default implementation uses a {@link ConcurrentHashMap}.
 	 * @return The value map.
 	 */
-	protected ConcurrentMap<Object, TValue> createValueMap() {
+	private ConcurrentMap<Object, TValue> createValueMap() {
 		return Maps.newConcurrentMap();
 	}
 	
@@ -115,19 +115,16 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * Construct a cache of keys and the associated player.
 	 * @return The key map.
 	 */
-	protected ConcurrentMap<Object, Player> createKeyCache() {
+	private 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());
-					}
-				}
-			}).
+					(RemovalListener<Object, Player>) removed -> {
+						// We ignore explicit removal
+						if (removed.wasEvicted()) {
+							onCacheEvicted(removed.getKey());
+						}
+					}).
 			build(
 			  new CacheLoader<Object, Player>() {
 				@Override
@@ -147,7 +144,6 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	/**
 	 * 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);
@@ -165,7 +161,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * @param key - a non-null key.
 	 * @return The player with the given key, or NULL if not found.
 	 */
-	protected Player findOnlinePlayer(Object key) {
+	private Player findOnlinePlayer(Object key) {
 		for (Player player : Util.getOnlinePlayers()) {
 			if (key.equals(keyMethod.apply(player))) {
 				return player;
@@ -179,7 +175,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * @param key - the key of the player we are locating.
 	 * @return The player, or NULL if not found.
 	 */
-	protected Player lookupPlayer(Object key) {
+	private Player lookupPlayer(Object key) {
 		try {
 			return keyLookup.get(key);
 		} catch (UncheckedExecutionException e) {
@@ -192,7 +188,9 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
 	 * @param player - the player whose key we want to retrieve.
 	 * @return The key.
 	 */
-	protected Object cachePlayerKey(Player player) {
+	private Object cachePlayerKey(Player player) {
+		Preconditions.checkNotNull(player, "player cannot be null");
+
 		Object key = keyMethod.apply(player);
 		
 		keyLookup.put(key, player);

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

@@ -55,7 +55,7 @@ public class ReportType {
 	 */
 	public static Class<?> getSenderClass(Object sender) {
 		if (sender == null)
-			throw new IllegalArgumentException("sender cannot be NUll.");
+			throw new IllegalArgumentException("sender cannot be null.");
 		else if (sender instanceof Class<?>)
 			return (Class<?>) sender;
 		else
@@ -75,7 +75,7 @@ public class ReportType {
 	 */
 	public static String getReportName(Object sender, ReportType type) {
 		if (sender == null)
-			throw new IllegalArgumentException("sender cannot be NUll.");
+			throw new IllegalArgumentException("sender cannot be null.");
 		return getReportName(getSenderClass(sender), type);
 	}
 	
@@ -83,13 +83,13 @@ public class ReportType {
 	 * 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 sender - 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.");
+			throw new IllegalArgumentException("sender cannot be null.");
 		
 		// Whether or not we need to retrieve the report name again
 		if (type.reportName == null) {
@@ -138,11 +138,10 @@ public class ReportType {
 	 * @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()
-		);
+		return FuzzyReflection.fromClass(clazz, true)
+				.getFieldList(FuzzyFieldContract.newBuilder()
+						.requireModifier(Modifier.STATIC)
+						.typeDerivedOf(ReportType.class)
+						.build());
 	}
 }

src/main/java/com/comphenix/protocol/events/PacketContainer.java

@@ -17,37 +17,15 @@
 
 package com.comphenix.protocol.events;
 
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
+import java.io.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ConcurrentMap;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.Vector;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.injector.StructureCache;
@@ -55,55 +33,15 @@ import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.ObjectWriter;
 import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.reflect.cloning.AggregateCloner;
+import com.comphenix.protocol.reflect.cloning.*;
 import com.comphenix.protocol.reflect.cloning.AggregateCloner.BuilderParameters;
-import com.comphenix.protocol.reflect.cloning.BukkitCloner;
-import com.comphenix.protocol.reflect.cloning.Cloner;
-import com.comphenix.protocol.reflect.cloning.CollectionCloner;
-import com.comphenix.protocol.reflect.cloning.FieldCloner;
-import com.comphenix.protocol.reflect.cloning.ImmutableDetector;
-import com.comphenix.protocol.reflect.cloning.OptionalCloner;
-import com.comphenix.protocol.reflect.cloning.SerializableCloner;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
 import com.comphenix.protocol.utility.MinecraftMethods;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.StreamSerializer;
-import com.comphenix.protocol.wrappers.BlockPosition;
-import com.comphenix.protocol.wrappers.BukkitConverters;
-import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
-import com.comphenix.protocol.wrappers.ChunkPosition;
-import com.comphenix.protocol.wrappers.EnumWrappers;
-import com.comphenix.protocol.wrappers.EnumWrappers.ChatType;
-import com.comphenix.protocol.wrappers.EnumWrappers.ChatVisibility;
-import com.comphenix.protocol.wrappers.EnumWrappers.ClientCommand;
-import com.comphenix.protocol.wrappers.EnumWrappers.CombatEventType;
-import com.comphenix.protocol.wrappers.EnumWrappers.Difficulty;
-import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
-import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.EnumConverter;
-import com.comphenix.protocol.wrappers.EnumWrappers.Hand;
-import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
-import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
-import com.comphenix.protocol.wrappers.EnumWrappers.Particle;
-import com.comphenix.protocol.wrappers.EnumWrappers.PlayerAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.PlayerDigType;
-import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.ResourcePackStatus;
-import com.comphenix.protocol.wrappers.EnumWrappers.ScoreboardAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.SoundCategory;
-import com.comphenix.protocol.wrappers.EnumWrappers.TitleAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.WorldBorderAction;
-import com.comphenix.protocol.wrappers.MultiBlockChangeInfo;
-import com.comphenix.protocol.wrappers.PlayerInfoData;
-import com.comphenix.protocol.wrappers.WrappedAttribute;
-import com.comphenix.protocol.wrappers.WrappedBlockData;
-import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import com.comphenix.protocol.wrappers.WrappedGameProfile;
-import com.comphenix.protocol.wrappers.WrappedServerPing;
-import com.comphenix.protocol.wrappers.WrappedStatistic;
-import com.comphenix.protocol.wrappers.WrappedWatchableObject;
+import com.comphenix.protocol.wrappers.*;
+import com.comphenix.protocol.wrappers.EnumWrappers.*;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
@@ -115,6 +53,16 @@ import com.google.common.collect.Sets;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
 /**
  * Represents a Minecraft packet indirectly.
  * 
@@ -134,30 +82,30 @@ public class PacketContainer implements Serializable {
 	private static ConcurrentMap<Class<?>, Method> readMethods = Maps.newConcurrentMap();
 	
 	// Used to clone packets
-	private static final AggregateCloner DEEP_CLONER = AggregateCloner.newBuilder().
-			instanceProvider(DefaultInstances.DEFAULT).
-			andThen(BukkitCloner.class).
-			andThen(ImmutableDetector.class).
-			andThen(OptionalCloner.class).
-			andThen(CollectionCloner.class).
-			andThen(getSpecializedDeepClonerFactory()).
-			build();
+	private static final AggregateCloner DEEP_CLONER = AggregateCloner
+			.newBuilder()
+			.instanceProvider(DefaultInstances.DEFAULT)
+			.andThen(BukkitCloner.class)
+			.andThen(ImmutableDetector.class)
+			.andThen(JavaOptionalCloner.class)
+			.andThen(GuavaOptionalCloner.class)
+			.andThen(CollectionCloner.class)
+			.andThen(getSpecializedDeepClonerFactory())
+			.build();
 	
-	private static final AggregateCloner SHALLOW_CLONER = AggregateCloner.newBuilder().
-			instanceProvider(DefaultInstances.DEFAULT).
-			andThen(new Function<BuilderParameters, Cloner>() {
-						@Override
-						public Cloner apply(@Nullable BuilderParameters param) {
-							if (param == null)
-								throw new IllegalArgumentException("Cannot be NULL.");
-							
-							return new FieldCloner(param.getAggregateCloner(), param.getInstanceProvider()) {{
-								// Use a default writer with no concept of cloning
-								writer = new ObjectWriter();
-							}};
-						}
-					}).
-			build();
+	private static final AggregateCloner SHALLOW_CLONER = AggregateCloner
+			.newBuilder()
+			.instanceProvider(DefaultInstances.DEFAULT)
+			.andThen(param -> {
+				if (param == null)
+					throw new IllegalArgumentException("Cannot be NULL.");
+
+				return new FieldCloner(param.getAggregateCloner(), param.getInstanceProvider()) {{
+					// Use a default writer with no concept of cloning
+					writer = new ObjectWriter();
+				}};
+			})
+			.build();
 	
 	// Packets that cannot be cloned by our default deep cloner
 	private static final Set<PacketType> CLONING_UNSUPPORTED = Sets.newHashSet(
@@ -385,8 +333,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<ItemStack> getItemModifier() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<ItemStack>withType(
-				MinecraftReflection.getItemStackClass(), BukkitConverters.getItemStackConverter());
+		return structureModifier.withType(
+				MinecraftReflection.getItemStackClass(),
+				BukkitConverters.getItemStackConverter());
 	}
 	
 	/**
@@ -398,9 +347,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<ItemStack[]> getItemArrayModifier() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<ItemStack[]>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getItemStackArrayClass(),
-				BukkitConverters.getIgnoreNull(new ItemStackArrayConverter()));
+				Converters.ignoreNull(new ItemStackArrayConverter()));
 	}
 
 	/**
@@ -414,10 +363,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the Bukkit wrapper
 		return structureModifier.withType(
 				List.class,
-				BukkitConverters.getListConverter(
-						MinecraftReflection.getItemStackClass(),
-						BukkitConverters.getItemStackConverter()
-				)
+				BukkitConverters.getListConverter(BukkitConverters.getItemStackConverter())
 		);
 	}
 
@@ -428,12 +374,9 @@ public class PacketContainer implements Serializable {
 	 * @return A modifier for maps of statistics.
 	 */
 	public StructureModifier<Map<WrappedStatistic, Integer>> getStatisticMaps() {
-		return structureModifier.withType(Map.class,
-			BukkitConverters.<WrappedStatistic, Integer>getMapConverter(
-				MinecraftReflection.getStatisticClass(),
-				BukkitConverters.getWrappedStatisticConverter()
-			)
-		);
+		return getMaps(
+				BukkitConverters.getWrappedStatisticConverter(),
+				Converters.passthrough(Integer.class));
 	}
 	
 	/**
@@ -445,7 +388,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WorldType> getWorldTypeModifier() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<WorldType>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getWorldTypeClass(),
 				BukkitConverters.getWorldTypeConverter());
 	}
@@ -456,7 +399,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WrappedDataWatcher> getDataWatcherModifier() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<WrappedDataWatcher>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getDataWatcherClass(),
 				BukkitConverters.getDataWatcherConverter());
 	}
@@ -475,7 +418,7 @@ public class PacketContainer implements Serializable {
 	public StructureModifier<Entity> getEntityModifier(@Nonnull World world) {
 		Preconditions.checkNotNull(world, "world cannot be NULL.");
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<Entity>withType(
+		return structureModifier.withType(
 				int.class, BukkitConverters.getEntityConverter(world));
 	}
 	
@@ -494,6 +437,16 @@ public class PacketContainer implements Serializable {
 		Preconditions.checkNotNull(event, "event cannot be NULL.");
 		return getEntityModifier(event.getPlayer().getWorld());
 	}
+
+	/**
+	 * Retrieves a read/write structure for entity types
+	 * @return A modifier for an EntityType.
+	 */
+	public StructureModifier<EntityType> getEntityTypeModifier() {
+		return structureModifier.withType(
+				MinecraftReflection.getMinecraftClass("EntityTypes"),
+				BukkitConverters.getEntityTypeConverter());
+	}
 	
 	/**
 	 * Retrieves a read/write structure for chunk positions.
@@ -547,10 +500,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 				Collection.class,
-				BukkitConverters.getListConverter(
-						MinecraftReflection.getNBTBaseClass(),
-						BukkitConverters.getNbtConverter()
-				)
+				BukkitConverters.getListConverter(BukkitConverters.getNbtConverter())
 		);
 	}
 
@@ -576,9 +526,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 			Collection.class,
-			BukkitConverters.getListConverter(
-					MinecraftReflection.getAttributeSnapshotClass(),
-					BukkitConverters.getWrappedAttributeConverter())
+			BukkitConverters.getListConverter(BukkitConverters.getWrappedAttributeConverter())
 		);
 	}
 	
@@ -594,10 +542,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 			Collection.class,
-			BukkitConverters.getListConverter(
-					MinecraftReflection.getChunkPositionClass(),
-					ChunkPosition.getConverter())
-		);
+			BukkitConverters.getListConverter(ChunkPosition.getConverter()));
 	}
 
 	/**
@@ -612,10 +557,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 			Collection.class,
-			BukkitConverters.getListConverter(
-					MinecraftReflection.getBlockPositionClass(),
-					BlockPosition.getConverter())
-		);
+			BukkitConverters.getListConverter(BlockPosition.getConverter()));
 	}
 
 	/**
@@ -629,10 +571,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 			Collection.class,
-			BukkitConverters.getListConverter(
-					MinecraftReflection.getDataWatcherItemClass(),
-					BukkitConverters.getWatchableObjectConverter())
-		);
+			BukkitConverters.getListConverter(BukkitConverters.getWatchableObjectConverter()));
 	}
 
 	/**
@@ -644,7 +583,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<Material> getBlocks() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<Material>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getBlockClass(), BukkitConverters.getBlockConverter());
 	}
 	
@@ -657,7 +596,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WrappedGameProfile> getGameProfiles() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<WrappedGameProfile>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getGameProfileClass(), BukkitConverters.getWrappedGameProfileConverter());
 	}
 	
@@ -670,7 +609,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WrappedBlockData> getBlockData() {
 		// Convert to and from our wrapper
-		return structureModifier.<WrappedBlockData>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getIBlockDataClass(), BukkitConverters.getWrappedBlockDataConverter());
 	}
 
@@ -685,7 +624,7 @@ public class PacketContainer implements Serializable {
 		ChunkCoordIntPair chunk = getChunkCoordIntPairs().read(0);
 
 		// Convert to and from our wrapper
-		return structureModifier.<MultiBlockChangeInfo[]>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getMultiBlockChangeInfoArrayClass(), MultiBlockChangeInfo.getArrayConverter(chunk));
 	}
 	
@@ -698,7 +637,7 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WrappedChatComponent> getChatComponents() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<WrappedChatComponent>withType(
+		return structureModifier.withType(
 				MinecraftReflection.getIChatBaseComponentClass(), BukkitConverters.getWrappedChatComponentConverter());
 	}
 
@@ -715,22 +654,23 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<WrappedChatComponent[]> getChatComponentArrays() {
 		// Convert to and from the Bukkit wrapper
-		return structureModifier.<WrappedChatComponent[]>withType(
+		return structureModifier.withType(
 				ComponentArrayConverter.getGenericType(),
-				BukkitConverters.getIgnoreNull(new ComponentArrayConverter()));
+				Converters.ignoreNull(new ComponentArrayConverter()));
 	}
 	
 	/**
 	 * Retrieve a read/write structure for the ServerPing fields in the following packet: <br>
 	 * <ul>
-	 *   <li>{@link PacketType.Status.Server#OUT_SERVER_INFO}
+	 *   <li>{@link PacketType.Status.Server#SERVER_INFO}
 	 * </ul>
 	 * @return A modifier for ServerPing fields.
 	 */
 	public StructureModifier<WrappedServerPing> getServerPings() {
 		// Convert to and from the wrapper
-		return structureModifier.<WrappedServerPing>withType(
-				MinecraftReflection.getServerPingClass(), BukkitConverters.getWrappedServerPingConverter());
+		return structureModifier.withType(
+				MinecraftReflection.getServerPingClass(),
+				BukkitConverters.getWrappedServerPingConverter());
 	}
 	
 	/**
@@ -744,10 +684,7 @@ public class PacketContainer implements Serializable {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
 			Collection.class,
-			BukkitConverters.getListConverter(
-					MinecraftReflection.getPlayerInfoDataClass(),
-					PlayerInfoData.getConverter())
-		);
+			BukkitConverters.getListConverter(PlayerInfoData.getConverter()));
 	}
 	
 	/**
@@ -756,8 +693,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<Protocol> getProtocols() {
 		// Convert to and from the wrapper
-		return structureModifier.<Protocol>withType(
-				EnumWrappers.getProtocolClass(), EnumWrappers.getProtocolConverter());
+		return structureModifier.withType(
+				EnumWrappers.getProtocolClass(),
+				EnumWrappers.getProtocolConverter());
 	}
 	
 	/**
@@ -766,8 +704,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<ClientCommand> getClientCommands() {
 		// Convert to and from the wrapper
-		return structureModifier.<ClientCommand>withType(
-				EnumWrappers.getClientCommandClass(), EnumWrappers.getClientCommandConverter());
+		return structureModifier.withType(
+				EnumWrappers.getClientCommandClass(),
+				EnumWrappers.getClientCommandConverter());
 	}
 
 	/**
@@ -776,8 +715,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<ChatVisibility> getChatVisibilities() {
 		// Convert to and from the wrapper
-		return structureModifier.<ChatVisibility>withType(
-				EnumWrappers.getChatVisibilityClass(), EnumWrappers.getChatVisibilityConverter());
+		return structureModifier.withType(
+				EnumWrappers.getChatVisibilityClass(),
+				EnumWrappers.getChatVisibilityConverter());
 	}
 	
 	/**
@@ -786,8 +726,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<Difficulty> getDifficulties() {
 		// Convert to and from the wrapper
-		return structureModifier.<Difficulty>withType(
-				EnumWrappers.getDifficultyClass(), EnumWrappers.getDifficultyConverter());
+		return structureModifier.withType(
+				EnumWrappers.getDifficultyClass(),
+				EnumWrappers.getDifficultyConverter());
 	}
 	
 	/**
@@ -796,8 +737,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<EntityUseAction> getEntityUseActions() {
 		// Convert to and from the wrapper
-		return structureModifier.<EntityUseAction>withType(
-				EnumWrappers.getEntityUseActionClass(), EnumWrappers.getEntityUseActionConverter());
+		return structureModifier.withType(
+				EnumWrappers.getEntityUseActionClass(),
+				EnumWrappers.getEntityUseActionConverter());
 	}
 
 	/**
@@ -806,8 +748,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<NativeGameMode> getGameModes() {
 		// Convert to and from the wrapper
-		return structureModifier.<NativeGameMode>withType(
-				EnumWrappers.getGameModeClass(), EnumWrappers.getGameModeConverter());
+		return structureModifier.withType(
+				EnumWrappers.getGameModeClass(),
+				EnumWrappers.getGameModeConverter());
 	}
 
 	/**
@@ -816,8 +759,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<ResourcePackStatus> getResourcePackStatus() {
 		// Convert to and from the wrapper
-		return structureModifier.<ResourcePackStatus>withType(
-				EnumWrappers.getResourcePackStatusClass(), EnumWrappers.getResourcePackStatusConverter());
+		return structureModifier.withType(
+				EnumWrappers.getResourcePackStatusClass(),
+				EnumWrappers.getResourcePackStatusConverter());
 	}
 
 	/**
@@ -826,8 +770,9 @@ public class PacketContainer implements Serializable {
 	 */
 	public StructureModifier<PlayerInfoAction> getPlayerInfoAction() {
 		// Convert to and from the wrapper
-		return structureModifier.<PlayerInfoAction>withType(
-				EnumWrappers.getPlayerInfoActionClass(), EnumWrappers.getPlayerInfoActionConverter());
+		return structureModifier.withType(
+				EnumWrappers.getPlayerInfoActionClass(),
+				EnumWrappers.getPlayerInfoActionConverter());
 	}
 
     /**
@@ -836,8 +781,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<TitleAction> getTitleActions() {
         // Convert to and from the wrapper
-        return structureModifier.<TitleAction>withType(
-                EnumWrappers.getTitleActionClass(), EnumWrappers.getTitleActionConverter());
+        return structureModifier.withType(
+                EnumWrappers.getTitleActionClass(),
+		        EnumWrappers.getTitleActionConverter());
     }
     
     /**
@@ -846,8 +792,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<WorldBorderAction> getWorldBorderActions() {
         // Convert to and from the wrapper
-        return structureModifier.<WorldBorderAction>withType(
-                EnumWrappers.getWorldBorderActionClass(), EnumWrappers.getWorldBorderActionConverter());
+        return structureModifier.withType(
+                EnumWrappers.getWorldBorderActionClass(),
+		        EnumWrappers.getWorldBorderActionConverter());
     }
     
     /**
@@ -856,8 +803,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<CombatEventType> getCombatEvents() {
         // Convert to and from the wrapper
-        return structureModifier.<CombatEventType>withType(
-                EnumWrappers.getCombatEventTypeClass(), EnumWrappers.getCombatEventTypeConverter());
+        return structureModifier.withType(
+                EnumWrappers.getCombatEventTypeClass(),
+		        EnumWrappers.getCombatEventTypeConverter());
     }
     
     /**
@@ -866,8 +814,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<PlayerDigType> getPlayerDigTypes() {
         // Convert to and from the wrapper
-        return structureModifier.<PlayerDigType>withType(
-                EnumWrappers.getPlayerDigTypeClass(), EnumWrappers.getPlayerDiggingActionConverter());
+        return structureModifier.withType(
+                EnumWrappers.getPlayerDigTypeClass(),
+		        EnumWrappers.getPlayerDiggingActionConverter());
     }
     
     /**
@@ -876,8 +825,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<PlayerAction> getPlayerActions() {
         // Convert to and from the wrapper
-        return structureModifier.<PlayerAction>withType(
-                EnumWrappers.getPlayerActionClass(), EnumWrappers.getEntityActionConverter());
+        return structureModifier.withType(
+                EnumWrappers.getPlayerActionClass(),
+		        EnumWrappers.getEntityActionConverter());
     }
     
     /**
@@ -886,18 +836,32 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<ScoreboardAction> getScoreboardActions() {
         // Convert to and from the wrapper
-        return structureModifier.<ScoreboardAction>withType(
-                EnumWrappers.getScoreboardActionClass(), EnumWrappers.getUpdateScoreActionConverter());
+        return structureModifier.withType(
+                EnumWrappers.getScoreboardActionClass(),
+		        EnumWrappers.getUpdateScoreActionConverter());
     }
 
     /**
-     * Retrieve a read/write structure for the Particle enum in 1.8.
+     * Retrieve a read/write structure for the Particle enum in 1.8-1.12.
+     * <b>NOTE:</b> This will produce undesirable results in 1.13
      * @return A modifier for Particle enum fields.
      */
-    public StructureModifier<Particle> getParticles() {
+    public StructureModifier<EnumWrappers.Particle> getParticles() {
     	// Convert to and from the wrapper
-    	return structureModifier.<Particle>withType(
-    			EnumWrappers.getParticleClass(), EnumWrappers.getParticleConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getParticleClass(),
+			    EnumWrappers.getParticleConverter());
+    }
+
+	/**
+	 * Retrieve a read/write structure for ParticleParams in 1.13
+	 * @return A modifier for ParticleParam fields.
+	 */
+	public StructureModifier<WrappedParticle> getNewParticles() {
+		return structureModifier.withType(
+				MinecraftReflection.getMinecraftClass("ParticleParam"),
+				BukkitConverters.getParticleConverter()
+		);
     }
 
     /**
@@ -906,8 +870,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<PotionEffectType> getEffectTypes() {
     	// Convert to and from Bukkit
-    	return structureModifier.<PotionEffectType>withType(
-    			MinecraftReflection.getMobEffectListClass(), BukkitConverters.getEffectTypeConverter());
+    	return structureModifier.withType(
+    			MinecraftReflection.getMobEffectListClass(),
+			    BukkitConverters.getEffectTypeConverter());
     }
 
     /**
@@ -916,8 +881,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<SoundCategory> getSoundCategories() {
     	// Convert to and from the enums
-    	return structureModifier.<SoundCategory>withType(
-    			EnumWrappers.getSoundCategoryClass(), EnumWrappers.getSoundCategoryConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getSoundCategoryClass(),
+			    EnumWrappers.getSoundCategoryConverter());
     }
 
     /**
@@ -926,8 +892,9 @@ public class PacketContainer implements Serializable {
      */
     public StructureModifier<Sound> getSoundEffects() {
     	// Convert to and from Bukkit
-    	return structureModifier.<Sound>withType(
-    			MinecraftReflection.getSoundEffectClass(), BukkitConverters.getSoundConverter());
+    	return structureModifier.withType(
+    			MinecraftReflection.getSoundEffectClass(),
+			    BukkitConverters.getSoundConverter());
     }
 
     /**
@@ -935,8 +902,9 @@ public class PacketContainer implements Serializable {
      * @return A modifier for ItemSlot enum fields.
      */
     public StructureModifier<ItemSlot> getItemSlots() {
-    	return structureModifier.<ItemSlot>withType(
-    			EnumWrappers.getItemSlotClass(), EnumWrappers.getItemSlotConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getItemSlotClass(),
+			    EnumWrappers.getItemSlotConverter());
     }
 
     /**
@@ -944,8 +912,9 @@ public class PacketContainer implements Serializable {
      * @return A modifier for Hand enum fields.
      */
     public StructureModifier<Hand> getHands() {
-    	return structureModifier.<Hand>withType(
-    			EnumWrappers.getHandClass(), EnumWrappers.getHandConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getHandClass(),
+			    EnumWrappers.getHandConverter());
     }
 
     /**
@@ -953,8 +922,9 @@ public class PacketContainer implements Serializable {
      * @return A modifier for Direction enum fields.
      */
     public StructureModifier<Direction> getDirections() {
-    	return structureModifier.<Direction>withType(
-    			EnumWrappers.getDirectionClass(), EnumWrappers.getDirectionConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getDirectionClass(),
+			    EnumWrappers.getDirectionConverter());
     }
     
     /**
@@ -962,8 +932,75 @@ public class PacketContainer implements Serializable {
      * @return A modifier for ChatType enum fields.
      */
     public StructureModifier<ChatType> getChatTypes() {
-    	return structureModifier.<ChatType>withType(
-    			EnumWrappers.getChatTypeClass(), EnumWrappers.getChatTypeConverter());
+    	return structureModifier.withType(
+    			EnumWrappers.getChatTypeClass(),
+			    EnumWrappers.getChatTypeConverter());
+    }
+
+	/**
+	 * Retrieve a read/write structure for the MinecraftKey class.
+	 * @return A modifier for MinecraftKey fields.
+	 */
+	public StructureModifier<MinecraftKey> getMinecraftKeys() {
+    	return structureModifier.withType(
+    			MinecraftReflection.getMinecraftKeyClass(),
+			    MinecraftKey.getConverter());
+    }
+
+	/**
+	 * Retrive a read/write structure for dimension IDs in 1.13.1+
+	 * @return A modifier for dimension IDs
+	 */
+	public StructureModifier<Integer> getDimensions() {
+		return structureModifier.withType(
+				MinecraftReflection.getMinecraftClass("DimensionManager"),
+				BukkitConverters.getDimensionIDConverter()
+		);
+    }
+
+	/**
+	 * Retrieve a read/write structure for the Map class.
+	 * @param keyConverter Converter for map keys
+	 * @param valConverter Converter for map values
+	 * @param <K> Key param
+	 * @param <V> Value param
+	 * @return A modifier for Map fields.
+	 *
+	 * @see BukkitConverters
+	 * @see EquivalentConverter
+	 */
+    public <K, V> StructureModifier<Map<K, V>> getMaps(EquivalentConverter<K> keyConverter,
+                                                       EquivalentConverter<V> valConverter) {
+    	return structureModifier.withType(
+    			Map.class,
+			    BukkitConverters.getMapConverter(keyConverter, valConverter));
+    }
+
+	/**
+	 * Retrieve a read/write structure for the Set class.
+	 * @param converter Converter for elements
+	 * @param <E> Element param
+	 * @return A modifier for Set fields
+	 *
+	 * @see BukkitConverters
+	 * @see EquivalentConverter
+	 */
+	public <E> StructureModifier<Set<E>> getSets(EquivalentConverter<E> converter) {
+    	return structureModifier.withType(
+    			Set.class,
+			    BukkitConverters.getSetConverter(converter));
+    }
+
+	/**
+	 * Retrieve a read/write structure for the List class.
+	 * @param converter Converter for elements
+	 * @param <E> Element param
+	 * @return A modifier for List fields
+	 */
+	public <E> StructureModifier<List<E>> getLists(EquivalentConverter<E> converter) {
+		return structureModifier.withType(
+				List.class,
+				BukkitConverters.getListConverter(converter));
     }
 
     /**
@@ -977,7 +1014,9 @@ public class PacketContainer implements Serializable {
      * @return The modifier
      */
     public <T extends Enum<T>> StructureModifier<T> getEnumModifier(Class<T> enumClass, Class<?> nmsClass) {
-    	return structureModifier.<T>withType(nmsClass, new EnumConverter<T>(enumClass));
+    	return structureModifier.withType(
+    			nmsClass,
+			    new EnumConverter<>(nmsClass, enumClass));
     }
 
     /**
@@ -990,7 +1029,9 @@ public class PacketContainer implements Serializable {
      * @see #getEnumModifier(Class, Class)
      */
     public <T extends Enum<T>> StructureModifier<T> getEnumModifier(Class<T> enumClass, int index) {
-    	return getEnumModifier(enumClass, structureModifier.getField(index).getType());
+    	return getEnumModifier(
+    			enumClass,
+			    structureModifier.getField(index).getType());
 	}
 
 	/**
@@ -1036,7 +1077,7 @@ public class PacketContainer implements Serializable {
 	 * @return A deep copy of the current packet.
 	 */
 	public PacketContainer deepClone() {
-		Object clonedPacket = null;
+		Object clonedPacket;
 		
 		// Fall back on the alternative (but slower) method of reading and writing back the packet
 		if (CLONING_UNSUPPORTED.contains(type)) {
@@ -1156,21 +1197,52 @@ public class PacketContainer implements Serializable {
 	}
 
 	// ---- Metadata
-	// This map will only be initialized if it is actually used
-	private Map<String, Object> metadata;
+
+	/**
+	 * Gets the metadata value for a given key if it exists. Packet metadata expires after a minute, which is far longer
+	 * than a packet will ever be held in processing.
+	 *
+	 * @param key Metadata key
+	 * @param <T> Metadata type
+	 * @return The metadata value, or an empty optional
+	 */
+	public <T> Optional<T> getMeta(String key) {
+		return PacketMetadata.get(handle, key);
+	}
+
+	/**
+	 * Sets the metadata value at a given key. Packet metadata expires after a minute, which is far longer than a packet
+	 * will ever be held in processing.
+	 *
+	 * @param key Metadata key
+	 * @param value Metadata value
+	 * @param <T> Metadata type
+	 */
+	public <T> void setMeta(String key, T value) {
+		PacketMetadata.set(handle, key, value);
+	}
+
+	/**
+	 * Removes the metadata for a given key if it exists.
+	 * @param key Key to remove meta for
+	 */
+	public void removeMeta(String key) {
+		PacketMetadata.remove(handle, key);
+	}
+
+	// ---- Old Metadata API
+	// Scheduled for removal in 4.5
 
 	/**
 	 * Gets the metadata value for a given key.
 	 * 
 	 * @param key Metadata key
 	 * @return Metadata value, or null if nonexistent.
+	 * @deprecated Replaced with {@link #getMeta(String)}
 	 */
+	@Deprecated
 	public Object getMetadata(String key) {
-		if (metadata != null) {
-			return metadata.get(key);
-		}
-
-		return null;
+		return getMeta(key).orElse(null);
 	}
 
 	/**
@@ -1180,13 +1252,11 @@ public class PacketContainer implements Serializable {
 	 * 
 	 * @param key Metadata key
 	 * @param value Metadata value
+	 * @deprecated Replaced by {@link #setMeta(String, Object)}
 	 */
+	@Deprecated
 	public void addMetadata(String key, Object value) {
-		if (metadata == null) {
-			metadata = new HashMap<String, Object>();
-		}
-
-		metadata.put(key, value);
+		setMeta(key, value);
 	}
 
 	/**
@@ -1196,18 +1266,11 @@ public class PacketContainer implements Serializable {
 	 * 
 	 * @param key Metadata key
 	 * @return The previous value, or null if nonexistant.
+	 * @deprecated Replaced by {@link #removeMeta(String)}. This one was pretty much just for naming consistency.
 	 */
+	@Deprecated
 	public Object removeMetadata(String key) {
-		if (metadata != null) {
-			Object value = metadata.remove(key);
-			if (metadata.isEmpty()) {
-				metadata = null;
-			}
-
-			return value;
-		}
-
-		return null;
+		return PacketMetadata.remove(handle, key).orElseGet(null);
 	}
 
 	/**
@@ -1215,9 +1278,11 @@ public class PacketContainer implements Serializable {
 	 * 
 	 * @param key Metadata key
 	 * @return True if this packet has metadata for the key, false if not.
+	 * @deprecated Replaced with {@code getMeta(key).isPresent()}
 	 */
+	@Deprecated
 	public boolean hasMetadata(String key) {
-		return metadata != null && metadata.containsKey(key);
+		return getMeta(key).isPresent();
 	}
 
 	/**
@@ -1259,13 +1324,13 @@ public class PacketContainer implements Serializable {
 		final EquivalentConverter<ItemStack> stackConverter = BukkitConverters.getItemStackConverter();
 		
 		@Override
-		public Object getGeneric(Class<?>genericType, ItemStack[] specific) {
+		public Object getGeneric(ItemStack[] specific) {
 			Class<?> nmsStack = MinecraftReflection.getItemStackClass();
 			Object[] result = (Object[]) Array.newInstance(nmsStack, specific.length);
 			
 			// Unwrap every item
 			for (int i = 0; i < result.length; i++) {
-				result[i] = stackConverter.getGeneric(nmsStack, specific[i]);
+				result[i] = stackConverter.getGeneric(specific[i]);
 			}
 			return result;
 		}
@@ -1296,13 +1361,13 @@ public class PacketContainer implements Serializable {
 		final EquivalentConverter<WrappedChatComponent> componentConverter = BukkitConverters.getWrappedChatComponentConverter();
 		
 		@Override
-		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
+		public Object getGeneric(WrappedChatComponent[] specific) {
 			Class<?> nmsComponent = MinecraftReflection.getIChatBaseComponentClass();
 			Object[] result = (Object[]) Array.newInstance(nmsComponent, specific.length);
 			
 			// Unwrap every item
 			for (int i = 0; i < result.length; i++) {
-				result[i] = componentConverter.getGeneric(nmsComponent, specific[i]);
+				result[i] = componentConverter.getGeneric(specific[i]);
 			}
 			return result;
 		}
@@ -1351,7 +1416,7 @@ public class PacketContainer implements Serializable {
 		}
 
 		@Override
-		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
+		public Object getGeneric(WrappedChatComponent[] specific) {
 			NbtCompound compound = NbtFactory.ofCompound("");
 
 			for (int i = 0; i < lines; i++) {
@@ -1365,7 +1430,7 @@ public class PacketContainer implements Serializable {
 				compound.put("Text" + (i + 1), component.getJson());
 			}
 
-			return nbtConverter.getGeneric(genericType, compound);
+			return nbtConverter.getGeneric(compound);
 		}
 
 		@Override
@@ -1381,7 +1446,7 @@ public class PacketContainer implements Serializable {
 	private static class ComponentArrayConverter implements EquivalentConverter<WrappedChatComponent[]> {
 		private static final EquivalentConverter<WrappedChatComponent[]> DELEGATE;
 		static {
-			if (!PacketType.Play.Server.UPDATE_SIGN.isDeprecated()) {
+			if (MinecraftReflection.signUpdateExists()) {
 				DELEGATE = new LegacyComponentConverter();
 			} else {
 				DELEGATE = new NBTComponentConverter();
@@ -1394,8 +1459,8 @@ public class PacketContainer implements Serializable {
 		}
 
 		@Override
-		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
-			return DELEGATE.getGeneric(genericType, specific);
+		public Object getGeneric(WrappedChatComponent[] specific) {
+			return DELEGATE.getGeneric(specific);
 		}
 
 		@Override

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

@@ -33,6 +33,7 @@ import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.error.PluginContext;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.injector.server.TemporaryPlayer;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
@@ -49,7 +50,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 			"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());
+			Multimaps.synchronizedSetMultimap(HashMultimap.create());
 	
 	/**
 	 * Automatically generated by Eclipse.
@@ -57,8 +58,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	private static final long serialVersionUID = -5360289379097430620L;
 	
 	private transient WeakReference<Player> playerReference;
-	private transient Player offlinePlayer;
-	
+
 	private PacketContainer packet;
 	private boolean serverPacket;
 	private boolean cancel;
@@ -89,7 +89,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	private PacketEvent(Object source, PacketContainer packet, NetworkMarker marker, Player player, boolean serverPacket, boolean filtered) {
 		super(source);
 		this.packet = packet;
-		this.playerReference = new WeakReference<Player>(player);
+		this.playerReference = new WeakReference<>(player);
 		this.networkMarker = marker;
 		this.serverPacket = serverPacket;
 		this.filtered = filtered;
@@ -98,7 +98,7 @@ public class PacketEvent extends EventObject implements Cancellable {
 	private PacketEvent(PacketEvent origial, AsyncMarker asyncMarker) {
 		super(origial.source);
 		this.packet = origial.packet;
-		this.playerReference = origial.playerReference;
+		this.playerReference = origial.getPlayerReference();
 		this.cancel = origial.cancel;
 		this.serverPacket = origial.serverPacket;
 		this.filtered = origial.filtered;
@@ -316,12 +316,48 @@ public class PacketEvent extends EventObject implements Cancellable {
 		this.cancel = cancel;
 	}
 
+	private WeakReference<Player> getPlayerReference() {
+		Player player = playerReference.get();
+
+		if (player instanceof TemporaryPlayer) {
+			Player updated = player.getPlayer();
+			if (updated != null && !(updated instanceof TemporaryPlayer)) {
+				playerReference.clear();
+				playerReference = new WeakReference<>(updated);
+			}
+		}
+
+		return playerReference;
+	}
+
 	/**
-	 * Retrieves the player that has sent the packet or is recieving it.
+	 * Retrieves the player that has sent the packet or is receiving it.
 	 * @return The player associated with this event.
 	 */
 	public Player getPlayer() {
-		return playerReference.get();
+		return getPlayerReference().get();
+	}
+
+	/**
+	 * Whether or not the player in this PacketEvent is temporary (i.e. they don't have a true player instance yet).
+	 * Temporary players have a limited subset of methods that may be used:
+	 * <ul>
+	 *     <li>getPlayer</li>
+	 *     <li>getAddress</li>
+	 *     <li>getServer</li>
+	 *     <li>chat</li>
+	 *     <li>sendMessage</li>
+	 *     <li>kickPlayer</li>
+	 *     <li>isOnline</li>
+	 * </ul>
+	 *
+	 * Anything else will throw an UnsupportedOperationException. Use this check before calling other methods when
+	 * dealing with packets early in the login sequence or if you get the aforementioned exception.
+	 *
+	 * @return True if the player is temporary, false if not.
+	 */
+	public boolean isPlayerTemporary() {
+		return getPlayer() instanceof TemporaryPlayer;
 	}
 	
 	/**
@@ -432,7 +468,8 @@ public class PacketEvent extends EventObject implements Cancellable {
 		output.defaultWriteObject();
 
 		// Write the name of the player (or NULL if it's not set)
-		output.writeObject(playerReference.get() != null ? new SerializedOfflinePlayer(playerReference.get()) : null);
+		Player player = getPlayer();
+		output.writeObject(player != null ? new SerializedOfflinePlayer(player) : null);
 	}
 
 	private void readObject(ObjectInputStream input) throws ClassNotFoundException, IOException {
@@ -444,8 +481,8 @@ public class PacketEvent extends EventObject implements Cancellable {
 		// 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);
+		    Player offlinePlayer = serialized.getPlayer();
+	    	playerReference = new WeakReference<>(offlinePlayer);
 	    }
 	}
 

src/main/java/com/comphenix/protocol/events/PacketMetadata.java

@@ -0,0 +1,142 @@
+/**
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2017 dmulloy2
+ *
+ *  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 com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import org.apache.commons.lang.Validate;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Stores and retrieves metadata for applicable packet objects.
+ * @author dmulloy2
+ */
+class PacketMetadata {
+
+	private static class MetaObject<T> {
+		private final String key;
+		private final T value;
+
+		private MetaObject(String key, T value) {
+			this.key = key;
+			this.value = value;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(key, value);
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) return true;
+
+			if (o instanceof MetaObject) {
+				MetaObject that = (MetaObject) o;
+				return that.key.equals(this.key) &&
+			           that.value.equals(this.value);
+			}
+
+			return false;
+		}
+
+		@Override
+		public String toString() {
+			return "MetaObject[" + key + "=" + value + "]";
+		}
+	}
+
+	// Packet meta cache
+	private static Cache<Object, List<MetaObject>> META_CACHE;
+
+	public static <T> Optional<T> get(Object packet, String key) {
+		Validate.notNull(key, "Null keys are not permitted!");
+
+		if (META_CACHE == null) {
+			return Optional.empty();
+		}
+
+		List<MetaObject> meta = META_CACHE.getIfPresent(packet);
+		if (meta == null) {
+			return Optional.empty();
+		}
+
+		for (MetaObject object : meta) {
+			if (object.key.equals(key)) {
+				return Optional.of((T) object.value);
+			}
+		}
+
+		return Optional.empty();
+	}
+
+	private static void createCache() {
+		META_CACHE = CacheBuilder
+				.newBuilder()
+				.expireAfterWrite(1, TimeUnit.MINUTES)
+				.build();
+	}
+
+	public static <T> void set(Object packet, String key, T value) {
+		Validate.notNull(key, "Null keys are not permitted!");
+
+		if (META_CACHE == null) {
+			createCache();
+		}
+
+		List<MetaObject> packetMeta;
+
+		try {
+			packetMeta = META_CACHE.get(packet, ArrayList::new);
+		} catch (ExecutionException ex) {
+			// Not possible, but let's humor the array list constructor having an issue
+			packetMeta = new ArrayList<>();
+		}
+
+		packetMeta.removeIf(meta -> meta.key.equals(key));
+		packetMeta.add(new MetaObject<>(key, value));
+		META_CACHE.put(packet, packetMeta);
+	}
+
+	public static <T> Optional<T> remove(Object packet, String key) {
+		Validate.notNull(key, "Null keys are not permitted!");
+
+		if (META_CACHE == null) {
+			return Optional.empty();
+		}
+
+		List<MetaObject> packetMeta = META_CACHE.getIfPresent(packet);
+		if (packetMeta == null) {
+			return Optional.empty();
+		}
+
+		Optional<T> value = Optional.empty();
+		Iterator<MetaObject> iter = packetMeta.iterator();
+		while (iter.hasNext()) {
+			MetaObject meta = iter.next();
+			if (meta.key.equals(key)) {
+				value = Optional.of((T) meta.value);
+				iter.remove();
+			}
+		}
+
+		return value;
+	}
+}

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

@@ -30,10 +30,8 @@ import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
+import org.bukkit.*;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.utility.EnhancerFactory;
@@ -109,6 +107,50 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
 		return bedSpawnLocation;
 	}
 
+	// TODO do we need to implement this?
+	
+	public void incrementStatistic(Statistic statistic) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic) throws IllegalArgumentException { }
+
+	public void incrementStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
+
+	public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
+
+	public int getStatistic(Statistic statistic) throws IllegalArgumentException {
+		return 0;
+	}
+
+	public void incrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException { }
+
+	public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
+		return 0;
+	}
+
+	public void incrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
+
+	public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
+
+	public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { }
+
+	public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
+		return 0;
+	}
+
+	public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException { }
+
+	public void decrementStatistic(Statistic statistic, EntityType entityType, int i) { }
+
+	public void setStatistic(Statistic statistic, EntityType entityType, int i) { }
+
 	@Override
 	public long getFirstPlayed() {
 		return firstPlayed;

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

@@ -5,28 +5,15 @@ 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.ListeningWhitelist;
-import com.comphenix.protocol.events.NetworkMarker;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.events.*;
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.reflect.FieldAccessException;
@@ -37,6 +24,13 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
+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;
+
 /**
  * A protocol manager that delays all packet listener registrations and unregistrations until
  * an underlying protocol manager can be constructed.
@@ -440,7 +434,7 @@ public class DelayedPacketManager implements InternalManager {
 		if (delegate != null)
 			delegate.updateEntity(entity, observers);
 		else
-			EntityUtilities.updateEntity(entity, observers);
+			EntityUtilities.getInstance().updateEntity(entity, observers);
 	}
 	
 	@Override
@@ -448,7 +442,7 @@ public class DelayedPacketManager implements InternalManager {
 		if (delegate != null)
 			return delegate.getEntityFromID(container, id);
 		else
-			return EntityUtilities.getEntityFromID(container, id);
+			return EntityUtilities.getInstance().getEntityFromID(container, id);
 	}
 	
 	@Override
@@ -456,7 +450,7 @@ public class DelayedPacketManager implements InternalManager {
 		if (delegate != null)
 			return delegate.getEntityTrackers(entity);
 		else
-			return EntityUtilities.getEntityTrackers(entity);
+			return EntityUtilities.getInstance().getEntityTrackers(entity);
 	}
 
 	@Override

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

@@ -0,0 +1,269 @@
+/*
+ *  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.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.FieldAccessor;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.wrappers.WrappedIntHashMap;
+import com.google.common.collect.Lists;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+/**
+ * Used to perform certain operations on entities.
+ *
+ * @author Kristian
+ */
+class EntityUtilities {
+	private static final boolean NEW_TRACKER = MinecraftVersion.VILLAGE_UPDATE.atOrAbove();
+	private static final EntityUtilities INSTANCE = new EntityUtilities();
+
+	public static EntityUtilities getInstance() {
+		return INSTANCE;
+	}
+
+	private EntityUtilities() { }
+
+	private FieldAccessor entityTrackerField;
+	private FieldAccessor trackedEntitiesField;
+	private FieldAccessor trackedPlayersField;
+
+	private Map<Class<?>, MethodAccessor> scanPlayersMethods = new HashMap<>();
+
+	public void updateEntity(Entity entity, List<Player> observers) {
+		if (entity == null || !entity.isValid()) {
+			return;
+		}
+
+		Collection<?> trackedPlayers = getTrackedPlayers(entity);
+		List<Object> nmsPlayers = unwrapBukkit(observers);
+
+		trackedPlayers.removeAll(nmsPlayers);
+
+		Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+
+		// there can be multiple different entity tracker entry impls, see GH-732....
+		scanPlayersMethods.computeIfAbsent(trackerEntry.getClass(), this::findScanPlayers).invoke(trackerEntry, nmsPlayers);
+	}
+
+	private MethodAccessor findScanPlayers(Class<?> trackerClass) {
+		MethodAccessor candidate = Accessors.getMethodAcccessorOrNull(trackerClass, "scanPlayers");
+		if (candidate != null) {
+			return candidate;
+		}
+
+		FuzzyReflection fuzzy = FuzzyReflection.fromClass(trackerClass, true);
+		return Accessors.getMethodAccessor(
+				fuzzy.getMethod(
+						FuzzyMethodContract.newBuilder().returnTypeVoid().parameterExactArray(List.class).build()));
+	}
+
+	/**
+	 * 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) {
+		if (entity == null || !entity.isValid()) {
+			return new ArrayList<>();
+		}
+
+		List<Player> result = new ArrayList<>();
+		Collection<?> trackedPlayers = getTrackedPlayers(entity);
+
+		// 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;
+	}
+
+	private Collection<?> getTrackedPlayers(Entity entity) {
+		Validate.notNull(entity, "entity cannot be null");
+
+		Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+		Validate.notNull(trackerEntry, "Could not find entity trackers for " + entity);
+
+		if (trackedPlayersField == null) {
+			trackedPlayersField = Accessors.getFieldAccessor(FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*"));
+		}
+
+		Validate.notNull(trackedPlayersField, "Could not find trackedPlayers field");
+
+		Object value = trackedPlayersField.get(trackerEntry);
+		if (value instanceof Collection) {
+			return (Collection<?>) value;
+		} else if (value instanceof Map) {
+			return ((Map<?, ?>) value).keySet();
+		} else {
+			// Please. No more changes.
+			throw new IllegalStateException("trackedPlayers field was an unknown type: expected Collection or Map, but got " + value.getClass());
+		}
+	}
+
+	private MethodAccessor getChunkProvider;
+	private FieldAccessor chunkMapField;
+
+	@SuppressWarnings("unchecked")
+	private Object getNewEntityTracker(Object worldServer, int entityId) {
+		if (getChunkProvider == null) {
+			Class<?> chunkProviderClass = MinecraftReflection.getMinecraftClass("ChunkProviderServer");
+			getChunkProvider = Accessors.getMethodAccessor(
+					FuzzyReflection.fromClass(worldServer.getClass(), false).getMethod(
+							FuzzyMethodContract.newBuilder().parameterCount(0).returnTypeExact(chunkProviderClass).build()));
+		}
+
+		Object chunkProvider = getChunkProvider.invoke(worldServer);
+
+		if (chunkMapField == null) {
+			Class<?> chunkMapClass = MinecraftReflection.getMinecraftClass("PlayerChunkMap");
+			chunkMapField = Accessors.getFieldAccessor(
+					FuzzyReflection.fromClass(chunkProvider.getClass(), false).getField(
+							FuzzyFieldContract.newBuilder().typeExact(chunkMapClass).build()));
+		}
+
+		Object playerChunkMap = chunkMapField.get(chunkProvider);
+
+		if (trackedEntitiesField == null) {
+			trackedEntitiesField = Accessors.getFieldAccessor(
+					FuzzyReflection.fromClass(playerChunkMap.getClass(), false).getField(
+							FuzzyFieldContract.newBuilder().typeDerivedOf(Map.class).nameExact("trackedEntities").build()));
+		}
+
+		Map<Integer, Object> trackedEntities = (Map<Integer, Object>) trackedEntitiesField.get(playerChunkMap);
+		return trackedEntities.get(entityId);
+	}
+
+	private Object getEntityTrackerEntry(World world, int entityID) {
+		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
+		Object worldServer = unwrapper.unwrapItem(world);
+
+		if (NEW_TRACKER) {
+			return getNewEntityTracker(worldServer, entityID);
+		}
+
+		if (entityTrackerField == null)
+			entityTrackerField = Accessors.getFieldAccessor(FuzzyReflection.fromObject(worldServer).
+									getFieldByType("tracker", MinecraftReflection.getEntityTrackerClass()));
+
+		// Get the tracker
+		Object tracker = entityTrackerField.get(worldServer);
+
+		// Looking for an IntHashMap in the tracker entry
+		if (trackedEntitiesField == null) {
+			trackedEntitiesField = Accessors.getFieldAccessor(FuzzyReflection.fromObject(tracker, false)
+					.getFieldByType("trackedEntities", MinecraftReflection.getIntHashMapClass()));
+		}
+
+		// Read the map
+		Object trackedEntities = trackedEntitiesField.get(tracker);
+		return WrappedIntHashMap.fromHandle(trackedEntities).get(entityID);
+	}
+
+	private Map<Class<?>, FieldAccessor> trackerFields = new ConcurrentHashMap<>();
+	private MethodAccessor getEntityFromId;
+
+	/**
+	 * Retrieve entity from a ID, even it it's newly created.
+	 * @return The associated entity.
+	 * @throws FieldAccessException Reflection error.
+	 */
+	public Entity getEntityFromID(World world, int entityID) {
+		Validate.notNull(world, "world cannot be null");
+		Validate.isTrue(entityID >= 0, "entityID cannot be negative");
+
+		try {
+			// first, try to read from the world
+			// this should be good enough for most cases, but only exists in 1.14+
+			if (NEW_TRACKER) {
+				Object worldServer = BukkitUnwrapper.getInstance().unwrapItem(world);
+
+				if (getEntityFromId == null) {
+					FuzzyReflection fuzzy = FuzzyReflection.fromClass(worldServer.getClass(), false);
+					getEntityFromId = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+							.parameterExactArray(int.class)
+							.returnTypeExact(MinecraftReflection.getEntityClass())
+							.build()));
+				}
+
+				Object entity = getEntityFromId.invoke(worldServer, entityID);
+				if (entity != null) {
+					return (Entity) MinecraftReflection.getBukkitEntity(entity);
+				}
+			}
+
+			// then go into the trackers
+			Object trackerEntry = getEntityTrackerEntry(world, entityID);
+			Object tracker = null;
+
+			if (trackerEntry != null) {
+				// plugins like citizens will use their own tracker
+				FieldAccessor trackerField = trackerFields.computeIfAbsent(trackerEntry.getClass(), x -> {
+					try {
+						return Accessors.getFieldAccessor(trackerEntry.getClass(), "tracker", true);
+					} catch (Exception e) {
+						// Assume it's the first entity field then
+						return Accessors.getFieldAccessor(FuzzyReflection.fromObject(trackerEntry, true)
+								.getFieldByType("tracker", MinecraftReflection.getEntityClass()));
+					}
+				});
+
+				tracker = trackerField.get(trackerEntry);
+			}
+
+			// If the tracker is NULL, we'll just assume this entity doesn't exist
+			return tracker != null ? (Entity) MinecraftReflection.getBukkitEntity(tracker) : null;
+		} catch (Exception e) {
+			throw new FieldAccessException("Cannot find entity from ID " + entityID + ".", e);
+		}
+	}
+
+	private List<Object> unwrapBukkit(List<Player> players) {
+		List<Object> output = Lists.newArrayList();
+		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
+
+		// Get the NMS equivalent
+		for (Player player : players) {
+			Object result = unwrapper.unwrapItem(player);
+
+			if (result != null)
+				output.add(result);
+			else
+				throw new IllegalArgumentException("Cannot unwrap item " + player);
+		}
+
+		return output;
+	}
+}