Update version to 4.5.0 for release

Finally got around to it on my ci and nexus

.github/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+Contributing to ProtocolLib
+===========================
+This page will detail specific things that must be done if you intend to contribute to this project.
+
+## Updating ProtocolLib to a New Protocol Version
+#### Before we get started:
+1. **When do we need to update the protocol version?**
+    _A Minecraft protocol version is a number for each specification of the Minecraft protocol.
+    This means it is incremented when there is a change to the [Protocol Specification](http://wiki.vg/Protocol),
+    but not necessarily for each Minecraft version update. If the latest Minecraft version contains a protocol change,
+    that means ProtocolLib needs to be updated._
+2. **When do we need to update other parts of ProtocolLib?**
+    _When the package version guard changes. The package version guard is the version string inserted
+    into the package identifier for CraftBukkit and net.minecraft.server (e.g. v1_9_R2). It is incremented
+    by Spigot if there is a major breaking change in the internal server code. This is to encourage plugins
+    that interact directly with CraftBukkit/nms code to update more specifically. However, since most of
+    ProtocolLib uses reflection, and the structure of packet classes is generally static, one will have
+    to go through the code and change imports from nms/CraftBukkit._
+
+#### Ready? Let's get started!
+1. Read the [Protocol Changes](http://wiki.vg/Protocol_History). Always make sure the list is both
+complete and correct. If you're unsure, don't hesitate to ask in #mcdevs (the people who maintain wiki.vg) on [freenode.net](http://freenode.net)
+or #spigot on [irc.spi.gt](http://irc.spi.gt) ([webchat](https://irc.spi.gt/iris/?channels=spigot)).
+2. Search for usages of the now-defunct NMS package guard and change them.
+3. The class `com.comphenix.protocol.PacketType` contains a list of all the packets. If any packets were added or removed
+(or had their ID changed), make sure to update this list. If a packet was removed
+in favor of usage of another packet, instead of removing it, move it to the bottom of the list
+in its section, add a deprecation warning to it, and redirect it to the packet that replaced it.
+4. `mvn` in the root directory to build the project.
+5. If tests fail in the maven build, go through the tests to make sure you removed references to any removed packets
+and changed the NMS version guards.
+6. Increment the package version in `com.comphenix.protocol.utility.Constants`.
+7. `com.comphenix.protocol.ProtocolLibrary` contains several constants that must be updated, including the Minecraft version
+and the release date.
+8. `com.comphenix.protocol.utility.MinecraftProtocolVersion` contains a map of all the protocol version integers.
+If the protocol version has been incremented, add a new line to the map.
+9. `mvn` in root directory again. If it builds successfully, test on the appropriate version of a Spigot server. If
+the build fails, debug!

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+_Follow this template except for feature requests. Use pastebin when providing /protocol dump and any relevant errors._
+
+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:

.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

@@ -7,6 +7,10 @@
 .classpath
 .settings/
 bin/
+.idea/
+*.iml
+.ipr
+.iws
 
 *.pydevproject
 .metadata
@@ -171,4 +175,8 @@ pip-log.txt
 .DS_Store
 
 # Log4J files
+logs/
+
+.gradle/
+build/
 logs/

.travis.yml

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

ProtocolLib/.gitignore

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

ProtocolLib/pom.xml

@@ -1,300 +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>3.6.5</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>v3-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.number></project.build.number>
-  </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.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>
-                </excludes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Main-Class>com.comphenix.protocol.Application</Main-Class>
-              <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.version}${project.build.number}</Implementation-Version>
-              <Implementation-Vendor>dmulloy2</Implementation-Vendor>
-            </manifestEntries>
-          </archive>
-          <finalName>ProtocolLib</finalName>
-        </configuration>
-      </plugin>
-
-      <!--<plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-              <goal>javadoc</goal>
-            </goals>
-          </execution>
-
-        </executions>
-      </plugin>-->
-
-    </plugins>
-  </build>
-
-  <!--<reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <threshold>High</threshold>
-          <effort>Default</effort>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <failOnError>false</failOnError>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-          </links>
-        </configuration>
-      </plugin>
-    </plugins>
-
-  </reporting>-->
-
-  <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>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</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.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</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://shadowvolt.com/</url>
-      <roles>
-        <role>developer</role>
-        <role>maintainer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>aadnk</id>
-      <name>Kristian S. Stangeland</name>
-      <email>kr_stang@hotmail.com</email>
-      <url>http://comphenix.net/</url>
-      <roles>
-        <role>former author</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</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>
-    <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>

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

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

ProtocolLib/src/main/java/com/comphenix/protocol/compat/guava/Guava.java

@@ -1,67 +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.compat.guava;
-
-import java.io.DataInputStream;
-import java.util.Set;
-import java.util.logging.Level;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.google.common.collect.Range;
-
-/**
- * @author dmulloy2
- */
-
-public class Guava {
-	private static GuavaCompat compat;
-
-	static {
-		try {
-			Range.closed(1, 2);
-			compat = new Guava17();
-		} catch (Throwable ex) {
-			try {
-				Class<?> clazz = Class.forName("com.comphenix.protocol.compat.guava.Guava10");
-				compat = (GuavaCompat) clazz.newInstance();
-			} catch (Throwable ex1) {
-				ProtocolLibrary.log(Level.SEVERE, "Failed to create Guava 10 compat:", ex1);
-			}
-		}
-	}
-
-	private static GuavaCompat getCompat() {
-		return compat;
-	}
-
-	public static <C extends Comparable<C>> Range<C> closedRange(C lower, C upper) {
-		return getCompat().closedRange(lower, upper);
-	}
-
-	public static <C extends Comparable<C>> Range<C> singleton(C singleton) {
-		return getCompat().singletonRange(singleton);
-	}
-
-	public static Set<Integer> toSet(Range<Integer> range) {
-		return getCompat().toSet(range);
-	}
-
-	public static DataInputStream addHeader(DataInputStream input, PacketType type) {
-		return getCompat().addHeader(input, type);
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/guava/Guava17.java

@@ -1,76 +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.compat.guava;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-
-import com.comphenix.protocol.PacketType;
-import com.google.common.collect.ContiguousSet;
-import com.google.common.collect.DiscreteDomain;
-import com.google.common.collect.Range;
-import com.google.common.io.ByteSource;
-
-/**
- * @author dmulloy2
- */
-
-public class Guava17 implements GuavaCompat {
-
-	@Override
-	public <C extends Comparable<C>> Range<C> closedRange(C lower, C upper) {
-		return Range.closed(lower, upper);
-	}
-
-	@Override
-	public <C extends Comparable<C>> Range<C> singletonRange(C singleton) {
-		return Range.singleton(singleton);
-	}
-
-	@Override
-	public Set<Integer> toSet(Range<Integer> range) {
-		return ContiguousSet.create(range, DiscreteDomain.integers());
-	}
-
-	@Override
-	public DataInputStream addHeader(final DataInputStream input, final PacketType type) {
-		ByteSource header = new ByteSource() {
-			@Override
-			public InputStream openStream() throws IOException {
-				byte[] data = new byte[] { (byte) type.getLegacyId() };
-				return new ByteArrayInputStream(data);
-			}
-		};
-
-		ByteSource data = new ByteSource() {
-			@Override
-			public InputStream openStream() throws IOException {
-				return input;
-			}
-		};
-		
-		// Combine them into a single stream
-		try {
-			return new DataInputStream(ByteSource.concat(header, data).openStream());
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot add header.", e);
-		}
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/guava/GuavaCompat.java

@@ -1,38 +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.compat.guava;
-
-import java.io.DataInputStream;
-import java.util.Set;
-
-import com.comphenix.protocol.PacketType;
-import com.google.common.collect.Range;
-
-/**
- * @author dmulloy2
- */
-
-public interface GuavaCompat {
-
-	<C extends Comparable<C>> Range<C> closedRange(C lower, C upper);
-
-	<C extends Comparable<C>> Range<C> singletonRange(C singleton);
-
-	Set<Integer> toSet(Range<Integer> range);
-
-	DataInputStream addHeader(DataInputStream input, PacketType type);
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/ChannelInjector.java

@@ -1,28 +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.compat.netty;
-
-import com.comphenix.protocol.injector.netty.Injector;
-
-/**
- * @author dmulloy2
- */
-
-public interface ChannelInjector extends Injector {
-
-	WrappedChannel getChannel();
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/LegacyProtocolRegistry.java

@@ -1,103 +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.compat.netty;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.PacketType;
-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.Iterables;
-import com.google.common.collect.Lists;
-
-/**
- * @author dmulloy2
- */
-
-public class LegacyProtocolRegistry extends ProtocolRegistry {
-	
-	public LegacyProtocolRegistry() {
-		super();
-	}
-
-	@Override
-	protected void initialize() {
-		final Object[] protocols = enumProtocol.getEnumConstants();
-		List<Map<Integer, Class<?>>> serverMaps = Lists.newArrayList();
-		List<Map<Integer, Class<?>>> clientMaps = Lists.newArrayList();
-		StructureModifier<Object> modifier = null;
-		
-		// Result
-		Register result = new Register();
-		
-		for (Object protocol : protocols) {
-			if (modifier == null)
-				modifier = new StructureModifier<Object>(protocol.getClass().getSuperclass(), false);
-			StructureModifier<Map<Integer, Class<?>>> maps = modifier.withTarget(protocol).withType(Map.class);
-			
-			serverMaps.add(maps.read(0));
-			clientMaps.add(maps.read(1));
-		}
-		// Maps we have to occationally check have changed
-		for (Map<Integer, Class<?>> map : Iterables.concat(serverMaps, clientMaps)) {
-			result.containers.add(new MapContainer(map));
-		}
- 		
-		// Heuristic - there are more server packets than client packets
-		if (sum(clientMaps) > sum(serverMaps)) {
-			// Swap if this is violated
-			List<Map<Integer, Class<?>>> temp = serverMaps;
-			serverMaps = clientMaps;
-			clientMaps = temp;
-		}
-		
-		for (int i = 0; i < protocols.length; i++) {
-			Enum<?> enumProtocol = (Enum<?>) protocols[i];
-			Protocol equivalent = Protocol.fromVanilla(enumProtocol);
-			
-			// Associate known types
-			associatePackets(result, serverMaps.get(i), equivalent, Sender.SERVER);
-			associatePackets(result, clientMaps.get(i), 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.fromID(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 (IllegalArgumentException ex) {
-				// Sometimes this happens with fake packets, just ignore it
-			}
-		}
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/Netty.java

@@ -1,99 +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.compat.netty;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.util.logging.Level;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.compat.netty.independent.IndependentNetty;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.injector.PacketFilterManager;
-import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
-
-/**
- * @author dmulloy2
- */
-
-public class Netty {
-	private static NettyCompat compat;
-
-	static {
-		try {
-			Class.forName("io.netty.buffer.ByteBuf");
-			compat = new IndependentNetty();
-		} catch (ClassNotFoundException ex) {
-			try {
-				Class<?> clazz = Class.forName("com.comphenix.protocol.compat.netty.shaded.ShadedNetty");
-				compat = (NettyCompat) clazz.newInstance();
-			} catch (Exception ex1) {
-				ProtocolLibrary.log(Level.SEVERE, "Failed to create legacy netty compat:", ex1);
-			}
-		}
-	}
-
-	private static NettyCompat getCompat() {
-		return compat;
-	}
-
-	public static boolean isIndependent() {
-		return compat instanceof IndependentNetty;
-	}
-
-	public static WrappedByteBuf createPacketBuffer() {
-		return getCompat().createPacketBuffer();
-	}
-
-	public static Class<?> getGenericFutureListenerArray() {
-		return getCompat().getGenericFutureListenerArray();
-	}
-
-	public static Class<?> getChannelHandlerContext() {
-		return getCompat().getChannelHandlerContext();
-	}
-
-	public static String toEncodedText(CompressedImage image) {
-		return getCompat().toEncodedText(image);
-	}
-
-	public static WrappedByteBuf decode(byte[] encoded) {
-		return getCompat().decode(encoded);
-	}
-
-	public static ProtocolInjector getProtocolInjector(Plugin library, PacketFilterManager packetFilterManager, ErrorReporter reporter) {
-		return getCompat().getProtocolInjector(library, packetFilterManager, reporter);
-	}
-
-	public static WrappedByteBuf packetReader(DataInputStream input) {
-		return getCompat().packetReader(input);
-	}
-
-	public static WrappedByteBuf packetWriter(DataOutputStream output) {
-		return getCompat().packetWriter(output);
-	}
-
-	public static WrappedByteBuf copiedBuffer(byte[] array) {
-		return getCompat().copiedBuffer(array);
-	}
-
-	public static WrappedByteBuf buffer() {
-		return getCompat().buffer();
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/NettyCompat.java

@@ -1,55 +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.compat.netty;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
-
-
-/**
- * @author dmulloy2
- */
-
-// TODO: Sort out packet readers/writers
-public interface NettyCompat {
-
-	WrappedByteBuf createPacketBuffer();
-
-	WrappedByteBuf copiedBuffer(byte[] array);
-
-	WrappedByteBuf buffer();
-
-	Class<?> getGenericFutureListenerArray();
-
-	Class<?> getChannelHandlerContext();
-
-	String toEncodedText(CompressedImage image);
-
-	WrappedByteBuf decode(byte[] encoded);
-
-	ProtocolInjector getProtocolInjector(Plugin plugin, ListenerInvoker invoker, ErrorReporter reporter);
-
-	WrappedByteBuf packetReader(DataInputStream input);
-
-	WrappedByteBuf packetWriter(DataOutputStream output);
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/ProtocolInjector.java

@@ -1,38 +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.compat.netty;
-
-import com.comphenix.protocol.injector.netty.ChannelListener;
-import com.comphenix.protocol.injector.packet.PacketInjector;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
-
-/**
- * @author dmulloy2
- */
-
-public interface ProtocolInjector extends ChannelListener {
-
-	PlayerInjectionHandler getPlayerInjector();
-
-	PacketInjector getPacketInjector();
-
-	void setDebug(boolean debug);
-
-	void inject();
-
-	void close();
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/WrappedByteBuf.java

@@ -1,46 +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.compat.netty;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-/**
- * @author dmulloy2
- */
-
-public interface WrappedByteBuf {
-
-	void writeBytes(ObjectInputStream input, int id) throws IOException;
-
-	Object getHandle();
-
-	int readableBytes();
-
-	void readBytes(ObjectOutputStream output, int readableBytes) throws IOException;
-
-	void readBytes(byte[] data);
-
-	void writeByte(byte b);
-
-	void writeByte(int i);
-
-	void writeBytes(byte[] bytes);
-
-	byte[] array();
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/WrappedChannel.java

@@ -1,26 +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.compat.netty;
-
-/**
- * @author dmulloy2
- */
-
-public interface WrappedChannel {
-
-	void writeAndFlush(Object packet);
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/independent/IndependentNetty.java

@@ -1,105 +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.compat.netty.independent;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.base64.Base64;
-import io.netty.util.concurrent.GenericFutureListener;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.compat.netty.NettyCompat;
-import com.comphenix.protocol.compat.netty.ProtocolInjector;
-import com.comphenix.protocol.compat.netty.WrappedByteBuf;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
-import com.google.common.base.Charsets;
-
-/**
- * @author dmulloy2
- */
-
-public class IndependentNetty implements NettyCompat {
-
-	@Override
-	public WrappedByteBuf createPacketBuffer() {
-		ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.buffer();
-		Class<?> packetSerializer = MinecraftReflection.getPacketDataSerializerClass();
-
-		try {
-			return new NettyByteBuf((ByteBuf) packetSerializer.getConstructor(ByteBuf.class).newInstance(buffer));
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct packet serializer.", e);
-		}
-	}
-
-	@Override
-	public Class<?> getGenericFutureListenerArray() {
-		return GenericFutureListener[].class;
-	}
-
-	@Override
-	public Class<?> getChannelHandlerContext() {
-		return ChannelHandlerContext.class;
-	}
-
-	@Override
-	public String toEncodedText(CompressedImage image) {
-		final ByteBuf buffer = Unpooled.wrappedBuffer(image.getDataCopy());
-		String computed = "data:" + image.getMime() + ";base64," +
-			Base64.encode(buffer).toString(Charsets.UTF_8);
-		return computed;
-	}
-
-	@Override
-	public WrappedByteBuf decode(byte[] encoded) {
-		return new NettyByteBuf(Base64.decode(Unpooled.wrappedBuffer(encoded)));
-	}
-
-	@Override
-	public ProtocolInjector getProtocolInjector(Plugin plugin, ListenerInvoker invoker, ErrorReporter reporter) {
-		return new NettyProtocolInjector(plugin, invoker, reporter);
-	}
-
-	@Override
-	public WrappedByteBuf packetReader(DataInputStream input) {
-		return new NettyByteBuf(NettyByteBufAdapter.packetReader(input));
-	}
-
-	@Override
-	public WrappedByteBuf packetWriter(DataOutputStream output) {
-		return new NettyByteBuf(NettyByteBufAdapter.packetWriter(output));
-	}
-
-	@Override
-	public WrappedByteBuf copiedBuffer(byte[] array) {
-		return new NettyByteBuf(Unpooled.copiedBuffer(array));
-	}
-
-	@Override
-	public WrappedByteBuf buffer() {
-		return new NettyByteBuf(Unpooled.buffer());
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/independent/NettyByteBuf.java

@@ -1,83 +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.compat.netty.independent;
-
-import io.netty.buffer.ByteBuf;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.ref.WeakReference;
-
-import com.comphenix.protocol.compat.netty.WrappedByteBuf;
-
-/**
- * @author dmulloy2
- */
-
-public class NettyByteBuf implements WrappedByteBuf {
-	private WeakReference<ByteBuf> handle;
-
-	public NettyByteBuf(ByteBuf handle) {
-		this.handle = new WeakReference<ByteBuf>(handle);
-	}
-
-	@Override
-	public void writeBytes(ObjectInputStream input, int id) throws IOException {
-		handle.get().writeBytes(input, id);
-	}
-
-	@Override
-	public Object getHandle() {
-		return handle.get();
-	}
-
-	@Override
-	public int readableBytes() {
-		return handle.get().readableBytes();
-	}
-
-	@Override
-	public void readBytes(ObjectOutputStream output, int readableBytes) throws IOException {
-		handle.get().readBytes(output, readableBytes);
-	}
-
-	@Override
-	public void readBytes(byte[] data) {
-		handle.get().readBytes(data);
-	}
-
-	@Override
-	public void writeByte(byte b) {
-		handle.get().writeByte(b);
-	}
-
-	@Override
-	public void writeByte(int i) {
-		handle.get().writeByte(i);
-	}
-
-	@Override
-	public void writeBytes(byte[] bytes) {
-		handle.get().writeBytes(bytes);
-	}
-
-	@Override
-	public byte[] array() {
-		return handle.get().array();
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/independent/NettyProtocolRegistry.java

@@ -1,104 +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.compat.netty.independent;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.PacketType;
-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 {
-	
-	@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 occationally 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 (int i = 0; i < protocols.length; i++) {
-			Object protocol = protocols[i];
-			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 (IllegalArgumentException ex) {
-				// Sometimes this happens with fake packets, just ignore it
-			}
-		}
-	}
-}

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

@@ -1,264 +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.Constructor;
-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.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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;
-
-	/*
-	 * While this function may look pretty bad, it's essentially just a reflection-warped
-	 * version of the following:
-	 * 
-	 *  	@SuppressWarnings("unchecked")
-	 *	 	public static void updateEntity2(Entity entity, List<Player> observers) {
-	 *
-	 *			World world = entity.getWorld();
-	 *			WorldServer worldServer = ((CraftWorld) world).getHandle();
-	 *
-	 *			EntityTracker tracker = worldServer.tracker;
-	 *			EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(entity.getEntityId());
-	 *
-	 *			List<EntityPlayer> nmsPlayers = getNmsPlayers(observers);
-	 *
-	 *			entry.trackedPlayers.removeAll(nmsPlayers);
-	 *			entry.scanPlayers(nmsPlayers);
-	 *		}
-	 *
-	 *		private static List<EntityPlayer> getNmsPlayers(List<Player> players) {
-	 *			List<EntityPlayer> nsmPlayers = new ArrayList<EntityPlayer>();
-	 *	
-	 *			for (Player bukkitPlayer : players) {
-	 *				CraftPlayer craftPlayer = (CraftPlayer) bukkitPlayer;
-	 *				nsmPlayers.add(craftPlayer.getHandle());
-	 *			}
-	 *	
-	 *			return nsmPlayers;
-	 *		}
-	 *
-	 */
-	public static void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException {
-		try {
-			//EntityTrackerEntry trackEntity = (EntityTrackerEntry) tracker.trackedEntities.get(entity.getEntityId());
-			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
-
-			if (trackedPlayersField == null) {
-				// This one is fairly easy
-				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
-			}
-			
-			// Phew, finally there.
-			Collection<?> trackedPlayers = (Collection<?>) FieldUtils.readField(trackedPlayersField, trackerEntry, false);
-			List<Object> nmsPlayers = unwrapBukkit(observers);
-			
-			// trackEntity.trackedPlayers.clear();
-			trackedPlayers.removeAll(nmsPlayers);
-			
-			// We have to rely on a NAME once again. Damn it.
-			if (scanPlayersMethod == null) {
-				scanPlayersMethod = trackerEntry.getClass().getMethod("scanPlayers", List.class);
-			}
-			
-			//trackEntity.scanPlayers(server.players);
-			scanPlayersMethod.invoke(trackerEntry, nmsPlayers);
-			
-		} catch (IllegalArgumentException e) {
-			throw e;
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Security limitation prevents access to 'get' method in IntHashMap", e);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("Exception occurred in Minecraft.", e);
-		} catch (SecurityException e) {
-			throw new FieldAccessException("Security limitation prevents access to 'scanPlayers' method in trackerEntry.", e);
-		} catch (NoSuchMethodException e) {
-			throw new FieldAccessException("Cannot find 'scanPlayers' method. Is ProtocolLib up to date?", e);
-		}
-	}
-
-	/**
-	 * Retrieve every client that is receiving information about a given entity.
-	 * @param entity - the entity that is being tracked.
-	 * @return Every client/player that is tracking the given entity.
-	 * @throws FieldAccessException If reflection failed.
-	 */
-	public static List<Player> getEntityTrackers(Entity entity) {
-		try {
-			List<Player> result = new ArrayList<Player>();
-			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
-
-			if (trackerEntry == null) {
-				throw new IllegalArgumentException("Cannot find entity trackers for " + entity +
-						(entity.isDead() ? " - entity is dead." : "."));
-			}
-			if (trackedPlayersField == null) {
-				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
-			}
-				
-			Collection<?> trackedPlayers = (Collection<?>) FieldUtils.readField(trackedPlayersField, trackerEntry, false);
-			
-			// Wrap every player - we also ensure that the underlying tracker list is immutable
-			for (Object tracker : trackedPlayers) {
-				if (MinecraftReflection.isMinecraftPlayer(tracker)) {
-					result.add((Player) MinecraftReflection.getBukkitEntity(tracker));
-				}
-			}
-			return result;
-			
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Security limitation prevented access to the list of tracked players.", e);
-		}
-	}
-	
-	/**
-	 * Retrieve the entity tracker entry given a ID.
-	 * @param world - world server.
-	 * @param entityID - entity ID.
-	 * @return The entity tracker entry.
-	 * @throws FieldAccessException
-	 */
-	private static Object getEntityTrackerEntry(World world, int entityID) throws FieldAccessException, IllegalArgumentException {
-		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);
-		}
-		
-		if (trackedEntitiesField == null) {
-			@SuppressWarnings("rawtypes")
-			Set<Class> ignoredTypes = new HashSet<Class>();
-			
-			// Well, this is more difficult. But we're looking for a Minecraft object that is not
-			// created by the constructor(s).
-			for (Constructor<?> constructor : tracker.getClass().getConstructors()) {
-				for (Class<?> type : constructor.getParameterTypes()) {
-					ignoredTypes.add(type);
-				}
-			}
-			
-			// The Minecraft field that's NOT filled in by the constructor
-			trackedEntitiesField = FuzzyReflection.fromObject(tracker, true).
-						getFieldByType(MinecraftReflection.getMinecraftObjectRegex(), ignoredTypes);
-		}
-		
-		// Read the entity hashmap
-		Object trackedEntities = null;
-		
-		try {
-			trackedEntities = FieldUtils.readField(trackedEntitiesField, tracker, true);
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Cannot access 'trackedEntities' field due to security limitations.", e);
-		}
-		
-		return WrappedIntHashMap.fromHandle(trackedEntities).get(entityID);
-	}
-	
-	/**
-	 * Retrieve entity from a ID, even it it's newly created.
-	 * @return The asssociated entity.
-	 * @throws FieldAccessException Reflection error.
-	 */
-	public static Entity getEntityFromID(World world, int entityID) throws FieldAccessException {
-		try {
-			Object trackerEntry = getEntityTrackerEntry(world, entityID);
-			Object tracker = null;
-
-			// Handle NULL cases
-			if (trackerEntry != null) {
-				if (trackerField == null) {
-					try {
-						trackerField = trackerEntry.getClass().getField("tracker");
-					} catch (NoSuchFieldException e) {
-						// Assume it's the first public entity field then
-						trackerField = FuzzyReflection.fromObject(trackerEntry).getFieldByType(
-								"tracker", MinecraftReflection.getEntityClass());
-					}
-				}
-				
-				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;
-	}
-}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/WirePacket.java

@@ -1,55 +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 com.comphenix.protocol.compat.netty.WrappedByteBuf;
-
-/**
- * @author dmulloy2
- */
-
-public class WirePacket {
-	private final int id;
-	private final byte[] bytes;
-
-	public WirePacket(int id, byte[] bytes) {
-		this.id = id;
-		this.bytes = bytes;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public byte[] getBytes() {
-		return bytes;
-	}
-
-	public void writeId(WrappedByteBuf output) {
-		int i = id;
-		while ((i & -128) != 0) {
-			output.writeByte(i & 127 | 128);
-			i >>>= 7;
-		}
-
-		output.writeByte(i);
-	}
-
-	public void writeBytes(WrappedByteBuf output) {
-		output.writeBytes(bytes);
-	}
-}

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

@@ -1,753 +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.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-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 com.comphenix.protocol.utility.Util;
-import com.comphenix.protocol.utility.WrappedScheduler;
-
-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 WrappedScheduler.TaskWrapper task = null;
-
-    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 = WrappedScheduler.runAsynchronouslyRepeat(plugin, new Runnable() {
-
-                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());
-                        }
-                    }
-                }
-            }, 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();
-        }
-    }
-}

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java

@@ -1,109 +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.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-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.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());
-		}
-	}
-
-	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());
-			default:
-				throw new IllegalArgumentException("Cannot clone objects of type " + source.getClass());
-		}
-	}
-}

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

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

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

@@ -1,92 +0,0 @@
-package com.comphenix.protocol.utility;
-
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
-/**
- * Allows us to stay backwards compatible with older versions of Bukkit.
- * 
- * @author Kristian
- */
-public class WrappedScheduler {
-	/**
-	 * Represents a backwards compatible Bukkit task.
-	 */
-	public static interface TaskWrapper {
-		/**
-		 * Cancel the current task.
-		 */
-		public void cancel();
-	}
-	
-	/**
-	 * Schedule a given task for a single asynchronous execution.
-	 * @param plugin - the owner plugin.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyOnce(final Plugin plugin, Runnable runnable, long firstDelay) {
-		return runAsynchronouslyRepeat(plugin, plugin.getServer().getScheduler(), runnable, firstDelay, -1L);
-	}
-	
-	/**
-	 * Schedule a given task for multiple asynchronous executions.
-	 * @param plugin - the owner plugin.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyRepeat(final Plugin plugin, Runnable runnable, long firstDelay, long repeatDelay) {
-		return runAsynchronouslyRepeat(plugin, plugin.getServer().getScheduler(), runnable, firstDelay, repeatDelay);
-	}
-	
-	/**
-	 * Schedule a given task for asynchronous execution.
-	 * @param plugin - the owner plugin.
-	 * @param scheduler - the current Bukkit scheduler.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyRepeat(final Plugin plugin, final BukkitScheduler scheduler, Runnable runnable, long firstDelay, long repeatDelay) {
-		try {
-			@SuppressWarnings("deprecation")
-			final int taskID = scheduler.scheduleAsyncRepeatingTask(plugin, runnable, firstDelay, repeatDelay);
-
-			// Return the cancellable object
-			return new TaskWrapper() {
-				@Override
-				public void cancel() {
-					scheduler.cancelTask(taskID);
-				}
-			};
-			
-		} catch (NoSuchMethodError e) {
-			return tryUpdatedVersion(plugin, scheduler, runnable, firstDelay, repeatDelay);
-		}
-	}
-	
-	/**
-	 * Attempt to do the same with the updated scheduling method.
-	 * @param plugin - the owner plugin.
-	 * @param scheduler - the current Bukkit scheduler.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	private static TaskWrapper tryUpdatedVersion(final Plugin plugin, final BukkitScheduler scheduler, Runnable runnable, long firstDelay, long repeatDelay) {
-		final BukkitTask task = scheduler.runTaskTimerAsynchronously(plugin, runnable, firstDelay, repeatDelay);
-		
-		return new TaskWrapper() {
-			@Override
-			public void cancel() {
-				task.cancel();
-			}
-		};
-	}
-}

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

@@ -1,166 +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));
-
-		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);
-	}
-
-	@Override
-	public String toString() {
-		return "WrappedBlockData[handle=" + handle + "]";
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof WrappedBlockData) {
-			WrappedBlockData that = (WrappedBlockData) o;
-			return this.getType() == that.getType();
-		}
-
-		return false;
-	}
-}

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

@@ -1,924 +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.wrappers;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.annotation.Nullable;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-
-import com.comphenix.protocol.injector.BukkitUnwrapper;
-import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.FieldUtils;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
-import com.comphenix.protocol.reflect.accessors.FieldAccessor;
-import com.comphenix.protocol.reflect.accessors.ReadOnlyFieldAccessor;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.collection.ConvertedMap;
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Maps;
-
-/**
- * Wraps a DataWatcher that is used to transmit arbitrary key-value pairs with a given entity.
- *
- * @author Kristian
- */
-public class WrappedDataWatcher extends AbstractWrapper implements Iterable<WrappedWatchableObject> {
-	/**
-	 * Every custom watchable type in the Spigot protocol hack.
-	 * @author Kristian
-	 */
-	public enum CustomType {
-		BYTE_SHORT("org.spigotmc.ProtocolData$ByteShort",   0, short.class),
-		DUAL_BYTE("org.spigotmc.ProtocolData$DualByte",     0, byte.class, byte.class),
-		HIDDEN_BYTE("org.spigotmc.ProtocolData$HiddenByte", 0, byte.class),
-		INT_BYTE("org.spigotmc.ProtocolData$IntByte",       2, int.class, byte.class),
-		DUAL_INT("org.spigotmc.ProtocolData$DualInt",       2, int.class, int.class);
-
-		private Class<?> spigotClass;
-		private ConstructorAccessor constructor;
-		private FieldAccessor secondaryValue;
-		private int typeId;
-
-		private CustomType(String className, int typeId, Class<?>... parameters) {
-			try {
-				this.spigotClass = Class.forName(className);
-				this.constructor = Accessors.getConstructorAccessor(spigotClass, parameters);
-				this.secondaryValue = parameters.length > 1 ? Accessors.getFieldAccessor(spigotClass, "value2", true) : null;
-			} catch (ClassNotFoundException e) {
-				// ProtocolLibrary.log(Level.WARNING, "Unable to find " + className);
-				this.spigotClass = null;
-			}
-
-			this.typeId = typeId;
-		}
-
-		/**
-		 * Construct a new instance of this Spigot type.
-		 * @param value - the value. Cannot be NULL.
-		 * @return The instance to construct.
-		 */
-		Object newInstance(Object value) {
-			return newInstance(value, null);
-		}
-
-		/**
-		 * Construct a new instance of this Spigot type.
-		 * <p>
-		 * The secondary value may be NULL if this custom type does not contain a secondary value.
-		 * @param value - the value.
-		 * @param secondary - optional secondary value.
-		 * @return
-		 */
-		Object newInstance(Object value, Object secondary) {
-			Preconditions.checkNotNull(value, "value cannot be NULL.");
-
-			if (hasSecondary()) {
-				return constructor.invoke(value, secondary);
-			} else {
-				if (secondary != null) {
-					throw new IllegalArgumentException("Cannot construct " + this + " with a secondary value");
-				}
-				return constructor.invoke(value);
-			}
-		}
-
-		/**
-		 * Set the secondary value of a given type.
-		 * @param instance - the instance.
-		 * @param secondary - the secondary value.
-		 */
-		void setSecondary(Object instance, Object secondary)  {
-			if (!hasSecondary()) {
-				throw new IllegalArgumentException(this + " does not have a secondary value.");
-			}
-			secondaryValue.set(instance, secondary);
-		}
-
-		/**
-		 * Get the secondary value of a type.
-		 * @param instance - the instance.
-		 * @return The secondary value.
-		 */
-		Object getSecondary(Object instance) {
-			if (!hasSecondary()) {
-				throw new IllegalArgumentException(this + " does not have a secondary value.");
-			}
-			return secondaryValue.get(instance);
-		}
-
-		/**
-		 * Determine if this type has a secondary value.
-		 * @return TRUE if it does, FALSE otherwise.
-		 */
-		public boolean hasSecondary() {
-			return secondaryValue != null;
-		}
-
-		/**
-		 * Underlying Spigot class.
-		 * @return The class.
-		 */
-		public Class<?> getSpigotClass() {
-			return spigotClass;
-		}
-
-		/**
-		 * The equivalent type ID.
-		 * @return The equivalent ID.
-		 */
-		public int getTypeId() {
-			return typeId;
-		}
-
-		/**
-		 * Retrieve the custom Spigot type of a value.
-		 * @param value - the value.
-		 * @return The Spigot type, or NULL if not found.
-		 */
-		public static CustomType fromValue(Object value) {
-			for (CustomType type : CustomType.values()) {
-				if (type.getSpigotClass().isInstance(value)) {
-					return type;
-				}
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * Used to assign integer IDs to given types.
-	 */
-	private static Map<Class<?>, Integer> TYPE_MAP;
-
-	/**
-	 * Custom types in the bountiful update.
-	 */
-	private static Map<Class<?>, Integer> CUSTOM_MAP;
-
-	// Accessors
-	private static FieldAccessor TYPE_MAP_ACCESSOR;
-	private static FieldAccessor VALUE_MAP_ACCESSOR;
-
-	// Fields
-	private static Field READ_WRITE_LOCK_FIELD;
-	private static Field ENTITY_FIELD;
-
-	// Methods
-	private static Method CREATE_KEY_VALUE_METHOD;
-	private static Method UPDATE_KEY_VALUE_METHOD;
-	private static Method GET_KEY_VALUE_METHOD;
-
-	// Constructors
-	private static Constructor<?> CREATE_DATA_WATCHER_CONSTRUCTOR;
-
-	// Entity methods
-	private volatile static Field ENTITY_DATA_FIELD;
-
-	/**
-	 * Whether or not this class has already been initialized.
-	 */
-	private static boolean HAS_INITIALIZED;
-
-	// Lock
-	private ReadWriteLock readWriteLock;
-
-	// Map of watchable objects
-	private Map<Integer, Object> watchableObjects;
-
-	// A map view of all the watchable objects
-	private Map<Integer, WrappedWatchableObject> mapView;
-
-	/**
-	 * Initialize a new data watcher.
-	 * @throws FieldAccessException If we're unable to wrap a DataWatcher.
-	 */
-	public WrappedDataWatcher() {
-		super(MinecraftReflection.getDataWatcherClass());
-
-		// Just create a new watcher
-		try {
-			if (MinecraftReflection.isUsingNetty()) {
-				setHandle(newEntityHandle(null));
-			} else {
-				setHandle(getHandleType().newInstance());
-			}
-			initialize();
-
-		} catch (Exception e) {
-			throw new RuntimeException("Unable to construct DataWatcher.", e);
-		}
-	}
-
-	/**
-	 * Create a wrapper for a given data watcher.
-	 * @param handle - the data watcher to wrap.
-	 * @throws FieldAccessException If we're unable to wrap a DataWatcher.
-	 */
-	public WrappedDataWatcher(Object handle) {
-		super(MinecraftReflection.getDataWatcherClass());
-		setHandle(handle);
-		initialize();
-	}
-
-	/**
-	 * Construct a new data watcher with the given entity.
-	 * <p>
-	 * In 1.6.4 and ealier, this will fall back to using {@link #WrappedDataWatcher()}.
-	 * @param entity - the entity.
-	 * @return The wrapped data watcher.
-	 */
-	public static WrappedDataWatcher newWithEntity(Entity entity) {
-		// Use the old constructor
-		if (!MinecraftReflection.isUsingNetty())
-			return new WrappedDataWatcher();
-		return new WrappedDataWatcher(newEntityHandle(entity));
-	}
-
-	/**
-	 * Construct a new native DataWatcher with the given entity.
-	 * <p>
-	 * Warning: This is only supported in 1.7.2 and above.
-	 * @param entity - the entity, or NULL.
-	 * @return The data watcher.
-	 */
-	private static Object newEntityHandle(Entity entity) {
-		Class<?> dataWatcher = MinecraftReflection.getDataWatcherClass();
-
-		try {
-			if (CREATE_DATA_WATCHER_CONSTRUCTOR == null)
-				CREATE_DATA_WATCHER_CONSTRUCTOR = dataWatcher.getConstructor(MinecraftReflection.getEntityClass());
-
-			return CREATE_DATA_WATCHER_CONSTRUCTOR.newInstance(
-					BukkitUnwrapper.getInstance().unwrapItem(entity)
-			);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct data watcher.", e);
-		}
-	}
-
-	/**
-	 * Create a new data watcher for a list of watchable objects.
-	 * <p>
-	 * Note that the watchable objects are not cloned, and will be modified in place. Use "deepClone" if
-	 * that is not desirable.
-	 * <p>
-	 * The {@link #removeObject(int)} method will not modify the given list, however.
-	 *
-	 * @param watchableObjects - list of watchable objects that will be copied.
-	 * @throws FieldAccessException Unable to read watchable objects.
-	 */
-	public WrappedDataWatcher(List<WrappedWatchableObject> watchableObjects) throws FieldAccessException {
-		this();
-
-		Lock writeLock = getReadWriteLock().writeLock();
-		Map<Integer, Object> map = getWatchableObjectMap();
-
-		writeLock.lock();
-
-		try {
-			// Add the watchable objects by reference
-			for (WrappedWatchableObject watched : watchableObjects) {
-				map.put(watched.getIndex(), watched.handle);
-			}
-		} finally {
-			writeLock.unlock();
-		}
-	}
-
-	/**
-	 * Retrieve the ID of a given type, if it's allowed to be watched.
-	 * @param clazz - Class to check for.
-	 * @return The ID, or NULL if it cannot be watched.
-	 * @throws FieldAccessException If we cannot initialize the reflection machinery.
-	 */
-	public static Integer getTypeID(Class<?> clazz) throws FieldAccessException {
-		initialize();
-		Integer result = TYPE_MAP.get(WrappedWatchableObject.getUnwrappedType(clazz));
-
-		if (result == null) {
-			result = CUSTOM_MAP.get(clazz);
-		}
-		return result;
-	}
-
-	/**
-	 * Retrieve the type of a given ID, if it's allowed to be watched.
-	 * @param id - id to get type for
-	 * @return The type using a given ID, or NULL if it cannot be watched.
-	 * @throws FieldAccessException If we cannot initialize the reflection machinery.
-	 */
-	public static Class<?> getTypeClass(int id) throws FieldAccessException {
-		initialize();
-
-		for (Map.Entry<Class<?>, Integer> entry : TYPE_MAP.entrySet()) {
-			if (Objects.equal(entry.getValue(), id)) {
-				return entry.getKey();
-			}
-		}
-
-		// Unknown class type
-		return null;
-	}
-
-    /**
-     * Get a watched byte.
-     * @param index - index of the watched byte.
-     * @return The watched byte, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public Byte getByte(int index) throws FieldAccessException {
-    	return (Byte) getObject(index);
-    }
-
-    /**
-     * Get a watched short.
-     * @param index - index of the watched short.
-     * @return The watched short, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public Short getShort(int index) throws FieldAccessException {
-    	return (Short) getObject(index);
-    }
-
-    /**
-     * Get a watched integer.
-     * @param index - index of the watched integer.
-     * @return The watched integer, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public Integer getInteger(int index) throws FieldAccessException {
-    	return (Integer) getObject(index);
-    }
-
-    /**
-     * Get a watched float.
-     * @param index - index of the watched float.
-     * @return The watched float, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public Float getFloat(int index) throws FieldAccessException {
-    	return (Float) getObject(index);
-    }
-
-    /**
-     * Get a watched string.
-     * @param index - index of the watched string.
-     * @return The watched string, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public String getString(int index) throws FieldAccessException {
-    	return (String) getObject(index);
-    }
-
-    /**
-     * Get a watched string.
-     * @param index - index of the watched string.
-     * @return The watched string, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public ItemStack getItemStack(int index) throws FieldAccessException {
-    	return (ItemStack) getObject(index);
-    }
-
-    /**
-     * Get a watched string.
-     * @param index - index of the watched string.
-     * @return The watched string, or NULL if this value doesn't exist.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public WrappedChunkCoordinate getChunkCoordinate(int index) throws FieldAccessException {
-    	return (WrappedChunkCoordinate) getObject(index);
-    }
-
-    /**
-     * Retrieve a watchable object by index.
-     * @param index - index of the object to retrieve.
-     * @return The watched object.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public Object getObject(int index) throws FieldAccessException {
-    	Object watchable = getWatchedObject(index);
-
-    	if (watchable != null) {
-    		return new WrappedWatchableObject(watchable).getValue();
-    	} else {
-    		return null;
-    	}
-    }
-
-    /**
-     * Retrieve every watchable object in this watcher.
-     * @return Every watchable object.
-     * @throws FieldAccessException If reflection failed.
-     */
-	public List<WrappedWatchableObject> getWatchableObjects() throws FieldAccessException {
-		Lock readLock = getReadWriteLock().readLock();
-		readLock.lock();
-
-    	try {
-    		List<WrappedWatchableObject> result = new ArrayList<WrappedWatchableObject>();
-
-    		// Add each watchable object to the list
-    		for (Object watchable : getWatchableObjectMap().values()) {
-    			if (watchable != null) {
-    				result.add(new WrappedWatchableObject(watchable));
-    			} else {
-    				result.add(null);
-    			}
-    		}
-    		return result;
-
-    	} finally {
-    		readLock.unlock();
-    	}
-    }
-
-	@Override
-	public boolean equals(Object obj) {
-		// Quick checks
-		if (obj == this)
-			return true;
-		if (obj == null)
-			return false;
-
-		if (obj instanceof WrappedDataWatcher) {
-			WrappedDataWatcher other = (WrappedDataWatcher) obj;
-			Iterator<WrappedWatchableObject> first = iterator(), second = other.iterator();
-
-			// Make sure they're the same size
-			if (size() != other.size())
-				return false;
-
-			for (; first.hasNext() && second.hasNext(); ) {
-				// See if the two elements are equal
-				if (!first.next().equals(second.next()))
-					return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return getWatchableObjects().hashCode();
-	}
-
-    /**
-     * Retrieve a copy of every index associated with a watched object.
-     * @return Every watched object index.
-     * @throws FieldAccessException If we're unable to read the underlying object.
-     */
-    public Set<Integer> indexSet() throws FieldAccessException {
-    	Lock readLock = getReadWriteLock().readLock();
-		readLock.lock();
-
-    	try {
-    		return new HashSet<Integer>(getWatchableObjectMap().keySet());
-    	} finally {
-    		readLock.unlock();
-    	}
-    }
-
-    /**
-     * Clone the content of the current DataWatcher.
-     * @return A cloned data watcher.
-     */
-    public WrappedDataWatcher deepClone() {
-    	WrappedDataWatcher clone = new WrappedDataWatcher();
-
-    	// Make a new copy instead
-    	for (WrappedWatchableObject watchable : this) {
-    		clone.setObject(watchable.getIndex(), watchable.getClonedValue());
-    	}
-    	return clone;
-    }
-
-    /**
-     * Retrieve the number of watched objects.
-     * @return Watched object count.
-     * @throws FieldAccessException If we're unable to read the underlying object.
-     */
-    public int size() throws FieldAccessException {
-    	Lock readLock = getReadWriteLock().readLock();
-    	readLock.lock();
-
-    	try {
-    		return getWatchableObjectMap().size();
-    	} finally {
-    		readLock.unlock();
-    	}
-    }
-
-    /**
-     * Remove a given object from the underlying DataWatcher.
-     * @param index - index of the object to remove.
-     * @return The watchable object that was removed, or NULL If none could be found.
-     */
-    public WrappedWatchableObject removeObject(int index) {
-    	Lock writeLock = getReadWriteLock().writeLock();
-    	writeLock.lock();
-
-    	try {
-    		Object removed = getWatchableObjectMap().remove(index);
-    		return removed != null ? new WrappedWatchableObject(removed) : null;
-    	} finally {
-    		writeLock.unlock();
-    	}
-    }
-
-    /**
-     * Set a watched byte.
-     * @param index - index of the watched byte.
-     * @param newValue - the new watched value.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public void setObject(int index, Object newValue) throws FieldAccessException {
-    	setObject(index, newValue, true);
-    }
-
-    /**
-     * Set a watched byte.
-     * @param index - index of the watched byte.
-     * @param newValue - the new watched value.
-     * @param update - whether or not to refresh every listening client.
-     * @throws FieldAccessException Cannot read underlying field.
-     */
-    public void setObject(int index, Object newValue, boolean update) throws FieldAccessException {
-    	// Aquire write lock
-    	Lock writeLock = getReadWriteLock().writeLock();
-    	writeLock.lock();
-
-    	try {
-    		Object watchable = getWatchedObject(index);
-
-	    	if (watchable != null) {
-	    		new WrappedWatchableObject(watchable).setValue(newValue, update);
-	    	} else {
-	    		CREATE_KEY_VALUE_METHOD.invoke(handle, index, WrappedWatchableObject.getUnwrapped(newValue));
-	    	}
-
-	    	// Handle invoking the method
-    	} catch (IllegalArgumentException e) {
-    		throw new FieldAccessException("Cannot convert arguments.", e);
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Illegal access.", e);
-		} catch (InvocationTargetException e) {
-			throw new FieldAccessException("Checked exception in Minecraft.", e);
-		} finally {
-    		writeLock.unlock();
-    	}
-    }
-
-    /**
-     * Set a watched byte with an optional secondary value.
-     * @param index - index of the watched byte.
-     * @param newValue - the new watched value.
-     * @param secondary - optional secondary value.
-     * @param update - whether or not to refresh every listening client.
-     * @param type - custom type.
-     * @throws FieldAccessException If we cannot read the underlying field.
-     */
-    public void setObject(int index, Object newValue, Object secondary, boolean update, CustomType type) throws FieldAccessException {
-		Object created = type.newInstance(newValue, secondary);
-
-		// Now update the watcher
-		setObject(index, created, update);
-    }
-
-    private Object getWatchedObject(int index) throws FieldAccessException {
-    	// We use the get-method first and foremost
-    	if (GET_KEY_VALUE_METHOD != null) {
-			try {
-				return GET_KEY_VALUE_METHOD.invoke(handle, index);
-			} catch (Exception e) {
-				throw new FieldAccessException("Cannot invoke get key method for index " + index, e);
-			}
-    	} else {
-    		try {
-    			getReadWriteLock().readLock().lock();
-    			return getWatchableObjectMap().get(index);
-
-    		} finally {
-    			getReadWriteLock().readLock().unlock();
-    		}
-    	}
-    }
-
-    /**
-     * Retrieve the current read write lock.
-     * @return Current read write lock.
-     * @throws FieldAccessException If we're unable to read the underlying field.
-     */
-    protected ReadWriteLock getReadWriteLock() throws FieldAccessException {
-    	try {
-	    	// Cache the read write lock
-	    	if (readWriteLock != null)
-	    		return readWriteLock;
-	    	else if (READ_WRITE_LOCK_FIELD != null)
-	    		return readWriteLock = (ReadWriteLock) FieldUtils.readField(READ_WRITE_LOCK_FIELD, handle, true);
-	    	else
-	    		return readWriteLock = new ReentrantReadWriteLock();
-    	} catch (IllegalAccessException e) {
-    		throw new FieldAccessException("Unable to read lock field.", e);
-    	}
-    }
-
-    /**
-	 * Retrieve the underlying map of key values that stores watchable objects.
-	 * @return A map of watchable objects.
-	 * @throws FieldAccessException If we don't have permission to perform reflection.
-	 */
-	@SuppressWarnings("unchecked")
-	protected Map<Integer, Object> getWatchableObjectMap() throws FieldAccessException {
-		if (watchableObjects == null)
-			watchableObjects = (Map<Integer, Object>) VALUE_MAP_ACCESSOR.get(handle);
-		return watchableObjects;
-	}
-
-	/**
-	 * Retrieve the data watcher associated with an entity.
-	 * @param entity - the entity to read from.
-	 * @return Associated data watcher.
-	 * @throws FieldAccessException Reflection failed.
-	 */
-	public static WrappedDataWatcher getEntityWatcher(Entity entity) throws FieldAccessException {
-		if (ENTITY_DATA_FIELD == null)
-			ENTITY_DATA_FIELD = FuzzyReflection.fromClass(MinecraftReflection.getEntityClass(), true).
-				getFieldByType("datawatcher", MinecraftReflection.getDataWatcherClass());
-
-		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
-
-		try {
-			Object nsmWatcher = FieldUtils.readField(ENTITY_DATA_FIELD, unwrapper.unwrapItem(entity), true);
-
-			if (nsmWatcher != null)
-				return new WrappedDataWatcher(nsmWatcher);
-			else
-				return null;
-
-		} catch (IllegalAccessException e) {
-			throw new FieldAccessException("Cannot access DataWatcher field.", e);
-		}
-	}
-
-	/**
-	 * Invoked when a data watcher is first used.
-	 */
-	@SuppressWarnings("unchecked")
-	private static void initialize() throws FieldAccessException {
-		// This method should only be run once, even if an exception is thrown
-		if (!HAS_INITIALIZED)
-			HAS_INITIALIZED = true;
-		else
-			return;
-
-		FuzzyReflection fuzzy = FuzzyReflection.fromClass(MinecraftReflection.getDataWatcherClass(), true);
-
-		for (Field lookup : fuzzy.getFieldListByType(Map.class)) {
-			if (Modifier.isStatic(lookup.getModifiers())) {
-				// This must be the type map
-				TYPE_MAP_ACCESSOR = Accessors.getFieldAccessor(lookup, true);
-			} else {
-				// If not, then we're probably dealing with the value map
-				VALUE_MAP_ACCESSOR = Accessors.getFieldAccessor(lookup, true);
-			}
-		}
-		// Spigot workaround (not necessary
-		initializeSpigot(fuzzy);
-
-		// Any custom types
-		CUSTOM_MAP = initializeCustom();
-
-		// Initialize static type type
-		TYPE_MAP = (Map<Class<?>, Integer>) TYPE_MAP_ACCESSOR.get(null);
-
-		try {
-			READ_WRITE_LOCK_FIELD = fuzzy.getFieldByType("readWriteLock", ReadWriteLock.class);
-		} catch (IllegalArgumentException e) {
-			// It's not a big deal
-		}
-
-		// Check for the entity field as well
-		if (MinecraftReflection.isUsingNetty()) {
-			ENTITY_FIELD = fuzzy.getFieldByType("entity", MinecraftReflection.getEntityClass());
-			ENTITY_FIELD.setAccessible(true);
-		}
-		initializeMethods(fuzzy);
-	}
-
-	// For Spigot's bountiful update patch
-	private static Map<Class<?>, Integer> initializeCustom() {
-		Map<Class<?>, Integer> map = Maps.newHashMap();
-
-		for (CustomType type : CustomType.values()) {
-			if (type.getSpigotClass() != null) {
-				map.put(type.getSpigotClass(), type.getTypeId());
-			}
-		}
-		return map;
-	}
-
-	// TODO: Remove, as this was fixed in build #1189 of Spigot
-	private static void initializeSpigot(FuzzyReflection fuzzy) {
-		// See if the workaround is needed
-		if (TYPE_MAP_ACCESSOR != null && VALUE_MAP_ACCESSOR != null)
-			return;
-
-		for (Field lookup : fuzzy.getFields()) {
-			final Class<?> type = lookup.getType();
-
-			if (TroveWrapper.isTroveClass(type)) {
-				// Create a wrapper accessor
-				final ReadOnlyFieldAccessor accessor = TroveWrapper.wrapMapField(
-				  Accessors.getFieldAccessor(lookup, true), new Function<Integer, Integer>() {
-					@Override
-					public Integer apply(@Nullable Integer value) {
-						// Do not use zero for no entry value
-						if (value == 0)
-							return -1;
-						return value;
-					}
-				});
-
-				if (Modifier.isStatic(lookup.getModifiers())) {
-					TYPE_MAP_ACCESSOR = accessor;
-				} else {
-					VALUE_MAP_ACCESSOR = accessor;
-				}
-			}
-		}
-
-		if (TYPE_MAP_ACCESSOR == null)
-			throw new IllegalArgumentException("Unable to find static type map.");
-		if (VALUE_MAP_ACCESSOR == null)
-			throw new IllegalArgumentException("Unable to find static value map.");
-	}
-
-	private static void initializeMethods(FuzzyReflection fuzzy) {
-		List<Method> candidates = fuzzy.getMethodListByParameters(Void.TYPE,
-				  					new Class<?>[] { int.class, Object.class});
-
-		// Load the get-method
-		try {
-			GET_KEY_VALUE_METHOD = fuzzy.getMethodByParameters(
-					"getWatchableObject", MinecraftReflection.getWatchableObjectClass(), new Class[] { int.class });
-			GET_KEY_VALUE_METHOD.setAccessible(true);
-
-		} catch (IllegalArgumentException e) {
-			// Use the fallback method
-		}
-
-		for (Method method : candidates) {
-			if (!method.getName().startsWith("watch")) {
-				CREATE_KEY_VALUE_METHOD = method;
-			} else {
-				UPDATE_KEY_VALUE_METHOD = method;
-			}
-		}
-
-		// Did we succeed?
-		if (UPDATE_KEY_VALUE_METHOD == null || CREATE_KEY_VALUE_METHOD == null) {
-			// Go by index instead
-			if (candidates.size() > 1) {
-				CREATE_KEY_VALUE_METHOD = candidates.get(0);
-				UPDATE_KEY_VALUE_METHOD = candidates.get(1);
-			} else {
-				throw new IllegalStateException("Unable to find create and update watchable object. Update ProtocolLib.");
-			}
-
-			// Be a little scientist - see if this in fact IS the right way around
-			try {
-				WrappedDataWatcher watcher = new WrappedDataWatcher();
-				watcher.setObject(0, 0);
-				watcher.setObject(0, 1);
-
-				if (watcher.getInteger(0) != 1) {
-					throw new IllegalStateException("This cannot be!");
-				}
-			} catch (Exception e) {
-				// Nope
-				UPDATE_KEY_VALUE_METHOD = candidates.get(0);
-				CREATE_KEY_VALUE_METHOD = candidates.get(1);
-			}
-		}
-	}
-
-	@Override
-	public Iterator<WrappedWatchableObject> iterator() {
-		// We'll wrap the iterator instead of creating a new list every time
-		return Iterators.transform(getWatchableObjectMap().values().iterator(),
-				new Function<Object, WrappedWatchableObject>() {
-
-			@Override
-			public WrappedWatchableObject apply(@Nullable Object item) {
-				if (item != null)
-					return new WrappedWatchableObject(item);
-				else
-					return null;
-			}
-		});
-	}
-
-	/**
-	 * Retrieve a view of this DataWatcher as a map.
-	 * <p>
-	 * Any changes to the map will be reflected in this DataWatcher, and vice versa.
-	 * @return A view of the data watcher as a map.
-	 */
-	public Map<Integer, WrappedWatchableObject> asMap() {
-		// Construct corresponding map
-		if (mapView == null) {
-			mapView = new ConvertedMap<Integer, Object, WrappedWatchableObject>(getWatchableObjectMap()) {
-				@Override
-				protected Object toInner(WrappedWatchableObject outer) {
-					if (outer == null)
-						return null;
-					return outer.getHandle();
-				}
-
-				@Override
-				protected WrappedWatchableObject toOuter(Object inner) {
-					if (inner == null)
-						return null;
-					return new WrappedWatchableObject(inner);
-				}
-			};
-		}
-		return mapView;
-	}
-
-	@Override
-	public String toString() {
-		return asMap().toString();
-	}
-
-	/**
-	 * Retrieve the entity associated with this data watcher.
-	 * <p>
-	 * <b>Warning:</b> This is only supported on 1.7.2 and above.
-	 * @return The entity, or NULL.
-	 */
-	public Entity getEntity() {
-		if (!MinecraftReflection.isUsingNetty())
-			throw new IllegalStateException("This method is only supported on 1.7.2 and above.");
-
-		try {
-			return (Entity) MinecraftReflection.getBukkitEntity(ENTITY_FIELD.get(handle));
-		} catch (Exception e) {
-			throw new RuntimeException("Unable to retrieve entity.", e);
-		}
-	}
-
-	/**
-	 * Set the entity associated with this data watcher.
-	 * <p>
-	 * <b>Warning:</b> This is only supported on 1.7.2 and above.
-	 * @param entity - the new entity.
-	 */
-	public void setEntity(Entity entity) {
-		if (!MinecraftReflection.isUsingNetty())
-			throw new IllegalStateException("This method is only supported on 1.7.2 and above.");
-
-		try {
-			ENTITY_FIELD.set(handle, BukkitUnwrapper.getInstance().unwrapItem(entity));
-		} catch (Exception e) {
-			throw new RuntimeException("Unable to set entity.", e);
-		}
-	}
-}

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

@@ -1,467 +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.wrappers;
-
-import java.lang.reflect.Constructor;
-
-import org.bukkit.inventory.ItemStack;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.reflect.instances.DefaultInstances;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.base.Objects;
-
-/**
- * Represents a watchable object.
- *
- * @author Kristian
- */
-public class WrappedWatchableObject extends AbstractWrapper {
-	// Whether or not the reflection machinery has been initialized
-	private static boolean hasInitialized;
-
-	// The field containing the value itself
-	private static StructureModifier<Object> baseModifier;
-
-	// Used to create new watchable objects
-	private static Constructor<?> watchableConstructor;
-
-	// The watchable object class type
-	private static Class<?> watchableObjectClass;
-
-	protected StructureModifier<Object> modifier;
-
-	// Type of the stored value
-	private Class<?> typeClass;
-
-	/**
-	 * Wrap a given raw Minecraft watchable object.
-	 * @param handle - the raw watchable object to wrap.
-	 */
-	public WrappedWatchableObject(Object handle) {
-		super(MinecraftReflection.getWatchableObjectClass());
-		load(handle);
-	}
-
-	/**
-	 * Construct a watchable object from an index and a given value.
-	 * @param index - the index.
-	 * @param value - non-null value of specific types.
-	 */
-	public WrappedWatchableObject(int index, Object value) {
-		super(MinecraftReflection.getWatchableObjectClass());
-
-		if (value == null)
-			throw new IllegalArgumentException("Value cannot be NULL.");
-
-		// Get the correct type ID
-		Integer typeID = WrappedDataWatcher.getTypeID(value.getClass());
-
-		if (typeID != null) {
-			if (watchableConstructor == null) {
-				try {
-					watchableConstructor = MinecraftReflection.getWatchableObjectClass().
-											getConstructor(int.class, int.class, Object.class);
-				} catch (Exception e) {
-					throw new RuntimeException("Cannot get the WatchableObject(int, int, Object) constructor.", e);
-				}
-			}
-
-			// Create the object
-			try {
-				load(watchableConstructor.newInstance(typeID, index, getUnwrapped(value)));
-			} catch (Exception e) {
-				throw new RuntimeException("Cannot construct underlying WatchableObject.", e);
-			}
-		} else {
-			throw new IllegalArgumentException("Cannot watch the type " + value.getClass());
-		}
-	}
-
-//	/**
-//	 * Construct a custom watchable object from an index, value and custom type.
-//	 * @param index - the index.
-//	 * @param primary - non-null value of specific types.
-//	 * @param secondary - optional secondary value, if the type can store it.
-//	 * @param type - the custom Spigot type.
-//	 */
-//	public WrappedWatchableObject(int index, Object value, Object secondary, CustomType type) {
-//		this(index, type.newInstance(value, secondary));
-//	}
-
-	// Wrap a NMS object
-	private void load(Object handle) {
-		initialize();
-		this.handle = handle;
-		this.modifier = baseModifier.withTarget(handle);
-
-		// Make sure the type is correct
-		if (!watchableObjectClass.isAssignableFrom(handle.getClass())) {
-			throw new ClassCastException("Cannot cast the class " + handle.getClass().getName() +
-										 " to " + watchableObjectClass.getName());
-		}
-	}
-
-	/**
-	 * Initialize reflection machinery.
-	 */
-	private static void initialize() {
-		if (!hasInitialized) {
-			hasInitialized = true;
-			watchableObjectClass = MinecraftReflection.getWatchableObjectClass();
-			baseModifier = new StructureModifier<Object>(watchableObjectClass, null, false);
-		}
-	}
-
-//	/**
-//	 * Retrieve the custom type of this object.
-//	 * @return The custom type, or NULL if not applicable.
-//	 */
-//	public CustomType getCustomType() {
-//		return CustomType.fromValue(getValue());
-//	}
-
-	/**
-	 * Retrieve the correct super type of the current value.
-	 * @return Super type.
-	 * @throws FieldAccessException Unable to read values.
-	 */
-	public Class<?> getType() throws FieldAccessException {
-		return getWrappedType(getTypeRaw());
-	}
-
-	/**
-	 * Retrieve the correct super type of the current value, given the raw NMS object.
-	 * @return Super type.
-	 * @throws FieldAccessException Unable to read values.
-	 */
-	private Class<?> getTypeRaw() throws FieldAccessException {
-		if (typeClass == null) {
-			typeClass = WrappedDataWatcher.getTypeClass(getTypeID());
-
-			if (typeClass == null) {
-				throw new IllegalStateException("Unrecognized data type: " + getTypeID());
-			}
-		}
-
-		return typeClass;
-	}
-
-	/**
-	 * Retrieve the index of this watchable object. This is used to identify a value.
-	 * @return Object index.
-	 * @throws FieldAccessException Reflection failed.
-	 */
-	public int getIndex() throws FieldAccessException {
-		return modifier.<Integer>withType(int.class).read(1);
-	}
-
-	/**
-	 * Set the the index of this watchable object.
-	 * @param index - the new object index.
-	 * @throws FieldAccessException Reflection failed.
-	 */
-	public void setIndex(int index) throws FieldAccessException {
-		modifier.<Integer>withType(int.class).write(1, index);
-	}
-
-	/**
-	 * Retrieve the type ID of a watchable object.
-	 * <table border=1>
-	 * <caption>Type to Value</caption>
-	 * <tbody>
-	 * <tr>
-	 * <th>Type ID</th>
-	 * <th>Data Type</th>
-	 * </tr>
-	 * <tr>
-	 * <td>0</td>
-	 * <td>Byte</td>
-	 * </tr>
-	 * <tr>
-	 * <td>1</td>
-	 * <td>Short</td>
-	 * </tr>
-	 * <tr>
-	 * <td>2</td>
-	 * <td>Int</td>
-	 * </tr>
-	 * <tr>
-	 * <td>3</td>
-	 * <td>Float</td>
-	 * </tr>
-	 * <tr>
-	 * <td>4</td>
-	 * <td>{@link String}</td>
-	 * </tr>
-	 * <tr>
-	 * <td>5</td>
-	 * <td>{@link org.bukkit.inventory.ItemStack ItemStack}</td>
-	 * </tr>
-	 * <tr>
-	 * <td>6<sup>*</sup></td>
-	 * <td>{@link com.comphenix.protocol.wrappers.ChunkPosition ChunkPosition}</td>
-	 * </tr>
-	 * </tbody>
-	 * </table>
-	 * @return Type ID that identifies the type of the value.
-	 * @throws FieldAccessException Reflection failed.
-	 */
-	public int getTypeID() throws FieldAccessException {
-		return modifier.<Integer>withType(int.class).read(0);
-	}
-
-	/**
-	 * Set the type ID of a watchable object.
-	 * @param id - the new ID.
-	 * @throws FieldAccessException Reflection failed.
-	 * @see #getTypeID()
-	 */
-	public void setTypeID(int id) throws FieldAccessException {
-		modifier.<Integer>withType(int.class).write(0, id);
-	}
-
-	/**
-	 * Update the value field.
-	 * @param newValue - new value.
-	 * @throws FieldAccessException Unable to use reflection.
-	 */
-	public void setValue(Object newValue) throws FieldAccessException {
-		setValue(newValue, true);
-	}
-
-	/**
-	 * Update the value field.
-	 * @param newValue - new value.
-	 * @param updateClient - whether or not to update listening clients.
-	 * @throws FieldAccessException Unable to use reflection.
-	 */
-	public void setValue(Object newValue, boolean updateClient) throws FieldAccessException {
-		// Verify a few quick things
-		if (newValue == null)
-			throw new IllegalArgumentException("Cannot watch a NULL value.");
-		if (!getType().isAssignableFrom(newValue.getClass()))
-			throw new IllegalArgumentException("Object " + newValue +  " must be of type " + getType().getName());
-
-		// See if we should update the client to
-		if (updateClient)
-			setDirtyState(true);
-
-		// Use the modifier to set the value
-		modifier.withType(Object.class).write(0, getUnwrapped(newValue));
-	}
-
-	/**
-	 * Read the underlying value field.
-	 * @return The underlying value.
-	 */
-	private Object getNMSValue() {
-		return modifier.withType(Object.class).read(0);
-	}
-
-	/**
-	 * Read the value field.
-	 * @return The watched value.
-	 * @throws FieldAccessException Unable to use reflection.
-	 */
-	public Object getValue() throws FieldAccessException {
-		return getWrapped(modifier.withType(Object.class).read(0));
-	}
-
-//	/**
-//	 * Retrieve the secondary value associated with this watchable object.
-//	 * <p>
-//	 * This is only applicable for certain {@link CustomType}.
-//	 * @return The secondary value, or NULL if not found.
-//	 */
-//	public Object getSecondaryValue() {
-//		CustomType type = getCustomType();
-//		return type != null ? type.getSecondary(getValue()) : null;
-//	}
-//
-//	/**
-//	 * Set the secondary value.
-//	 * @param secondary - the secondary value.
-//	 * @throws IllegalStateException If this watchable object does not have a secondary value.
-//	 */
-//	public void setSecondaryValue(Object secondary) {
-//		CustomType type = getCustomType();
-//
-//		if (type == null) {
-//			throw new IllegalStateException(this + " does not have a custom type.");
-//		}
-//		type.setSecondary(getValue(), secondary);
-//	}
-
-	/**
-	 * Set whether or not the value must be synchronized with the client.
-	 * @param dirty - TRUE if the value should be synchronized, FALSE otherwise.
-	 * @throws FieldAccessException Unable to use reflection.
-	 */
-	public void setDirtyState(boolean dirty) throws FieldAccessException {
-		modifier.<Boolean>withType(boolean.class).write(0, dirty);
-	}
-
-	/**
-	 * Retrieve whether or not the value must be synchronized with the client.
-	 * @return TRUE if the value should be synchronized, FALSE otherwise.
-	 * @throws FieldAccessException Unable to use reflection.
-	 */
-	public boolean getDirtyState() throws FieldAccessException {
-		return modifier.<Boolean>withType(boolean.class).read(0);
-	}
-
-	/**
-	 * Retrieve the wrapped object value, if needed.
-	 * @param value - the raw NMS object to wrap.
-	 * @return The wrapped object.
-	 */
-	@SuppressWarnings("rawtypes")
-	static Object getWrapped(Object value) {
-    	// Handle the special cases
-    	if (MinecraftReflection.isItemStack(value)) {
-    		return BukkitConverters.getItemStackConverter().getSpecific(value);
-    	} else if (MinecraftReflection.isChunkCoordinates(value)) {
-    		return new WrappedChunkCoordinate((Comparable) value);
-    	} else {
-    		return value;
-    	}
-	}
-
-	/**
-	 * Retrieve the wrapped type, if needed.
-	 * @param wrapped - the wrapped class type.
-	 * @return The wrapped class type.
-	 */
-	static Class<?> getWrappedType(Class<?> unwrapped) {
-		if (unwrapped.equals(MinecraftReflection.getChunkPositionClass()))
-			return ChunkPosition.class;
-		else if (unwrapped.equals(MinecraftReflection.getBlockPositionClass()))
-			return BlockPosition.class;
-		else if (unwrapped.equals(MinecraftReflection.getChunkCoordinatesClass()))
-			return WrappedChunkCoordinate.class;
-		else if (unwrapped.equals(MinecraftReflection.getItemStackClass()))
-			return ItemStack.class;
-		else
-			return unwrapped;
-	}
-
-	/**
-	 * Retrieve the raw NMS value.
-	 * @param wrapped - the wrapped position.
-	 * @return The raw NMS object.
-	 */
-	static Object getUnwrapped(Object wrapped) {
-		// Convert special cases
-		if (wrapped instanceof ChunkPosition)
-			return ChunkPosition.getConverter().getGeneric(MinecraftReflection.getChunkPositionClass(), (ChunkPosition) wrapped);
-		else if (wrapped instanceof BlockPosition)
-			return BlockPosition.getConverter().getGeneric(MinecraftReflection.getBlockPositionClass(), (BlockPosition) wrapped);
-		else if (wrapped instanceof WrappedChunkCoordinate)
-			return ((WrappedChunkCoordinate) wrapped).getHandle();
-		else if (wrapped instanceof ItemStack)
-			return BukkitConverters.getItemStackConverter().getGeneric(MinecraftReflection.getItemStackClass(), (ItemStack) wrapped);
-		else
-			return wrapped;
-	}
-
-	/**
-	 * Retrieve the unwrapped type, if needed.
-	 * @param wrapped - the unwrapped class type.
-	 * @return The unwrapped class type.
-	 */
-	static Class<?> getUnwrappedType(Class<?> wrapped) {
-		if (wrapped.equals(ChunkPosition.class))
-			return MinecraftReflection.getChunkPositionClass();
-		else if (wrapped.equals(BlockPosition.class))
-			return MinecraftReflection.getBlockPositionClass();
-		else if (wrapped.equals(WrappedChunkCoordinate.class))
-			return MinecraftReflection.getChunkCoordinatesClass();
-		else if (ItemStack.class.isAssignableFrom(wrapped))
-			return MinecraftReflection.getItemStackClass();
-		else
-			return wrapped;
-	}
-
-	/**
-	 * Clone the current wrapped watchable object, along with any contained objects.
-	 * @return A deep clone of the current watchable object.
-	 * @throws FieldAccessException If we're unable to use reflection.
-	 */
-	public WrappedWatchableObject deepClone() throws FieldAccessException {
-		WrappedWatchableObject clone = new WrappedWatchableObject(
-				DefaultInstances.DEFAULT.getDefault(MinecraftReflection.getWatchableObjectClass()));
-
-		clone.setDirtyState(getDirtyState());
-		clone.setIndex(getIndex());
-		clone.setTypeID(getTypeID());
-		clone.setValue(getClonedValue(), false);
-		return clone;
-	}
-
-	// Helper
-	Object getClonedValue() throws FieldAccessException {
-		Object value = getNMSValue();
-
-		// Only a limited set of references types are supported
-		if (MinecraftReflection.isBlockPosition(value)) {
-			EquivalentConverter<BlockPosition> converter = BlockPosition.getConverter();
-			return converter.getGeneric(MinecraftReflection.getBlockPositionClass(), converter.getSpecific(value));
-		} else if (MinecraftReflection.isChunkPosition(value)) {
-			EquivalentConverter<ChunkPosition> converter = ChunkPosition.getConverter();
-			return converter.getGeneric(MinecraftReflection.getChunkPositionClass(), converter.getSpecific(value));
-		} else if (MinecraftReflection.isItemStack(value)) {
-			return MinecraftReflection.getMinecraftItemStack(MinecraftReflection.getBukkitItemStack(value).clone());
-		} else {
-			// A string or primitive wrapper, which are all immutable.
-			return value;
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		// Quick checks
-		if (obj == this)
-			return true;
-		if (obj == null)
-			return false;
-
-		if (obj instanceof WrappedWatchableObject) {
-			WrappedWatchableObject other = (WrappedWatchableObject) obj;
-
-			return Objects.equal(getIndex(), other.getIndex()) &&
-				   Objects.equal(getTypeID(), other.getTypeID()) &&
-				   Objects.equal(getValue(), other.getValue());
-		}
-
-		// No, this is not equivalent
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hashCode(getIndex(), getTypeID(), getValue());
-	}
-
-	@Override
-	public String toString() {
-		return String.format("[%s: %s (%s)]", getIndex(), getValue(), getType().getSimpleName());
-	}
-}

ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java

@@ -1,65 +0,0 @@
-package com.comphenix.protocol;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.logging.Logger;
-
-import net.minecraft.server.v1_8_R3.DispenserRegistry;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemFactory;
-import org.bukkit.craftbukkit.v1_8_R3.util.Versioning;
-
-import com.comphenix.protocol.utility.Constants;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.utility.MinecraftVersion;
-
-/**
- * Used to ensure that ProtocolLib and Bukkit is prepared to be tested.
- *
- * @author Kristian
- */
-public class BukkitInitialization {
-	private static boolean initialized;
-
-	/**
-	 * Initialize Bukkit and ProtocolLib such that we can perfrom unit testing.
-	 * @throws IllegalAccessException If we are unable to initialize Bukkit.
-	 */
-	public static void initializeItemMeta() throws IllegalAccessException {
-		if (!initialized) {
-			// Denote that we're done
-			initialized = true;
-
-			DispenserRegistry.c(); // Basically registers everything
-
-			// Mock the server object
-			Server mockedServer = mock(Server.class);
-
-			when(mockedServer.getLogger()).thenReturn(Logger.getLogger("Minecraft"));
-			when(mockedServer.getName()).thenReturn("Mock Server");
-			when(mockedServer.getVersion()).thenReturn(CraftServer.class.getPackage().getImplementationVersion());
-			when(mockedServer.getBukkitVersion()).thenReturn(Versioning.getBukkitVersion());
-
-			when(mockedServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
-			when(mockedServer.isPrimaryThread()).thenReturn(true);
-
-			// Inject this fake server
-			Bukkit.setServer(mockedServer);
-
-			initializePackage();
-		}
-	}
-
-	/**
-	 * Ensure that package names are correctly set up.
-	 */
-	public static void initializePackage() {
-		// Initialize reflection
-		MinecraftReflection.setMinecraftPackage(Constants.NMS, Constants.OBC);
-		MinecraftVersion.setCurrentVersion(MinecraftVersion.BOUNTIFUL_UPDATE);
-	}
-}

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

@@ -1,40 +0,0 @@
-package com.comphenix.protocol;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.compat.netty.independent.NettyProtocolRegistry;
-import com.comphenix.protocol.injector.netty.ProtocolRegistry;
-
-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 ensureAllExist() {
-		ProtocolRegistry registry = new NettyProtocolRegistry();
-		Map<PacketType, Class<?>> lookup = registry.getPacketTypeLookup();
-		for (Entry<PacketType, Class<?>> entry : lookup.entrySet()) {
-			PacketType type = entry.getKey();
-			Class<?> clazz = entry.getValue();
-
-			assertFalse("Packet " + clazz + " does not have a corresponding PacketType!", type.isDynamic());
-		}
-	}
-}

ProtocolLib/src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java

@@ -1,25 +0,0 @@
-package com.comphenix.protocol.reflect.cloning;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.comphenix.protocol.BukkitInitialization;
-
-public class AggregateClonerTest {
-
-	@BeforeClass
-	public static void initializeBukkit() {
-		BukkitInitialization.initializePackage();
-	}
-	
-	@Test
-	public void testArrays() {		
-		List<Integer> input = Arrays.asList(1, 2, 3);
-		assertEquals(input, AggregateCloner.DEFAULT.clone(input));
-	}
-}

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

@@ -1,31 +0,0 @@
-package com.comphenix.protocol.wrappers;
-
-import static org.junit.Assert.assertEquals;
-
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.junit.BeforeClass;
-import org.junit.Test;
-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());
-	}
-}

Readme.md

@@ -1,162 +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/)
-* [Downloads](http://ci.shadowvolt.com/job/ProtocolLib)
-* [JavaDoc](http://ci.shadowvolt.com/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>
-  ...
-</repository>
-
-<dependencies>
-  <dependency>
-    <groupId>com.comphenix.protocol</groupId>
-    <artifactId>ProtocolLib</artifactId>
-    <version>3.6.4</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
-
-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.

TinyProtocol/pom.xml

@@ -7,11 +7,15 @@
   <name>TinyProtocol</name>
   <description>Intercept packets without ProtocolLib.</description>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <parent>
     <groupId>com.comphenix.protocol</groupId>
     <artifactId>ProtocolLib-Parent</artifactId>
-    <version>v3-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <version>v4-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <repositories>
@@ -38,8 +42,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -73,20 +77,6 @@
     </plugins>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.8.7-R0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8.7-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
   <profiles>
     <profile>
       <id>release-sign-artifacts</id>

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

@@ -114,4 +114,4 @@ public class ExamplePlugin extends JavaPlugin {
 			throw new RuntimeException("Cannot send packet.", e);
 		}
 	}
-}
+}

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

@@ -178,7 +178,7 @@ public final class Reflection {
 	}
 
 	/**
-	 * Search for the first publically and privately defined method of the given name and parameter count.
+	 * Search for the first publicly and privately defined method of the given name and parameter count.
 	 * 
 	 * @param className - lookup name of the class, see {@link #getClass(String)}.
 	 * @param methodName - the method name, or NULL to skip.
@@ -191,7 +191,7 @@ public final class Reflection {
 	}
 
 	/**
-	 * Search for the first publically and privately defined method of the given name and parameter count.
+	 * Search for the first publicly and privately defined method of the given name and parameter count.
 	 * 
 	 * @param clazz - a class to start with.
 	 * @param methodName - the method name, or NULL to skip.
@@ -204,7 +204,7 @@ public final class Reflection {
 	}
 
 	/**
-	 * Search for the first publically and privately defined method of the given name and parameter count.
+	 * Search for the first publicly and privately defined method of the given name and parameter count.
 	 * 
 	 * @param clazz - a class to start with.
 	 * @param methodName - the method name, or NULL to skip.
@@ -215,7 +215,9 @@ public final class Reflection {
 	 */
 	public static MethodInvoker getTypedMethod(Class<?> clazz, String methodName, Class<?> returnType, Class<?>... params) {
 		for (final Method method : clazz.getDeclaredMethods()) {
-			if ((methodName == null || method.getName().equals(methodName)) && (returnType == null) || method.getReturnType().equals(returnType) && Arrays.equals(method.getParameterTypes(), params)) {
+			if ((methodName == null || method.getName().equals(methodName))
+					&& (returnType == null || method.getReturnType().equals(returnType))
+					&& Arrays.equals(method.getParameterTypes(), params)) {
 				method.setAccessible(true);
 
 				return new MethodInvoker() {
@@ -398,4 +400,4 @@ public final class Reflection {
 		matcher.appendTail(output);
 		return output.toString();
 	}
-}
+}

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

@@ -105,8 +105,7 @@ public abstract class TinyProtocol {
 		} catch (IllegalArgumentException ex) {
 			// Damn you, late bind
 			plugin.getLogger().info("[TinyProtocol] Delaying server channel injection due to late bind.");
-			
-			// Damn you, late bind
+
 			new BukkitRunnable() {
 				@Override
 				public void run() {
@@ -129,7 +128,7 @@ public abstract class TinyProtocol {
 					synchronized (networkManagers) {
 						// Stop injecting channels
 						if (!closed) {
-							injectChannelInternal(channel);
+							channel.eventLoop().submit(() -> injectChannelInternal(channel));
 						}
 					}
 				} catch (Exception e) {
@@ -256,13 +255,12 @@ public abstract class TinyProtocol {
 	 * <p>
 	 * Note that this is not executed on the main thread.
 	 * 
-	 * @param reciever - the receiving player, NULL for early login/status packets.
+	 * @param receiver - the receiving player, NULL for early login/status packets.
 	 * @param channel - the channel that received the packet. Never NULL.
-	 * @param remoteAddress - remote address of the sending client. Never NULL.
 	 * @param packet - the packet being sent.
 	 * @return The packet to send instead, or NULL to cancel the transmission.
 	 */
-	public Object onPacketOutAsync(Player reciever, Channel channel, Object packet) {
+	public Object onPacketOutAsync(Player receiver, Channel channel, Object packet) {
 		return packet;
 	}
 
@@ -283,7 +281,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Send a packet to a particular player.
 	 * <p>
-	 * Note that {@link #onPacketOutAsync(Player, Object)} will be invoked with this packet.
+	 * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
 	 * 
 	 * @param player - the destination player.
 	 * @param packet - the packet to send.
@@ -295,7 +293,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Send a packet to a particular client.
 	 * <p>
-	 * Note that {@link #onPacketOutAsync(Player, Object)} will be invoked with this packet.
+	 * Note that {@link #onPacketOutAsync(Player, Channel, Object)} will be invoked with this packet.
 	 * 
 	 * @param channel - client identified by a channel.
 	 * @param packet - the packet to send.
@@ -307,7 +305,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Pretend that a given packet has been received from a player.
 	 * <p>
-	 * Note that {@link #onPacketInAsync(Player, Object)} will be invoked with this packet.
+	 * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
 	 * 
 	 * @param player - the player that sent the packet.
 	 * @param packet - the packet that will be received by the server.
@@ -319,7 +317,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Pretend that a given packet has been received from a given client.
 	 * <p>
-	 * Note that {@link #onPacketInAsync(Player, Object)} will be invoked with this packet.
+	 * Note that {@link #onPacketInAsync(Player, Channel, Object)} will be invoked with this packet.
 	 * 
 	 * @param channel - client identified by a channel.
 	 * @param packet - the packet that will be received by the server.
@@ -353,7 +351,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Add a custom channel handler to the given channel.
 	 * 
-	 * @param player - the channel to inject.
+	 * @param channel - the channel to inject.
 	 * @return The intercepted channel, or NULL if it has already been injected.
 	 */
 	public void injectChannel(Channel channel) {
@@ -363,7 +361,7 @@ public abstract class TinyProtocol {
 	/**
 	 * Add a custom channel handler to the given channel.
 	 * 
-	 * @param player - the channel to inject.
+	 * @param channel - the channel to inject.
 	 * @return The packet interceptor.
 	 */
 	private PacketInterceptor injectChannelInternal(Channel channel) {
@@ -521,4 +519,4 @@ public abstract class TinyProtocol {
 			}
 		}
 	}
-}
+}

modules/ItemDisguise/pom.xml

@@ -1,78 +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>
-  <groupId>com.comphenix.itemdisguise</groupId>
-  <artifactId>ItemDisguise</artifactId>
-  <version>1.1.0</version>
-  <name>Item Disguise</name>
-  <description>Change the appearance of inventory items.</description>
-
-  <properties>
-    <project.build.sourceEncoding>cp1252</project.build.sourceEncoding>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-    </repository>
-    <repository>
-      <id>dmulloy2-repo</id>
-      <url>http://repo.dmulloy2.net/content/groups/public/</url>
-    </repository>
-  </repositories>
-
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <connection>scm:git:git://github.com/aadnk/ProtocolLib.git</connection>
-    <developerConnection>scm:git:git@github.com:aadnk/ProtocolLib.git</developerConnection>
-    <url>https://github.com/aadnk/ProtocolLib</url>
-  </scm>
-
-  <licenses>
-    <license>
-      <name>GNU GENERAL PUBLIC LICENSE - Version 2, June 1991</name>
-      <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.8.7-R0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8.7-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.comphenix.protocol</groupId>
-      <artifactId>ProtocolLib</artifactId>
-      <version>3.6.4</version>
-    </dependency>
-  </dependencies>
-</project>

modules/ItemDisguise/src/main/java/com/comphenix/itemdisguise/HideEnchantmentsListener.java

@@ -1,111 +0,0 @@
-/*
- *  ItemDisguise - A simple Bukkit plugin that illustrates how to use ProtocolLib.
- *  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.itemdisguise;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.Server;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolManager;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.reflect.FieldAccessException;
-
-public class HideEnchantmentsListener {
-
-	private final Server server;
-	private final Logger logger;
-
-	public HideEnchantmentsListener(Server server, Logger logger) {
-		this.server = server;
-		this.logger = logger;
-	}
-
-	public void addListener(ProtocolManager protocolManager, JavaPlugin plugin) {
-		// Hide all enchantments
-		protocolManager.addPacketListener(new PacketAdapter(plugin, PacketType.Play.Server.SET_SLOT, PacketType.Play.Server.WINDOW_ITEMS,
-				PacketType.Play.Server.NAMED_SOUND_EFFECT) {
-			@Override
-			public void onPacketSending(PacketEvent event) {
-				PacketContainer packet = event.getPacket();
-
-				try {
-					// Item packets
-					if (event.getPacketType() == PacketType.Play.Server.SET_SLOT) {
-						removeEnchantments(packet.getItemModifier().read(0));
-					} else if (event.getPacketType() == PacketType.Play.Server.WINDOW_ITEMS) {
-						ItemStack[] elements = packet.getItemArrayModifier().read(0);
-
-						for (int i = 0; i < elements.length; i++) {
-							if (elements[i] != null) {
-								removeEnchantments(elements[i]);
-							}
-						}
-					} else if (event.getPacketType() == PacketType.Play.Server.NAMED_SOUND_EFFECT) {
-						event.setCancelled(true);
-					}
-				} catch (FieldAccessException e) {
-					logger.log(Level.SEVERE, "Couldn't access field.", e);
-				}
-			}
-		});
-
-		// Censor
-		protocolManager.addPacketListener(new PacketAdapter(plugin, PacketType.Play.Client.CHAT) {
-			@Override
-			public void onPacketReceiving(PacketEvent event) {
-				if (event.getPacketType() == PacketType.Play.Client.CHAT) {
-					try {
-						String message = event.getPacket().getSpecificModifier(String.class).read(0);
-						if (message.contains("shit") || message.contains("fuck")) {
-							event.setCancelled(true);
-							event.getPlayer().sendMessage("Bad manners!");
-						}
-					} catch (FieldAccessException e) {
-						logger.log(Level.SEVERE, "Couldn't access field.", e);
-					}
-				}
-			}
-		});
-	}
-
-	public Server getServer() {
-		return server;
-	}
-
-	public void removeListener(ProtocolManager protocolManager, JavaPlugin plugin) {
-		// Just remove every adapter with this plugin
-		protocolManager.removePacketListeners(plugin);
-	}
-
-	private void removeEnchantments(ItemStack stack) {
-		if (stack == null)
-			return;
-
-		Enchantment[] copy = stack.getEnchantments().keySet().toArray(new Enchantment[0]);
-		for (Enchantment enchantment : copy) {
-			stack.removeEnchantment(enchantment);
-		}
-	}
-}

modules/ItemDisguise/src/main/java/com/comphenix/itemdisguise/ItemDisguiseMod.java

@@ -1,92 +0,0 @@
-/*
- *  ItemDisguise - A simple Bukkit plugin that illustrates how to use ProtocolLib.
- *  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.itemdisguise;
-
-import java.util.logging.Logger;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
-import com.comphenix.protocol.events.PacketContainer;
-
-public class ItemDisguiseMod extends JavaPlugin {
-
-	private ProtocolManager protocolManager;
-	private Logger logger;
-
-	private HideEnchantmentsListener enchantmentsListener;
-
-	@Override
-	public void onEnable() {
-		logger = getLoggerSafely();
-		protocolManager = ProtocolLibrary.getProtocolManager();
-
-		enchantmentsListener = new HideEnchantmentsListener(getServer(), logger);
-		enchantmentsListener.addListener(protocolManager, this);
-	}
-
-	@Override
-	public void onDisable() {
-		enchantmentsListener.removeListener(protocolManager, this);
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (sender instanceof Player) {
-			Player player = (Player) sender;
-			if (label.equalsIgnoreCase("explosion")) {
-				PacketContainer fakeExplosion = protocolManager.createPacket(PacketType.Play.Server.EXPLOSION);
-
-				// Set the coordinates
-				try {
-					fakeExplosion.getSpecificModifier(double.class).write(0, player.getLocation().getX()).write(1, player.getLocation().getY()).write(2, player.getLocation().getZ());
-					fakeExplosion.getSpecificModifier(float.class).write(0, 3.0F);
-
-					protocolManager.sendServerPacket(player, fakeExplosion);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	// Get the Bukkit logger first, before we try to create our own
-	private Logger getLoggerSafely() {
-
-		Logger log = null;
-
-		try {
-			log = getLogger();
-		} catch (Throwable e) {
-			// We'll handle it
-		}
-
-		if (log == null)
-			log = Logger.getLogger("Minecraft");
-		return log;
-	}
-}

modules/ItemDisguise/src/main/java/plugin.yml

@@ -1,14 +0,0 @@
-name: ItemDisguiseMod
-version: 1.0.0
-description: Change the appearance of inventory items.
-author: Comphenix
-website: http://www.comphenix.net/ItemDisguise
-
-main: com.comphenix.itemdisguise.ItemDisguiseMod
-depends: [ProtocolLib]
-database: false
-
-commands:
-   explosion:
-      description: Creates a fake explosion around the caller.
-      usage: /<command>

modules/v1_7_R4/pom.xml

@@ -1,275 +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-v1_7_R4</artifactId>
-  <name>ProtocolLib-v1_7_R4</name>
-  <version>3.6.5</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>v3-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.number></project.build.number>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>md_5-repo</id>
-      <url>http://repo.md-5.net/content/groups/public/</url>
-    </repository>
-  </repositories>
-
-  <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.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>
-                </excludes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Main-Class>com.comphenix.protocol.Application</Main-Class>
-              <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.version}${project.build.number}</Implementation-Version>
-              <Implementation-Vendor>dmulloy2</Implementation-Vendor>
-            </manifestEntries>
-          </archive>
-          <finalName>ProtocolLib</finalName>
-          <outputDirectory>../../target/</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>attach-javadocs</id>
-          </execution>
-        </executions>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <threshold>High</threshold>
-          <effort>Default</effort>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <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>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</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.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</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>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.7.10-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.7.10-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.comphenix.protocol</groupId>
-      <artifactId>ProtocolLib</artifactId>
-      <version>${project.version}</version>
-    </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>
-</project>

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/guava/Guava10.java

@@ -1,78 +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.compat.guava;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-
-import com.comphenix.protocol.PacketType;
-import com.google.common.collect.DiscreteDomains;
-import com.google.common.collect.Range;
-import com.google.common.collect.Ranges;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.InputSupplier;
-
-/**
- * @author dmulloy2
- */
-
-public class Guava10 implements GuavaCompat {
-
-	@Override
-	public <C extends Comparable<C>> Range<C> closedRange(C lower, C upper) {
-		return Ranges.closed(lower, upper);
-	}
-
-	@Override
-	public <C extends Comparable<C>> Range<C> singletonRange(C value) {
-		return Ranges.singleton(value);
-	}
-
-	@Override
-	public Set<Integer> toSet(Range<Integer> range) {
-		return range.asSet(DiscreteDomains.integers());
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	public DataInputStream addHeader(final DataInputStream input, final PacketType type) {
-		InputSupplier<InputStream> header = new InputSupplier<InputStream>() {
-			@Override
-			public InputStream getInput() throws IOException {
-				byte[] data = new byte[] { (byte) type.getLegacyId() };
-				return new ByteArrayInputStream(data);
-			}
-		};
-
-		InputSupplier<InputStream> data = new InputSupplier<InputStream>() {
-			@Override
-			public InputStream getInput() throws IOException {
-				return input;
-			}
-		};
-		
-		// Combine them into a single stream
-		try {
-			return new DataInputStream(ByteStreams.join(header, data).getInput());
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot add header.", e);
-		}
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedBootstrapList.java

@@ -1,234 +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.compat.netty.shaded;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.concurrent.Callable;
-
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-
-import com.google.common.collect.Lists;
-
-public class ShadedBootstrapList implements List<Object> {
-	private List<Object> delegate;
-	private ChannelHandler handler;
-	
-	/**
-	 * Construct a new bootstrap list.
-	 * @param delegate - the delegate.
-	 * @param handler - the channel handler to add.
-	 */
-	public ShadedBootstrapList(List<Object> delegate, ChannelHandler handler) {
-		this.delegate = delegate;
-		this.handler = handler;
-		
-		// Process all existing bootstraps
-		for (Object item : this) {
-			processElement(item);
-		}
-	}
-
-	@Override
-	public synchronized boolean add(Object element) {
-		processElement(element);
-		return delegate.add(element);
-	}
-	
-	@Override
-	public synchronized boolean addAll(Collection<? extends Object> collection) {
-		List<Object> copy = Lists.newArrayList(collection);
-		
-		// Process the collection before we pass it on
-		for (Object element : copy) {
-			processElement(element);
-		}
-		return delegate.addAll(copy);
-	}
-	
-	@Override
-	public synchronized Object set(int index, Object element) {
-		Object old = delegate.set(index, element);
-		
-		// Handle the old future, and the newly inserted future
-		if (old != element) {
-			unprocessElement(old);
-			processElement(element);
-		}
-		return old;
-	}
-	
-	/**
-	 * Process a single element.
-	 * @param element - the element.
-	 */
-	protected void processElement(Object element) {
-		if (element instanceof ChannelFuture) {
-			processBootstrap((ChannelFuture) element);
-		}
-	}
-	
-	/**
-	 * Unprocess a single element.
-	 * @param element - the element to unprocess.
-	 */
-	protected void unprocessElement(Object element) {
-		if (element instanceof ChannelFuture) {
-			unprocessBootstrap((ChannelFuture) element);
-		}
-	}
-	
-	/**
-	 * Process a single channel future.
-	 * @param future - the future.
-	 */
-	protected void processBootstrap(ChannelFuture future) {
-		// Important: Must be addFirst()
-		future.channel().pipeline().addFirst(handler);
-	}
-	
-	/**
-	 * Revert any changes we made to the channel future.
-	 * @param future - the future.
-	 */
-	protected void unprocessBootstrap(ChannelFuture future) {
-		final Channel channel = future.channel();
-		
-		// For thread safety - see ChannelInjector.close()
-		channel.eventLoop().submit(new Callable<Object>() {
-			@Override
-			public Object call() throws Exception {
-				channel.pipeline().remove(handler);
-				return null;
-			}
-		});
-	}
-	
-	/**
-	 * Close and revert all changes.
-	 */
-	public synchronized void close() {
-		for (Object element : this)
-			unprocessElement(element);
-	}
-
-	// Boiler plate
-	@Override
-	public synchronized int size() {
-		return delegate.size();
-	}
-
-	@Override
-	public synchronized boolean isEmpty() {
-		return delegate.isEmpty();
-	}
-
-	@Override
-	public boolean contains(Object o) {
-		return delegate.contains(o);
-	}
-
-	@Override
-	public synchronized Iterator<Object> iterator() {
-		return delegate.iterator();
-	}
-
-	@Override
-	public synchronized Object[] toArray() {
-		return delegate.toArray();
-	}
-
-	@Override
-	public synchronized <T> T[] toArray(T[] a) {
-		return delegate.toArray(a);
-	}
-
-	@Override
-	public synchronized boolean remove(Object o) {
-		return delegate.remove(o);
-	}
-
-	@Override
-	public synchronized boolean containsAll(Collection<?> c) {
-		return delegate.containsAll(c);
-	}
-
-	@Override
-	public synchronized boolean addAll(int index, Collection<? extends Object> c) {
-		return delegate.addAll(index, c);
-	}
-
-	@Override
-	public synchronized boolean removeAll(Collection<?> c) {
-		return delegate.removeAll(c);
-	}
-
-	@Override
-	public synchronized boolean retainAll(Collection<?> c) {
-		return delegate.retainAll(c);
-	}
-
-	@Override
-	public synchronized void clear() {
-		delegate.clear();
-	}
-
-	@Override
-	public synchronized Object get(int index) {
-		return delegate.get(index);
-	}
-
-	@Override
-	public synchronized void add(int index, Object element) {
-		delegate.add(index, element);
-	}
-
-	@Override
-	public synchronized Object remove(int index) {
-		return delegate.remove(index);
-	}
-
-	@Override
-	public synchronized int indexOf(Object o) {
-		return delegate.indexOf(o);
-	}
-
-	@Override
-	public synchronized int lastIndexOf(Object o) {
-		return delegate.lastIndexOf(o);
-	}
-
-	@Override
-	public synchronized ListIterator<Object> listIterator() {
-		return delegate.listIterator();
-	}
-
-	@Override
-	public synchronized ListIterator<Object> listIterator(int index) {
-		return delegate.listIterator(index);
-	}
-
-	@Override
-	public synchronized List<Object> subList(int fromIndex, int toIndex) {
-		return delegate.subList(fromIndex, toIndex);
-	}
-	// End boiler plate
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedByteBuf.java

@@ -1,83 +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.compat.netty.shaded;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.ref.WeakReference;
-
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-
-import com.comphenix.protocol.compat.netty.WrappedByteBuf;
-
-/**
- * @author dmulloy2
- */
-
-public class ShadedByteBuf implements WrappedByteBuf {
-	private WeakReference<ByteBuf> handle;
-
-	public ShadedByteBuf(ByteBuf handle) {
-		this.handle = new WeakReference<ByteBuf>(handle);
-	}
-
-	@Override
-	public Object getHandle() {
-		return handle.get();
-	}
-
-	@Override
-	public void writeBytes(ObjectInputStream input, int id) throws IOException {
-		handle.get().writeBytes(input, id);
-	}
-
-	@Override
-	public int readableBytes() {
-		return handle.get().readableBytes();
-	}
-
-	@Override
-	public void readBytes(ObjectOutputStream output, int readableBytes) throws IOException {
-		handle.get().readBytes(output, readableBytes);
-	}
-
-	@Override
-	public void readBytes(byte[] data) {
-		handle.get().readBytes(data);
-	}
-
-	@Override
-	public void writeByte(byte b) {
-		handle.get().writeByte(b);
-	}
-
-	@Override
-	public void writeByte(int i) {
-		handle.get().writeByte(i);
-	}
-
-	@Override
-	public void writeBytes(byte[] bytes) {
-		handle.get().writeBytes(bytes);
-	}
-
-	@Override
-	public byte[] array() {
-		return handle.get().array();
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedByteBufAdapter.java

@@ -1,393 +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.compat.netty.shaded;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.Channels;
-import java.nio.channels.GatheringByteChannel;
-import java.nio.channels.ScatteringByteChannel;
-import java.nio.channels.WritableByteChannel;
-
-import net.minecraft.util.io.netty.buffer.AbstractByteBuf;
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.ByteBufAllocator;
-
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.FieldAccessor;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.LimitInputStream;
-
-/**
- * Construct a ByteBuf around an input stream and an output stream.
- * <p>
- * Note that as streams usually don't support seeking, this implementation will ignore
- * all indexing in the byte buffer.
- * @author Kristian
- */
-public class ShadedByteBufAdapter extends AbstractByteBuf {
-	private DataInputStream input;
-	private DataOutputStream output;
-	
-	// For modifying the reader or writer index
-	private static FieldAccessor READER_INDEX;
-	private static FieldAccessor WRITER_INDEX;
-	
-	private static final int CAPACITY = Short.MAX_VALUE;
-	
-	private ShadedByteBufAdapter(DataInputStream input, DataOutputStream output) {
-		// Just pick a figure
-		super(CAPACITY);
-		this.input = input;
-		this.output = output;
-		
-		// Prepare accessors
-		try {
-			if (READER_INDEX == null) {
-				READER_INDEX = Accessors.getFieldAccessor(AbstractByteBuf.class.getDeclaredField("readerIndex"));
-			}
-			if (WRITER_INDEX == null) {
-				WRITER_INDEX = Accessors.getFieldAccessor(AbstractByteBuf.class.getDeclaredField("writerIndex"));
-			}
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot initialize ByteBufAdapter.", e);
-		}
-		
-		// "Infinite" reading/writing
-		if (input == null)
-			READER_INDEX.set(this, Integer.MAX_VALUE);
-		if (output == null)
-			WRITER_INDEX.set(this, Integer.MAX_VALUE);
-	}
-
-	/**
-	 * Construct a new Minecraft packet serializer using the current byte buf adapter.
-	 * @param input - the input stream.
-	 * @return A packet serializer with a wrapped byte buf adapter.
-	 */
-	public static ByteBuf packetReader(DataInputStream input) {
-		return (ByteBuf) MinecraftReflection.getPacketDataSerializer(new ShadedByteBufAdapter(input, null));
-	}
-	
-	/**
-	 * Construct a new Minecraft packet deserializer using the current byte buf adapter.
-	 * @param output - the output stream.
-	 * @return A packet serializer with a wrapped byte buf adapter.
-	 */
-	public static ByteBuf packetWriter(DataOutputStream output) {
-		return (ByteBuf) MinecraftReflection.getPacketDataSerializer(new ShadedByteBufAdapter(null, output));
-	}
-	
-	@Override
-	public int refCnt() {
-		return 1;
-	}
-
-	@Override
-	public boolean release() {
-		return false;
-	}
-
-	@Override
-	public boolean release(int paramInt) {
-		return false;
-	}
-
-	@Override
-	protected byte _getByte(int paramInt) {
-		try {
-			return input.readByte();
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-	}
-
-	@Override
-	protected short _getShort(int paramInt) {
-		try {
-			return input.readShort();
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-	}
-
-	@Override
-	protected int _getUnsignedMedium(int paramInt) {
-		try {
-			return input.readUnsignedShort();
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-	}
-
-	@Override
-	protected int _getInt(int paramInt) {
-		try {
-			return input.readInt();
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-	}
-
-	@Override
-	protected long _getLong(int paramInt) {
-		try {
-			return input.readLong();
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-	}
-
-	@Override
-	protected void _setByte(int index, int value) {
-		try {
-			output.writeByte(value);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	protected void _setShort(int index, int value) {
-		try {
-			output.writeShort(value);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	protected void _setMedium(int index, int value) {
-		try {
-			output.writeShort(value);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	protected void _setInt(int index, int value) {
-		try {
-			output.writeInt(value);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	protected void _setLong(int index, long value) {
-		try {
-			output.writeLong(value);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	public int capacity() {
-		return CAPACITY;
-	}
-
-	@Override
-	public ByteBuf capacity(int paramInt) {
-		return this;
-	}
-
-	@Override
-	public ByteBufAllocator alloc() {
-		return null;
-	}
-
-	@Override
-	public ByteOrder order() {
-		return ByteOrder.LITTLE_ENDIAN;
-	}
-
-	@Override
-	public ByteBuf unwrap() {
-		return null;
-	}
-
-	@Override
-	public boolean isDirect() {
-		return false;
-	}
-
-	@Override
-	public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
-		try {
-			for (int i = 0; i < length; i++) {
-				dst.setByte(dstIndex + i, input.read());
-			}
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-		return this;
-	}
-
-	@Override
-	public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) {
-		try {
-			input.read(dst, dstIndex, length);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-		return this;
-	}
-
-	@Override
-	public ByteBuf getBytes(int index, ByteBuffer dst) {
-		try {
-			dst.put(ByteStreams.toByteArray(input));
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read input.", e);
-		}
-		return this;
-	}
-
-	@Override
-	public ByteBuf getBytes(int index, OutputStream dst, int length) throws IOException {
-		ByteStreams.copy(new LimitInputStream(input, length), dst);
-		return this;
-	}
-
-	@Override
-	public int getBytes(int index, GatheringByteChannel out, int length) throws IOException {
-		byte[] data = ByteStreams.toByteArray(new LimitInputStream(input, length));
-		
-		out.write(ByteBuffer.wrap(data));
-		return data.length;
-	}
-
-	@Override
-	public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length) {
-		byte[] buffer = new byte[length];
-		src.getBytes(srcIndex, buffer);
-		
-		try {
-			output.write(buffer);
-			return this;
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length) {
-		try {
-			output.write(src, srcIndex, length);
-			return this;
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	public ByteBuf setBytes(int index, ByteBuffer src) {
-		try {
-			WritableByteChannel channel = Channels.newChannel(output);
-
-			channel.write(src);
-			return this;
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot write output.", e);
-		}
-	}
-
-	@Override
-	public int setBytes(int index, InputStream in, int length) throws IOException {
-		LimitInputStream limit = new LimitInputStream(in, length);
-		ByteStreams.copy(limit, output);
-		return length - limit.available();
-	}
-
-	@Override
-	public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException {
-		ByteBuffer buffer = ByteBuffer.allocate(length);
-		WritableByteChannel channel = Channels.newChannel(output);
-		
-		int count = in.read(buffer);
-		channel.write(buffer);
-		return count;
-	}
-
-	@Override
-	public ByteBuf copy(int index, int length) {
-		throw new UnsupportedOperationException("Cannot seek in input stream.");
-	}
-
-	@Override
-	public int nioBufferCount() {
-		return 0;
-	}
-
-	@Override
-	public ByteBuffer nioBuffer(int paramInt1, int paramInt2) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public ByteBuffer internalNioBuffer(int paramInt1, int paramInt2) {
-		return null;
-	}
-
-	@Override
-	public ByteBuffer[] nioBuffers(int paramInt1, int paramInt2) {
-		return null;
-	}
-
-	@Override
-	public boolean hasArray() {
-		return false;
-	}
-
-	@Override
-	public byte[] array() {
-		return null;
-	}
-
-	@Override
-	public int arrayOffset() {
-		return 0;
-	}
-
-	@Override
-	public boolean hasMemoryAddress() {
-		return false;
-	}
-
-	@Override
-	public long memoryAddress() {
-		return 0;
-	}
-
-	@Override
-	public ByteBuf retain(int paramInt) {
-		return this;
-	}
-
-	@Override
-	public ByteBuf retain() {
-		return this;
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedChannel.java

@@ -1,38 +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.compat.netty.shaded;
-
-import net.minecraft.util.io.netty.channel.Channel;
-
-import com.comphenix.protocol.compat.netty.WrappedChannel;
-
-/**
- * @author dmulloy2
- */
-
-public class ShadedChannel implements WrappedChannel {
-	private final Channel channel;
-
-	public ShadedChannel(Channel channel) {
-		this.channel = channel;
-	}
-
-	@Override
-	public void writeAndFlush(Object packet) {
-		channel.writeAndFlush(packet);
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedChannelInjector.java

@@ -1,931 +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.compat.netty.shaded;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
-import net.minecraft.util.io.netty.channel.ChannelPipeline;
-import net.minecraft.util.io.netty.channel.ChannelPromise;
-import net.minecraft.util.io.netty.channel.socket.SocketChannel;
-import net.minecraft.util.io.netty.handler.codec.ByteToMessageDecoder;
-import net.minecraft.util.io.netty.handler.codec.MessageToByteEncoder;
-import net.minecraft.util.io.netty.util.concurrent.GenericFutureListener;
-import net.minecraft.util.io.netty.util.internal.TypeParameterMatcher;
-import net.sf.cglib.proxy.Factory;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.compat.netty.ChannelInjector;
-import com.comphenix.protocol.compat.netty.WrappedByteBuf;
-import com.comphenix.protocol.compat.netty.WrappedChannel;
-import com.comphenix.protocol.error.Report;
-import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.NetworkMarker;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.NetworkProcessor;
-import com.comphenix.protocol.injector.netty.ChannelListener;
-import com.comphenix.protocol.injector.netty.NettyNetworkMarker;
-import com.comphenix.protocol.injector.netty.WirePacket;
-import com.comphenix.protocol.injector.server.SocketInjector;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.VolatileField;
-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.utility.MinecraftFields;
-import com.comphenix.protocol.utility.MinecraftMethods;
-import com.comphenix.protocol.utility.MinecraftProtocolVersion;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.WrappedGameProfile;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.MapMaker;
-
-/**
- * Represents a channel injector.
- * @author Kristian
- */
-public class ShadedChannelInjector extends ByteToMessageDecoder implements ChannelInjector {
-	public static final ReportType REPORT_CANNOT_INTERCEPT_SERVER_PACKET = new ReportType("Unable to intercept a written server packet.");
-	public static final ReportType REPORT_CANNOT_INTERCEPT_CLIENT_PACKET = new ReportType("Unable to intercept a read client packet.");
-	public static final ReportType REPORT_CANNOT_EXECUTE_IN_CHANNEL_THREAD = new ReportType("Cannot execute code in channel thread.");
-	public static final ReportType REPORT_CANNOT_FIND_GET_VERSION = new ReportType("Cannot find getVersion() in NetworkMananger");
-	public static final ReportType REPORT_CANNOT_SEND_PACKET = new ReportType("Unable to send packet %s to %s");
-
-	/**
-	 * Indicates that a packet has bypassed packet listeners.
-	 */
-	private static final PacketEvent BYPASSED_PACKET = new PacketEvent(ShadedChannelInjector.class);
-
-	// The login packet
-	private static Class<?> PACKET_LOGIN_CLIENT = null;
-	private static FieldAccessor LOGIN_GAME_PROFILE = null;
-
-	// Saved accessors
-	private static MethodAccessor DECODE_BUFFER;
-	private static MethodAccessor ENCODE_BUFFER;
-	private static FieldAccessor ENCODER_TYPE_MATCHER;
-
-	// For retrieving the protocol
-	private static FieldAccessor PROTOCOL_ACCESSOR;
-
-	// For retrieving the protocol version
-	private static MethodAccessor PROTOCOL_VERSION;
-
-	// The factory that created this injector
-	private ShadedInjectionFactory factory;
-
-	// The player, or temporary player
-	private Player player;
-	private Player updated;
-	private String playerName;
-
-	// The player connection
-	private Object playerConnection;
-
-	// The current network manager and channel
-	private final Object networkManager;
-	private final Channel originalChannel;
-	private VolatileField channelField;
-
-	// Known network markers
-	private ConcurrentMap<Object, NetworkMarker> packetMarker = new MapMaker().weakKeys().makeMap();
-
-	/**
-	 * Indicate that this packet has been processed by event listeners.
-	 * <p>
-	 * This must never be set outside the channel pipeline's thread.
-	 */
-	private PacketEvent currentEvent;
-
-	/**
-	 * A packet event that should be processed by the write method.
-	 */
-	private PacketEvent finalEvent;
-
-	/**
-	 * A flag set by the main thread to indiciate that a packet should not be processed.
-	 */
-	private final ThreadLocal<Boolean> scheduleProcessPackets = new ThreadLocal<Boolean>() {
-		@Override
-        protected Boolean initialValue() {
-			return true;
-		};
-	};
-
-	// Other handlers
-	private ByteToMessageDecoder vanillaDecoder;
-	private MessageToByteEncoder<Object> vanillaEncoder;
-
-	private Deque<PacketEvent> finishQueue = new ArrayDeque<PacketEvent>();
-
-	// The channel listener
-	private ChannelListener channelListener;
-
-	// Processing network markers
-	private NetworkProcessor processor;
-
-	// Closed
-	private boolean injected;
-	private boolean closed;
-
-	/**
-	 * Construct a new channel injector.
-	 * @param player - the current player, or temporary player.
-	 * @param networkManager - its network manager.
-	 * @param channel - its channel.
-	 * @param channelListener - a listener.
-	 * @param factory - the factory that created this injector
-	 */
-	public ShadedChannelInjector(Player player, Object networkManager, Channel channel, ChannelListener channelListener, ShadedInjectionFactory factory) {
-		this.player =  Preconditions.checkNotNull(player, "player cannot be NULL");
-		this.networkManager =  Preconditions.checkNotNull(networkManager, "networkMananger cannot be NULL");
-		this.originalChannel = Preconditions.checkNotNull(channel, "channel cannot be NULL");
-		this.channelListener = Preconditions.checkNotNull(channelListener, "channelListener cannot be NULL");
-		this.factory = Preconditions.checkNotNull(factory, "factory cannot be NULL");
-		this.processor = new NetworkProcessor(ProtocolLibrary.getErrorReporter());
-
-		// Get the channel field
-		this.channelField = new VolatileField(FuzzyReflection.fromObject(networkManager, true).getFieldByType("channel", Channel.class),
-				networkManager, true);
-	}
-
-	/**
-	 * Get the version of the current protocol.
-	 * @return The version.
-	 */
-	@Override
-	public int getProtocolVersion() {
-		MethodAccessor accessor = PROTOCOL_VERSION;
-		if (accessor == null) {
-			try {
-				accessor = Accessors.getMethodAccessor(networkManager.getClass(), "getVersion");
-			} catch (Throwable ex) {
-			}
-		}
-
-		if (accessor != null) {
-			return (Integer) accessor.invoke(networkManager);
-		} else {
-			return MinecraftProtocolVersion.getCurrentVersion();
-		}
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean inject() {
-		synchronized (networkManager) {
-			if (closed)
-				return false;
-			if (originalChannel instanceof Factory)
-				return false;
-			if (!originalChannel.isActive())
-				return false;
-
-			// Main thread? We should synchronize with the channel thread, otherwise we might see a
-			// pipeline with only some of the handlers removed
-			if (Bukkit.isPrimaryThread()) {
-				// Just like in the close() method, we'll avoid blocking the main thread
-				executeInChannelThread(new Runnable() {
-					@Override
-					public void run() {
-						inject();
-					}
-				});
-				return false; // We don't know
-			}
-
-			// Don't inject the same channel twice
-			if (findChannelHandler(originalChannel, ShadedChannelInjector.class) != null) {
-				return false;
-			}
-
-			// Get the vanilla decoder, so we don't have to replicate the work
-			vanillaDecoder = (ByteToMessageDecoder) originalChannel.pipeline().get("decoder");
-			vanillaEncoder = (MessageToByteEncoder<Object>) originalChannel.pipeline().get("encoder");
-
-			if (vanillaDecoder == null)
-				throw new IllegalArgumentException("Unable to find vanilla decoder in " + originalChannel.pipeline() );
-			if (vanillaEncoder == null)
-				throw new IllegalArgumentException("Unable to find vanilla encoder in " + originalChannel.pipeline() );
-			patchEncoder(vanillaEncoder);
-
-			if (DECODE_BUFFER == null)
-				DECODE_BUFFER = Accessors.getMethodAccessor(vanillaDecoder.getClass(),
-					"decode", ChannelHandlerContext.class, ByteBuf.class, List.class);
-			if (ENCODE_BUFFER == null)
-				ENCODE_BUFFER = Accessors.getMethodAccessor(vanillaEncoder.getClass(),
-					"encode", ChannelHandlerContext.class, Object.class, ByteBuf.class);
-
-			// Intercept sent packets
-			MessageToByteEncoder<Object> protocolEncoder = new MessageToByteEncoder<Object>() {
-				@Override
-				protected void encode(ChannelHandlerContext ctx, Object packet, ByteBuf output) throws Exception {
-					if (packet instanceof WirePacket) {
-						// Special case for wire format
-						ShadedChannelInjector.this.encodeWirePacket((WirePacket) packet, new ShadedByteBuf(output));
-					} else {
-						ShadedChannelInjector.this.encode(ctx, packet, output);
-					}
-				}
-
-				@Override
-				public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) throws Exception {
-					super.write(ctx, packet, promise);
-					ShadedChannelInjector.this.finalWrite(ctx, packet, promise);
-				}
-			};
-
-			// Intercept recieved packets
-			ChannelInboundHandlerAdapter finishHandler = new ChannelInboundHandlerAdapter() {
-				@Override
-				public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-					// Execute context first
-					ctx.fireChannelRead(msg);
-					ShadedChannelInjector.this.finishRead(ctx, msg);
-				}
-			};
-
-			// Insert our handlers - note that we effectively replace the vanilla encoder/decoder
-			originalChannel.pipeline().addBefore("decoder", "protocol_lib_decoder", this);
-			originalChannel.pipeline().addBefore("protocol_lib_decoder", "protocol_lib_finish", finishHandler);
-			originalChannel.pipeline().addAfter("encoder", "protocol_lib_encoder", protocolEncoder);
-
-			// Intercept all write methods
-			channelField.setValue(new ShadedChannelProxy(originalChannel, MinecraftReflection.getPacketClass()) {
-				// Compatibility with Spigot 1.8
-				private final ShadedPipelineProxy pipelineProxy = new ShadedPipelineProxy(originalChannel.pipeline(), this) {
-					@Override
-					public ChannelPipeline addBefore(String baseName, String name, ChannelHandler handler) {
-						// Correct the position of the decoder
-						if ("decoder".equals(baseName)) {
-							if (super.get("protocol_lib_decoder") != null && guessCompression(handler)) {
-								super.addBefore("protocol_lib_decoder", name, handler);
-								return this;
-							}
-						}
-
-						return super.addBefore(baseName, name, handler);
-					}
-				};
-
-				@Override
-				public ChannelPipeline pipeline() {
-					return pipelineProxy;
-				}
-
-				@Override
-				protected <T> Callable<T> onMessageScheduled(final Callable<T> callable, FieldAccessor packetAccessor) {
-					final PacketEvent event = handleScheduled(callable, packetAccessor);
-
-					// Handle cancelled events
-					if (event != null && event.isCancelled())
-						return null;
-
-					return new Callable<T>() {
-						@Override
-						public T call() throws Exception {
-							T result = null;
-
-							// This field must only be updated in the pipeline thread
-							currentEvent = event;
-							result = callable.call();
-							currentEvent = null;
-							return result;
-						}
-					};
-				}
-
-				@Override
-				protected Runnable onMessageScheduled(final Runnable runnable, FieldAccessor packetAccessor) {
-					final PacketEvent event = handleScheduled(runnable, packetAccessor);
-
-					// Handle cancelled events
-					if (event != null && event.isCancelled())
-						return null;
-
-					return new Runnable() {
-						@Override
-						public void run() {
-							currentEvent = event;
-							runnable.run();
-							currentEvent = null;
-						}
-					};
-				}
-
-				protected PacketEvent handleScheduled(Object instance, FieldAccessor accessor) {
-					// Let the filters handle this packet
-					Object original = accessor.get(instance);
-
-					// See if we've been instructed not to process packets
-					if (!scheduleProcessPackets.get()) {
-						NetworkMarker marker = getMarker(original);
-
-						if (marker != null)	{
-							PacketEvent result = new PacketEvent(ShadedChannelInjector.class);
-							result.setNetworkMarker(marker);
-							return result;
-						} else {
-							return BYPASSED_PACKET;
-						}
-					}
-					PacketEvent event = processSending(original);
-
-					if (event != null && !event.isCancelled()) {
-						Object changed = event.getPacket().getHandle();
-
-						// Change packet to be scheduled
-						if (original != changed)
-							accessor.set(instance, changed);
-					};
-					return event != null ? event : BYPASSED_PACKET;
-				}
-			});
-
-			injected = true;
-			return true;
-		}
-	}
-
-	/**
-	 * Determine if the given object is a compressor or decompressor.
-	 * @param handler - object to test.
-	 * @return TRUE if it is, FALSE if not or unknown.
-	 */
-	private boolean guessCompression(ChannelHandler handler) {
-		String className = handler != null ? handler.getClass().getCanonicalName() : null;
-		return className.contains("Compressor") || className.contains("Decompressor");
-	}
-
-	/**
-	 * Process a given message on the packet listeners.
-	 * @param message - the message/packet.
-	 * @return The resulting message/packet.
-	 */
-	private PacketEvent processSending(Object message) {
-		return channelListener.onPacketSending(ShadedChannelInjector.this, message, getMarker(message));
-	}
-
-	/**
-	 * This method patches the encoder so that it skips already created packets.
-	 * @param encoder - the encoder to patch.
-	 */
-	private void patchEncoder(MessageToByteEncoder<Object> encoder) {
-		if (ENCODER_TYPE_MATCHER == null) {
-			ENCODER_TYPE_MATCHER = Accessors.getFieldAccessor(encoder.getClass(), "matcher", true);
-		}
-		ENCODER_TYPE_MATCHER.set(encoder, TypeParameterMatcher.get(MinecraftReflection.getPacketClass()));
-	}
-
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		if (channelListener.isDebug())
-			cause.printStackTrace();
-		super.exceptionCaught(ctx, cause);
-	}
-
-	protected void encodeWirePacket(WirePacket packet, WrappedByteBuf output) throws Exception {
-		packet.writeId(output);
-		packet.writeBytes(output);
-	}
-
-	/**
-	 * Encode a packet to a byte buffer, taking over for the standard Minecraft encoder.
-	 * @param ctx - the current context.
-	 * @param packet - the packet to encode to a byte array.
-	 * @param output - the output byte array.
-	 * @throws Exception If anything went wrong.
-	 */
-	protected void encode(ChannelHandlerContext ctx, Object packet, ByteBuf output) throws Exception {
-		NetworkMarker marker = null;
-		PacketEvent event = currentEvent;
-
-		try {
-			// Skip every kind of non-filtered packet
-			if (!scheduleProcessPackets.get()) {
-				return;
-			}
-
-			// This packet has not been seen by the main thread
-			if (event == null) {
-				Class<?> clazz = packet.getClass();
-
-				// Schedule the transmission on the main thread instead
-				if (channelListener.hasMainThreadListener(clazz)) {
-					// Delay the packet
-					scheduleMainThread(packet);
-					packet = null;
-
-				} else {
-					event = processSending(packet);
-
-					// Handle the output
-					if (event != null) {
-						packet = !event.isCancelled() ? event.getPacket().getHandle() : null;
-					}
-				}
-			}
-			if (event != null) {
-				// Retrieve marker without accidentally constructing it
-				marker = NetworkMarker.getNetworkMarker(event);
-			}
-
-			// Process output handler
-			if (packet != null && event != null && NetworkMarker.hasOutputHandlers(marker)) {
-				ByteBuf packetBuffer = ctx.alloc().buffer();
-				ENCODE_BUFFER.invoke(vanillaEncoder, ctx, packet, packetBuffer);
-
-				// Let each handler prepare the actual output
-				byte[] data = processor.processOutput(event, marker, getBytes(packetBuffer));
-
-				// Write the result
-				output.writeBytes(data);
-				packet = null;
-
-				// Sent listeners?
-				finalEvent = event;
-				return;
-			}
-		} catch (Exception e) {
-			channelListener.getReporter().reportDetailed(this,
-				Report.newBuilder(REPORT_CANNOT_INTERCEPT_SERVER_PACKET).callerParam(packet).error(e).build());
-		} finally {
-			// Attempt to handle the packet nevertheless
-			if (packet != null) {
-				ENCODE_BUFFER.invoke(vanillaEncoder, ctx, packet, output);
-				finalEvent = event;
-			}
-		}
-	}
-
-	/**
-	 * Invoked when a packet has been written to the channel.
-	 * @param ctx - current context.
-	 * @param packet - the packet that has been written.
-	 * @param promise - a promise.
-	 */
-	protected void finalWrite(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) {
-		PacketEvent event = finalEvent;
-
-		if (event != null) {
-			// Necessary to prevent infinite loops
-			finalEvent = null;
-			currentEvent = null;
-
-			processor.invokePostEvent(event, NetworkMarker.getNetworkMarker(event));
-		}
-	}
-
-	private void scheduleMainThread(final Object packetCopy) {
-		// Don't use BukkitExecutors for this - it has a bit of overhead
-		Bukkit.getScheduler().scheduleSyncDelayedTask(factory.getPlugin(), new Runnable() {
-			@Override
-			public void run() {
-				invokeSendPacket(packetCopy);
-			}
-		});
-	}
-
-	@Override
-	protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuffer, List<Object> packets) throws Exception {
-		byteBuffer.markReaderIndex();
-		DECODE_BUFFER.invoke(vanillaDecoder, ctx, byteBuffer, packets);
-
-		try {
-			// Reset queue
-			finishQueue.clear();
-
-			for (ListIterator<Object> it = packets.listIterator(); it.hasNext(); ) {
-				Object input = it.next();
-				Class<?> packetClass = input.getClass();
-				NetworkMarker marker = null;
-
-				// Special case!
-				handleLogin(packetClass, input);
-
-				if (channelListener.includeBuffer(packetClass)) {
-					byteBuffer.resetReaderIndex();
-					marker = new NettyNetworkMarker(ConnectionSide.CLIENT_SIDE, getBytes(byteBuffer));
-				}
-
-				PacketEvent output = channelListener.onPacketReceiving(this, input, marker);
-
-				// Handle packet changes
-				if (output != null) {
-					if (output.isCancelled()) {
-						it.remove();
-						continue;
-					} else if (output.getPacket().getHandle() != input) {
-						it.set(output.getPacket().getHandle());
-					}
-
-					finishQueue.addLast(output);
-				}
-			}
-		} catch (Exception e) {
-			channelListener.getReporter().reportDetailed(this,
-					Report.newBuilder(REPORT_CANNOT_INTERCEPT_CLIENT_PACKET).callerParam(byteBuffer).error(e).build());
-		}
-	}
-
-	/**
-	 * Invoked after our decoder.
-	 * @param ctx - current context.
-	 * @param msg - the current packet.
-	 */
-	protected void finishRead(ChannelHandlerContext ctx, Object msg) {
-		// Assume same order
-		PacketEvent event = finishQueue.pollFirst();
-
-		if (event != null) {
-			NetworkMarker marker = NetworkMarker.getNetworkMarker(event);
-
-			if (marker != null) {
-				processor.invokePostEvent(event, marker);
-			}
-		}
-	}
-
-	/**
-	 * Invoked when we may need to handle the login packet.
-	 * @param packetClass - the packet class.
-	 * @param packet - the packet.
-	 */
-	protected void handleLogin(Class<?> packetClass, Object packet) {
-		Class<?> loginClass = PACKET_LOGIN_CLIENT;
-		FieldAccessor loginClient = LOGIN_GAME_PROFILE;
-
-		// Initialize packet class and login
-		if (loginClass == null) {
-			loginClass = PacketType.Login.Client.START.getPacketClass();
-			PACKET_LOGIN_CLIENT = loginClass;
-		}
-		if (loginClient == null) {
-			loginClient = Accessors.getFieldAccessor(PACKET_LOGIN_CLIENT, MinecraftReflection.getGameProfileClass(), true);
-			LOGIN_GAME_PROFILE = loginClient;
-		}
-
-		// See if we are dealing with the login packet
-		if (loginClass.equals(packetClass)) {
-			// GameProfile profile = (GameProfile) loginClient.get(packet);
-			WrappedGameProfile profile = WrappedGameProfile.fromHandle(loginClient.get(packet));
-
-			// Save the channel injector
-			factory.cacheInjector(profile.getName(), this);
-		}
-	}
-
-	@Override
-	public void channelActive(ChannelHandlerContext ctx) throws Exception {
-		super.channelActive(ctx);
-
-		// See NetworkManager.channelActive(ChannelHandlerContext) for why
-		if (channelField != null) {
-			channelField.refreshValue();
-		}
-	}
-
-	/**
-	 * Retrieve every byte in the given byte buffer.
-	 * @param buffer - the buffer.
-	 * @return The bytes.
-	 */
-	private byte[] getBytes(ByteBuf buffer) {
-		byte[] data = new byte[buffer.readableBytes()];
-
-		buffer.readBytes(data);
-		return data;
-	}
-
-	/**
-	 * Disconnect the current player.
-	 * @param message - the disconnect message, if possible.
-	 */
-	private void disconnect(String message) {
-		// If we're logging in, we can only close the channel
-		if (playerConnection == null || player instanceof Factory) {
-			originalChannel.disconnect();
-		} else {
-			// Call the disconnect method
-			try {
-				MinecraftMethods.getDisconnectMethod(playerConnection.getClass()).
-					invoke(playerConnection, message);
-			} catch (Exception e) {
-				throw new IllegalArgumentException("Unable to invoke disconnect method.", e);
-			}
-		}
-	}
-
-	@Override
-	public void sendServerPacket(Object packet, NetworkMarker marker, boolean filtered) {
-		saveMarker(packet, marker);
-
-		try {
-			scheduleProcessPackets.set(filtered);
-			invokeSendPacket(packet);
-		} finally {
-			scheduleProcessPackets.set(true);
-		}
-	}
-
-	/**
-	 * Invoke the sendPacket method in Minecraft.
-	 * @param packet - the packet to send.
- 	 */
-	private void invokeSendPacket(Object packet) {
-		// Attempt to send the packet with NetworkMarker.handle(), or the PlayerConnection if its active
-		try {
-			if (player instanceof Factory) {
-				MinecraftMethods.getNetworkManagerHandleMethod().invoke(networkManager, packet, new GenericFutureListener[0]);
-			} else {
-				MinecraftMethods.getSendPacketMethod().invoke(getPlayerConnection(), packet);
-			}
-		} catch (Throwable ex) {
-			ProtocolLibrary.getErrorReporter().reportWarning(factory.getPlugin(),
-					Report.newBuilder(REPORT_CANNOT_SEND_PACKET).messageParam(packet, playerName).error(ex).build());
-		}
-	}
-
-	@Override
-	public void recieveClientPacket(final Object packet) {
-		// TODO: Ensure the packet listeners are executed in the channel thread.
-
-		// Execute this in the channel thread
-		Runnable action = new Runnable() {
-			@Override
-			public void run() {
-				try {
-					MinecraftMethods.getNetworkManagerReadPacketMethod().invoke(networkManager, null, packet);
-				} catch (Exception e) {
-					// Inform the user
-					ProtocolLibrary.getErrorReporter().reportMinimal(factory.getPlugin(), "recieveClientPacket", e);
-				}
-			}
-		};
-
-		// Execute in the worker thread
-		if (originalChannel.eventLoop().inEventLoop()) {
-			action.run();
-		} else {
-			originalChannel.eventLoop().execute(action);
-		}
-	}
-
-	@Override
-	public Protocol getCurrentProtocol() {
-		if (PROTOCOL_ACCESSOR == null) {
-			PROTOCOL_ACCESSOR = Accessors.getFieldAccessor(
-					networkManager.getClass(), MinecraftReflection.getEnumProtocolClass(), true);
-		}
-		return Protocol.fromVanilla((Enum<?>) PROTOCOL_ACCESSOR.get(networkManager));
-	}
-
-	/**
-	 * Retrieve the player connection of the current player.
-	 * @return The player connection.
-	 */
-	private Object getPlayerConnection() {
-		if (playerConnection == null) {
-			playerConnection = MinecraftFields.getPlayerConnection(player);
-		}
-		return playerConnection;
-	}
-
-	@Override
-	public NetworkMarker getMarker(Object packet) {
-		return packetMarker.get(packet);
-	}
-
-	@Override
-	public void saveMarker(Object packet, NetworkMarker marker) {
-		if (marker != null) {
-			packetMarker.put(packet, marker);
-		}
-	}
-
-	@Override
-	public Player getPlayer() {
-		if (player == null && playerName != null) {
-			return Bukkit.getPlayer(playerName);
-		}
-
-		return player;
-	}
-
-	/**
-	 * Set the player instance.
-	 * @param player - current instance.
-	 */
-	@Override
-    public void setPlayer(Player player) {
-		this.player = player;
-		this.playerName = player.getName();
-	}
-
-	/**
-	 * Set the updated player instance.
-	 * @param updated - updated instance.
-	 */
-	@Override
-    public void setUpdatedPlayer(Player updated) {
-		this.updated = updated;
-		this.playerName = updated.getName();
-	}
-
-	@Override
-	public boolean isInjected() {
-		return injected;
-	}
-
-	/**
-	 * Determine if this channel has been closed and cleaned up.
-	 * @return TRUE if it has, FALSE otherwise.
-	 */
-	@Override
-	public boolean isClosed() {
-		return closed;
-	}
-
-	@Override
-	public void close() {
-		if (!closed) {
-			closed = true;
-
-			if (injected) {
-				channelField.revertValue();
-
-				// Calling remove() in the main thread will block the main thread, which may lead
-				// to a deadlock:
-				//    http://pastebin.com/L3SBVKzp
-				//
-				// ProtocolLib executes this close() method through a PlayerQuitEvent in the main thread,
-				// which has implicitly aquired a lock on SimplePluginManager (see SimplePluginManager.callEvent(Event)).
-				// Unfortunately, the remove() method will schedule the removal on one of the Netty worker threads if
-				// it's called from a different thread, blocking until the removal has been confirmed.
-				//
-				// This is bad enough (Rule #1: Don't block the main thread), but the real trouble starts if the same
-				// worker thread happens to be handling a server ping connection when this removal task is scheduled.
-				// In that case, it may attempt to invoke an asynchronous ServerPingEvent (see PacketStatusListener)
-				// using SimplePluginManager.callEvent(). But, since this has already been locked by the main thread,
-				// we end up with a deadlock. The main thread is waiting for the worker thread to process the task, and
-			    // the worker thread is waiting for the main thread to finish executing PlayerQuitEvent.
-				//
-				// TLDR: Concurrency is hard.
-				executeInChannelThread(new Runnable() {
-					@Override
-					public void run() {
-						String[] handlers = new String[] {
-								"protocol_lib_decoder", "protocol_lib_finish", "protocol_lib_encoder"
-						};
-
-						for (String handler : handlers) {
-							try {
-								originalChannel.pipeline().remove(handler);
-							} catch (NoSuchElementException e) {
-								// Ignore
-							}
-						}
-					}
-				});
-
-				// Clear cache
-				factory.invalidate(player);
-
-				// Clear player instances
-				// Should help fix memory leaks
-				this.player = null;
-				this.updated = null;
-			}
-		}
-	}
-
-	/**
-	 * Execute a specific command in the channel thread.
-	 * <p>
-	 * Exceptions are printed through the standard error reporter mechanism.
-	 * @param command - the command to execute.
-	 */
-	private void executeInChannelThread(final Runnable command) {
-		originalChannel.eventLoop().execute(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					command.run();
-				} catch (Exception e) {
-					ProtocolLibrary.getErrorReporter().reportDetailed(ShadedChannelInjector.this,
-						Report.newBuilder(REPORT_CANNOT_EXECUTE_IN_CHANNEL_THREAD).error(e).build());
-				}
-			}
-		});
-	}
-
-	/**
-	 * Find the first channel handler that is assignable to a given type.
-	 * @param channel - the channel.
-	 * @param clazz - the type.
-	 * @return The first handler, or NULL.
-	 */
-	public static ChannelHandler findChannelHandler(Channel channel, Class<?> clazz) {
-		for (Entry<String, ChannelHandler> entry : channel.pipeline()) {
-			if (clazz.isAssignableFrom(entry.getValue().getClass())) {
-				return entry.getValue();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Represents a socket injector that foreards to the current channel injector.
-	 * @author Kristian
-	 */
-	public static class ChannelSocketInjector implements SocketInjector {
-		private final ShadedChannelInjector injector;
-
-		public ChannelSocketInjector(ShadedChannelInjector injector) {
-			this.injector = Preconditions.checkNotNull(injector, "injector cannot be NULL");
-		}
-
-		@Override
-		public Socket getSocket() throws IllegalAccessException {
-			return ShadedSocketAdapter.adapt((SocketChannel) injector.originalChannel);
-		}
-
-		@Override
-		public SocketAddress getAddress() throws IllegalAccessException {
-			return injector.originalChannel.remoteAddress();
-		}
-
-		@Override
-		public void disconnect(String message) throws InvocationTargetException {
-			injector.disconnect(message);
-		}
-
-		@Override
-		public void sendServerPacket(Object packet, NetworkMarker marker, boolean filtered) throws InvocationTargetException {
-			injector.sendServerPacket(packet, marker, filtered);
-		}
-
-		@Override
-		public Player getPlayer() {
-			return injector.getPlayer();
-		}
-
-		@Override
-		public Player getUpdatedPlayer() {
-			return injector.updated;
-		}
-
-		@Override
-		public void transferState(SocketInjector delegate) {
-			// Do nothing
-		}
-
-		@Override
-		public void setUpdatedPlayer(Player updatedPlayer) {
-			injector.setPlayer(updatedPlayer);
-		}
-
-		public ShadedChannelInjector getChannelInjector() {
-			return injector;
-		}
-	}
-
-	@Override
-	public WrappedChannel getChannel() {
-		return new ShadedChannel(originalChannel);
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedChannelProxy.java

@@ -1,334 +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.compat.netty.shaded;
-
-import java.lang.reflect.Field;
-import java.net.SocketAddress;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import net.minecraft.util.io.netty.buffer.ByteBufAllocator;
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelConfig;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelMetadata;
-import net.minecraft.util.io.netty.channel.ChannelPipeline;
-import net.minecraft.util.io.netty.channel.ChannelProgressivePromise;
-import net.minecraft.util.io.netty.channel.ChannelPromise;
-import net.minecraft.util.io.netty.channel.EventLoop;
-import net.minecraft.util.io.netty.util.Attribute;
-import net.minecraft.util.io.netty.util.AttributeKey;
-
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.FieldAccessor;
-import com.google.common.collect.Maps;
-
-public abstract class ShadedChannelProxy implements Channel {
-	// Mark that a certain object does not contain a message field
-	private static final FieldAccessor MARK_NO_MESSAGE = new FieldAccessor() {
-		@Override
-        public void set(Object instance, Object value) { }
-		@Override
-        public Object get(Object instance) { return null; }
-		@Override
-        public Field getField() { return null; };
-	};
-
-	// Looking up packets in inner classes
-	private static Map<Class<?>, FieldAccessor> MESSAGE_LOOKUP = Maps.newConcurrentMap();
-
-	// The underlying channel
-	protected Channel delegate;
-	protected Class<?> messageClass;
-
-	// Event loop proxy
-	private transient ShadedEventLoopProxy loopProxy;
-
-	public ShadedChannelProxy(Channel delegate, Class<?> messageClass) {
-		this.delegate = delegate;
-		this.messageClass = messageClass;
-	}
-
-	/**
-	 * Invoked when a packet is scheduled for transmission in the event loop.
-	 * @param <T> Type
-	 * @param callable - callable to schedule for execution.
-	 * @param packetAccessor - accessor for modifying the packet in the callable.
-	 * @return The callable that will be scheduled, or NULL to cancel.
-	 */
-	protected abstract <T> Callable<T> onMessageScheduled(Callable<T> callable, FieldAccessor packetAccessor);
-
-	/**
-	 * Invoked when a packet is scheduled for transmission in the event loop.
-	 * @param runnable - the runnable that contains a packet to be scheduled.
-	 * @param packetAccessor - accessor for modifying the packet in the runnable.
-	 * @return The runnable that will be scheduled, or NULL to cancel.
-	 */
-	protected abstract Runnable onMessageScheduled(Runnable runnable, FieldAccessor packetAccessor);
-
-	@Override
-    public <T> Attribute<T> attr(AttributeKey<T> paramAttributeKey) {
-		return delegate.attr(paramAttributeKey);
-	}
-
-	@Override
-    public ChannelFuture bind(SocketAddress paramSocketAddress) {
-		return delegate.bind(paramSocketAddress);
-	}
-
-	@Override
-    public ChannelPipeline pipeline() {
-		return delegate.pipeline();
-	}
-
-	@Override
-    public ChannelFuture connect(SocketAddress paramSocketAddress) {
-		return delegate.connect(paramSocketAddress);
-	}
-
-	@Override
-    public ByteBufAllocator alloc() {
-		return delegate.alloc();
-	}
-
-	@Override
-    public ChannelPromise newPromise() {
-		return delegate.newPromise();
-	}
-
-	@Override
-    public EventLoop eventLoop() {
-		if (loopProxy == null) {
-			loopProxy = new ShadedEventLoopProxy() {
-				@Override
-				protected EventLoop getDelegate() {
-					return delegate.eventLoop();
-				}
-
-				@Override
-				protected Runnable schedulingRunnable(final Runnable runnable) {
-					final FieldAccessor accessor = getMessageAccessor(runnable);
-
-					if (accessor != null) {
-						Runnable result = onMessageScheduled(runnable, accessor);;
-						return result != null ? result : getEmptyRunnable();
-					}
-					return runnable;
-				}
-
-				@Override
-				protected <T> Callable<T> schedulingCallable(Callable<T> callable) {
-					FieldAccessor accessor = getMessageAccessor(callable);
-
-					if (accessor != null) {
-						Callable<T> result = onMessageScheduled(callable, accessor);;
-						return result != null ? result : ShadedEventLoopProxy.<T>getEmptyCallable();
-					}
-					return callable;
-				}
-			};
-		}
-		return loopProxy;
-	}
-
-	/**
-	 * Retrieve a way to access the packet field of an object.
-	 * @param value - the object.
-	 * @return The packet field accessor, or NULL if not found.
-	 */
-	private FieldAccessor getMessageAccessor(Object value) {
-		Class<?> clazz = value.getClass();
-		FieldAccessor accessor = MESSAGE_LOOKUP.get(clazz);
-
-		if (accessor == null) {
-			try {
-				accessor = Accessors.getFieldAccessor(clazz, messageClass, true);
-			} catch (IllegalArgumentException e) {
-				accessor = MARK_NO_MESSAGE;
-			}
-			// Save the result
-			MESSAGE_LOOKUP.put(clazz, accessor);
-		}
-		return accessor != MARK_NO_MESSAGE ? accessor : null;
-	}
-
-	@Override
-    public ChannelFuture connect(SocketAddress paramSocketAddress1,
-			SocketAddress paramSocketAddress2) {
-		return delegate.connect(paramSocketAddress1, paramSocketAddress2);
-	}
-
-	@Override
-    public ChannelProgressivePromise newProgressivePromise() {
-		return delegate.newProgressivePromise();
-	}
-
-	@Override
-    public Channel parent() {
-		return delegate.parent();
-	}
-
-	@Override
-    public ChannelConfig config() {
-		return delegate.config();
-	}
-
-	@Override
-    public ChannelFuture newSucceededFuture() {
-		return delegate.newSucceededFuture();
-	}
-
-	@Override
-    public boolean isOpen() {
-		return delegate.isOpen();
-	}
-
-	@Override
-    public ChannelFuture disconnect() {
-		return delegate.disconnect();
-	}
-
-	@Override
-    public boolean isRegistered() {
-		return delegate.isRegistered();
-	}
-
-	@Override
-    public ChannelFuture newFailedFuture(Throwable paramThrowable) {
-		return delegate.newFailedFuture(paramThrowable);
-	}
-
-	@Override
-    public ChannelFuture close() {
-		return delegate.close();
-	}
-
-	@Override
-    public boolean isActive() {
-		return delegate.isActive();
-	}
-
-	@Override
-    @Deprecated
-	public ChannelFuture deregister() {
-		return delegate.deregister();
-	}
-
-	@Override
-    public ChannelPromise voidPromise() {
-		return delegate.voidPromise();
-	}
-
-	@Override
-    public ChannelMetadata metadata() {
-		return delegate.metadata();
-	}
-
-	@Override
-    public ChannelFuture bind(SocketAddress paramSocketAddress,
-			ChannelPromise paramChannelPromise) {
-		return delegate.bind(paramSocketAddress, paramChannelPromise);
-	}
-
-	@Override
-    public SocketAddress localAddress() {
-		return delegate.localAddress();
-	}
-
-	@Override
-    public SocketAddress remoteAddress() {
-		return delegate.remoteAddress();
-	}
-
-	@Override
-    public ChannelFuture connect(SocketAddress paramSocketAddress,
-			ChannelPromise paramChannelPromise) {
-		return delegate.connect(paramSocketAddress, paramChannelPromise);
-	}
-
-	@Override
-    public ChannelFuture closeFuture() {
-		return delegate.closeFuture();
-	}
-
-	@Override
-    public boolean isWritable() {
-		return delegate.isWritable();
-	}
-
-	@Override
-    public Channel flush() {
-		return delegate.flush();
-	}
-
-	@Override
-    public ChannelFuture connect(SocketAddress paramSocketAddress1,
-			SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise) {
-		return delegate.connect(paramSocketAddress1, paramSocketAddress2, paramChannelPromise);
-	}
-
-	@Override
-    public Channel read() {
-		return delegate.read();
-	}
-
-	@Override
-    public Unsafe unsafe() {
-		return delegate.unsafe();
-	}
-
-	@Override
-    public ChannelFuture disconnect(ChannelPromise paramChannelPromise) {
-		return delegate.disconnect(paramChannelPromise);
-	}
-
-	@Override
-    public ChannelFuture close(ChannelPromise paramChannelPromise) {
-		return delegate.close(paramChannelPromise);
-	}
-
-	@Override
-    @Deprecated
-	public ChannelFuture deregister(ChannelPromise paramChannelPromise) {
-		return delegate.deregister(paramChannelPromise);
-	}
-
-	@Override
-    public ChannelFuture write(Object paramObject) {
-		return delegate.write(paramObject);
-	}
-
-	@Override
-    public ChannelFuture write(Object paramObject, ChannelPromise paramChannelPromise) {
-		return delegate.write(paramObject, paramChannelPromise);
-	}
-
-	@Override
-    public ChannelFuture writeAndFlush(Object paramObject, ChannelPromise paramChannelPromise) {
-		return delegate.writeAndFlush(paramObject, paramChannelPromise);
-	}
-
-	@Override
-    public ChannelFuture writeAndFlush(Object paramObject) {
-		return delegate.writeAndFlush(paramObject);
-	}
-
-	@Override
-    public int compareTo(Channel o) {
-		return delegate.compareTo(o);
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedEventLoopProxy.java

@@ -1,259 +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.compat.netty.shaded;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelPromise;
-import net.minecraft.util.io.netty.channel.EventLoop;
-import net.minecraft.util.io.netty.channel.EventLoopGroup;
-import net.minecraft.util.io.netty.util.concurrent.EventExecutor;
-import net.minecraft.util.io.netty.util.concurrent.Future;
-import net.minecraft.util.io.netty.util.concurrent.ProgressivePromise;
-import net.minecraft.util.io.netty.util.concurrent.Promise;
-import net.minecraft.util.io.netty.util.concurrent.ScheduledFuture;
-
-/**
- * An event loop proxy.
- * @author Kristian.
- */
-abstract class ShadedEventLoopProxy implements EventLoop {
-	private static final Runnable EMPTY_RUNNABLE = new Runnable() {
-		@Override
-		public void run() {
-			// Do nothing
-		}
-	};
-	private static final Callable<?> EMPTY_CALLABLE = new Callable<Object>() {
-		@Override
-		public Object call() throws Exception {
-			return null;
-		};
-	};
-
-	/**
-	 * Retrieve the underlying event loop.
-	 * @return The event loop.
-	 */
-	protected abstract EventLoop getDelegate();
-	
-	/**
-	 * Retrieve a callable that does nothing but return NULL.
-	 * @return The empty callable.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> Callable<T> getEmptyCallable() {
-		return (Callable<T>) EMPTY_CALLABLE;
-	}
-	
-	/**
-	 * Retrieve a runnable that does nothing.
-	 * @return A NO-OP runnable.
-	 */
-	public static Runnable getEmptyRunnable() {
-		return EMPTY_RUNNABLE;
-	}
-	
-	/**
-	 * Invoked when a runnable is being scheduled.
-	 * @param runnable - the runnable that is scheduling.
-	 * @return The runnable to schedule instead. Cannot be NULL.
-	 */
-	protected abstract Runnable schedulingRunnable(Runnable runnable);
-
-	/**
-	 * Invoked when a callable is being scheduled.
-	 * @param runnable - the callable that is scheduling.
-	 * @return The callable to schedule instead. Cannot be NULL.
-	 */
-	protected abstract <T> Callable<T> schedulingCallable(Callable<T> callable);
-	
-	@Override
-	public void execute(Runnable command) {
-		getDelegate().execute(schedulingRunnable(command));
-	}
-
-	@Override
-	public <T> Future<T> submit(Callable<T> action) {
-		return getDelegate().submit(schedulingCallable(action));
-	}
-
-	@Override
-	public <T> Future<T> submit(Runnable action, T arg1) {
-		return getDelegate().submit(schedulingRunnable(action), arg1);
-	}
-
-	@Override
-	public Future<?> submit(Runnable action) {
-		return getDelegate().submit(schedulingRunnable(action));
-	}
-	
-	@Override
-	public <V> ScheduledFuture<V> schedule(Callable<V> action, long arg1, TimeUnit arg2) {
-		return getDelegate().schedule(schedulingCallable(action), arg1, arg2);
-	}
-
-	@Override
-	public ScheduledFuture<?> schedule(Runnable action, long arg1, TimeUnit arg2) {
-		return getDelegate().schedule(schedulingRunnable(action), arg1, arg2);
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleAtFixedRate(Runnable action, long arg1, long arg2, TimeUnit arg3) {
-		return getDelegate().scheduleAtFixedRate(schedulingRunnable(action), arg1, arg2, arg3);
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleWithFixedDelay(Runnable action, long arg1, long arg2, TimeUnit arg3) {
-		return getDelegate().scheduleWithFixedDelay(schedulingRunnable(action), arg1, arg2, arg3);
-	}
-	
-	// Boiler plate:
-	@Override
-	public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
-		return getDelegate().awaitTermination(timeout, unit);
-	}
-
-	@Override
-	public boolean inEventLoop() {
-		return getDelegate().inEventLoop();
-	}
-
-	@Override
-	public boolean inEventLoop(Thread arg0) {
-		return getDelegate().inEventLoop(arg0);
-	}
-
-	@Override
-	public boolean isShutdown() {
-		return getDelegate().isShutdown();
-	}
-
-	@Override
-	public boolean isTerminated() {
-		return getDelegate().isTerminated();
-	}
-
-	@Override
-	public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
-			throws InterruptedException {
-		return getDelegate().invokeAll(tasks);
-	}
-
-	@Override
-	public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout,
-			TimeUnit unit) throws InterruptedException {
-		return getDelegate().invokeAll(tasks, timeout, unit);
-	}
-
-	@Override
-	public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException,
-			ExecutionException {
-		return getDelegate().invokeAny(tasks);
-	}
-
-	@Override
-	public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
-			throws InterruptedException, ExecutionException, TimeoutException {
-		return getDelegate().invokeAny(tasks, timeout, unit);
-	}
-
-	@Override
-	public boolean isShuttingDown() {
-		return getDelegate().isShuttingDown();
-	}
-
-	@Override
-	public Iterator<EventExecutor> iterator() {
-		return getDelegate().iterator();
-	}
-
-	@Override
-	public <V> Future<V> newFailedFuture(Throwable arg0) {
-		return getDelegate().newFailedFuture(arg0);
-	}
-
-	@Override
-	public EventLoop next() {
-		return ((EventLoopGroup) getDelegate()).next();
-	}
-	
-	@Override
-	public <V> ProgressivePromise<V> newProgressivePromise() {
-		return getDelegate().newProgressivePromise();
-	}
-
-	@Override
-	public <V> Promise<V> newPromise() {
-		return getDelegate().newPromise();
-	}
-
-	@Override
-	public <V> Future<V> newSucceededFuture(V arg0) {
-		return getDelegate().newSucceededFuture(arg0);
-	}
-	
-	@Override
-	public EventLoopGroup parent() {
-		return getDelegate().parent();
-	}
-
-	@Override
-	public ChannelFuture register(Channel arg0, ChannelPromise arg1) {
-		return getDelegate().register(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture register(Channel arg0) {
-		return getDelegate().register(arg0);
-	}
-
-	@Override
-	public Future<?> shutdownGracefully() {
-		return getDelegate().shutdownGracefully();
-	}
-
-	@Override
-	public Future<?> shutdownGracefully(long arg0, long arg1, TimeUnit arg2) {
-		return getDelegate().shutdownGracefully(arg0, arg1, arg2);
-	}
-
-	@Override
-	public Future<?> terminationFuture() {
-		return getDelegate().terminationFuture();
-	}
-	
-	@Override
-	@Deprecated
-	public void shutdown() {
-		getDelegate().shutdown();
-	}
-	
-	@Override
-	@Deprecated
-	public List<Runnable> shutdownNow() {
-		return getDelegate().shutdownNow();
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedInjectionFactory.java

@@ -1,239 +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.compat.netty.shaded;
-
-import java.util.concurrent.ConcurrentMap;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.util.io.netty.channel.Channel;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.compat.netty.shaded.ShadedChannelInjector.ChannelSocketInjector;
-import com.comphenix.protocol.injector.netty.ChannelListener;
-import com.comphenix.protocol.injector.netty.ClosedInjector;
-import com.comphenix.protocol.injector.netty.Injector;
-import com.comphenix.protocol.injector.server.SocketInjector;
-import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.utility.MinecraftFields;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.collect.MapMaker;
-
-/**
- * Represents an injector factory.
- * <p>
- * Note that the factory will return {@link ClosedInjector} when the factory is closed.
- * @author Kristian
- */
-public class ShadedInjectionFactory {
-	// This should work as long as the injectors are, uh, injected
-	private final ConcurrentMap<Player, Injector> playerLookup = new MapMaker().weakKeys().weakValues().makeMap();
-	private final ConcurrentMap<String, Injector> nameLookup = new MapMaker().weakValues().makeMap();
-	
-	// Whether or not the factory is closed
-	private volatile boolean closed;
-	
-	// The current plugin
-	private final Plugin plugin;
-	
-	public ShadedInjectionFactory(Plugin plugin) {
-		this.plugin = plugin;
-	}
-	
-	/**
-	 * Retrieve the main plugin associated with this injection factory.
-	 * @return The main plugin.
-	 */
-	public Plugin getPlugin() {
-		return plugin;
-	}
-	
-	/**
-	 * Construct or retrieve a channel injector from an existing Bukkit player.
-	 * @param player - the existing Bukkit player.
-	 * @param listener - the listener.
-	 * @return A new injector, an existing injector associated with this player, or a closed injector.
-	 */
-	@Nonnull
-	public Injector fromPlayer(Player player, ChannelListener listener) {
-		if (closed)
-			return new ClosedInjector(player);
-		Injector injector = playerLookup.get(player);
-		
-		// Find a temporary injector as well
-		if (injector == null)
-			injector = getTemporaryInjector(player);
-		if (injector != null && !injector.isClosed())
-			return injector;
-		
-		Object networkManager = MinecraftFields.getNetworkManager(player);
-		
-		// Must be a temporary Bukkit player
-		if (networkManager == null) {
-			return fromName(player.getName(), player);
-		}
-		Channel channel = FuzzyReflection.getFieldValue(networkManager, Channel.class, true);
-		
-		// See if a channel has already been created
-		injector = (ShadedChannelInjector) ShadedChannelInjector.findChannelHandler(channel, ShadedChannelInjector.class);
-		
-		if (injector != null) {
-			// Update the player instance
-			playerLookup.remove(injector.getPlayer());
-			injector.setPlayer(player);
-		} else {
-			injector = new ShadedChannelInjector(player, networkManager, channel, listener, this);
-		}
-		
-		// Cache injector and return
-		cacheInjector(player, injector);
-		return injector;
-	}
-		
-	/**
-	 * Retrieve a cached injector from a name.
-	 * <p>
-	 * The injector may be NULL if the plugin has been reloaded during a player login.
-	 * @param name - the name.
-	 * @param player - the player.
-	 * @return The cached injector, or a closed injector if it could not be found.
-	 */
-	public Injector fromName(String name, Player player) {
-		if (!closed) {
-			Injector injector = nameLookup.get(name);
-			
-			// We can only retrieve cached injectors
-			if (injector != null) {
-				// Update instance
-				injector.setUpdatedPlayer(player);
-				return injector;
-			}
-		}
-		return new ClosedInjector(player);
-	}
-	
-	/**
-	 * Construct a new channel injector for the given channel.
-	 * @param channel - the channel.
-	 * @param listener - the listener.
-	 * @param playerFactory - a temporary player creator.
-	 * @return The channel injector, or a closed injector.
-	 */
-	@Nonnull
-	public Injector fromChannel(Channel channel, ChannelListener listener, TemporaryPlayerFactory playerFactory) {
-		if (closed)
-			return new ClosedInjector(null);
-		
-		Object networkManager = findNetworkManager(channel);
-		Player temporaryPlayer = playerFactory.createTemporaryPlayer(Bukkit.getServer());
-		ShadedChannelInjector injector = new ShadedChannelInjector(temporaryPlayer, networkManager, channel, listener, this);
-		
-		// Initialize temporary player
-		TemporaryPlayerFactory.setInjectorInPlayer(temporaryPlayer, new ChannelSocketInjector(injector));
-		return injector;
-	}
-	
-	/**
-	 * Invalidate a cached injector.
-	 * @param player - the associated player.
-	 * @return The cached injector, or NULL if nothing was cached.
-	 */
-	public Injector invalidate(Player player) {
-		Injector injector = playerLookup.remove(player);
-		
-		nameLookup.remove(player.getName());
-		return injector;
-	}
-	
-	/**
-	 * Cache an injector by player.
-	 * @param player - the player.
-	 * @param injector - the injector to cache.
-	 * @return The previously cached injector.
-	 */
-	public Injector cacheInjector(Player player, Injector injector) {
-		nameLookup.put(player.getName(), injector);
-		return playerLookup.put(player, injector);
-	}
-	
-	/**
-	 * Cache an injector by name alone.
-	 * @param name - the name to lookup.
-	 * @param injector - the injector.
-	 * @return The cached injector.
-	 */
-	public Injector cacheInjector(String name, Injector injector) {
-		return nameLookup.put(name, injector);
-	}
-	
-	/**
-	 * Retrieve the associated channel injector.
-	 * @param player - the temporary player, or normal Bukkit player.
-	 * @return The associated injector, or NULL if this is a Bukkit player.
-	 */
-	private ShadedChannelInjector getTemporaryInjector(Player player) {
-		SocketInjector injector = TemporaryPlayerFactory.getInjectorFromPlayer(player);
-		
-		if (injector != null) {
-			return ((ChannelSocketInjector) injector).getChannelInjector();
-		}
-		return null;
-	}
-	
-	/**
-	 * Find the network manager in a channel's pipeline.
-	 * @param channel - the channel.
-	 * @return The network manager.
-	 */
-	private Object findNetworkManager(Channel channel) {
-		// Find the network manager
-		Object networkManager = ShadedChannelInjector.findChannelHandler(channel, MinecraftReflection.getNetworkManagerClass());
-		
-		if (networkManager != null)
-			return networkManager;
-		throw new IllegalArgumentException("Unable to find NetworkManager in " + channel);
-	}
-	
-	/**
-	 * Determine if the factory is closed.
-	 * <p>
-	 * If it is, all new injectors will be closed by default.
-	 * @return TRUE if it is closed, FALSE otherwise.
-	 */
-	public boolean isClosed() {
-		return closed;
-	}
-	
-	/**
-	 * Close all injectors created by this factory, and cease the creation of new injections.
-	 */
-	public synchronized void close() {
-		if (!closed) {
-			closed = true;
-			
-			// Close everything
-			for (Injector injector : playerLookup.values())
-				injector.close();
-			for (Injector injector : nameLookup.values())
-				injector.close();
-		}
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedNetty.java

@@ -1,105 +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.compat.netty.shaded;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.Unpooled;
-import net.minecraft.util.io.netty.buffer.UnpooledByteBufAllocator;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.handler.codec.base64.Base64;
-import net.minecraft.util.io.netty.util.concurrent.GenericFutureListener;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.compat.netty.NettyCompat;
-import com.comphenix.protocol.compat.netty.ProtocolInjector;
-import com.comphenix.protocol.compat.netty.WrappedByteBuf;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.WrappedServerPing.CompressedImage;
-import com.google.common.base.Charsets;
-
-/**
- * @author dmulloy2
- */
-
-public class ShadedNetty implements NettyCompat {
-
-	@Override
-	public WrappedByteBuf createPacketBuffer() {
-		ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.buffer();
-		Class<?> packetSerializer = MinecraftReflection.getPacketDataSerializerClass();
-
-		try {
-			return new ShadedByteBuf((ByteBuf) packetSerializer.getConstructor(ByteBuf.class).newInstance(buffer));
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct packet serializer.", e);
-		}
-	}
-
-	@Override
-	public Class<?> getGenericFutureListenerArray() {
-		return GenericFutureListener[].class;
-	}
-
-	@Override
-	public Class<?> getChannelHandlerContext() {
-		return ChannelHandlerContext.class;
-	}
-
-	@Override
-	public String toEncodedText(CompressedImage image) {
-		final ByteBuf buffer = Unpooled.wrappedBuffer(image.getDataCopy());
-		String computed = "data:" + image.getMime() + ";base64," +
-			Base64.encode(buffer).toString(Charsets.UTF_8);
-		return computed;
-	}
-
-	@Override
-	public WrappedByteBuf decode(byte[] encoded) {
-		return new ShadedByteBuf(Base64.decode(Unpooled.wrappedBuffer(encoded)));
-	}
-
-	@Override
-	public ProtocolInjector getProtocolInjector(Plugin plugin, ListenerInvoker invoker, ErrorReporter reporter) {
-		return new ShadedProtocolInjector(plugin, invoker, reporter);
-	}
-
-	@Override
-	public WrappedByteBuf packetReader(DataInputStream input) {
-		return new ShadedByteBuf(ShadedByteBufAdapter.packetReader(input));
-	}
-
-	@Override
-	public WrappedByteBuf packetWriter(DataOutputStream output) {
-		return new ShadedByteBuf(ShadedByteBufAdapter.packetWriter(output));
-	}
-
-	@Override
-	public WrappedByteBuf copiedBuffer(byte[] array) {
-		return new ShadedByteBuf(Unpooled.copiedBuffer(array));
-	}
-
-	@Override
-	public WrappedByteBuf buffer() {
-		return new ShadedByteBuf(Unpooled.buffer());
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedPipelineProxy.java

@@ -1,371 +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.compat.netty.shaded;
-
-import java.net.SocketAddress;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelPipeline;
-import net.minecraft.util.io.netty.channel.ChannelPromise;
-import net.minecraft.util.io.netty.util.concurrent.EventExecutorGroup;
-
-/**
- * A pipeline proxy.
- * @author Kristian
- */
-public class ShadedPipelineProxy implements ChannelPipeline {
-	protected final ChannelPipeline pipeline;
-	protected final Channel channel;
-
-	public ShadedPipelineProxy(ChannelPipeline pipeline, Channel channel) {
-		this.pipeline = pipeline;
-		this.channel = channel;
-	}
-
-	@Override
-	public ChannelPipeline addAfter(EventExecutorGroup arg0, String arg1, String arg2, ChannelHandler arg3) {
-		pipeline.addAfter(arg0, arg1, arg2, arg3);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addAfter(String arg0, String arg1, ChannelHandler arg2) {
-		pipeline.addAfter(arg0, arg1, arg2);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addBefore(EventExecutorGroup arg0, String arg1, String arg2, ChannelHandler arg3) {
-		pipeline.addBefore(arg0, arg1, arg2, arg3);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addBefore(String arg0, String arg1, ChannelHandler arg2) {
-		pipeline.addBefore(arg0, arg1, arg2);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addFirst(ChannelHandler... arg0) {
-		pipeline.addFirst(arg0);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addFirst(EventExecutorGroup arg0, ChannelHandler... arg1) {
-		pipeline.addFirst(arg0, arg1);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addFirst(EventExecutorGroup arg0, String arg1, ChannelHandler arg2) {
-		pipeline.addFirst(arg0, arg1, arg2);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addFirst(String arg0, ChannelHandler arg1) {
-		pipeline.addFirst(arg0, arg1);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addLast(ChannelHandler... arg0) {
-		pipeline.addLast(arg0);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addLast(EventExecutorGroup arg0, ChannelHandler... arg1) {
-		pipeline.addLast(arg0, arg1);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addLast(EventExecutorGroup arg0, String arg1, ChannelHandler arg2) {
-		pipeline.addLast(arg0, arg1, arg2);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline addLast(String arg0, ChannelHandler arg1) {
-		pipeline.addLast(arg0, arg1);
-		return this;
-	}
-
-	@Override
-	public ChannelFuture bind(SocketAddress arg0, ChannelPromise arg1) {
-		return pipeline.bind(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture bind(SocketAddress arg0) {
-		return pipeline.bind(arg0);
-	}
-
-	@Override
-	public Channel channel() {
-		return channel;
-	}
-
-	@Override
-	public ChannelFuture close() {
-		return pipeline.close();
-	}
-
-	@Override
-	public ChannelFuture close(ChannelPromise arg0) {
-		return pipeline.close(arg0);
-	}
-
-	@Override
-	public ChannelFuture connect(SocketAddress arg0, ChannelPromise arg1) {
-		return pipeline.connect(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture connect(SocketAddress arg0, SocketAddress arg1, ChannelPromise arg2) {
-		return pipeline.connect(arg0, arg1, arg2);
-	}
-
-	@Override
-    public ChannelFuture connect(SocketAddress arg0, SocketAddress arg1) {
-		return pipeline.connect(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture connect(SocketAddress arg0) {
-		return pipeline.connect(arg0);
-	}
-
-	@Override
-	public ChannelHandlerContext context(ChannelHandler arg0) {
-		return pipeline.context(arg0);
-	}
-
-	@Override
-    public ChannelHandlerContext context(Class<? extends ChannelHandler> arg0) {
-		return pipeline.context(arg0);
-	}
-
-	@Override
-	public ChannelHandlerContext context(String arg0) {
-		return pipeline.context(arg0);
-	}
-
-	// We have to call the depreciated methods to properly implement the proxy
-	@Override
-	public ChannelFuture deregister() {
-		return pipeline.deregister();
-	}
-
-	@Override
-	public ChannelFuture deregister(ChannelPromise arg0) {
-		return pipeline.deregister(arg0);
-	}
-
-	@Override
-	public ChannelPipeline fireChannelUnregistered() {
-		pipeline.fireChannelUnregistered();
-		return this;
-	}
-
-	@Override
-	public ChannelFuture disconnect() {
-		return pipeline.disconnect();
-	}
-
-	@Override
-	public ChannelFuture disconnect(ChannelPromise arg0) {
-		return pipeline.disconnect(arg0);
-	}
-
-	@Override
-	public ChannelPipeline fireChannelActive() {
-		pipeline.fireChannelActive();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireChannelInactive() {
-		pipeline.fireChannelInactive();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireChannelRead(Object arg0) {
-		pipeline.fireChannelRead(arg0);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireChannelReadComplete() {
-		pipeline.fireChannelReadComplete();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireChannelRegistered() {
-		pipeline.fireChannelRegistered();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireChannelWritabilityChanged() {
-		pipeline.fireChannelWritabilityChanged();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireExceptionCaught(Throwable arg0) {
-		pipeline.fireExceptionCaught(arg0);
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline fireUserEventTriggered(Object arg0) {
-		pipeline.fireUserEventTriggered(arg0);
-		return this;
-	}
-
-	@Override
-	public ChannelHandler first() {
-		return pipeline.first();
-	}
-
-	@Override
-	public ChannelHandlerContext firstContext() {
-		return pipeline.firstContext();
-	}
-
-	@Override
-	public ChannelPipeline flush() {
-		pipeline.flush();
-		return this;
-	}
-
-	@Override
-	public <T extends ChannelHandler> T get(Class<T> arg0) {
-		return pipeline.get(arg0);
-	}
-
-	@Override
-	public ChannelHandler get(String arg0) {
-		return pipeline.get(arg0);
-	}
-
-	@Override
-	public Iterator<Entry<String, ChannelHandler>> iterator() {
-		return pipeline.iterator();
-	}
-
-	@Override
-	public ChannelHandler last() {
-		return pipeline.last();
-	}
-
-	@Override
-	public ChannelHandlerContext lastContext() {
-		return pipeline.lastContext();
-	}
-
-	@Override
-	public List<String> names() {
-		return pipeline.names();
-	}
-
-	@Override
-	public ChannelPipeline read() {
-		pipeline.read();
-		return this;
-	}
-
-	@Override
-	public ChannelPipeline remove(ChannelHandler arg0) {
-		pipeline.remove(arg0);
-		return this;
-	}
-
-	@Override
-	public <T extends ChannelHandler> T remove(Class<T> arg0) {
-		return pipeline.remove(arg0);
-	}
-
-	@Override
-	public ChannelHandler remove(String arg0) {
-		return pipeline.remove(arg0);
-	}
-
-	@Override
-	public ChannelHandler removeFirst() {
-		return pipeline.removeFirst();
-	}
-
-	@Override
-	public ChannelHandler removeLast() {
-		return pipeline.removeLast();
-	}
-
-	@Override
-	public ChannelPipeline replace(ChannelHandler arg0, String arg1, ChannelHandler arg2) {
-		pipeline.replace(arg0, arg1, arg2);
-		return this;
-	}
-
-	@Override
-	public <T extends ChannelHandler> T replace(Class<T> arg0, String arg1, ChannelHandler arg2) {
-		return pipeline.replace(arg0, arg1, arg2);
-	}
-
-	@Override
-	public ChannelHandler replace(String arg0, String arg1, ChannelHandler arg2) {
-		return pipeline.replace(arg0, arg1, arg2);
-	}
-
-	@Override
-	public Map<String, ChannelHandler> toMap() {
-		return pipeline.toMap();
-	}
-
-	@Override
-	public ChannelFuture write(Object arg0, ChannelPromise arg1) {
-		return pipeline.write(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture write(Object arg0) {
-		return pipeline.write(arg0);
-	}
-
-	@Override
-	public ChannelFuture writeAndFlush(Object arg0, ChannelPromise arg1) {
-		return pipeline.writeAndFlush(arg0, arg1);
-	}
-
-	@Override
-	public ChannelFuture writeAndFlush(Object arg0) {
-		return pipeline.writeAndFlush(arg0);
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedProtocolInjector.java

@@ -1,438 +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.compat.netty.shaded;
-
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandler;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
-import net.minecraft.util.io.netty.channel.ChannelInitializer;
-
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.compat.netty.ChannelInjector;
-import com.comphenix.protocol.compat.netty.ProtocolInjector;
-import com.comphenix.protocol.compat.netty.WrappedChannel;
-import com.comphenix.protocol.concurrency.PacketTypeSet;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.error.Report;
-import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.ListenerOptions;
-import com.comphenix.protocol.events.NetworkMarker;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.injector.netty.ChannelListener;
-import com.comphenix.protocol.injector.netty.Injector;
-import com.comphenix.protocol.injector.netty.NettyNetworkMarker;
-import com.comphenix.protocol.injector.packet.PacketInjector;
-import com.comphenix.protocol.injector.packet.PacketRegistry;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
-import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
-import com.comphenix.protocol.injector.spigot.AbstractPacketInjector;
-import com.comphenix.protocol.injector.spigot.AbstractPlayerHandler;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.VolatileField;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.collect.Lists;
-
-public class ShadedProtocolInjector implements ProtocolInjector {
-	public static final ReportType REPORT_CANNOT_INJECT_INCOMING_CHANNEL = new ReportType("Unable to inject incoming channel %s.");
-	
-    private volatile boolean injected;
-    private volatile boolean closed;
-    
-    // The temporary player factory
-    private TemporaryPlayerFactory playerFactory = new TemporaryPlayerFactory();
-    private List<VolatileField> bootstrapFields = Lists.newArrayList();
-    
-    // The channel injector factory
-    private ShadedInjectionFactory injectionFactory;
-    
-    // List of network managers
-    private volatile List<Object> networkManagers;
-    
-	// Different sending filters
-	private PacketTypeSet sendingFilters = new PacketTypeSet();
-	private PacketTypeSet reveivedFilters = new PacketTypeSet();
-	
-	// Packets that must be executed on the main thread
-	private PacketTypeSet mainThreadFilters = new PacketTypeSet();
-	
-	// Which packets are buffered
-    private PacketTypeSet bufferedPackets = new PacketTypeSet();
-    private ListenerInvoker invoker;
-    
-    // Handle errors
-    private ErrorReporter reporter;
-    private boolean debug;
-    
-    public ShadedProtocolInjector(Plugin plugin, ListenerInvoker invoker, ErrorReporter reporter) {
-    	this.injectionFactory = new ShadedInjectionFactory(plugin);
-		this.invoker = invoker;
-		this.reporter = reporter;
-	}
-
-    @Override
-    public boolean isDebug() {
-		return debug;
-	}
-    
-    /**
-     * Set whether or not the debug mode is enabled.
-     * @param debug - TRUE if it is, FALSE otherwise.
-     */
-	@Override
-	public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-    
-	/**
-     * Inject into the spigot connection class.
-     */
-    @Override
-	@SuppressWarnings("unchecked")
-	public synchronized void inject() {
-        if (injected)
-            throw new IllegalStateException("Cannot inject twice.");
-        try {
-        	FuzzyReflection fuzzyServer = FuzzyReflection.fromClass(MinecraftReflection.getMinecraftServerClass());
-            List<Method> serverConnectionMethods = fuzzyServer.getMethodListByParameters(MinecraftReflection.getServerConnectionClass(), new Class[] {});
-            
-            // Get the server connection
-            Object server = fuzzyServer.getSingleton();
-            Object serverConnection = null;
-            
-            for (Method method : serverConnectionMethods) {
-            	try {
-            		serverConnection = method.invoke(server);
-            		
-            		// Continue until we get a server connection
-            		if (serverConnection != null) {
-            			break;
-            		}
-            	} catch (Exception e) {
-            		// Try the next though
-            		e.printStackTrace();
-            	}
-            }
-            
-            // Handle connected channels
-            final ChannelInboundHandler endInitProtocol = new ChannelInitializer<Channel>() {
-                @Override
-                protected void initChannel(Channel channel) throws Exception {
-                	try {
-	                    // This can take a while, so we need to stop the main thread from interfering
-	                    synchronized (networkManagers) {
-	                    	injectionFactory.fromChannel(channel, ShadedProtocolInjector.this, playerFactory).inject();
-						}
-                	} catch (Exception e) {
-                		reporter.reportDetailed(ShadedProtocolInjector.this, Report.newBuilder(REPORT_CANNOT_INJECT_INCOMING_CHANNEL).
-                				messageParam(channel).error(e));
-                	}
-                }
-            };
-            
-            // This is executed before Minecraft's channel handler
-            final ChannelInboundHandler beginInitProtocol = new ChannelInitializer<Channel>() {
-            	@Override
-            	protected void initChannel(Channel channel) throws Exception {
-            		// Our only job is to add init protocol
-            		channel.pipeline().addLast(endInitProtocol);
-            	}
-            };
-            
-            // Add our handler to newly created channels
-            final ChannelHandler connectionHandler = new ChannelInboundHandlerAdapter() {
-            	@Override
-            	public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-                    Channel channel = (Channel) msg;
-
-                    // Prepare to initialize ths channel
-                    channel.pipeline().addFirst(beginInitProtocol);
-                    ctx.fireChannelRead(msg);
-            	}
-            };
-            
-            // Get the current NetworkMananger list
-            networkManagers = (List<Object>) FuzzyReflection.fromObject(serverConnection, true).
-            	invokeMethod(null, "getNetworkManagers", List.class, serverConnection);
-            
-            // Insert ProtocolLib's connection interceptor
-            bootstrapFields = getBootstrapFields(serverConnection);
-            
-            for (VolatileField field : bootstrapFields) {
-            	final List<Object> list = (List<Object>) field.getValue();
-     
-            	// We don't have to override this list
-            	if (list == networkManagers) {
-            		continue;
-            	}
-            	
-            	// Synchronize with each list before we attempt to replace them.
-				field.setValue(new ShadedBootstrapList(list, connectionHandler));
-            }
-
-            injected = true;
-            
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to inject channel futures.", e);
-        }
-    }
-    
-	@Override
-	public boolean hasListener(Class<?> packetClass) {
-		return reveivedFilters.contains(packetClass) || sendingFilters.contains(packetClass);
-	}
-    
-	@Override
-	public boolean hasMainThreadListener(Class<?> packetClass) {
-		return mainThreadFilters.contains(packetClass);
-	}
-	
-	@Override
-	public ErrorReporter getReporter() {
-		return reporter;
-	}
-    
-    /**
-     * Inject our packet handling into a specific player.
-     * @param player Player to inject into
-     */
-    public void injectPlayer(Player player) {
-    	injectionFactory.fromPlayer(player, this).inject();
-    }
-    
-    private List<VolatileField> getBootstrapFields(Object serverConnection) {
-    	List<VolatileField> result = Lists.newArrayList();
-    	
-    	// Find and (possibly) proxy every list
-    	for (Field field : FuzzyReflection.fromObject(serverConnection, true).getFieldListByType(List.class)) {
-    		VolatileField volatileField = new VolatileField(field, serverConnection, true).toSynchronized();
-    		
-    		@SuppressWarnings("unchecked")
-			List<Object> list = (List<Object>) volatileField.getValue();
-    		
-    		if (list.size() == 0 || list.get(0) instanceof ChannelFuture) {
-    			result.add(volatileField);
-    		}
-    	}
-    	return result;
-    }
-    
-    /**
-     * Clean up any remaning injections.
-     */
-    @Override
-	public synchronized void close() {
-        if (!closed) {
-            closed = true;
-
-            for (VolatileField field : bootstrapFields) {
-            	Object value = field.getValue();
-
-            	// Undo the processed channels, if any
-            	if (value instanceof ShadedBootstrapList) {
-            		((ShadedBootstrapList) value).close();
-            	}
-            	field.revertValue();
-            }
-            // Uninject all the players
-            injectionFactory.close();
-        }
-    }
-    
-    @Override
-    public PacketEvent onPacketSending(Injector injector, Object packet, NetworkMarker marker) {
-		Class<?> clazz = packet.getClass();
-		
-		if (sendingFilters.contains(clazz) || marker != null) {
-			PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(clazz), packet);
-			return packetQueued(container, injector.getPlayer(), marker);
-		}
-
-		// Don't change anything
-		return null;
-    }
-
-	@Override
-	public PacketEvent onPacketReceiving(Injector injector, Object packet, NetworkMarker marker) {
-		Class<?> clazz = packet.getClass();
-		
-		if (reveivedFilters.contains(clazz) || marker != null) {
-			PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(clazz), packet);
-			return packetReceived(container, injector.getPlayer(), marker);
-		}
-
-		// Don't change anything
-		return null;
-	}
-
-	@Override
-	public boolean includeBuffer(Class<?> packetClass) {
-		return bufferedPackets.contains(packetClass);
-	}
- 
-	/**
-	 * Called to inform the event listeners of a queued packet.
-	 * @param packet - the packet that is to be sent.
-	 * @param receiver - the receiver of this packet.
-	 * @return The packet event that was used.
-	 */
-	private PacketEvent packetQueued(PacketContainer packet, Player receiver, NetworkMarker marker) {
-		PacketEvent event = PacketEvent.fromServer(this, packet, marker, receiver);
-		
-		invoker.invokePacketSending(event);
-		return event;
-	}
-	
-	/**
-	 * Called to inform the event listeners of a received packet.
-	 * @param packet - the packet that has been receieved.
-	 * @param sender - the client packet.
-	 * @param marker - the network marker.
-	 * @return The packet event that was used.
-	 */
-	private PacketEvent packetReceived(PacketContainer packet, Player sender, NetworkMarker marker) {
-		PacketEvent event = PacketEvent.fromClient(this, packet, marker, sender);
-		
-		invoker.invokePacketRecieving(event);
-		return event;
-	}
-    
-	// Server side
-	@Override
-	public PlayerInjectionHandler getPlayerInjector() {
-		return new AbstractPlayerHandler(sendingFilters) {
-			private ChannelListener listener = ShadedProtocolInjector.this;
-			
-			@Override
-			public int getProtocolVersion(Player player) {
-				return injectionFactory.fromPlayer(player, listener).getProtocolVersion();
-			}
-			
-			@Override
-			public void updatePlayer(Player player) {
-				injectionFactory.fromPlayer(player, listener).inject();
-			}
-
-			@Override
-			public void injectPlayer(Player player, ConflictStrategy strategy) {
-				injectionFactory.fromPlayer(player, listener).inject();
-			}
-			
-			@Override
-			public boolean uninjectPlayer(InetSocketAddress address) {
-				// Ignore this too
-				return true;
-			}
-			
-			@Override
-			public void addPacketHandler(PacketType type, Set<ListenerOptions> options) {
-				if (options != null && !type.forceAsync() && !options.contains(ListenerOptions.ASYNC))
-					mainThreadFilters.addType(type);
-				super.addPacketHandler(type, options);
-			}
-			
-			@Override
-			public void removePacketHandler(PacketType type) {
-				mainThreadFilters.removeType(type);
-				super.removePacketHandler(type);
-			}
-			
-			@Override
-			public boolean uninjectPlayer(Player player) {
-				// Just let Netty clean this up
-				return true;
-			}
-
-			@Override
-			public void sendServerPacket(Player receiver, PacketContainer packet, NetworkMarker marker, boolean filters) throws InvocationTargetException {
-				injectionFactory.fromPlayer(receiver, listener).
-					sendServerPacket(packet.getHandle(), marker, filters);
-			}
-			
-			@Override
-			public boolean hasMainThreadListener(PacketType type) {
-				return mainThreadFilters.contains(type);
-			}
-			
-			@Override
-			public void recieveClientPacket(Player player, Object mcPacket) throws IllegalAccessException, InvocationTargetException {
-				injectionFactory.fromPlayer(player, listener).
-					recieveClientPacket(mcPacket);
-			}
-			
-			@Override
-			public PacketEvent handlePacketRecieved(PacketContainer packet, InputStream input, byte[] buffered) {
-				// Ignore this
-				return null;
-			}
-			
-			@Override
-			public void handleDisconnect(Player player) {
-				injectionFactory.fromPlayer(player, listener).close();
-			}
-
-			@Override
-			public WrappedChannel getChannel(Player player) {
-				Injector injector = injectionFactory.fromPlayer(player, listener);
-				if (injector instanceof ChannelInjector) {
-					return ((ChannelInjector) injector).getChannel();
-				}
-
-				return null;
-			}
-		};
-	}
-	
-	/**
-	 * Retrieve a view of this protocol injector as a packet injector.
-	 * @return The packet injector.
-	 */
-	// Client side
-	@Override
-	public PacketInjector getPacketInjector() {
-		return new AbstractPacketInjector(reveivedFilters) {
-			@Override
-			public PacketEvent packetRecieved(PacketContainer packet, Player client, byte[] buffered) {
-				NetworkMarker marker = buffered != null ? new NettyNetworkMarker(ConnectionSide.CLIENT_SIDE, buffered) : null;
-				injectionFactory.fromPlayer(client, ShadedProtocolInjector.this).
-					saveMarker(packet.getHandle(), marker);
-				return packetReceived(packet, client, marker);
-			}
-			
-			@Override
-			public void inputBuffersChanged(Set<PacketType> set) {
-				bufferedPackets = new PacketTypeSet(set);
-			}
-		};
-	}
-}

modules/v1_7_R4/src/main/java/com/comphenix/protocol/compat/netty/shaded/ShadedSocketAdapter.java

@@ -1,265 +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.compat.netty.shaded;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelOption;
-import net.minecraft.util.io.netty.channel.socket.SocketChannel;
-
-/**
- * This class wraps a Netty {@link Channel} in a {@link Socket}. It overrides
- * all methods in {@link Socket} to ensure that calls are not mistakingly made
- * to the unsupported super socket. All operations that can be sanely applied to
- * a {@link Channel} are implemented here. Those which cannot will throw an
- * {@link UnsupportedOperationException}.
- */
-// Thanks MD5. :)
-public class ShadedSocketAdapter extends Socket {
-    private final SocketChannel ch;
-
-    private ShadedSocketAdapter(SocketChannel ch) {
-        this.ch = ch;
-    }
-
-    public static ShadedSocketAdapter adapt(SocketChannel ch) {
-        return new ShadedSocketAdapter(ch);
-    }
-
-    @Override
-    public void bind(SocketAddress bindpoint) throws IOException {
-        ch.bind(bindpoint).syncUninterruptibly();
-    }
-
-    @Override
-    public synchronized void close() throws IOException {
-        ch.close().syncUninterruptibly();
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint) throws IOException {
-        ch.connect(endpoint).syncUninterruptibly();
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
-        ch.config().setConnectTimeoutMillis(timeout);
-        ch.connect(endpoint).syncUninterruptibly();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof ShadedSocketAdapter && ch.equals(((ShadedSocketAdapter) obj).ch);
-    }
-
-    @Override
-    public java.nio.channels.SocketChannel getChannel() {
-         throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public InetAddress getInetAddress() {
-        return ch.remoteAddress().getAddress();
-    }
-
-    @Override
-    public InputStream getInputStream() throws IOException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public boolean getKeepAlive() throws SocketException {
-        return ch.config().getOption(ChannelOption.SO_KEEPALIVE);
-    }
-
-    @Override
-    public InetAddress getLocalAddress() {
-        return ch.localAddress().getAddress();
-    }
-
-    @Override
-    public int getLocalPort() {
-        return ch.localAddress().getPort();
-    }
-
-    @Override
-    public SocketAddress getLocalSocketAddress() {
-        return ch.localAddress();
-    }
-
-    @Override
-    public boolean getOOBInline() throws SocketException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public OutputStream getOutputStream() throws IOException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public int getPort() {
-        return ch.remoteAddress().getPort();
-    }
-
-    @Override
-    public synchronized int getReceiveBufferSize() throws SocketException {
-        return ch.config().getOption(ChannelOption.SO_RCVBUF);
-    }
-
-    @Override
-    public SocketAddress getRemoteSocketAddress() {
-        return ch.remoteAddress();
-    }
-
-    @Override
-    public boolean getReuseAddress() throws SocketException {
-        return ch.config().getOption(ChannelOption.SO_REUSEADDR);
-    }
-
-    @Override
-    public synchronized int getSendBufferSize() throws SocketException {
-        return ch.config().getOption(ChannelOption.SO_SNDBUF);
-    }
-
-    @Override
-    public int getSoLinger() throws SocketException {
-        return ch.config().getOption(ChannelOption.SO_LINGER);
-    }
-
-    @Override
-    public synchronized int getSoTimeout() throws SocketException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public boolean getTcpNoDelay() throws SocketException {
-        return ch.config().getOption(ChannelOption.TCP_NODELAY);
-    }
-
-    @Override
-    public int getTrafficClass() throws SocketException {
-        return ch.config().getOption(ChannelOption.IP_TOS);
-    }
-
-    @Override
-    public int hashCode() {
-        return ch.hashCode();
-    }
-
-    @Override
-    public boolean isBound() {
-        return ch.localAddress() != null;
-    }
-
-    @Override
-    public boolean isClosed() {
-        return !ch.isOpen();
-    }
-
-    @Override
-    public boolean isConnected() {
-        return ch.isActive();
-    }
-
-    @Override
-    public boolean isInputShutdown() {
-        return ch.isInputShutdown();
-    }
-
-    @Override
-    public boolean isOutputShutdown() {
-        return ch.isOutputShutdown();
-    }
-
-    @Override
-    public void sendUrgentData(int data) throws IOException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public void setKeepAlive(boolean on) throws SocketException {
-        ch.config().setOption(ChannelOption.SO_KEEPALIVE, on);
-    }
-
-    @Override
-    public void setOOBInline(boolean on) throws SocketException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public synchronized void setReceiveBufferSize(int size) throws SocketException {
-        ch.config().setOption(ChannelOption.SO_RCVBUF, size);
-    }
-
-    @Override
-    public void setReuseAddress(boolean on) throws SocketException {
-        ch.config().setOption(ChannelOption.SO_REUSEADDR, on);
-    }
-
-    @Override
-    public synchronized void setSendBufferSize(int size) throws SocketException {
-        ch.config().setOption(ChannelOption.SO_SNDBUF, size);
-    }
-
-    @Override
-    public void setSoLinger(boolean on, int linger) throws SocketException {
-        ch.config().setOption(ChannelOption.SO_LINGER, linger);
-    }
-
-    @Override
-    public synchronized void setSoTimeout(int timeout) throws SocketException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public void setTcpNoDelay(boolean on) throws SocketException {
-        ch.config().setOption(ChannelOption.TCP_NODELAY, on);
-    }
-
-    @Override
-    public void setTrafficClass(int tc) throws SocketException {
-        ch.config().setOption(ChannelOption.IP_TOS, tc);
-    }
-
-    @Override
-    public void shutdownInput() throws IOException {
-        throw new UnsupportedOperationException("Operation not supported on Channel wrapper.");
-    }
-
-    @Override
-    public void shutdownOutput() throws IOException {
-        ch.shutdownOutput().syncUninterruptibly();
-    }
-
-    @Override
-    public String toString() {
-        return ch.toString();
-    }
-}

pom.xml

@@ -1,93 +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>v3-SNAPSHOT</version>
-  <name>ProtocolLib-Parent</name>
-
-  <modules>
-    <module>ProtocolLib</module>
-    <module>modules/v1_7_R4</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>
-
-  <build>
-    <defaultGoal>clean package install</defaultGoal>
-    <finalName>${project.name}</finalName>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</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>
-
-  <!--<reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-    </plugins>
-  </reporting>-->
-</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.0</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.1-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/AsynchronousManager.java

@@ -152,4 +152,4 @@ public interface AsynchronousManager {
 	 * @return Set of every asynchronous packet listener.
 	 */
 	public abstract Set<PacketListener> getAsyncHandlers();
-}
+}

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

@@ -22,7 +22,9 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 import org.bukkit.ChatColor;
@@ -193,7 +195,7 @@ class CommandProtocol extends CommandBase {
 	 * Prevent further automatic updates until the next delay.
 	 */
 	public void updateFinished() {
-		long currentTime = System.currentTimeMillis() / ProtocolLibrary.MILLI_PER_SECOND;
+		long currentTime = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
 
 		config.setAutoLastTime(currentTime);
 		config.saveAll();
@@ -251,19 +253,37 @@ class CommandProtocol extends CommandBase {
 			pw.println();
 
 			Set<PacketListener> listeners = manager.getPacketListeners();
-			if (listeners.size() > 0) {
+			Set<Plugin> plugins = new HashSet<>();
+
+			if (!listeners.isEmpty()) {
 				pw.println("Listeners:");
 
 				for (PacketListener listener : listeners) {
 					pw.println(DetailedErrorReporter.getStringDescription(listener));
+
+					Plugin plugin = listener.getPlugin();
+					if (plugin != null) {
+						plugins.add(plugin);
+					} else {
+						pw.println("(Missing plugin!)");
+					}
 				}
+
+				pw.println();
 			} else {
 				pw.println("No listeners");
 			}
 
+			if (!plugins.isEmpty()) {
+				pw.println("Plugins Using ProtocolLib:");
+				for (Plugin plugin : plugins) {
+					pw.println(plugin.getName() + " by " + plugin.getDescription().getAuthors());
+				}
+			}
+
 			sender.sendMessage("Data dump written to " + file.getAbsolutePath());
 		} catch (IOException ex) {
-			ProtocolLibrary.log(Level.SEVERE, "Failed to create dump:", ex);
+			ProtocolLogger.log(Level.SEVERE, "Failed to create dump:", ex);
 			sender.sendMessage(ChatColor.RED + "Failed to create dump! Check console!");
 		} finally {
 			closer.close();

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

@@ -0,0 +1,268 @@
+/**
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2017 Dan Mulloy
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307 USA
+ */
+package com.comphenix.protocol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.*;
+
+import com.comphenix.protocol.PacketType.Protocol;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.events.ListeningWhitelist;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.events.PacketListener;
+import com.comphenix.protocol.injector.netty.WirePacket;
+import com.google.common.base.Charsets;
+
+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;
+
+/**
+ * Logs packets to a given stream
+ * @author dmulloy2
+ */
+public class PacketLogging implements CommandExecutor, PacketListener {
+	public static final String NAME = "packetlog";
+
+	private List<PacketType> sendingTypes = new ArrayList<>();
+	private List<PacketType> receivingTypes = new ArrayList<>();
+
+	private ListeningWhitelist sendingWhitelist;
+	private ListeningWhitelist receivingWhitelist;
+
+	private Logger fileLogger;
+	private LogLocation location = LogLocation.FILE;
+
+	private final ProtocolManager manager;
+	private final Plugin plugin;
+
+	PacketLogging(Plugin plugin, ProtocolManager manager) {
+		this.plugin = plugin;
+		this.manager = manager;
+	}
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+		PacketType type = null;
+
+		try {
+			if (args.length > 2) {
+				Protocol protocol;
+
+				try {
+					protocol = Protocol.valueOf(args[0].toUpperCase());
+				} catch (IllegalArgumentException ex) {
+					sender.sendMessage(ChatColor.RED + "Unknown protocol " + args[0]);
+					return true;
+				}
+
+				Sender pSender;
+
+				try {
+					pSender = Sender.valueOf(args[1].toUpperCase());
+				} catch (IllegalArgumentException ex) {
+					sender.sendMessage(ChatColor.RED + "Unknown sender: " + args[1]);
+					return true;
+				}
+
+				try {
+					try { // Try IDs first
+						int id = Integer.parseInt(args[2]);
+						type = PacketType.findCurrent(protocol, pSender, id);
+					} catch (NumberFormatException ex) { // Check packet names
+						String name = args[2];
+						for (PacketType packet : PacketType.values()) {
+							if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
+								if (packet.name().equalsIgnoreCase(name)) {
+									type = packet;
+									break;
+								}
+								for (String className : packet.getClassNames()) {
+									if (className.equalsIgnoreCase(name)) {
+										type = packet;
+										break;
+									}
+								}
+							}
+						}
+					}
+				} catch (IllegalArgumentException ex) { // RIP
+					type = null;
+				}
+
+				if (type == null) {
+					sender.sendMessage(ChatColor.RED + "Unknown packet: " + args[2]);
+					return true;
+				}
+
+				if (args.length > 3) {
+					if (args[3].equalsIgnoreCase("console")) {
+						this.location = LogLocation.CONSOLE;
+					} else {
+						this.location = LogLocation.FILE;
+					}
+				}
+
+				if (pSender == Sender.CLIENT) {
+					if (receivingTypes.contains(type)) {
+						receivingTypes.remove(type);
+					} else {
+						receivingTypes.add(type);
+					}
+				} else {
+					if (sendingTypes.contains(type)) {
+						sendingTypes.remove(type);
+					} else {
+						sendingTypes.add(type);
+					}
+				}
+
+				startLogging();
+				sender.sendMessage(ChatColor.GREEN + "Now logging " + type.getPacketClass().getSimpleName());
+				return true;
+			}
+
+			sender.sendMessage(ChatColor.RED + "Invalid syntax: /packetlog <protocol> <sender> <packet> [location]");
+			return true;
+		} catch (Throwable ex) {
+			sender.sendMessage(ChatColor.RED + "Failed to parse command: " + ex.toString());
+			return true;
+		}
+	}
+
+	private void startLogging() {
+		manager.removePacketListener(this);
+
+		if (sendingTypes.isEmpty() && receivingTypes.isEmpty()) {
+			return;
+		}
+
+		this.sendingWhitelist = ListeningWhitelist.newBuilder().types(sendingTypes).build();
+		this.receivingWhitelist = ListeningWhitelist.newBuilder().types(receivingTypes).build();
+
+		// Setup the file logger if it hasn't been already
+		if (location == LogLocation.FILE && fileLogger == null) {
+			fileLogger = Logger.getLogger("ProtocolLib-FileLogging");
+
+			for (Handler handler : fileLogger.getHandlers())
+				fileLogger.removeHandler(handler);
+			fileLogger.setUseParentHandlers(false);
+
+			try {
+				File logFile = new File(plugin.getDataFolder(), "log.log");
+				FileHandler handler = new FileHandler(logFile.getAbsolutePath(), true);
+				handler.setFormatter(new LogFormatter());
+				fileLogger.addHandler(handler);
+			} catch (IOException ex) {
+				plugin.getLogger().log(Level.SEVERE, "Failed to obtain log file:", ex);
+				return;
+			}
+		}
+
+		manager.addPacketListener(this);
+	}
+
+	@Override
+	public void onPacketSending(PacketEvent event) {
+		log(event);
+	}
+
+	@Override
+	public void onPacketReceiving(PacketEvent event) {
+		log(event);
+	}
+
+	// Here's where the magic happens
+
+	private static String hexDump(byte[] bytes) throws IOException {
+		try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+			HexDump.dump(bytes, 0, output, 0);
+			return new String(output.toByteArray(), Charsets.UTF_8);
+		}
+	}
+
+	private void log(PacketEvent event) {
+		try {
+			byte[] bytes = WirePacket.bytesFromPacket(event.getPacket());
+			String hexDump = hexDump(bytes);
+
+			if (location == LogLocation.FILE) {
+				fileLogger.log(Level.INFO, event.getPacketType() + ":");
+				fileLogger.log(Level.INFO, hexDump);
+				fileLogger.log(Level.INFO, "");
+			} else {
+				System.out.println(event.getPacketType() + ":");
+				System.out.println(hexDump);
+				System.out.println();
+			}
+		} catch (Throwable ex) {
+			plugin.getLogger().log(Level.WARNING, "Failed to log packet " + event.getPacketType() + ":", ex);
+			plugin.getLogger().log(Level.WARNING, "Clearing packet logger...");
+
+			sendingTypes.clear();
+			receivingTypes.clear();
+			startLogging();
+		}
+	}
+
+	@Override
+	public ListeningWhitelist getSendingWhitelist() {
+		return sendingWhitelist;
+	}
+
+	@Override
+	public ListeningWhitelist getReceivingWhitelist() {
+		return receivingWhitelist;
+	}
+
+	@Override
+	public Plugin getPlugin() {
+		return plugin;
+	}
+
+	private enum LogLocation {
+		CONSOLE, FILE
+	}
+
+	private static class LogFormatter extends Formatter {
+		private static final SimpleDateFormat DATE = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+		private static final String FORMAT = "[{0}] {1}";
+
+		@Override
+		public String format(LogRecord record) {
+			String string = formatMessage(record);
+			if (string.isEmpty()) {
+				return LINE_SEPARATOR;
+			}
+
+			StringBuilder message = new StringBuilder();
+			message.append(MessageFormat.format(FORMAT, DATE.format(record.getMillis()), string));
+			message.append(LINE_SEPARATOR);
+			return message.toString();
+		}
+	}
+}

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

@@ -15,7 +15,7 @@
  *  02111-1307 USA
  */
 
-package com.comphenix.protocol.reflect;
+package com.comphenix.protocol;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -23,8 +23,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import com.comphenix.protocol.PacketType;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Sets;
 
 /**
  * Represents a more modern object-based enum.
@@ -33,41 +35,53 @@ import com.google.common.collect.HashBiMap;
  * want to prevent the creation of additional members dynamically.
  * @author Kristian
  */
-public class ObjectEnum<T> implements Iterable<T> {
+public class PacketTypeEnum implements Iterable<PacketType> {
 	// Used to convert between IDs and names
-	protected BiMap<T, String> members = HashBiMap.create();
+	protected Set<PacketType> members = Sets.newHashSet();
 
 	/**
-	 * Registers every declared integer field.
-	 * @param fieldType Field type
+	 * Registers every declared PacketType field.
 	 */
-	public ObjectEnum(Class<T> fieldType) {
-		registerAll(fieldType);
+	public PacketTypeEnum() {
+		registerAll();
 	}
 
 	/**
 	 * Registers every public assignable static field as a member.
-	 * @param fieldType Field type
 	 */
 	@SuppressWarnings("unchecked")
-	protected void registerAll(Class<T> fieldType) {
+	protected void registerAll() {
 		try {
-			// Register every int field
+			// Register every non-deprecated field
 			for (Field entry : this.getClass().getFields()) {
-				if (Modifier.isStatic(entry.getModifiers()) && fieldType.isAssignableFrom(entry.getType())) {
-					T value = (T) entry.get(null);
-					
-					if (value == null)
-						throw new IllegalArgumentException("Field " + entry + " was NULL. Remember to " +
-								"construct the object after the field has been declared.");
-					registerMember(value, entry.getName());
+				if (Modifier.isStatic(entry.getModifiers()) && PacketType.class.isAssignableFrom(entry.getType())) {
+					PacketType value = (PacketType) entry.get(null);
+					if (value == null) {
+						throw new IllegalArgumentException("Field " + entry.getName() + " was null!");
+					}
+
+					value.setName(entry.getName());
+
+					if (entry.getAnnotation(PacketType.ForceAsync.class) != null) {
+						value.forceAsync();
+					}
+
+					boolean deprecated = entry.getAnnotation(Deprecated.class) != null;
+					if (deprecated) value.setDeprecated();
+
+					if (members.contains(value)) {
+						// Replace potentially deprecated packet types with non-deprecated ones
+						if (!deprecated) {
+							members.remove(value);
+							members.add(value);
+						}
+					} else {
+						members.add(value);
+					}
 				}
 			}
-		
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
+		} catch (Exception ex) {
+			ex.printStackTrace();
 		}
 	}
 	
@@ -77,11 +91,14 @@ public class ObjectEnum<T> implements Iterable<T> {
 	 * @param name - name of member.
 	 * @return TRUE if the member was registered, FALSE otherwise.
 	 */
-	public boolean registerMember(T instance, String name) {
-		if (!members.containsKey(instance)) {
-			members.put(instance, name);
+	public boolean registerMember(PacketType instance, String name) {
+		instance.setName(name);
+
+		if (!members.contains(instance)) {
+			members.add(instance);
 			return true;
 		}
+
 		return false;
 	}
 	
@@ -90,38 +107,36 @@ public class ObjectEnum<T> implements Iterable<T> {
 	 * @param member - the member to check.
 	 * @return TRUE if the given member has been registered, FALSE otherwise.
 	 */
-	public boolean hasMember(T member) {
-		return members.containsKey(member);
+	public boolean hasMember(PacketType member) {
+		return members.contains(member);
 	}
 	
 	/**
 	 * Retrieve a member by name,
 	 * @param name - name of member to retrieve.
 	 * @return The member, or NULL if not found.
+	 * @deprecated Don't use this
 	 */
-	public T valueOf(String name) {
-		return members.inverse().get(name);
+	@Deprecated
+	public PacketType valueOf(String name) {
+		for (PacketType member : members) {
+			if (member.name().equals(name))
+				return member;
+		}
+
+		return null;
 	}
-	
-	/**
-	 * Retrieve the name of the given member.
-	 * @param member - the member to retrieve.
-	 * @return Declared name of the member, or NULL if not found.
-	 */
-	public String getDeclaredName(T member) {
-		return members.get(member);
-	}
-	
+
 	/**
 	 * Retrieve every registered member.
 	 * @return Enumeration of every value.
 	 */
-	public Set<T> values() {
-		return new HashSet<T>(members.keySet());
+	public Set<PacketType> values() {
+		return new HashSet<>(members);
 	}
 
 	@Override
-	public Iterator<T> iterator() {
-		return members.keySet().iterator();
+	public Iterator<PacketType> iterator() {
+		return members.iterator();
 	}
 }

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

@@ -4,18 +4,20 @@ import java.util.Collection;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.compat.guava.Guava;
 import com.comphenix.protocol.events.ConnectionSide;
+import com.google.common.collect.ContiguousSet;
+import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
 import com.google.common.collect.Sets;
 
 class PacketTypeParser {
-	public final static Range<Integer> DEFAULT_MAX_RANGE = Guava.closedRange(0, 255);
+	public final static Range<Integer> DEFAULT_MAX_RANGE = Range.closed(0, 255);
 	
 	private Sender side = null;
 	private Protocol protocol = null;
@@ -52,7 +54,7 @@ class PacketTypeParser {
 		// And finally, parse packet names if we have a protocol
 		if (protocol != null) {
 			for (Iterator<String> it = arguments.iterator(); it.hasNext(); ) {
-				String name = it.next().toUpperCase();
+				String name = it.next().toUpperCase(Locale.ENGLISH);
 				Collection<PacketType> names = PacketType.fromName(name);
 				
 				for (PacketType type : names) {
@@ -71,7 +73,7 @@ class PacketTypeParser {
 		}
 		
 		for (Range<Integer> range : ranges) {
-			for (Integer id : Guava.toSet(range)) {
+			for (Integer id : ContiguousSet.create(range, DiscreteDomain.integers())) {
 				// Deprecated packets
 				if (protocol == null) {
 					if (PacketType.hasLegacy(id)) {

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

@@ -17,10 +17,6 @@
 
 package com.comphenix.protocol;
 
-import java.util.Set;
-
-import com.comphenix.protocol.injector.PacketFilterManager;
-import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.IntEnum;
 
 /**
@@ -165,30 +161,7 @@ public final class Packets {
 		public static Server getRegistry() {
 			return INSTANCE;
 		}
-		
-		/**
-		 * Determine if the given packet is a valid server packet in the current version of Minecraft.
-		 * <p>
-		 * Use {@link PacketType#isSupported()} instead.
-		 * @param packetID - the packet to test.
-		 * @return TRUE if this packet is supported, FALSE otherwise.
-		 * @throws FieldAccessException If we're unable to retrieve the server packet data from Minecraft.
-		 */
-		@Deprecated
-		public static boolean isSupported(int packetID) throws FieldAccessException {
-			return PacketFilterManager.getServerPackets().contains(packetID);
-		}
-		
-		/**
-		 * Retrieve every client packet the current version of Minecraft is aware of.
-		 * @return Every supported server packet.
-		 * @throws FieldAccessException If we're unable to retrieve the server packet data from Minecraft.
-		 */
-		@Deprecated
-		public static Set<Integer> getSupported() throws FieldAccessException {
-			return PacketFilterManager.getServerPackets();
-		}
-		
+
 		// We only allow a single instance of this class
 	    private Server() {
 			super();
@@ -262,26 +235,7 @@ public final class Packets {
 		public static Client getRegistry() {
 			return INSTANCE;
 		}
-		
-		/**
-		 * Determine if the given packet is a valid client packet in the current version of Minecraft.
-		 * @param packetID - the packet to test.
-		 * @return TRUE if this packet is supported, FALSE otherwise.
-		 * @throws FieldAccessException If we're unable to retrieve the client packet data from Minecraft.
-		 */
-		public static boolean isSupported(int packetID) throws FieldAccessException {
-			return PacketFilterManager.getClientPackets().contains(packetID);
-		}
-		
-		/**
-		 * Retrieve every client packet the current version of Minecraft is aware of.
-		 * @return Every supported client packet.
-		 * @throws FieldAccessException If we're unable to retrieve the client packet data from Minecraft.
-		 */
-		public static Set<Integer> getSupported() throws FieldAccessException {
-			return PacketFilterManager.getClientPackets();
-		}
-		
+
 		// Like above
 		private Client() {
 			super();

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

@@ -20,12 +20,13 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.plugin.Plugin;
 
-import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+import com.comphenix.protocol.injector.PlayerInjectHooks;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -157,6 +158,9 @@ public class ProtocolConfig {
 		}
 		if (global != null) {
 			updater = global.getConfigurationSection(SECTION_AUTOUPDATER);
+			if (updater.getValues(true).isEmpty()) {
+				plugin.getLogger().warning("Updater section is missing, regenerate your config!");
+			}
 		}
 
 		// Automatically copy defaults
@@ -256,7 +260,7 @@ public class ProtocolConfig {
 	 * @return TRUE if it should, FALSE otherwise.
 	 */
 	public boolean isAutoDownload() {
-		return updater != null && getUpdaterValue(UPDATER_DOWNLAD, true);
+		return updater != null && getUpdaterValue(UPDATER_DOWNLAD, false);
 	}
 
 	/**
@@ -461,7 +465,7 @@ public class ProtocolConfig {
 		PlayerInjectHooks hook = getDefaultMethod();
 
 		if (text != null)
-			hook = PlayerInjectHooks.valueOf(text.toUpperCase().replace(" ", "_"));
+			hook = PlayerInjectHooks.valueOf(text.toUpperCase(Locale.ENGLISH).replace(" ", "_"));
 		return hook;
 	}
 
@@ -497,4 +501,4 @@ public class ProtocolConfig {
 		valuesChanged = false;
 		configChanged = false;
 	}
-}
+}

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

@@ -18,9 +18,6 @@ package com.comphenix.protocol;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -47,7 +44,7 @@ import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.injector.DelayedSingleTask;
 import com.comphenix.protocol.injector.InternalManager;
 import com.comphenix.protocol.injector.PacketFilterManager;
-import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+import com.comphenix.protocol.injector.PlayerInjectHooks;
 import com.comphenix.protocol.metrics.Statistics;
 import com.comphenix.protocol.reflect.compiler.BackgroundCompiler;
 import com.comphenix.protocol.updater.Updater;
@@ -65,7 +62,7 @@ import com.google.common.util.concurrent.ListeningScheduledExecutorService;
  *
  * @author Kristian
  */
-public class ProtocolLibrary extends JavaPlugin {
+public class ProtocolLib extends JavaPlugin {
 	// Every possible error or warning report type
 	public static final ReportType REPORT_CANNOT_LOAD_CONFIG = new ReportType("Cannot load configuration");
 	public static final ReportType REPORT_CANNOT_DELETE_CONFIG = new ReportType("Cannot delete old ProtocolLib configuration.");
@@ -84,21 +81,6 @@ public class ProtocolLibrary extends JavaPlugin {
 	public static final ReportType REPORT_CANNOT_CREATE_TIMEOUT_TASK = new ReportType("Unable to create packet timeout task.");
 	public static final ReportType REPORT_CANNOT_UPDATE_PLUGIN = new ReportType("Cannot perform automatic updates.");
 
-	/**
-	 * The minimum version ProtocolLib has been tested with.
-	 */
-	public static final String MINIMUM_MINECRAFT_VERSION = "1.0";
-
-	/**
-	 * The maximum version ProtocolLib has been tested with,
-	 */
-	public static final String MAXIMUM_MINECRAFT_VERSION = "1.8.8";
-
-	/**
-	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.8.8) was released.
-	 */
-	public static final String MINECRAFT_LAST_RELEASE_DATE = "2015-07-27";
-
 	// Update information
 	static final String BUKKIT_DEV_SLUG = "protocollib";
 	static final int BUKKIT_DEV_ID = 45564;
@@ -107,7 +89,8 @@ public class ProtocolLibrary extends JavaPlugin {
 	private enum ProtocolCommand {
 		FILTER,
 		PACKET,
-		PROTOCOL
+		PROTOCOL,
+		LOGGING;
 	}
 
 	/**
@@ -150,7 +133,7 @@ public class ProtocolLibrary extends JavaPlugin {
 
 	// Updater
 	private Updater updater;
-	private static boolean UPDATES_DISABLED;
+	public static boolean UPDATES_DISABLED;
 
 	// Logger
 	private static Logger logger;
@@ -160,15 +143,16 @@ public class ProtocolLibrary extends JavaPlugin {
 	private CommandProtocol commandProtocol;
 	private CommandPacket commandPacket;
 	private CommandFilter commandFilter;
+	private PacketLogging packetLogging;
 
 	// Whether or not disable is not needed
 	private boolean skipDisable;
 
 	@Override
 	public void onLoad() {
-		// Load configuration
-		logger = getLoggerSafely();
-		Application.registerPrimaryThread();
+		// Logging
+		logger = getLogger();
+		ProtocolLogger.init(this);
 
 		// Initialize enhancer factory
 		EnhancerFactory.getInstance().setClassLoader(getClassLoader());
@@ -228,6 +212,9 @@ public class ProtocolLibrary extends JavaPlugin {
 					.reporter(reporter)
 					.build();
 
+			// Initialize the API
+			ProtocolLibrary.init(this, config, protocolManager, reporter, executorAsync, executorSync);
+
 			// Setup error reporter
 			detailedReporter.addGlobalParameter("manager", protocolManager);
 
@@ -250,8 +237,6 @@ public class ProtocolLibrary extends JavaPlugin {
 
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_LOAD_ERROR).error(e).callerParam(protocolManager));
 			disablePlugin();
@@ -275,11 +260,12 @@ public class ProtocolLibrary extends JavaPlugin {
 				case PACKET:
 					commandPacket = new CommandPacket(reporter, this, logger, commandFilter, protocolManager);
 					break;
+				case LOGGING:
+					packetLogging = new PacketLogging(this, protocolManager);
+					break;
 				}
 			} catch (OutOfMemoryError e) {
 				throw e;
-			} catch (ThreadDeath e) {
-				throw e;
 			} catch (LinkageError e) {
 				logger.warning("Failed to register command " + command.name() + ": " + e);
 			} catch (Throwable e) {
@@ -410,6 +396,7 @@ public class ProtocolLibrary extends JavaPlugin {
 			registerCommand(CommandProtocol.NAME, commandProtocol);
 			registerCommand(CommandPacket.NAME, commandPacket);
 			registerCommand(CommandFilter.NAME, commandFilter);
+			registerCommand(PacketLogging.NAME, packetLogging);
 
 			// Player login and logout events
 			protocolManager.registerEvents(manager, this);
@@ -419,8 +406,6 @@ public class ProtocolLibrary extends JavaPlugin {
 			createPacketTask(server);
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_ENABLE_ERROR).error(e));
 			disablePlugin();
@@ -434,8 +419,6 @@ public class ProtocolLibrary extends JavaPlugin {
 			}
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (IOException e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_METRICS_IO_ERROR).error(e).callerParam(statistics));
 		} catch (Throwable e) {
@@ -444,10 +427,9 @@ public class ProtocolLibrary extends JavaPlugin {
 	}
 
 	// Plugin authors: Notify me to remove these
-	public static List<String> INCOMPATIBLE = Arrays.asList("TagAPI");
 
 	private void checkForIncompatibility(PluginManager manager) {
-		for (String plugin : INCOMPATIBLE) {
+		for (String plugin : ProtocolLibrary.INCOMPATIBLE) {
 			if (manager.getPlugin(plugin) != null) {
 				// Special case for TagAPI and iTag
 				if (plugin.equals("TagAPI")) {
@@ -464,8 +446,8 @@ public class ProtocolLibrary extends JavaPlugin {
 
 	// Used to check Minecraft version
 	private MinecraftVersion verifyMinecraftVersion() {
-		MinecraftVersion minimum = new MinecraftVersion(MINIMUM_MINECRAFT_VERSION);
-		MinecraftVersion maximum = new MinecraftVersion(MAXIMUM_MINECRAFT_VERSION);
+		MinecraftVersion minimum = new MinecraftVersion(ProtocolLibrary.MINIMUM_MINECRAFT_VERSION);
+		MinecraftVersion maximum = new MinecraftVersion(ProtocolLibrary.MAXIMUM_MINECRAFT_VERSION);
 
 		try {
 			MinecraftVersion current = new MinecraftVersion(getServer());
@@ -503,7 +485,7 @@ public class ProtocolLibrary extends JavaPlugin {
 
 			File[] candidates = pluginFolder.listFiles();
 			if (candidates != null) {
-				for (File candidate : pluginFolder.listFiles()) {
+				for (File candidate : candidates) {
 					if (candidate.isFile() && !candidate.equals(loadedFile)) {
 						Matcher match = ourPlugin.matcher(candidate.getName());
 						if (match.matches()) {
@@ -586,8 +568,6 @@ public class ProtocolLibrary extends JavaPlugin {
 			}, ASYNC_MANAGER_DELAY, ASYNC_MANAGER_DELAY);
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			if (packetTask == -1) {
 				reporter.reportDetailed(this, Report.newBuilder(REPORT_CANNOT_CREATE_TIMEOUT_TASK).error(e));
@@ -612,13 +592,13 @@ public class ProtocolLibrary extends JavaPlugin {
 			long updateTime = config.getAutoLastTime() + config.getAutoDelay();
 
 			// Should we update?
-			if (currentTime > updateTime && !updater.isChecking()) {		
+			if (currentTime > updateTime && !updater.isChecking()) {
 				// Initiate the update as if it came from the console
 				if (config.isAutoDownload())
 					commandProtocol.updateVersion(getServer().getConsoleSender(), false);
 				else if (config.isAutoNotify())
 					commandProtocol.checkVersion(getServer().getConsoleSender(), false);
-				else 
+				else
 					commandProtocol.updateFinished();
 			}
 		} catch (Exception e) {
@@ -664,52 +644,6 @@ public class ProtocolLibrary extends JavaPlugin {
 		reporter = new BasicErrorReporter();
 	}
 
-	// Get the Bukkit logger first, before we try to create our own
-	private Logger getLoggerSafely() {
-		Logger log = null;
-
-		try {
-			log = getLogger();
-		} catch (OutOfMemoryError e) {
-			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
-		} catch (Throwable e) {
-			// Ignore
-		}
-
-		// Use the default logger instead
-		if (log == null)
-			log = Logger.getLogger("Minecraft");
-		return log;
-	}
-
-	/**
-	 * Retrieve the current error reporter.
-	 * <p>
-	 * This is guaranteed to not be NULL in 2.5.0 and later.
-	 * @return Current error reporter.
-	 */
-	public static ErrorReporter getErrorReporter() {
-		return reporter;
-	}
-
-	/**
-	 * Retrieve the current strongly typed configuration.
-	 * @return The configuration, or NULL if ProtocolLib hasn't loaded yet.
-	 */
-	public static ProtocolConfig getConfiguration() {
-		return config;
-	}
-
-	/**
-	 * Retrieves the packet protocol manager.
-	 * @return Packet protocol manager, or NULL if it has been disabled.
-	 */
-	public static ProtocolManager getProtocolManager() {
-		return protocolManager;
-	}
-
 	/**
 	 * Retrieve the metrics instance used to measure users of this library.
 	 * <p>
@@ -721,41 +655,7 @@ public class ProtocolLibrary extends JavaPlugin {
 		return statistics;
 	}
 
-	/**
-	 * Retrieve an executor service for performing asynchronous tasks on the behalf of ProtocolLib.
-	 * <p>
-	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
-	 * @return The executor service, or NULL.
-	 */
-	public static ListeningScheduledExecutorService getExecutorAsync() {
-		return executorAsync;
-	}
-
-	/**
-	 * Retrieve an executor service for performing synchronous tasks (main thread) on the behalf of ProtocolLib.
-	 * <p>
-	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
-	 * @return The executor service, or NULL.
-	 */
-	public static ListeningScheduledExecutorService getExecutorSync() {
-		return executorSync;
-	}
-
-	// ---- Logging Methods
-
-	public static void log(Level level, String message, Object... args) {
-		logger.log(level, MessageFormat.format(message, args));
-	}
-
-	public static void log(String message, Object... args) {
-		log(Level.INFO, message, args);
-	}
-
-	public static void log(Level level, String message, Throwable ex) {
-		logger.log(level, message, ex);
-	}
-
-	public void disableUpdates() {
-		UPDATES_DISABLED = true;
+	public ProtocolConfig getProtocolConfig() {
+		return config;
 	}
 }

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

@@ -0,0 +1,143 @@
+/**
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2016 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;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.error.BasicErrorReporter;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.google.common.util.concurrent.ListeningScheduledExecutorService;
+
+/**
+ * The main entry point for ProtocolLib.
+ * @author dmulloy2
+ */
+public class ProtocolLibrary {
+	/**
+	 * The minimum version ProtocolLib has been tested with.
+	 */
+	public static final String MINIMUM_MINECRAFT_VERSION = "1.8";
+
+	/**
+	 * The maximum version ProtocolLib has been tested with.
+	 */
+	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.14.4) was released.
+	 */
+	public static final String MINECRAFT_LAST_RELEASE_DATE = "2019-12-17";
+
+	/**
+	 * Plugins that are currently incompatible with ProtocolLib.
+	 */
+	public static final List<String> INCOMPATIBLE = Arrays.asList("TagAPI");
+
+	private static Plugin plugin;
+	private static ProtocolConfig config;
+	private static ProtocolManager manager;
+	private static ErrorReporter reporter = new BasicErrorReporter();
+
+	private static ListeningScheduledExecutorService executorAsync;
+	private static ListeningScheduledExecutorService executorSync;
+
+	private static boolean updatesDisabled;
+	private static boolean initialized;
+
+	protected static void init(Plugin plugin, ProtocolConfig config, ProtocolManager manager, ErrorReporter reporter,
+			ListeningScheduledExecutorService executorAsync, ListeningScheduledExecutorService executorSync) {
+		Validate.isTrue(!initialized, "ProtocolLib has already been initialized.");
+		ProtocolLibrary.plugin = plugin;
+		ProtocolLibrary.config = config;
+		ProtocolLibrary.manager = manager;
+		ProtocolLibrary.reporter = reporter;
+		ProtocolLibrary.executorAsync = executorAsync;
+		ProtocolLibrary.executorSync = executorSync;
+		initialized = true;
+	}
+
+	/**
+	 * Gets the ProtocolLib plugin instance.
+	 * @return The plugin instance
+	 */
+	public static Plugin getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * Gets ProtocolLib's configuration
+	 * @return The config
+	 */
+	public static ProtocolConfig getConfig() {
+		return config;
+	}
+
+	/**
+	 * Retrieves the packet protocol manager.
+	 * @return Packet protocol manager
+	 */
+	public static ProtocolManager getProtocolManager() {
+		return manager;
+	}
+
+	/**
+	 * Retrieve the current error reporter.
+	 * @return Current error reporter.
+	 */
+	public static ErrorReporter getErrorReporter() {
+		return reporter;
+	}
+
+	/**
+	 * Retrieve an executor service for performing asynchronous tasks on the behalf of ProtocolLib.
+	 * <p>
+	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
+	 * @return The executor service, or NULL.
+	 */
+	public static ListeningScheduledExecutorService getExecutorAsync() {
+		return executorAsync;
+	}
+
+	/**
+	 * Retrieve an executor service for performing synchronous tasks (main thread) on the behalf of ProtocolLib.
+	 * <p>
+	 * Note that this service is NULL if ProtocolLib has not been initialized yet.
+	 * @return The executor service, or NULL.
+	 */
+	public static ListeningScheduledExecutorService getExecutorSync() {
+		return executorSync;
+	}
+
+	/**
+	 * Disables the ProtocolLib update checker.
+	 */
+	public static void disableUpdates() {
+		updatesDisabled = true;
+	}
+
+	/**
+	 * Whether or not updates are currently disabled.
+	 * @return True if it is, false if not
+	 */
+	public static boolean updatesDisabled() {
+		return updatesDisabled;
+	}
+}

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

@@ -0,0 +1,80 @@
+/**
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2016 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;
+
+import java.text.MessageFormat;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.bukkit.plugin.Plugin;
+
+/**
+ * @author dmulloy2
+ */
+public class ProtocolLogger {
+	private static boolean debugEnabled = false;
+	private static Logger logger = Logger.getLogger("Minecraft");
+
+	protected static void init(Plugin plugin) {
+		logger = plugin.getLogger();
+
+		try {
+			debugEnabled = plugin.getConfig().getBoolean("global.debug", false);
+		} catch (Throwable ignored) { }
+	}
+
+	/**
+	 * Logs a message to console with a given level.
+	 * @param level Logging level
+	 * @param message Message to log
+	 * @param args Arguments to format in
+	 */
+	public static void log(Level level, String message, Object... args) {
+		logger.log(level, MessageFormat.format(message, args));
+	}
+
+	/**
+	 * Logs a method to console with the INFO level.
+	 * @param message Message to log
+	 * @param args Arguments to format in
+	 */
+	public static void log(String message, Object... args) {
+		log(Level.INFO, message, args);
+	}
+
+	/**
+	 * Logs a message to console with a given level and exception.
+	 * @param level Logging level
+	 * @param message Message to log
+	 * @param ex Exception to log
+	 */
+	public static void log(Level level, String message, Throwable ex) {
+		logger.log(level, message, ex);
+	}
+
+	public static void debug(String message, Object... args) {
+		if (debugEnabled) {
+			log("[Debug] " + message, args);
+		}
+	}
+
+	public static void debug(String message, Throwable ex) {
+		if (debugEnabled) {
+			logger.log(Level.WARNING, "[Debug] " + message, ex);
+		}
+	}
+}

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

@@ -29,6 +29,7 @@ import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.PacketConstructor;
@@ -279,4 +280,6 @@ public interface ProtocolManager extends PacketStream {
 	 * @return Asynchronous packet manager.
 	 */
 	public AsynchronousManager getAsynchronousManager();
-}
+
+	public void verifyWhitelist(PacketListener listener, ListeningWhitelist whitelist);
+}

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

@@ -23,7 +23,8 @@ import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
 
-import com.comphenix.protocol.compat.guava.Guava;
+import com.google.common.collect.ContiguousSet;
+import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.Range;
 
 /**
@@ -67,7 +68,7 @@ class RangeParser {
 					throw new IllegalArgumentException("Cannot form a range without a upper limit.");
 
 				// This is a proper range
-				range = Guava.closedRange(Integer.parseInt(current), Integer.parseInt(tokens.get(i + 2)));
+				range = Range.closed(Integer.parseInt(current), Integer.parseInt(tokens.get(i + 2)));
 				ranges.add(range);
 				
 				// Skip the two next tokens
@@ -75,7 +76,7 @@ class RangeParser {
 				
 			} else {
 				// Just a single number
-				range = Guava.singleton(Integer.parseInt(current));
+				range = Range.singleton(Integer.parseInt(current));
 				ranges.add(range);
 			}
 			
@@ -101,7 +102,7 @@ class RangeParser {
 		
 		// Set every ID
 		for (Range<Integer> range : ranges) {
-			for (int id : Guava.toSet(range)) {
+			for (int id : ContiguousSet.create(range, DiscreteDomain.integers())) {
 				set[id] = true;
 			}
 		}
@@ -114,7 +115,7 @@ class RangeParser {
 				}
 			} else {
 				if (start >= 0) {
-					result.add(Guava.closedRange(start, i - 1));
+					result.add(Range.closed(start, i - 1));
 					start = -1;
 				}
 			}

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

@@ -35,7 +35,6 @@ import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
-import com.comphenix.protocol.injector.PacketFilterManager;
 import com.comphenix.protocol.injector.PrioritizedListener;
 import com.comphenix.protocol.injector.SortedPacketListenerList;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
@@ -181,11 +180,11 @@ public class AsyncFilterManager implements AsynchronousManager {
 		
 		// Add listener to either or both processing queue
 		if (hasValidWhitelist(sendingWhitelist)) {
-			PacketFilterManager.verifyWhitelist(listener, sendingWhitelist);
+			manager.verifyWhitelist(listener, sendingWhitelist);
 			serverProcessingQueue.addListener(handler, sendingWhitelist);
 		}
 		if (hasValidWhitelist(receivingWhitelist)) {
-			PacketFilterManager.verifyWhitelist(listener, receivingWhitelist);
+			manager.verifyWhitelist(listener, receivingWhitelist);
 			clientProcessingQueue.addListener(handler, receivingWhitelist);
 		}
 		
@@ -319,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/async/AsyncListenerHandler.java

@@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.bukkit.plugin.Plugin;
-
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
@@ -36,10 +34,11 @@ import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.timing.TimedListenerManager;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
 import com.comphenix.protocol.timing.TimedTracker;
-import com.comphenix.protocol.utility.WrappedScheduler;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 
+import org.bukkit.plugin.Plugin;
+
 /**
  * Represents a handler for an asynchronous event.
  * <p>
@@ -345,8 +344,7 @@ public class AsyncListenerHandler {
 	}
 	
 	private void scheduleAsync(Runnable runnable) {
-		// Handle deprecation
-		WrappedScheduler.runAsynchronouslyRepeat(listener.getPlugin(), filterManager.getScheduler(), runnable, 0L, -1L);
+		listener.getPlugin().getServer().getScheduler().runTaskAsynchronously(listener.getPlugin(), runnable);
 	}
 	
 	/**

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

@@ -28,7 +28,7 @@ import java.util.logging.Level;
 
 import com.comphenix.protocol.PacketStream;
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.PrioritizedListener;
@@ -429,15 +429,17 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 							// Incoming chat packets are async only if they aren't commands
 							return ! content.startsWith("/");
 						} else {
-							ProtocolLibrary.log(Level.WARNING, "Failed to determine contents of incoming chat packet!");
+							ProtocolLogger.log(Level.WARNING, "Failed to determine contents of incoming chat packet!");
 							alwaysSync = true;
 						}
+					} else if (event.getPacketType() == PacketType.Status.Server.SERVER_INFO) {
+						return true;
 					} else {
 						// TODO: Find more cases of async packets
 						return false;
 					}
 				} else {
-					ProtocolLibrary.log(Level.INFO, "Could not determine asynchronous state of packets (this can probably be ignored)");
+					ProtocolLogger.log(Level.INFO, "Could not determine asynchronous state of packets (this can probably be ignored)");
 					alwaysSync = true;
 				}
 			}

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

@@ -243,4 +243,4 @@ public class ExpireHashMap<K, V> {
 		return valueView.toString();
 	}
 }
- 
+ 

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

@@ -23,7 +23,6 @@ import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.comphenix.protocol.compat.guava.Guava;
 import com.google.common.base.Objects;
 import com.google.common.collect.Range;
 
@@ -68,7 +67,7 @@ public abstract class AbstractIntervalTree<TKey extends Comparable<TKey>, TValue
 
 		@Override
 		public Range<TKey> getKey() {
-			return Guava.closedRange(left.key, right.key);
+			return Range.closed(left.key, right.key);
 		}
 
 		@Override

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