I'll look into signing releases later

Fix performance issue

Readme.md

@@ -47,7 +47,7 @@ You can also add ProtocolLib as a Maven dependency:
     <url>http://repo.dmulloy2.net/content/groups/public/</url>
   </repository>
   ...
-</repository>
+</repositories>
 
 <dependencies>
   <dependency>

modules/API/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ProtocolLib-API</artifactId>
   <name>ProtocolLib-API</name>
-  <version>4.0</version>
+  <version>4.2.0</version>
 
   <description>Provides read/write access to the Minecraft protocol.</description>
   <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
@@ -19,6 +19,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.number></project.build.number>
+    <project.fullVersion>${project.version}</project.fullVersion>
   </properties>
 
   <build>
@@ -54,7 +55,7 @@
             <manifestEntries>
               <Main-Class>com.comphenix.protocol.Application</Main-Class>
               <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.version}${project.build.number}</Implementation-Version>
+              <Implementation-Version>${project.fullVersion}</Implementation-Version>
               <Implementation-Vendor>dmulloy2</Implementation-Vendor>
             </manifestEntries>
           </archive>
@@ -88,6 +89,7 @@
       </activation>
       <properties>
         <project.build.number>-b${env.BUILD_NUMBER}</project.build.number>
+        <project.fullVersion>${project.version}${project.build.number}</project.fullVersion>
       </properties>
     </profile>
 
@@ -99,6 +101,9 @@
           <value>true</value>
         </property>
       </activation>
+      <properties>
+        <project.fullVersion>${project.version}</project.fullVersion>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -129,6 +134,7 @@
             </executions>
           </plugin>
 
+          <!-- TODO: Look into signing releases
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -143,6 +149,7 @@
               </execution>
             </executions>
           </plugin>
+          -->
 
         </plugins>
       </build>
@@ -196,13 +203,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.11.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.11.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

modules/API/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();
-}
+}

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
@@ -31,7 +32,7 @@ import com.google.common.util.concurrent.Futures;
  * Note that vanilla Minecraft reuses packet IDs per protocol (ping, game, login) and IDs are subject to change, so they are not reliable.
  * @author Kristian
  */
-public class PacketType implements Serializable, Comparable<PacketType> {
+public class PacketType implements Serializable, Cloneable, Comparable<PacketType> {
 	// Increment whenever the type changes
 	private static final long serialVersionUID = 1L;
 	
@@ -182,31 +183,61 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x4B, 0x20, "UpdateAttributes");
 			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x4C, 0x1D, "EntityEffect");
 
-			/**
-			 * @deprecated Replaced by {@link WINDOW_DATA}
-			 */
-			@Deprecated
-			public static final PacketType CRAFT_PROGRESS_BAR =           WINDOW_DATA;
+			// ---- Removed in 1.9
 
 			/**
-			 * @deprecated Replaced by {@link REL_ENTITY_MOVE_LOOK}
+			 * @deprecated Removed in 1.9
 			 */
 			@Deprecated
-			public static final PacketType ENTITY_MOVE_LOOK =             REL_ENTITY_MOVE_LOOK;
+			public static final PacketType MAP_CHUNK_BULK =              new PacketType(PROTOCOL, SENDER, 255, 255, "MapChunkBulk").deprecatedIn(MinecraftVersion.COMBAT_UPDATE);
 
 			/**
-			 * @deprecated Replaced by {@link STATISTIC}
+			 * @deprecated Removed in 1.9
 			 */
 			@Deprecated
-			public static final PacketType STATISTICS =                   STATISTIC;
+			public static final PacketType SET_COMPRESSION =             new PacketType(PROTOCOL, SENDER, 254, 254, "SetCompression").deprecatedIn(MinecraftVersion.COMBAT_UPDATE);
+
+			/**
+			 * @deprecated Removed in 1.9
+			 */
+			@Deprecated
+			public static final PacketType UPDATE_ENTITY_NBT =           new PacketType(PROTOCOL, SENDER, 253, 253, "UpdateEntityNBT").deprecatedIn(MinecraftVersion.COMBAT_UPDATE);
+
+			// ----- Renamed packets
+
+			/**
+			 * @deprecated Renamed to {@link WINDOW_DATA}
+			 */
+			@Deprecated
+			public static final PacketType CRAFT_PROGRESS_BAR =           WINDOW_DATA.deprecated();
+
+			/**
+			 * @deprecated Renamed to {@link REL_ENTITY_MOVE_LOOK}
+			 */
+			@Deprecated
+			public static final PacketType ENTITY_MOVE_LOOK =             REL_ENTITY_MOVE_LOOK.deprecated();
+
+			/**
+			 * @deprecated Renamed to {@link STATISTIC}
+			 */
+			@Deprecated
+			public static final PacketType STATISTICS =                   STATISTIC.deprecated();
+
+			/**
+			 * @deprecated Renamed to {@link OPEN_SIGN_EDITOR}
+			 */
+			@Deprecated
+			public static final PacketType OPEN_SIGN_ENTITY =             OPEN_SIGN_EDITOR.deprecated();
+
+			// ----- Replaced in 1.9.4
 
 			/**
 			 * @deprecated Replaced by {@link TILE_ENTITY_DATA}
 			 */
 			@Deprecated
-			public static final PacketType UPDATE_SIGN =                  TILE_ENTITY_DATA;
+			public static final PacketType UPDATE_SIGN =                  MinecraftReflection.signUpdateExists() ? new PacketType(PROTOCOL, SENDER, 252, 252, "UpdateSign") :
+																			  TILE_ENTITY_DATA.deprecated();
 
-			// The instance must
 			private final static Server INSTANCE = new Server();
 
 			// Prevent accidental construction
@@ -297,7 +328,7 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 			 * @deprecated Replaced by {@link SERVER_INFO}
 			 */
 			@Deprecated
-			public static final PacketType OUT_SERVER_INFO =              SERVER_INFO;
+			public static final PacketType OUT_SERVER_INFO =              SERVER_INFO.deprecated();
 
 			private final static Server INSTANCE = new Server();
 
@@ -512,7 +543,7 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 		}
 
 		public String getPacketName() {
-			return WordUtils.capitalize(name().toLowerCase());
+			return WordUtils.capitalize(name().toLowerCase(Locale.ENGLISH));
 		}
 	}
 
@@ -551,7 +582,7 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 	/**
 	 * Protocol version of all the current IDs.
 	 */
-	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.BOUNTIFUL_UPDATE;
+	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.EXPLORATION_UPDATE;
 
 	private final Protocol protocol;
 	private final Sender sender;
@@ -562,6 +593,7 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 
 	private boolean forceAsync;
 	private boolean dynamic;
+	private boolean deprecated;
 
 	/**
 	 * Retrieve the current packet/legacy lookup.
@@ -1043,6 +1075,24 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 		return forceAsync;
 	}
 
+	private PacketType deprecatedIn(MinecraftVersion version) {
+		try {
+			return MinecraftVersion.getCurrentVersion().isAtLeast(version) ? deprecated() : this;
+		} catch (Throwable ex) {
+			return deprecated();
+		}
+	}
+
+	private PacketType deprecated() {
+		PacketType ret = clone();
+		ret.deprecated = true;
+		return ret;
+	}
+
+	public boolean isDeprecated() {
+		return deprecated;
+	}
+
 	@Override
 	public int hashCode() {
 		return Objects.hashCode(protocol, sender, currentId, legacyId);
@@ -1078,8 +1128,17 @@ public class PacketType implements Serializable, Comparable<PacketType> {
 		Class<?> clazz = getPacketClass();
 
 		if (clazz == null)
-			return "UNREGISTERED[" + protocol + ", " + sender + ", " + currentId + ", legacy: " + legacyId + ", classNames: " + Arrays.toString(classNames) + "]";
+			return name() + "[" + protocol + ", " + sender + ", " + currentId + ", legacy: " + legacyId + ", classNames: " + Arrays.toString(classNames) + " (unregistered)]";
 		else
 			return clazz.getSimpleName() + "[" + currentId + ", legacy: " + legacyId + "]";
 	}
-}
+
+	@Override
+	public PacketType clone() {
+		try {
+			return (PacketType) super.clone();
+		} catch (CloneNotSupportedException ex) {
+			throw new Error("This shouldn't happen", ex);
+		}
+	}
+}

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

@@ -20,6 +20,7 @@ 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;
@@ -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;
 	}
-}
+}

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

@@ -1,144 +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.9";
-
-	/**
-	 * The maximum version ProtocolLib has been tested with.
-	 */
-	public static final String MAXIMUM_MINECRAFT_VERSION = "1.9.4";
-
-	/**
-	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.9.4) was released.
-	 */
-	public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-05-10";
-
-	/**
-	 * 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;
-		ProtocolLogger.init(plugin);
-		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;
-	}
-}
+/**
+ *  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.11.1";
+
+	/**
+	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.11) was released.
+	 */
+	public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-12-20";
+
+	/**
+	 * 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;
+	}
+}

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

@@ -1,63 +1,76 @@
-/**
- *  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 Logger logger;
-
-	protected static void init(Plugin plugin) {
-		ProtocolLogger.logger = plugin.getLogger();
-	}
-
-	/**
-	 * 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);
-	}
-}
+/**
+ *  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 org.bukkit.plugin.Plugin;
+
+/**
+ * @author dmulloy2
+ */
+public class ProtocolLogger {
+	private static Plugin plugin;
+
+	protected static void init(Plugin plugin) {
+		ProtocolLogger.plugin = plugin;
+	}
+
+	private static boolean isDebugEnabled() {
+		try {
+			return plugin.getConfig().getBoolean("global.debug", false);
+		} catch (Throwable ex) { // Maybe we're testing or something
+			return false;
+		}
+	}
+
+	/**
+	 * 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) {
+		plugin.getLogger().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) {
+		plugin.getLogger().log(level, message, ex);
+	}
+
+	public static void debug(String message, Object... args) {
+		if (isDebugEnabled()) {
+			log("[Debug] " + message, args);
+		}
+	}
+}

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

@@ -282,4 +282,4 @@ public interface ProtocolManager extends PacketStream {
 	public AsynchronousManager getAsynchronousManager();
 
 	public void verifyWhitelist(PacketListener listener, ListeningWhitelist whitelist);
-}
+}

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

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

modules/API/src/main/java/com/comphenix/protocol/error/ErrorReporter.java

@@ -87,4 +87,4 @@ public interface ErrorReporter {
 	 * @param reportBuilder - an error report builder that will be used to get the report.
 	 */
 	public abstract void reportDetailed(Object sender, ReportBuilder reportBuilder);
-}
+}

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

@@ -17,9 +17,6 @@
 
 package com.comphenix.protocol.events;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
 import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutput;
@@ -36,6 +33,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.annotation.Nonnull;
@@ -80,6 +78,7 @@ import com.comphenix.protocol.wrappers.EnumWrappers.ChatVisibility;
 import com.comphenix.protocol.wrappers.EnumWrappers.ClientCommand;
 import com.comphenix.protocol.wrappers.EnumWrappers.CombatEventType;
 import com.comphenix.protocol.wrappers.EnumWrappers.Difficulty;
+import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
 import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
 import com.comphenix.protocol.wrappers.EnumWrappers.EnumConverter;
 import com.comphenix.protocol.wrappers.EnumWrappers.Hand;
@@ -105,11 +104,16 @@ import com.comphenix.protocol.wrappers.WrappedServerPing;
 import com.comphenix.protocol.wrappers.WrappedStatistic;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
+import com.comphenix.protocol.wrappers.nbt.NbtCompound;
+import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.UnpooledByteBufAllocator;
+
 /**
  * Represents a Minecraft packet indirectly.
  * 
@@ -330,7 +334,15 @@ public class PacketContainer implements Serializable {
 	public StructureModifier<String> getStrings() {
 		return structureModifier.withType(String.class);
 	}
-	
+
+	/**
+	 * Retrieves a read/write structure for every UUID field.
+	 * @return A modifier for every UUID field.
+	 */
+	public StructureModifier<UUID> getUUIDs() {
+		return structureModifier.withType(UUID.class);
+	}
+
 	/**
 	 * Retrieves a read/write structure for every String array field.
 	 * @return A modifier for every String array field.
@@ -366,7 +378,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for ItemStack.
 	 * <p>
-	 * This modifier will automatically marshall between the Bukkit ItemStack and the
+	 * This modifier will automatically marshal between the Bukkit ItemStack and the
 	 * internal Minecraft ItemStack.
 	 * @return A modifier for ItemStack fields.
 	 */
@@ -379,7 +391,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for arrays of ItemStacks.
 	 * <p>
-	 * This modifier will automatically marshall between the Bukkit ItemStack and the
+	 * This modifier will automatically marshal between the Bukkit ItemStack and the
 	 * internal Minecraft ItemStack.
 	 * @return A modifier for ItemStack array fields.
 	 */
@@ -389,7 +401,25 @@ public class PacketContainer implements Serializable {
 				MinecraftReflection.getItemStackArrayClass(),
 				BukkitConverters.getIgnoreNull(new ItemStackArrayConverter()));
 	}
-	
+
+	/**
+	 * Retrieves a read/write structure for lists of ItemStacks.
+	 * <p>
+	 * This modifier will automatically marshal between the Bukkit ItemStack and the
+	 * internal Minecraft ItemStack.
+	 * @return A modifier for ItemStack list fields.
+	 */
+	public StructureModifier<List<ItemStack>> getItemListModifier() {
+		// Convert to and from the Bukkit wrapper
+		return structureModifier.withType(
+				List.class,
+				BukkitConverters.getListConverter(
+						MinecraftReflection.getItemStackClass(),
+						BukkitConverters.getItemStackConverter()
+				)
+		);
+	}
+
 	/**
 	 * Retrieve a read/write structure for maps of statistics.
 	 * <p>
@@ -408,7 +438,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for the world type enum.
 	 * <p>
-	 * This modifier will automatically marshall between the Bukkit world type and the
+	 * This modifier will automatically marshal between the Bukkit world type and the
 	 * internal Minecraft world type.
 	 * @return A modifier for world type fields.
 	 */
@@ -508,6 +538,21 @@ public class PacketContainer implements Serializable {
 				BukkitConverters.getNbtConverter());
 	}
 
+	/**
+	 * Retrieves a read/write structure for lists of NBT classes.
+	 * @return A modifier for lists of NBT classes.
+	 */
+	public StructureModifier<List<NbtBase<?>>> getListNbtModifier() {
+		// Convert to and from the ProtocolLib wrapper
+		return structureModifier.withType(
+				Collection.class,
+				BukkitConverters.getListConverter(
+						MinecraftReflection.getNBTBaseClass(),
+						BukkitConverters.getNbtConverter()
+				)
+		);
+	}
+
 	/**
 	 * Retrieves a read/write structure for Vectors.
 	 * @return A modifier for Vectors.
@@ -522,7 +567,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for collections of attribute snapshots.
 	 * <p>
-	 * This modifier will automatically marshall between the visible ProtocolLib WrappedAttribute and the
+	 * This modifier will automatically marshal between the visible ProtocolLib WrappedAttribute and the
 	 * internal Minecraft AttributeSnapshot.
 	 * @return A modifier for AttributeSnapshot collection fields.
 	 */
@@ -539,7 +584,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for collections of chunk positions.
 	 * <p>
-	 * This modifier will automatically marshall between the visible ProtocolLib ChunkPosition and the
+	 * This modifier will automatically marshal between the visible ProtocolLib ChunkPosition and the
 	 * internal Minecraft ChunkPosition.
 	 * 
 	 * @return A modifier for ChunkPosition list fields.
@@ -557,7 +602,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for collections of chunk positions.
 	 * <p>
-	 * This modifier will automatically marshall between the visible ProtocolLib BlockPosition and the
+	 * This modifier will automatically marshal between the visible ProtocolLib BlockPosition and the
 	 * internal Minecraft BlockPosition.
 	 *
 	 * @return A modifier for ChunkPosition list fields.
@@ -575,7 +620,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for collections of watchable objects.
 	 * <p>
-	 * This modifier will automatically marshall between the visible WrappedWatchableObject and the
+	 * This modifier will automatically marshal between the visible WrappedWatchableObject and the
 	 * internal Minecraft WatchableObject.
 	 * @return A modifier for watchable object list fields.
 	 */
@@ -592,7 +637,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for block fields.
 	 * <p>
-	 * This modifier will automatically marshall between Material and the
+	 * This modifier will automatically marshal between Material and the
 	 * internal Minecraft Block.
 	 * @return A modifier for GameProfile fields.
 	 */
@@ -605,7 +650,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for game profiles in Minecraft 1.7.2.
 	 * <p>
-	 * This modifier will automatically marshall between WrappedGameProfile and the
+	 * This modifier will automatically marshal between WrappedGameProfile and the
 	 * internal Minecraft GameProfile.
 	 * @return A modifier for GameProfile fields.
 	 */
@@ -618,7 +663,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for BlockData in Minecraft 1.8.
 	 * <p>
-	 * This modifier will automatically marshall between WrappedBlockData and the
+	 * This modifier will automatically marshal between WrappedBlockData and the
 	 * internal Minecraft IBlockData.
 	 * @return A modifier for BlockData fields.
 	 */
@@ -631,7 +676,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for MultiBlockChangeInfo arrays in Minecraft 1.8.
 	 * <p>
-	 * This modifier will automatically marshall between MultiBlockChangeInfo and the
+	 * This modifier will automatically marshal between MultiBlockChangeInfo and the
 	 * internal Minecraft MultiBlockChangeInfo.
 	 * @return A modifier for BlockData fields.
 	 */
@@ -646,7 +691,7 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for chat components in Minecraft 1.7.2.
 	 * <p>
-	 * This modifier will automatically marshall between WrappedChatComponent and the
+	 * This modifier will automatically marshal between WrappedChatComponent and the
 	 * internal Minecraft IChatBaseComponent.
 	 * @return A modifier for ChatComponent fields.
 	 */
@@ -659,15 +704,19 @@ public class PacketContainer implements Serializable {
 	/**
 	 * Retrieves a read/write structure for arrays of chat components.
 	 * <p>
-	 * This modifier will automatically marshall between WrappedChatComponent and the
-	 * internal Minecraft IChatBaseComponent.
+	 * This modifier will automatically marshal between WrappedChatComponent and the
+	 * internal Minecraft IChatBaseComponent (1.9.2 and below) or the internal
+	 * NBTCompound (1.9.4 and up).
+	 * <p>
+	 * Note that in 1.9.4 and up this modifier only works properly with sign
+	 * tile entities.
 	 * @return A modifier for ChatComponent array fields.
 	 */
 	public StructureModifier<WrappedChatComponent[]> getChatComponentArrays() {
 		// Convert to and from the Bukkit wrapper
 		return structureModifier.<WrappedChatComponent[]>withType(
-				MinecraftReflection.getIChatBaseComponentArrayClass(),
-				BukkitConverters.getIgnoreNull(new WrappedChatComponentArrayConverter()));
+				ComponentArrayConverter.getGenericType(),
+				BukkitConverters.getIgnoreNull(new ComponentArrayConverter()));
 	}
 	
 	/**
@@ -881,7 +930,7 @@ public class PacketContainer implements Serializable {
     }
 
     /**
-     * Retrive a read/write structure for the ItemSlot enum in 1.9.
+     * Retrieve a read/write structure for the ItemSlot enum in 1.9.
      * @return A modifier for ItemSlot enum fields.
      */
     public StructureModifier<ItemSlot> getItemSlots() {
@@ -890,7 +939,7 @@ public class PacketContainer implements Serializable {
     }
 
     /**
-     * Retrive a read/write structure for the Hand enum in 1.9.
+     * Retrieve a read/write structure for the Hand enum in 1.9.
      * @return A modifier for Hand enum fields.
      */
     public StructureModifier<Hand> getHands() {
@@ -898,6 +947,15 @@ public class PacketContainer implements Serializable {
     			EnumWrappers.getHandClass(), EnumWrappers.getHandConverter());
     }
 
+    /**
+     * Retrieve a read/write structure for the Direction enum in 1.10.
+     * @return A modifier for Direction enum fields.
+     */
+    public StructureModifier<Direction> getDirections() {
+    	return structureModifier.<Direction>withType(
+    			EnumWrappers.getDirectionClass(), EnumWrappers.getDirectionConverter());
+    }
+
     /**
      * Retrieve a read/write structure for an enum. This allows for the use of
      * user-created enums that may not exist in ProtocolLib. The specific (user
@@ -923,7 +981,7 @@ public class PacketContainer implements Serializable {
      */
     public <T extends Enum<T>> StructureModifier<T> getEnumModifier(Class<T> enumClass, int index) {
     	return getEnumModifier(enumClass, structureModifier.getField(index).getType());
-    }
+	}
 
 	/**
 	 * Retrieves the ID of this packet.
@@ -1076,7 +1134,7 @@ public class PacketContainer implements Serializable {
 	 * Construct a new packet data serializer.
 	 * @return The packet data serializer.
 	 */
-	private ByteBuf createPacketBuffer() {
+	public static ByteBuf createPacketBuffer() {
 		ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.buffer();
 		Class<?> packetSerializer = MinecraftReflection.getPacketDataSerializerClass();
 
@@ -1224,11 +1282,11 @@ public class PacketContainer implements Serializable {
 	 * Represents an equivalent converter for ChatComponent arrays.
 	 * @author dmulloy2
 	 */
-	private static class WrappedChatComponentArrayConverter implements EquivalentConverter<WrappedChatComponent[]> {
+	private static class LegacyComponentConverter implements EquivalentConverter<WrappedChatComponent[]> {
 		final EquivalentConverter<WrappedChatComponent> componentConverter = BukkitConverters.getWrappedChatComponentConverter();
 		
 		@Override
-		public Object getGeneric(Class<?>genericType, WrappedChatComponent[] specific) {
+		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
 			Class<?> nmsComponent = MinecraftReflection.getIChatBaseComponentClass();
 			Object[] result = (Object[]) Array.newInstance(nmsComponent, specific.length);
 			
@@ -1257,8 +1315,95 @@ public class PacketContainer implements Serializable {
 		}
 	}
 
+	/**
+	 * Converts from NBT to WrappedChatComponent arrays
+	 * @author dmulloy2
+	 */
+	private static class NBTComponentConverter implements EquivalentConverter<WrappedChatComponent[]> {
+		private EquivalentConverter<NbtBase<?>> nbtConverter = BukkitConverters.getNbtConverter();
+		private final int lines = 4;
+
+		@Override
+		public WrappedChatComponent[] getSpecific(Object generic) {
+			NbtBase<?> nbtBase = nbtConverter.getSpecific(generic);
+			NbtCompound compound = (NbtCompound) nbtBase;
+
+			WrappedChatComponent[] components = new WrappedChatComponent[lines];
+			for (int i = 0; i < lines; i++) {
+				if (compound.containsKey("Text" + (i + 1))) {
+					components[i] = WrappedChatComponent.fromJson(compound.getString("Text" + (i + 1)));
+				} else {
+					components[i] = WrappedChatComponent.fromText("");
+				}
+			}
+
+			return components;
+		}
+
+		@Override
+		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
+			NbtCompound compound = NbtFactory.ofCompound("");
+
+			for (int i = 0; i < lines; i++) {
+				WrappedChatComponent component;
+				if (i < specific.length && specific[i] != null) {
+					component = specific[i];
+				} else {
+					component = WrappedChatComponent.fromText("");
+				}
+
+				compound.put("Text" + (i + 1), component.getJson());
+			}
+
+			return nbtConverter.getGeneric(genericType, compound);
+		}
+
+		@Override
+		public Class<WrappedChatComponent[]> getSpecificType() {
+			return WrappedChatComponent[].class;
+		}
+	}
+
+	/**
+	 * A delegated converter that supports NBT to Component Array and regular Component Array
+	 * @author dmulloy2
+	 */
+	private static class ComponentArrayConverter implements EquivalentConverter<WrappedChatComponent[]> {
+		private static final EquivalentConverter<WrappedChatComponent[]> DELEGATE;
+		static {
+			if (!PacketType.Play.Server.UPDATE_SIGN.isDeprecated()) {
+				DELEGATE = new LegacyComponentConverter();
+			} else {
+				DELEGATE = new NBTComponentConverter();
+			}
+		}
+
+		@Override
+		public WrappedChatComponent[] getSpecific(Object generic) {
+			return DELEGATE.getSpecific(generic);
+		}
+
+		@Override
+		public Object getGeneric(Class<?> genericType, WrappedChatComponent[] specific) {
+			return DELEGATE.getGeneric(genericType, specific);
+		}
+
+		@Override
+		public Class<WrappedChatComponent[]> getSpecificType() {
+			return DELEGATE.getSpecificType();
+		}
+
+		public static Class<?> getGenericType() {
+			if (DELEGATE instanceof NBTComponentConverter) {
+				return MinecraftReflection.getNBTCompoundClass();
+			} else {
+				return MinecraftReflection.getIChatBaseComponentArrayClass();
+			}
+		}
+	}
+
 	@Override
 	public String toString() {
 		return "PacketContainer[type=" + type + ", structureModifier=" + structureModifier + "]";
 	}
-}
+}

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

@@ -453,4 +453,4 @@ public class PacketEvent extends EventObject implements Cancellable {
 	public String toString() {
 		return "PacketEvent[player=" + getPlayer() + ", packet=" + packet + "]";
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java

@@ -24,6 +24,9 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
@@ -31,6 +34,7 @@ import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.injector.PacketConstructor.Unwrapper;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
+import com.comphenix.protocol.utility.MinecraftReflection;
 import com.google.common.primitives.Primitives;
 
 /**
@@ -182,20 +186,55 @@ public class BukkitUnwrapper implements Unwrapper {
 					Report.newBuilder(REPORT_SECURITY_LIMITATION).error(e).callerParam(type)
 			);
 		} catch (NoSuchMethodException e) {
+			// Maybe it's a proxy?
+			Unwrapper proxyUnwrapper = getProxyUnwrapper(type);
+			if (proxyUnwrapper != null)
+				return proxyUnwrapper;
+
 			// Try getting the field unwrapper too
 			Unwrapper fieldUnwrapper = getFieldUnwrapper(type);
-			
 			if (fieldUnwrapper != null)
 				return fieldUnwrapper;
 			else
 				reporter.reportDetailed(this,
 						Report.newBuilder(REPORT_CANNOT_FIND_UNWRAP_METHOD).error(e).callerParam(type));
 		}
-		
+
 		// Default method
 		return null;
 	}
-	
+
+	// Players should /always/ be able to be unwrapped
+	// We should only get here if the 'Player' is a proxy
+	private Unwrapper getProxyUnwrapper(final Class<?> type) {
+		try {
+			if (Player.class.isAssignableFrom(type)) {
+				final Method getHandle = MinecraftReflection.getCraftPlayerClass().getMethod("getHandle");
+
+				Unwrapper unwrapper = new Unwrapper() {
+					@Override
+					public Object unwrapItem(Object wrapped) {
+						try {
+							return getHandle.invoke(((Player) wrapped).getPlayer());
+						} catch (Throwable ex) {
+							try {
+								return getHandle.invoke(Bukkit.getPlayer(((Player) wrapped).getUniqueId()));
+							} catch (ReflectiveOperationException ex1) {
+								throw new RuntimeException("Failed to unwrap proxy " + wrapped, ex);
+							}
+						}
+					}
+				};
+
+				unwrapperCache.put(type, unwrapper);
+				return unwrapper;
+			}
+		} catch (Throwable ignored) {
+		}
+
+		return null;
+	}
+
 	/**
 	 * Retrieve a cached unwrapper using the handle field.
 	 * @param type - a cached field unwrapper.

modules/API/src/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java

@@ -1,31 +1,31 @@
-package com.comphenix.protocol.injector;
-
-/**
- * Sets the inject hook type. Different types allow for maximum compatibility.
- * @author Kristian
- */
-public enum PlayerInjectHooks {
-	/**
-	 * The injection hook that does nothing. Set when every other inject hook fails.
-	 */
-	NONE,
-
-	/**
-	 * Override the network handler object itself. Only works in 1.3.
-	 * <p>
-	 * Cannot intercept MapChunk packets.
-	 */
-	NETWORK_MANAGER_OBJECT,
-
-	/**
-	 * Override the packet queue lists in NetworkHandler.
-	 * <p>
-	 * Cannot intercept MapChunk packets.
-	 */
-	NETWORK_HANDLER_FIELDS,
-
-	/**
-	 * Override the server handler object. Versatile, but a tad slower.
-	 */
-	NETWORK_SERVER_OBJECT;
-}
+package com.comphenix.protocol.injector;
+
+/**
+ * Sets the inject hook type. Different types allow for maximum compatibility.
+ * @author Kristian
+ */
+public enum PlayerInjectHooks {
+	/**
+	 * The injection hook that does nothing. Set when every other inject hook fails.
+	 */
+	NONE,
+
+	/**
+	 * Override the network handler object itself. Only works in 1.3.
+	 * <p>
+	 * Cannot intercept MapChunk packets.
+	 */
+	NETWORK_MANAGER_OBJECT,
+
+	/**
+	 * Override the packet queue lists in NetworkHandler.
+	 * <p>
+	 * Cannot intercept MapChunk packets.
+	 */
+	NETWORK_HANDLER_FIELDS,
+
+	/**
+	 * Override the server handler object. Versatile, but a tad slower.
+	 */
+	NETWORK_SERVER_OBJECT;
+}

modules/API/src/main/java/com/comphenix/protocol/injector/StructureCache.java

@@ -172,4 +172,4 @@ public class StructureCache {
 		}
 		return result;
 	}
-}
+}

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

@@ -389,4 +389,4 @@ public class NettyByteBufAdapter extends AbstractByteBuf {
 	public ByteBuf retain() {
 		return this;
 	}
-}
+}

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

@@ -1,104 +1,111 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2015 dmulloy2
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program;
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307 USA
- */
-package com.comphenix.protocol.injector.netty;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.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 - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2015 dmulloy2
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307 USA
+ */
+package com.comphenix.protocol.injector.netty;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLogger;
+import com.comphenix.protocol.PacketType.Protocol;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.injector.netty.ProtocolRegistry;
+import com.comphenix.protocol.injector.packet.MapContainer;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.google.common.collect.Maps;
+
+/**
+ * @author dmulloy2
+ */
+
+public class NettyProtocolRegistry extends ProtocolRegistry {
+
+	public NettyProtocolRegistry() {
+		super();
+	}
+
+	@Override
+	protected synchronized void initialize() {
+		ProtocolLogger.debug("Initializing the Netty protocol registry"); // Debug for issue #202
+
+		Object[] protocols = enumProtocol.getEnumConstants();
+
+		// ID to Packet class maps
+		Map<Object, Map<Integer, Class<?>>> serverMaps = Maps.newLinkedHashMap();
+		Map<Object, Map<Integer, Class<?>>> clientMaps = Maps.newLinkedHashMap();
+
+		Register result = new Register();
+		StructureModifier<Object> modifier = null;
+
+		// Iterate through the protocols
+		for (Object protocol : protocols) {
+			if (modifier == null)
+				modifier = new StructureModifier<Object>(protocol.getClass().getSuperclass(), false);
+			StructureModifier<Map<Object, Map<Integer, Class<?>>>> maps = modifier.withTarget(protocol).withType(Map.class);
+			for (Entry<Object, Map<Integer, Class<?>>> entry : maps.read(0).entrySet()) {
+				String direction = entry.getKey().toString();
+				if (direction.contains("CLIENTBOUND")) { // Sent by Server
+					serverMaps.put(protocol, entry.getValue());
+				} else if (direction.contains("SERVERBOUND")) { // Sent by Client
+					clientMaps.put(protocol, entry.getValue());
+				}
+			}
+		}
+
+		// Maps we have to occasionally check have changed
+		for (Map<Integer, Class<?>> map : serverMaps.values()) {
+			result.containers.add(new MapContainer(map));
+		}
+
+		for (Map<Integer, Class<?>> map : clientMaps.values()) {
+			result.containers.add(new MapContainer(map));
+		}
+
+		for (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
+			}
+		}
+	}
+}

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

@@ -19,7 +19,7 @@ import com.google.common.collect.Sets;
  * Represents a way of accessing the new netty Protocol enum.
  * @author Kristian
  */
-// TODO: Handle modifications to the BiMap
+
 public abstract class ProtocolRegistry {
 	/**
 	 * Represents a register we are currently building.
@@ -97,7 +97,7 @@ public abstract class ProtocolRegistry {
 	 * This operation may block the calling thread.
 	 */
 	public synchronized void synchronize() {
-		// See if the register is outdated
+		// Check if the packet registry has changed
 		if (register.isOutdated()) {
 			initialize();
 		}
@@ -122,4 +122,4 @@ public abstract class ProtocolRegistry {
 			count += map.size();
 		return count;
 	}
-}
+}

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

@@ -1,55 +1,222 @@
-/**
- *  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 io.netty.buffer.ByteBuf;
-
-/**
- * @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(ByteBuf output) {
-		int i = id;
-		while ((i & -128) != 0) {
-			output.writeByte(i & 127 | 128);
-			i >>>= 7;
-		}
-
-		output.writeByte(i);
-	}
-
-	public void writeBytes(ByteBuf output) {
-		output.writeBytes(bytes);
-	}
-}
+/**
+ *  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 static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.utility.MinecraftMethods;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+/**
+ * A packet represented only by its id and bytes.
+ * @author dmulloy2
+ */
+public class WirePacket {
+	private final int id;
+	private final byte[] bytes;
+
+	/**
+	 * Constructs a new WirePacket with a given type and contents
+	 * @param type Type of the packet
+	 * @param bytes Contents of the packet
+	 */
+	public WirePacket(PacketType type, byte[] bytes) {
+		this.id = checkNotNull(type, "type cannot be null").getCurrentId();
+		this.bytes = bytes;
+	}
+
+	/**
+	 * Constructs a new WirePacket with a given id and contents
+	 * @param id ID of the packet
+	 * @param bytes Contents of the packet
+	 */
+	public WirePacket(int id, byte[] bytes) {
+		this.id = id;
+		this.bytes = bytes;
+	}
+
+	/**
+	 * Gets this packet's ID
+	 * @return The ID
+	 */
+	public int getId() {
+		return id;
+	}
+
+	/**
+	 * Gets this packet's contents as a byte array
+	 * @return The contents
+	 */
+	public byte[] getBytes() {
+		return bytes;
+	}
+
+	/**
+	 * Writes the id of this packet to a given output
+	 * @param output Output to write to
+	 */
+	public void writeId(ByteBuf output) {
+		writeVarInt(output, id);
+	}
+
+	/**
+	 * Writes the contents of this packet to a given output
+	 * @param output Output to write to
+	 */
+	public void writeBytes(ByteBuf output) {
+		checkNotNull(output, "output cannot be null!");
+		output.writeBytes(bytes);
+	}
+
+	/**
+	 * Fully writes the ID and contents of this packet to a given output
+	 * @param output Output to write to
+	 */
+	public void writeFully(ByteBuf output) {
+		writeId(output);
+		writeBytes(output);
+	}
+
+	/**
+	 * Serializes this packet into a byte buffer
+	 * @return The buffer
+	 */
+	public ByteBuf serialize() {
+		ByteBuf buffer = Unpooled.buffer();
+		writeFully(buffer);
+		return buffer;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+
+		if (obj instanceof WirePacket) {
+			WirePacket that = (WirePacket) obj;
+			return this.id == that.id &&
+					Arrays.equals(this.bytes, that.bytes);
+		}
+
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Arrays.hashCode(bytes);
+		result = prime * result + id;
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "WirePacket[id=" + id + ", bytes=" + Arrays.toString(bytes) + "]";
+	}
+
+	private static byte[] getBytes(ByteBuf buffer) {
+		byte[] array = new byte[buffer.readableBytes()];
+		buffer.readBytes(array);
+		return array;
+	}
+
+	/**
+	 * Creates a WirePacket from an existing PacketContainer
+	 * @param packet Existing packet
+	 * @return The resulting WirePacket
+	 */
+	public static WirePacket fromPacket(PacketContainer packet) {
+		checkNotNull(packet, "packet cannot be null!");
+
+		int id = packet.getType().getCurrentId();
+
+		ByteBuf buffer = PacketContainer.createPacketBuffer();
+		Method write = MinecraftMethods.getPacketWriteByteBufMethod();
+
+		try {
+			write.invoke(packet.getHandle(), buffer);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Failed to serialize packet contents.", ex);
+		}
+
+		return new WirePacket(id, getBytes(buffer));
+	}
+
+	/**
+	 * Creates a WirePacket from an existing Minecraft packet
+	 * @param packet Existing Minecraft packet
+	 * @return The resulting WirePacket
+	 * @throws IllegalArgumentException If the packet is null or not a Minecraft packet
+	 */
+	public static WirePacket fromPacket(Object packet) {
+		checkNotNull(packet, "packet cannot be null!");
+		checkArgument(MinecraftReflection.isPacketClass(packet), "packet must be a Minecraft packet");
+
+		PacketType type = PacketType.fromClass(packet.getClass());
+		int id = type.getCurrentId();
+
+		ByteBuf buffer = PacketContainer.createPacketBuffer();
+		Method write = MinecraftMethods.getPacketWriteByteBufMethod();
+
+		try {
+			write.invoke(packet, buffer);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Failed to serialize packet contents.", ex);
+		}
+
+		return new WirePacket(id, getBytes(buffer));
+	}
+
+	public static void writeVarInt(ByteBuf output, int i) {
+		checkNotNull(output, "output cannot be null!");
+
+		while ((i & -128) != 0) {
+			output.writeByte(i & 127 | 128);
+			i >>>= 7;
+		}
+
+		output.writeByte(i);
+	}
+
+	public static int readVarInt(ByteBuf input) {
+		checkNotNull(input, "input cannot be null!");
+
+        int i = 0;
+        int j = 0;
+
+        byte b0;
+
+        do {
+            b0 = input.readByte();
+            i |= (b0 & 127) << j++ * 7;
+            if (j > 5) {
+                throw new RuntimeException("VarInt too big");
+            }
+        } while ((b0 & 128) == 128);
+
+        return i;
+	}
+}

modules/API/src/main/java/com/comphenix/protocol/injector/packet/MapContainer.java

@@ -3,6 +3,7 @@ package com.comphenix.protocol.injector.packet;
 import java.lang.reflect.Field;
 
 import com.comphenix.protocol.reflect.FieldUtils;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Represents a class that can detect if a map has changed.
@@ -10,17 +11,20 @@ import com.comphenix.protocol.reflect.FieldUtils;
  */
 public class MapContainer {
 	// For detecting changes
-	private Field modCountField;
+	private final Field modCountField;
 	private int lastModCount;
 	
 	// The object along with whether or not this is the initial run
-	private Object source;
+	private final Object source;
 	private boolean changed;
 	
 	public MapContainer(Object source) {
 		this.source = source;
-		this.changed = true;
-		this.modCountField = FieldUtils.getField(source.getClass(), "modCount", true);
+		this.changed = false;
+		
+		Field modCountField = FieldUtils.getField(source.getClass(), "modCount", true);
+		this.modCountField = checkNotNull(modCountField, "Could not obtain modCount field");
+		this.lastModCount = getModificationCount();
 	}
 	
 	/**
@@ -55,13 +59,13 @@ public class MapContainer {
 	
 	/**
 	 * Retrieve the current modification count.
-	 * @return The current count, or something different than lastModCount if not accessible.
+	 * @return The current count
 	 */
 	private int getModificationCount() {
 		try {
-			return modCountField != null ? modCountField.getInt(source) : lastModCount + 1;
-		} catch (Exception e) {
-			throw new RuntimeException("Unable to retrieve modCount.", e);
+			return modCountField.getInt(source);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Unable to retrieve modCount.", ex);
 		}
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java

@@ -18,6 +18,7 @@
 package com.comphenix.protocol.injector.packet;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -28,6 +29,7 @@ import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.injector.netty.NettyProtocolRegistry;
 import com.comphenix.protocol.injector.netty.ProtocolRegistry;
 import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.utility.MinecraftReflection;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -43,30 +45,30 @@ public class PacketRegistry {
 	public static final ReportType REPORT_INSUFFICIENT_SERVER_PACKETS = new ReportType("Too few server packets detected: %s");
 	public static final ReportType REPORT_INSUFFICIENT_CLIENT_PACKETS = new ReportType("Too few client packets detected: %s");
 
-	// Two different packet registry
+	// The Netty packet registry
 	private static volatile ProtocolRegistry NETTY;
 
 	// Cached for Netty
 	private static volatile Set<Integer> LEGACY_SERVER_PACKETS;
 	private static volatile Set<Integer> LEGACY_CLIENT_PACKETS;
 	private static volatile Map<Integer, Class> LEGACY_PREVIOUS_PACKETS;
-	
-	// Whether or not the registry has
-	private static boolean INITIALIZED;
-	
+
+	// Whether or not the registry has been initialized
+	private static volatile boolean INITIALIZED = false;
+
 	/**
-	 * Initialize the packet registry.
+	 * Initializes the packet registry.
 	 */
 	private static void initialize() {
 		if (INITIALIZED) {
-			// Make sure they were initialized
-			if (NETTY == null)
-				throw new IllegalStateException("No initialized registry.");
+			if (NETTY == null) {
+				throw new IllegalStateException("Failed to initialize packet registry.");
+			}
 			return;
 		}
 
-		// Check for netty
 		NETTY = new NettyProtocolRegistry();
+		INITIALIZED = true;
 	}
 
 	/**
@@ -154,11 +156,10 @@ public class PacketRegistry {
 	 */
 	@Deprecated
 	public static Set<Integer> getServerPackets() throws FieldAccessException {
-		initialize();
-
 		if (LEGACY_SERVER_PACKETS == null) {
-			LEGACY_SERVER_PACKETS = toLegacy(NETTY.getServerPackets());
+			LEGACY_SERVER_PACKETS = toLegacy(getServerPacketTypes());
 		}
+
 		return LEGACY_SERVER_PACKETS;
 	}
 	
@@ -168,9 +169,18 @@ public class PacketRegistry {
 	 */
 	public static Set<PacketType> getServerPacketTypes() {
 		initialize();
-
 		NETTY.synchronize();
-		return NETTY.getServerPackets();
+
+		Set<PacketType> types = new HashSet<>();
+
+		// Filter out unsupported packets
+		for (PacketType type : NETTY.getServerPackets()) {
+			if (!type.isDeprecated()) {
+				types.add(type);
+			}
+		}
+
+		return types;
 	}
 	
 	/**
@@ -182,11 +192,10 @@ public class PacketRegistry {
 	 */
 	@Deprecated
 	public static Set<Integer> getClientPackets() throws FieldAccessException {
-		initialize();
-
 		if (LEGACY_CLIENT_PACKETS == null) {
-			LEGACY_CLIENT_PACKETS = toLegacy(NETTY.getClientPackets());
+			LEGACY_CLIENT_PACKETS = toLegacy(getClientPacketTypes());
 		}
+
 		return LEGACY_CLIENT_PACKETS;
 	}
 	
@@ -196,9 +205,18 @@ public class PacketRegistry {
 	 */
 	public static Set<PacketType> getClientPacketTypes() {
 		initialize();
-
 		NETTY.synchronize();
-		return NETTY.getClientPackets();
+
+		Set<PacketType> types = new HashSet<>();
+
+		// Filter out unsupported packets
+		for (PacketType type : NETTY.getClientPackets()) {
+			if (!type.isDeprecated()) {
+				types.add(type);
+			}
+		}
+
+		return types;
 	}
 	
 	/**
@@ -269,7 +287,24 @@ public class PacketRegistry {
 	 */
 	public static Class getPacketClassFromType(PacketType type, boolean forceVanilla) {
 		initialize();
-		return NETTY.getPacketTypeLookup().get(type);
+
+		// Try the lookup first
+		Class<?> clazz = NETTY.getPacketTypeLookup().get(type);
+		if (clazz != null) {
+			return clazz;
+		}
+
+		// Then try looking up the class names
+		for (String name : type.getClassNames()) {
+			try {
+				clazz = MinecraftReflection.getMinecraftClass(name);
+				break;
+			} catch (Exception ex) {
+			}
+		}
+
+		// TODO Cache the result?
+		return clazz;
 	}
 
 	/**
@@ -319,4 +354,4 @@ public class PacketRegistry {
 		initialize();
 		return NETTY.getPacketClassLookup().get(packet);
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/package-info.java

@@ -11,4 +11,4 @@
  * }
  * </pre>
  */
-package com.comphenix.protocol;
+package com.comphenix.protocol;

modules/API/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java

@@ -29,6 +29,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.Validate;
+
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.fuzzy.AbstractFuzzyMatcher;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
@@ -577,6 +579,8 @@ public class FuzzyReflection {
 	 * @return Every field.
 	 */
 	public Set<Field> getFields() {
+		Validate.notNull(source, "source cannot be null!");
+
 		// We will only consider private fields in the declared class
 		if (forceAccess)
 			return setUnion(source.getDeclaredFields(), source.getFields());

modules/API/src/main/java/com/comphenix/protocol/reflect/ObjectEnum.java

@@ -52,7 +52,7 @@ public class ObjectEnum<T> implements Iterable<T> {
 	@SuppressWarnings("unchecked")
 	protected void registerAll(Class<T> fieldType) {
 		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);
@@ -63,7 +63,6 @@ public class ObjectEnum<T> implements Iterable<T> {
 					registerMember(value, entry.getName());
 				}
 			}
-		
 		} catch (IllegalArgumentException e) {
 			e.printStackTrace();
 		} catch (IllegalAccessException e) {

modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java

@@ -682,4 +682,4 @@ public class StructureModifier<TField> {
 	public String toString() {
 		return "StructureModifier[fieldType=" + fieldType + ", data=" + data + "]";
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java

@@ -51,4 +51,4 @@ final class DefaultConstrutorAccessor implements ConstructorAccessor {
 	public String toString() {
 		return "DefaultConstrutorAccessor [constructor=" + constructor + "]";
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java

@@ -57,4 +57,4 @@ final class DefaultFieldAccessor implements FieldAccessor {
 	public String toString() {
 		return "DefaultFieldAccessor [field=" + field + "]";
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java

@@ -49,4 +49,4 @@ final class DefaultMethodAccessor implements MethodAccessor {
 	public String toString() {
 		return "DefaultMethodAccessor [method=" + method + "]";
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java

@@ -27,4 +27,4 @@ public interface FieldAccessor {
 	 * @return The field.
 	 */
 	public Field getField();
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java

@@ -20,4 +20,4 @@ public interface MethodAccessor {
 	 * @return The method.
 	 */
 	public Method getMethod();
-}
+}

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

@@ -16,15 +16,20 @@
  */
 package com.comphenix.protocol.reflect.cloning;
 
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.ChunkPosition;
 import com.comphenix.protocol.wrappers.MinecraftKey;
+import com.comphenix.protocol.wrappers.WrappedBlockData;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
 import com.google.common.collect.Maps;
@@ -61,6 +66,16 @@ public class BukkitCloner implements Cloner {
 			addClass(5, MinecraftReflection.getDataWatcherSerializerClass());
 			addClass(6, MinecraftReflection.getMinecraftKeyClass());
 		}
+
+		try {
+			addClass(7, MinecraftReflection.getIBlockDataClass());
+		} catch (Throwable ex) {
+		}
+
+		try {
+			addClass(8, MinecraftReflection.getNonNullListClass());
+		} catch (Throwable ex) {
+		}
 	}
 
 	private void addClass(int id, Class<?> clazz) {
@@ -112,9 +127,47 @@ public class BukkitCloner implements Cloner {
 				return source;
 			case 6:
 				EquivalentConverter<MinecraftKey> keyConverter = MinecraftKey.getConverter();
-				return keyConverter.getGeneric(clonableClasses.get(5), keyConverter.getSpecific(source));
+				return keyConverter.getGeneric(clonableClasses.get(6), keyConverter.getSpecific(source));
+			case 7:
+				EquivalentConverter<WrappedBlockData> blockDataConverter = BukkitConverters.getWrappedBlockDataConverter();
+				return blockDataConverter.getGeneric(clonableClasses.get(7), blockDataConverter.getSpecific(source).deepClone());
+			case 8:
+				return nonNullListCloner().clone(source);
 			default:
 				throw new IllegalArgumentException("Cannot clone objects of type " + source.getClass());
 		}
 	}
-}
+
+	private static Constructor<?> nonNullList = null;
+
+	private static final Cloner nonNullListCloner() {
+		return new Cloner() {
+			@Override
+			public boolean canClone(Object source) {
+				return MinecraftReflection.is(MinecraftReflection.getNonNullListClass(), source);
+			}
+
+			@Override
+			public Object clone(Object source) {
+				StructureModifier<Object> modifier = new StructureModifier<>(source.getClass(), true).withTarget(source);
+				List<?> list = (List<?>) modifier.read(0);
+				Object empty = modifier.read(1);
+
+				if (nonNullList == null) {
+					try {
+						nonNullList = source.getClass().getDeclaredConstructor(List.class, Object.class);
+						nonNullList.setAccessible(true);
+					} catch (ReflectiveOperationException ex) {
+						throw new RuntimeException("Could not find NonNullList constructor", ex);
+					}
+				}
+
+				try {
+					return nonNullList.newInstance(new ArrayList<>(list), empty);
+				} catch (ReflectiveOperationException ex) {
+					throw new RuntimeException("Could not create new NonNullList", ex);
+				}
+			}
+		};
+	}
+}

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

@@ -1,39 +1,39 @@
-/**
- * (c) 2016 dmulloy2
- */
-package com.comphenix.protocol.reflect.cloning;
-
-import com.google.common.base.Optional;
-
-/**
- * A cloner that can clone Optional objects
- * @author dmulloy2
- */
-
-public class OptionalCloner implements Cloner {
-	protected Cloner wrapped;
-
-	public OptionalCloner(Cloner wrapped) {
-		this.wrapped = wrapped;
-	}
-
-	@Override
-	public boolean canClone(Object source) {
-		return source instanceof Optional;
-	}
-
-	@Override
-	public Object clone(Object source) {
-		Optional<?> optional = (Optional<?>) source;
-		if (!optional.isPresent()) {
-			return Optional.absent();
-		}
-
-		// Clone the inner value
-		return Optional.of(wrapped.clone(optional.get()));
-	}
-
-	public Cloner getWrapped() {
-		return wrapped;
-	}
-}
+/**
+ * (c) 2016 dmulloy2
+ */
+package com.comphenix.protocol.reflect.cloning;
+
+import com.google.common.base.Optional;
+
+/**
+ * A cloner that can clone Optional objects
+ * @author dmulloy2
+ */
+
+public class OptionalCloner implements Cloner {
+	protected Cloner wrapped;
+
+	public OptionalCloner(Cloner wrapped) {
+		this.wrapped = wrapped;
+	}
+
+	@Override
+	public boolean canClone(Object source) {
+		return source instanceof Optional;
+	}
+
+	@Override
+	public Object clone(Object source) {
+		Optional<?> optional = (Optional<?>) source;
+		if (!optional.isPresent()) {
+			return Optional.absent();
+		}
+
+		// Clone the inner value
+		return Optional.of(wrapped.clone(optional.get()));
+	}
+
+	public Cloner getWrapped() {
+		return wrapped;
+	}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java

@@ -55,4 +55,4 @@ class ClassRegexMatcher extends AbstractFuzzyMatcher<Class<?>> {
 		}
 		return false;
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java

@@ -54,4 +54,4 @@ class ClassSetMatcher extends AbstractFuzzyMatcher<Class<?>> {
 		}
 		return true;
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java

@@ -65,4 +65,4 @@ public class CollectionGenerator implements InstanceProvider {
 		// Cannot provide an instance
 		return null;
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java

@@ -32,4 +32,4 @@ public interface InstanceProvider {
 	 * @throws NotConstructableException Thrown to indicate that this type cannot or should never be constructed.
 	 */
 	public abstract Object create(@Nullable Class<?> type);
-}
+}

modules/API/src/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java

@@ -77,4 +77,4 @@ public class PrimitiveGenerator implements InstanceProvider {
 		// Cannot handle this type
 		return null;
 	}	
-}
+}

modules/API/src/main/java/com/comphenix/protocol/timing/HistogramStream.java

@@ -122,4 +122,4 @@ public class HistogramStream extends OnlineComputation {
 	public int getCount() {
 		return count;
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/timing/OnlineComputation.java

@@ -46,4 +46,4 @@ public abstract class OnlineComputation {
 			}
 		};
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/timing/StatisticsStream.java

@@ -152,4 +152,4 @@ public class StatisticsStream extends OnlineComputation {
 			getMean(), getStandardDeviation(),
 			getMinimum(), getMaximum(), getCount());
     }
-}
+}

modules/API/src/main/java/com/comphenix/protocol/utility/CachedPackage.java

@@ -1,24 +1,24 @@
-/*
+/**
  *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
  *  Copyright (C) 2012 Kristian S. Stangeland
  *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the 
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of 
  *  the License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
  *  See the GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License along with this program;
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  You should have received a copy of the GNU General Public License along with this program; 
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
  *  02111-1307 USA
  */
-
 package com.comphenix.protocol.utility;
 
 import java.util.Map;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
@@ -29,10 +29,10 @@ import com.google.common.collect.Maps;
  * @author Kristian
  */
 class CachedPackage {
-	private final Map<String, Class<?>> cache;
+	private final Map<String, Optional<Class<?>>> cache;
 	private final String packageName;
 	private final ClassSource source;
-	
+
 	/**
 	 * Construct a new cached package.
 	 * @param packageName - the name of the current package.
@@ -43,16 +43,20 @@ class CachedPackage {
 		this.cache = Maps.newConcurrentMap();
 		this.source = source;
 	}
-	
+
 	/**
 	 * Associate a given class with a class name.
 	 * @param className - class name.
 	 * @param clazz - type of class.
 	 */
 	public void setPackageClass(String className, Class<?> clazz) {
-		cache.put(className, clazz);
+		if (clazz != null) {
+			cache.put(className, Optional.<Class<?>> of(clazz));
+		} else {
+			cache.remove(className);
+		}
 	}
-	
+
 	/**
 	 * Retrieve the class object of a specific class in the current package.
 	 * @param className - the specific class.
@@ -60,25 +64,33 @@ class CachedPackage {
 	 * @throws RuntimeException If we are unable to find the given class.
 	 */
 	public Class<?> getPackageClass(String className) {
-		try {
-			Class<?> result = cache.get(Preconditions.checkNotNull(className, "className cannot be NULL"));
-			
-			// Concurrency is not a problem - we don't care if we look up a class twice
-			if (result == null) {
-				// Look up the class dynamically
-				result = source.loadClass(combine(packageName, className));
-				if (result == null)
-					throw new IllegalArgumentException("Source " + source + " returned NULL for " + className);
+		Preconditions.checkNotNull(className, "className cannot be null!");
 
-				cache.put(className, result);
+		// See if we've already looked it up
+		if (cache.containsKey(className)) {
+			Optional<Class<?>> result = cache.get(className);
+			if (!result.isPresent()) {
+				throw new RuntimeException("Cannot find class " + className);
 			}
 
-			return result;
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException("Cannot find class " + combine(packageName, className), e);
+			return result.get();
+		}
+
+		try {
+			// Try looking it up
+			Class<?> clazz = source.loadClass(combine(packageName, className));
+			if (clazz == null) {
+				throw new IllegalArgumentException("Source " + source + " returned null for " + className);
+			}
+
+			cache.put(className, Optional.<Class<?>> of(clazz));
+			return clazz;
+		} catch (ClassNotFoundException ex) {
+			cache.put(className, Optional.<Class<?>> absent());
+			throw new RuntimeException("Cannot find class " + className, ex);
 		}
 	}
-	
+
 	/**
 	 * Correctly combine a package name and the child class we're looking for.
 	 * @param packageName - name of the package, or an empty string for the default package.

modules/API/src/main/java/com/comphenix/protocol/utility/Closer.java

@@ -1,57 +1,57 @@
-/**
- *  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.utility;
-
-import java.io.Closeable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author dmulloy2
- */
-
-// TODO Switch to AutoCloseable w/ Java 7
-public class Closer implements Closeable {
-	private final List<Closeable> list;
-
-	private Closer() {
-		this.list = new ArrayList<Closeable>();
-	}
-
-	public static Closer create() {
-		return new Closer();
-	}
-
-	public <C extends Closeable> C register(C close) {
-		list.add(close);
-		return close;
-	}
-
-	@Override
-	public void close() {
-		for (Closeable close : list) {
-			closeQuietly(close);
-		}
-	}
-
-	public static void closeQuietly(Closeable close) {
-		try {
-			close.close();
-		} catch (Throwable ex) { }
-	}
-
-}
+/**
+ *  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.utility;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dmulloy2
+ */
+
+// TODO Switch to AutoCloseable w/ Java 7
+public class Closer implements Closeable {
+	private final List<Closeable> list;
+
+	private Closer() {
+		this.list = new ArrayList<Closeable>();
+	}
+
+	public static Closer create() {
+		return new Closer();
+	}
+
+	public <C extends Closeable> C register(C close) {
+		list.add(close);
+		return close;
+	}
+
+	@Override
+	public void close() {
+		for (Closeable close : list) {
+			closeQuietly(close);
+		}
+	}
+
+	public static void closeQuietly(Closeable close) {
+		try {
+			close.close();
+		} catch (Throwable ex) { }
+	}
+
+}

modules/API/src/main/java/com/comphenix/protocol/utility/Constants.java

@@ -1,27 +1,27 @@
-/**
- *  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.utility;
-
-/**
- * @author dmulloy2
- */
-
-public final class Constants {
-	public static final String PACKAGE_VERSION = "v1_9_R2";
-	public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
-	public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
-}
+/**
+ *  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.utility;
+
+/**
+ * @author dmulloy2
+ */
+
+public final class Constants {
+	public static final String PACKAGE_VERSION = "v1_11_R1";
+	public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
+	public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
+}

modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftFields.java

@@ -47,6 +47,7 @@ public class MinecraftFields {
 	 * @return The player connection.
 	 */
 	public static Object getPlayerConnection(Player player) {
+		Preconditions.checkNotNull(player, "player cannot be null!");
 		return getPlayerConnection(BukkitUnwrapper.getInstance().unwrapItem(player));
 	}
 	

modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java

@@ -4,7 +4,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import com.comphenix.protocol.ProtocolLibrary;
 import com.google.common.collect.Maps;
 
 /**
@@ -42,6 +41,9 @@ public class MinecraftProtocolVersion {
 		map.put(new MinecraftVersion(1, 9, 0), 107);
 		map.put(new MinecraftVersion(1, 9, 2), 109);
 		map.put(new MinecraftVersion(1, 9, 4), 110);
+		map.put(new MinecraftVersion(1, 10, 0), 210);
+		map.put(new MinecraftVersion(1, 11, 0), 315);
+		map.put(new MinecraftVersion(1, 11, 1), 316);
 		return map;
 	}
 
@@ -50,7 +52,7 @@ public class MinecraftProtocolVersion {
 	 * @return The version number.
 	 */
 	public static int getCurrentVersion() {
-		return getVersion(ProtocolLibrary.getProtocolManager().getMinecraftVersion());
+		return getVersion(MinecraftVersion.getCurrentVersion());
 	}
 	
 	/**

modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java

@@ -41,6 +41,7 @@ import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 
@@ -62,8 +63,8 @@ import com.comphenix.protocol.reflect.fuzzy.FuzzyClassContract;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMatchers;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
-import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavaibleException;
-import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavaibleException.Reason;
+import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavailableException;
+import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavailableException.Reason;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.comphenix.protocol.wrappers.nbt.NbtType;
 import com.google.common.base.Joiner;
@@ -128,13 +129,13 @@ public class MinecraftReflection {
 	private static String packageVersion;
 
 	// Item stacks
-	private static Method craftNMSMethod;
+	/* private static Method craftNMSMethod;
 	private static Method craftBukkitNMS;
 	private static Method craftBukkitOBC;
 	private static boolean craftItemStackFailed;
 
 	private static Constructor<?> craftNMSConstructor;
-	private static Constructor<?> craftBukkitConstructor;
+	private static Constructor<?> craftBukkitConstructor; */
 
 	// net.minecraft.server
 	private static Class<?> itemStackArrayClass;
@@ -152,6 +153,7 @@ public class MinecraftReflection {
 
 	// Whether or not we are using netty
 	private static Boolean cachedNetty;
+	private static Boolean cachedWatcherObject;
 
 	private MinecraftReflection() {
 		// No need to make this constructable.
@@ -408,14 +410,31 @@ public class MinecraftReflection {
 		return javaName.startsWith(MINECRAFT_PREFIX_PACKAGE) && javaName.endsWith(className);
  	}
 
+	/**
+	 * Determine if a given Object is compatible with a given Class. That is,
+	 * whether or not the Object is an instance of that Class or one of its
+	 * subclasses. If either is null, false is returned.
+	 * 
+	 * @param clazz Class to test for, may be null
+	 * @param object the Object to test, may be null
+	 * @return True if it is, false if not
+	 * @see Class#isAssignableFrom(Class)
+	 */
+	public static boolean is(Class<?> clazz, Object object) {
+		if (clazz == null || object == null) {
+			return false;
+		}
+
+		return clazz.isAssignableFrom(object.getClass());
+	}
+
 	/**
 	 * Determine if a given object is a ChunkPosition.
 	 * @param obj - the object to test.
 	 * @return TRUE if it can, FALSE otherwise.
 	 */
 	public static boolean isChunkPosition(Object obj) {
-		Class<?> chunkPosition = getChunkPositionClass();
-		return obj != null && chunkPosition != null && chunkPosition.isAssignableFrom(obj.getClass());
+		return is(getChunkPositionClass(), obj);
 	}
 
 	/**
@@ -424,8 +443,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it can, FALSE otherwise.
 	 */
 	public static boolean isBlockPosition(Object obj) {
-		Class<?> blockPosition = getBlockPositionClass();
-		return obj != null && blockPosition != null && blockPosition.isAssignableFrom(obj.getClass());
+		return is(getBlockPositionClass(), obj);
 	}
 
 	/**
@@ -434,7 +452,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it can, FALSE otherwise.
 	 */
 	public static boolean isChunkCoordIntPair(Object obj) {
-		return obj != null && getChunkCoordIntPair().isAssignableFrom(obj.getClass());
+		return is(getChunkCoordIntPair(), obj);
 	}
 
 	/**
@@ -443,8 +461,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it can, FALSE otherwise.
 	 */
 	public static boolean isChunkCoordinates(Object obj) {
-		Class<?> chunkCoordinates = getChunkCoordinatesClass();
-		return obj != null && chunkCoordinates != null && chunkCoordinates.isAssignableFrom(obj.getClass());
+		return is(getChunkCoordinatesClass(), obj);
 	}
 
 	/**
@@ -453,7 +470,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isPacketClass(Object obj) {
-		return obj != null && getPacketClass().isAssignableFrom(obj.getClass());
+		return is(getPacketClass(), obj);
 	}
 
 	/**
@@ -462,7 +479,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isLoginHandler(Object obj) {
-		return obj != null && getNetLoginHandlerClass().isAssignableFrom(obj.getClass());
+		return is(getNetLoginHandlerClass(), obj);
 	}
 
 	/**
@@ -471,7 +488,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isServerHandler(Object obj) {
-		return obj != null && getPlayerConnectionClass().isAssignableFrom(obj.getClass());
+		return is(getPlayerConnectionClass(), obj);
 	}
 
 	/**
@@ -480,7 +497,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isMinecraftEntity(Object obj) {
-		return obj != null && getEntityClass().isAssignableFrom(obj.getClass());
+		return is(getEntityClass(), obj);
 	}
 
 	/**
@@ -489,7 +506,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isItemStack(Object value) {
-		return value != null && getItemStackClass().isAssignableFrom(value.getClass());
+		return is(getItemStackClass(), value);
 	}
 
 	/**
@@ -498,7 +515,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isCraftPlayer(Object value) {
-		return value != null && getCraftPlayerClass().isAssignableFrom(value.getClass());
+		return is(getCraftPlayerClass(), value);
 	}
 
 	/**
@@ -507,7 +524,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isMinecraftPlayer(Object obj) {
-		return obj != null && getEntityPlayerClass().isAssignableFrom(obj.getClass());
+		return is(getEntityPlayerClass(), obj);
 	}
 
 	/**
@@ -516,7 +533,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isWatchableObject(Object obj) {
-		return obj != null && getWatchableObjectClass().isAssignableFrom(obj.getClass());
+		return is(getWatchableObjectClass(), obj);
 	}
 
 	/**
@@ -525,7 +542,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isDataWatcher(Object obj) {
-		return obj != null && getDataWatcherClass().isAssignableFrom(obj.getClass());
+		return is(getDataWatcherClass(), obj);
 	}
 
 	/**
@@ -534,7 +551,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isIntHashMap(Object obj) {
-		return obj != null && getIntHashMapClass().isAssignableFrom(obj.getClass());
+		return is(getIntHashMapClass(), obj);
 	}
 
 	/**
@@ -543,7 +560,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isCraftItemStack(Object obj) {
-		return obj != null && getCraftItemStackClass().isAssignableFrom(obj.getClass());
+		return is(getCraftItemStackClass(), obj);
 	}
 
 	/**
@@ -917,6 +934,9 @@ public class MinecraftReflection {
 			return getMinecraftClass("MinecraftServer");
 		} catch (RuntimeException e) {
 			useFallbackServer();
+
+			// Reset cache and try again
+			setMinecraftClass("MinecraftServer", null);
 			return getMinecraftClass("MinecraftServer");
 		}
 	}
@@ -965,8 +985,10 @@ public class MinecraftReflection {
 		try {
 			return getMinecraftClass("ServerConfigurationManager", "PlayerList");
 		} catch (RuntimeException e) {
-			// Try again
 			useFallbackServer();
+
+			// Reset cache and try again
+			setMinecraftClass("ServerConfigurationManager", null);
 			return getMinecraftClass("ServerConfigurationManager");
 		}
 	}
@@ -1180,24 +1202,7 @@ public class MinecraftReflection {
 		try {
 			return getMinecraftClass("ChunkPosition");
 		} catch (RuntimeException e) {
-			try {
-				Class<?> normalChunkGenerator = getCraftBukkitClass("generator.NormalChunkGenerator");
-
-				// ChunkPosition a(net.minecraft.server.World world, String string, int i, int i1, int i2) {
-				FuzzyMethodContract selected = FuzzyMethodContract.newBuilder()
-						.banModifier(Modifier.STATIC)
-						.parameterMatches(getMinecraftObjectMatcher(), 0)
-						.parameterExactType(String.class, 1)
-						.parameterExactType(int.class, 2)
-						.parameterExactType(int.class, 3)
-						.parameterExactType(int.class, 4)
-						.build();
-
-				return setMinecraftClass("ChunkPosition",
-						FuzzyReflection.fromClass(normalChunkGenerator).getMethod(selected).getReturnType());
-			} catch (Throwable ex) {
-				return null;
-			}
+			return null;
 		}
 	}
 
@@ -1315,16 +1320,23 @@ public class MinecraftReflection {
 	}
 
 	public static Class<?> getDataWatcherObjectClass() {
-		// TODO Implement a fallback
-		return getMinecraftClass("DataWatcherObject");
+		try {
+			return getMinecraftClass("DataWatcherObject");
+		} catch (RuntimeException ex) {
+			return null;
+		}
 	}
 
 	public static boolean watcherObjectExists() {
-		try {
-			return getDataWatcherObjectClass() != null;
-		} catch (RuntimeException e) {
-			return false;
+		if (cachedWatcherObject == null) {
+			try {
+				return cachedWatcherObject = getDataWatcherObjectClass() != null;
+			} catch (Throwable ex) {
+				return cachedWatcherObject = false;
+			}
 		}
+
+		return cachedWatcherObject;
 	}
 
 	public static Class<?> getDataWatcherSerializerClass() {
@@ -1621,8 +1633,10 @@ public class MinecraftReflection {
 		try {
 			return getMinecraftClass("AttributeModifier");
 		} catch (RuntimeException e) {
-			// Initialize first
 			getAttributeSnapshotClass();
+
+			// Reset cache and try again
+			setMinecraftClass("AttributeModifier", null);
 			return getMinecraftClass("AttributeModifier");
 		}
 	}
@@ -1794,8 +1808,7 @@ public class MinecraftReflection {
 	 * @return TRUE if it is, FALSE otherwise.
 	 */
 	public static boolean isPlayerInfoData(Object obj) {
-		Class<?> clazz = getPlayerInfoDataClass();
-		return clazz != null && obj.getClass().equals(clazz);
+		return is(getPlayerInfoDataClass(), obj);
 	}
 
 	/**
@@ -1822,119 +1835,119 @@ public class MinecraftReflection {
 		return getArrayClass(getMultiBlockChangeInfoClass());
 	}
 
-	/**
-	 * Retrieve a CraftItemStack from a given ItemStack.
-	 * @param bukkitItemStack - the Bukkit ItemStack to convert.
-	 * @return A CraftItemStack as an ItemStack.
-	 */
-	public static ItemStack getBukkitItemStack(ItemStack bukkitItemStack) {
-		// Delegate this task to the method that can execute it
-		if (craftBukkitNMS != null)
-			return getBukkitItemByMethod(bukkitItemStack);
-
-		if (craftBukkitConstructor == null) {
-			try {
-				craftBukkitConstructor = getCraftItemStackClass().getConstructor(ItemStack.class);
-			} catch (Exception e) {
-				// See if this method works
-				if (!craftItemStackFailed)
-					return getBukkitItemByMethod(bukkitItemStack);
-
-				throw new RuntimeException("Cannot find CraftItemStack(org.bukkit.inventory.ItemStack).", e);
-			}
-		}
-
-		// Try to create the CraftItemStack
+	public static boolean signUpdateExists() {
 		try {
-			return (ItemStack) craftBukkitConstructor.newInstance(bukkitItemStack);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct CraftItemStack.", e);
+			return getMinecraftClass("PacketPlayOutUpdateSign") != null;
+		} catch (RuntimeException ex) {
+			return false;
 		}
 	}
 
-	private static ItemStack getBukkitItemByMethod(ItemStack bukkitItemStack) {
-		if (craftBukkitNMS == null) {
-			try {
-				craftBukkitNMS = getCraftItemStackClass().getMethod("asNMSCopy", ItemStack.class);
-				craftBukkitOBC = getCraftItemStackClass().getMethod("asCraftMirror", MinecraftReflection.getItemStackClass());
-			} catch (Exception e) {
-				craftItemStackFailed = true;
-				throw new RuntimeException("Cannot find CraftItemStack.asCraftCopy(org.bukkit.inventory.ItemStack).", e);
-			}
-		}
-
-		// Next, construct it
-		try {
-			Object nmsItemStack = craftBukkitNMS.invoke(null, bukkitItemStack);
-			return (ItemStack) craftBukkitOBC.invoke(null, nmsItemStack);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct CraftItemStack.", e);
-		}
+	public static Class<?> getNonNullListClass() {
+		return getMinecraftClass("NonNullList");
 	}
 
+	// ---- ItemStack conversions
+
+	private static Method asNMSCopy = null;
+	private static Method asCraftMirror = null;
+
+	private static Boolean nullEnforced = null;
+	private static Method isEmpty = null;
+
 	/**
-	 * Retrieve the Bukkit ItemStack from a given net.minecraft.server ItemStack.
-	 * @param minecraftItemStack - the NMS ItemStack to wrap.
-	 * @return The wrapped ItemStack.
-	 */
-	public static ItemStack getBukkitItemStack(Object minecraftItemStack) {
-		// Delegate this task to the method that can execute it
-		if (craftNMSMethod != null)
-			return getBukkitItemByMethod(minecraftItemStack);
-
-		if (craftNMSConstructor == null) {
-			try {
-				craftNMSConstructor = getCraftItemStackClass().getConstructor(minecraftItemStack.getClass());
-			} catch (Exception e) {
-				// Give it a try
-				if (!craftItemStackFailed)
-					return getBukkitItemByMethod(minecraftItemStack);
-
-				throw new RuntimeException("Cannot find CraftItemStack(net.minecraft.server.ItemStack).", e);
-			}
-		}
-
-		// Try to create the CraftItemStack
-		try {
-			return (ItemStack) craftNMSConstructor.newInstance(minecraftItemStack);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct CraftItemStack.", e);
-		}
-	}
-
-	private static ItemStack getBukkitItemByMethod(Object minecraftItemStack) {
-		if (craftNMSMethod == null) {
-			try {
-				craftNMSMethod = getCraftItemStackClass().getMethod("asCraftMirror", minecraftItemStack.getClass());
-			} catch (Exception e) {
-				craftItemStackFailed = true;
-				throw new RuntimeException("Cannot find CraftItemStack.asCraftMirror(net.minecraft.server.ItemStack).", e);
-			}
-		}
-
-		// Next, construct it
-		try {
-			return (ItemStack) craftNMSMethod.invoke(null, minecraftItemStack);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot construct CraftItemStack.", e);
-		}
-	}
-
-	/**
-	 * Retrieve the net.minecraft.server ItemStack from a Bukkit ItemStack.
-	 * <p>
-	 * By convention, item stacks that contain air are usually represented as NULL.
+	 * Retrieves the Bukkit equivalent of a NMS ItemStack. This method should
+	 * preserve NBT data and will never return null when supplied with a valid
+	 * ItemStack. Empty ItemStacks are treated as AIR.
 	 * 
-	 * @param stack - the Bukkit ItemStack to convert.
-	 * @return The NMS ItemStack, or NULL if the stack represents air.
+	 * @param generic NMS ItemStack
+	 * @return The Bukkit equivalent
 	 */
-	public static Object getMinecraftItemStack(ItemStack stack) {
-		// Make sure this is a CraftItemStack
-		if (!isCraftItemStack(stack))
-			stack = getBukkitItemStack(stack);
+	public static ItemStack getBukkitItemStack(Object generic) {
+		if (generic == null) {
+			// Convert null to AIR - 1.11 behavior
+			return new ItemStack(Material.AIR);
+		}
 
-		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
-		return unwrapper.unwrapItem(stack);
+		if (generic instanceof ItemStack) {
+			ItemStack bukkit = (ItemStack) generic;
+
+			// They're probably looking for the CraftItemStack
+			// If it's one already our work is done
+			if (is(getCraftItemStackClass(), generic)) {
+				return bukkit;
+			}
+
+			// If not, convert it to one
+			Object nmsStack = getMinecraftItemStack((ItemStack) generic);
+			return getBukkitItemStack(nmsStack);
+		}
+
+		if (!is(getItemStackClass(), generic)) {
+			// We can't do anything with non-ItemStacks
+			throw new IllegalArgumentException(generic + " is not an ItemStack!");
+		}
+
+		try {
+			// Check null enforcement - 1.11 behavior
+			if (nullEnforced == null) {
+				isEmpty = getItemStackClass().getMethod("isEmpty");
+				nullEnforced = true;
+			}
+
+			if (nullEnforced) {
+				if ((boolean) isEmpty.invoke(generic)) {
+					return new ItemStack(Material.AIR);
+				}
+			}
+		} catch (ReflectiveOperationException ex) {
+			nullEnforced = false;
+		}
+
+		if (asCraftMirror == null) {
+			try {
+				asCraftMirror = getCraftItemStackClass().getMethod("asCraftMirror", getItemStackClass());
+			} catch (ReflectiveOperationException ex) {
+				throw new RuntimeException("Failed to obtain CraftItemStack.asCraftMirror", ex);
+			}
+		}
+
+		try {
+			// Convert to a craft mirror to preserve NBT data
+			return (ItemStack) asCraftMirror.invoke(nullEnforced, generic);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Failed to obtain craft mirror of " + generic, ex);
+		}
+	}
+
+	/**
+	 * Retrieves the NMS equivalent of a Bukkit ItemStack. This method will
+	 * never return null and should preserve NBT data. Null inputs are treated
+	 * as empty (AIR) ItemStacks.
+	 * 
+	 * @param specific Bukkit ItemStack
+	 * @return The NMS equivalent
+	 */
+	public static Object getMinecraftItemStack(ItemStack specific) {
+		if (asNMSCopy == null) {
+			try {
+				asNMSCopy = getCraftItemStackClass().getMethod("asNMSCopy", ItemStack.class);
+			} catch (ReflectiveOperationException ex) {
+				throw new RuntimeException("Failed to obtain CraftItemStack.asNMSCopy", ex);
+			}
+		}
+
+		if (is(getCraftItemStackClass(), specific)) {
+			// If it's already a CraftItemStack, use its handle
+			return new BukkitUnwrapper().unwrapItem(specific);
+		}
+
+		try {
+			// If not, grab a NMS copy
+			return asNMSCopy.invoke(null, specific);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Failed to make NMS copy of " + specific, ex);
+		}
 	}
 
 	/**
@@ -1999,7 +2012,7 @@ public class MinecraftReflection {
 			// Attempt to use MCPC
 			try {
 				return classSource = new RemappedClassSource().initialize();
-			} catch (RemapperUnavaibleException e) {
+			} catch (RemapperUnavailableException e) {
 				if (e.getReason() != Reason.MCPC_NOT_PRESENT)
 					reporter.reportWarning(MinecraftReflection.class, Report.newBuilder(REPORT_CANNOT_FIND_MCPC_REMAPPER));
 			} catch (Exception e) {
@@ -2103,4 +2116,4 @@ public class MinecraftReflection {
 			throw new RuntimeException("Cannot construct packet serializer.", e);
 		}
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -44,6 +44,16 @@ public class MinecraftVersion implements Comparable<MinecraftVersion>, Serializa
 	 */
 	private static final Pattern VERSION_PATTERN = Pattern.compile(".*\\(.*MC.\\s*([a-zA-z0-9\\-\\.]+)\\s*\\)");
 
+	/**
+	 * Version 1.11 - the exploration update.
+	 */
+	public static final MinecraftVersion EXPLORATION_UPDATE = new MinecraftVersion("1.11");
+
+	/**
+	 * Version 1.10 - the frostburn update.
+	 */
+	public static final MinecraftVersion FROSTBURN_UPDATE = new MinecraftVersion("1.10");
+
 	/**
 	 * Version 1.9 - the combat update.
 	 */

modules/API/src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java

@@ -28,7 +28,7 @@ import org.bukkit.Server;
 
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.MethodUtils;
-import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavaibleException.Reason;
+import com.comphenix.protocol.utility.RemappedClassSource.RemapperUnavailableException.Reason;
 
 class RemappedClassSource extends ClassSource {
 	private Object classRemapper;
@@ -53,7 +53,7 @@ class RemappedClassSource extends ClassSource {
 	/**
 	 * Attempt to load the MCPC remapper.
 	 * @return TRUE if we succeeded, FALSE otherwise.
-	 * @throws RemapperUnavaibleException If the remapper is not present.
+	 * @throws RemapperUnavailableException If the remapper is not present.
 	 */
 	public RemappedClassSource initialize() {
 		try {
@@ -64,14 +64,14 @@ class RemappedClassSource extends ClassSource {
 
 			String version = server.getVersion();
 			if (!version.contains("MCPC") && !version.contains("Cauldron")) {
-				throw new RemapperUnavaibleException(Reason.MCPC_NOT_PRESENT);
+				throw new RemapperUnavailableException(Reason.MCPC_NOT_PRESENT);
 			}
 
 			// Obtain the Class remapper used by MCPC+/Cauldron
 			this.classRemapper = FieldUtils.readField(getClass().getClassLoader(), "remapper", true);
 			
 			if (this.classRemapper == null) {
-				throw new RemapperUnavaibleException(Reason.REMAPPER_DISABLED);
+				throw new RemapperUnavailableException(Reason.REMAPPER_DISABLED);
 			}
 			
 			// Initialize some fields and methods used by the Jar Remapper
@@ -82,7 +82,7 @@ class RemappedClassSource extends ClassSource {
 			
 			return this;
 			
-		} catch (RemapperUnavaibleException e) {
+		} catch (RemapperUnavailableException e) {
 			throw e;
 		} catch (Exception e) {
 			// Damn it
@@ -115,7 +115,7 @@ class RemappedClassSource extends ClassSource {
 		}
 	}
 
-	public static class RemapperUnavaibleException extends RuntimeException {
+	public static class RemapperUnavailableException extends RuntimeException {
 		private static final long serialVersionUID = 1L;
 
 		public enum Reason {
@@ -139,7 +139,7 @@ class RemappedClassSource extends ClassSource {
 		
 		private final Reason reason;
 		
-		public RemapperUnavaibleException(Reason reason) {
+		public RemapperUnavailableException(Reason reason) {
 			super(reason.getMessage());
 			this.reason = reason;
 		}

modules/API/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java

@@ -468,4 +468,4 @@ public class StreamSerializer {
 		else
 			return null;
 	}
-}
+}

modules/API/src/main/java/com/comphenix/protocol/utility/Util.java

@@ -1,63 +1,72 @@
-/**
- *  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.utility;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-/**
- * General utility class
- * @author dmulloy2
- */
-public class Util {
-
-	/**
-	 * Gets a list of currently online Players.
-	 * @return The list
-	 */
-	@SuppressWarnings("unchecked")
-	public static List<Player> getOnlinePlayers() {
-		return (List<Player>) Bukkit.getOnlinePlayers();
-	}
-
-	/**
-	 * Converts a variable argument array into a List.
-	 * @param elements Array to convert
-	 * @return The list
-	 */
-	@SafeVarargs
-	public static <E> List<E> asList(E... elements) {
-		List<E> list = new ArrayList<E>(elements.length);
-		for (E element : elements) {
-			list.add(element);
-		}
-
-		return list;
-	}
-
-	/**
-	 * Whether or not this server is running Spigot. This works by checking
-	 * the server version for the String "Spigot"
-	 * @return True if it is, false if not.
-	 */
-	public static boolean isUsingSpigot() {
-		return Bukkit.getServer().getVersion().contains("Spigot");
-	}
-}
+/**
+ *  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.utility;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+/**
+ * General utility class
+ * @author dmulloy2
+ */
+public class Util {
+
+	/**
+	 * Gets a list of currently online Players.
+	 * @return The list
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<Player> getOnlinePlayers() {
+		return (List<Player>) Bukkit.getOnlinePlayers();
+	}
+
+	/**
+	 * Converts a variable argument array into a List.
+	 * @param elements Array to convert
+	 * @return The list
+	 */
+	@SafeVarargs
+	public static <E> List<E> asList(E... elements) {
+		List<E> list = new ArrayList<E>(elements.length);
+		for (E element : elements) {
+			list.add(element);
+		}
+
+		return list;
+	}
+
+	/**
+	 * Whether or not this server is running Spigot. This works by checking
+	 * the server version for the String "Spigot"
+	 * @return True if it is, false if not.
+	 */
+	public static boolean isUsingSpigot() {
+		return Bukkit.getServer().getVersion().contains("Spigot");
+	}
+
+	/**
+	 * Gets the currently running major Java version.
+	 * @return The version
+	 */
+	public static int getJavaVersion() {
+		String version = Runtime.class.getPackage().getSpecificationVersion();
+		return (int) (Double.valueOf(version) * 10 % 10);
+	}
+}

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

@@ -47,4 +47,26 @@ public abstract class AbstractWrapper {
 	public Class<?> getHandleType() {
 		return handleType;
 	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+
+		if (obj instanceof AbstractWrapper) {
+			AbstractWrapper that = (AbstractWrapper) obj;
+			return this.handle.equals(that.handle);
+		}
+
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		return handle.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getName() + "[handle=" + handle + "]";
+	}
 }

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

@@ -1,244 +1,244 @@
-/**
- *  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.Constructor;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.util.Vector;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.base.Objects;
-
-/**
- * Copies a immutable net.minecraft.server.BlockPosition, which represents a integer 3D vector.
- * 
- * @author dmulloy2
- */
-public class BlockPosition {
-	
-	/**
-	 * Represents the null (0, 0, 0) origin.
-	 */
-	public static BlockPosition ORIGIN = new BlockPosition(0, 0, 0);
-	
-	private static Constructor<?> blockPositionConstructor;
-
-	// Use protected members, like Bukkit
-	protected final int x;
-	protected final int y;
-	protected final int z;
-	
-	// Used to access a BlockPosition, in case it's names are changed
-	private static StructureModifier<Integer> intModifier;
-
-	/**
-	 * Construct an immutable 3D vector.
-	 * @param x - x coordinate
-	 * @param y - y coordinate
-	 * @param z - z coordinate
-	 */
-	public BlockPosition(int x, int y, int z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-	
-	/**
-	 * Construct an immutable integer 3D vector from a mutable Bukkit vector.
-	 * @param vector - the mutable real Bukkit vector to copy.
-	 */
-	public BlockPosition(Vector vector) {
-		if (vector == null)
-			throw new IllegalArgumentException("Vector cannot be NULL.");
-		this.x = vector.getBlockX();
-		this.y = vector.getBlockY();
-		this.z = vector.getBlockZ();
-	}
-
-	/**
-	 * Convert this instance to an equivalent real 3D vector.
-	 * @return Real 3D vector.
-	 */
-	public Vector toVector() {
-		return new Vector(x, y, z);
-	}
-	
-	/**
-	 * Convert this instance to an equivalent Location.
-	 * @param world World for the location
-	 * @return Location
-	 */
-	public Location toLocation(World world) {
-		return new Location(world, x, y, z);
-	}
-	
-	/**
-	 * Retrieve the x-coordinate.
-	 * @return X coordinate.
-	 */
-	public int getX() {
-		return x;
-	}
-	
-	/**
-	 * Retrieve the y-coordinate.
-	 * @return Y coordinate.
-	 */
-	public int getY() {
-		return y;
-	}
-	
-	/**
-	 * Retrieve the z-coordinate.
-	 * @return Z coordinate.
-	 */
-	public int getZ() {
-		return z;
-	}
-	
-	/**
-	 * Adds the current position and a given position together, producing a result position.
-	 * @param other - the other position.
-	 * @return The new result position.
-	 */
-	public BlockPosition add(BlockPosition other) {
-		if (other == null)
-			throw new IllegalArgumentException("other cannot be NULL");
-		return new BlockPosition(x + other.x, y + other.y, z + other.z);
-	}
-	
-	/**
-	 * Adds the current position and a given position together, producing a result position.
-	 * @param other - the other position.
-	 * @return The new result position.
-	 */
-	public BlockPosition subtract(BlockPosition other) {
-		if (other == null)
-			throw new IllegalArgumentException("other cannot be NULL");
-		return new BlockPosition(x - other.x, y - other.y, z - other.z);
-	}
-	
-	/**
-	 * Multiply each dimension in the current position by the given factor.
-	 * @param factor - multiplier.
-	 * @return The new result.
-	 */
-	public BlockPosition multiply(int factor) {
-		return new BlockPosition(x * factor, y * factor, z * factor);
-	}
-	
-	/**
-	 * Divide each dimension in the current position by the given divisor.
-	 * @param divisor - the divisor.
-	 * @return The new result.
-	 */
-	public BlockPosition divide(int divisor) {
-		if (divisor == 0)
-			throw new IllegalArgumentException("Cannot divide by null.");
-		return new BlockPosition(x / divisor, y / divisor, z / divisor);
-	}
-	
-	/**
-	 * Used to convert between NMS ChunkPosition and the wrapper instance.
-	 * @return A new converter.
-	 */
-	public static EquivalentConverter<BlockPosition> getConverter() {
-		return new EquivalentConverter<BlockPosition>() {
-			@Override
-			public Object getGeneric(Class<?> genericType, BlockPosition specific) {
-				if (blockPositionConstructor == null) {
-					try {
-						blockPositionConstructor = MinecraftReflection.getBlockPositionClass().
-							getConstructor(int.class, int.class, int.class);
-					} catch (Exception e) {
-						throw new RuntimeException("Cannot find block position constructor.", e);
-					}
-				}
-				
-				// Construct the underlying BlockPosition
-				try {
-					Object result = blockPositionConstructor.newInstance(specific.x, specific.y, specific.z);
-					return result;
-				} catch (Exception e) {
-					throw new RuntimeException("Cannot construct BlockPosition.", e);
-				}
-			}
-			
-			@Override
-			public BlockPosition getSpecific(Object generic) {
-				if (MinecraftReflection.isBlockPosition(generic)) {
-					// Use a structure modifier
-					intModifier = new StructureModifier<Object>(generic.getClass(), null, false).withType(int.class);
-					
-					// Damn it all
-					if (intModifier.size() < 3) {
-						throw new IllegalStateException("Cannot read class " + generic.getClass() + " for its integer fields.");
-					}
-					
-					if (intModifier.size() >= 3) {
-						try {
-							StructureModifier<Integer> instance = intModifier.withTarget(generic);
-							BlockPosition result = new BlockPosition(instance.read(0), instance.read(1), instance.read(2));
-							return result;
-						} catch (FieldAccessException e) {
-							// This is an exeptional work-around, so we don't want to burden the caller with the messy details
-							throw new RuntimeException("Field access error.", e);
-						}
-					}
-				}
-				
-				// Otherwise, return NULL
-				return null;
-			}
-
-			// Thanks Java Generics!
-			@Override
-			public Class<BlockPosition> getSpecificType() {
-				return BlockPosition.class;
-			}
-		};
-	}
-		
-	@Override
-	public boolean equals(Object obj) {
-		// Fast checks
-		if (this == obj) return true;
-		if (obj == null) return false;
-		
-		// Only compare objects of similar type
-		if (obj instanceof BlockPosition) {
-			BlockPosition other = (BlockPosition) obj;
-			return x == other.x && y == other.y && z == other.z;
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-		return Objects.hashCode(x, y, z);
-	}
-
-	@Override
-	public String toString() {
-		return "BlockPosition [x=" + x + ", y=" + y + ", z=" + z + "]";
-	}
-}
+/**
+ *  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.Constructor;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.util.Vector;
+
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.google.common.base.Objects;
+
+/**
+ * Copies a immutable net.minecraft.server.BlockPosition, which represents a integer 3D vector.
+ * 
+ * @author dmulloy2
+ */
+public class BlockPosition {
+	
+	/**
+	 * Represents the null (0, 0, 0) origin.
+	 */
+	public static BlockPosition ORIGIN = new BlockPosition(0, 0, 0);
+	
+	private static Constructor<?> blockPositionConstructor;
+
+	// Use protected members, like Bukkit
+	protected final int x;
+	protected final int y;
+	protected final int z;
+	
+	// Used to access a BlockPosition, in case it's names are changed
+	private static StructureModifier<Integer> intModifier;
+
+	/**
+	 * Construct an immutable 3D vector.
+	 * @param x - x coordinate
+	 * @param y - y coordinate
+	 * @param z - z coordinate
+	 */
+	public BlockPosition(int x, int y, int z) {
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+	
+	/**
+	 * Construct an immutable integer 3D vector from a mutable Bukkit vector.
+	 * @param vector - the mutable real Bukkit vector to copy.
+	 */
+	public BlockPosition(Vector vector) {
+		if (vector == null)
+			throw new IllegalArgumentException("Vector cannot be NULL.");
+		this.x = vector.getBlockX();
+		this.y = vector.getBlockY();
+		this.z = vector.getBlockZ();
+	}
+
+	/**
+	 * Convert this instance to an equivalent real 3D vector.
+	 * @return Real 3D vector.
+	 */
+	public Vector toVector() {
+		return new Vector(x, y, z);
+	}
+	
+	/**
+	 * Convert this instance to an equivalent Location.
+	 * @param world World for the location
+	 * @return Location
+	 */
+	public Location toLocation(World world) {
+		return new Location(world, x, y, z);
+	}
+	
+	/**
+	 * Retrieve the x-coordinate.
+	 * @return X coordinate.
+	 */
+	public int getX() {
+		return x;
+	}
+	
+	/**
+	 * Retrieve the y-coordinate.
+	 * @return Y coordinate.
+	 */
+	public int getY() {
+		return y;
+	}
+	
+	/**
+	 * Retrieve the z-coordinate.
+	 * @return Z coordinate.
+	 */
+	public int getZ() {
+		return z;
+	}
+	
+	/**
+	 * Adds the current position and a given position together, producing a result position.
+	 * @param other - the other position.
+	 * @return The new result position.
+	 */
+	public BlockPosition add(BlockPosition other) {
+		if (other == null)
+			throw new IllegalArgumentException("other cannot be NULL");
+		return new BlockPosition(x + other.x, y + other.y, z + other.z);
+	}
+	
+	/**
+	 * Adds the current position and a given position together, producing a result position.
+	 * @param other - the other position.
+	 * @return The new result position.
+	 */
+	public BlockPosition subtract(BlockPosition other) {
+		if (other == null)
+			throw new IllegalArgumentException("other cannot be NULL");
+		return new BlockPosition(x - other.x, y - other.y, z - other.z);
+	}
+	
+	/**
+	 * Multiply each dimension in the current position by the given factor.
+	 * @param factor - multiplier.
+	 * @return The new result.
+	 */
+	public BlockPosition multiply(int factor) {
+		return new BlockPosition(x * factor, y * factor, z * factor);
+	}
+	
+	/**
+	 * Divide each dimension in the current position by the given divisor.
+	 * @param divisor - the divisor.
+	 * @return The new result.
+	 */
+	public BlockPosition divide(int divisor) {
+		if (divisor == 0)
+			throw new IllegalArgumentException("Cannot divide by null.");
+		return new BlockPosition(x / divisor, y / divisor, z / divisor);
+	}
+	
+	/**
+	 * Used to convert between NMS ChunkPosition and the wrapper instance.
+	 * @return A new converter.
+	 */
+	public static EquivalentConverter<BlockPosition> getConverter() {
+		return new EquivalentConverter<BlockPosition>() {
+			@Override
+			public Object getGeneric(Class<?> genericType, BlockPosition specific) {
+				if (blockPositionConstructor == null) {
+					try {
+						blockPositionConstructor = MinecraftReflection.getBlockPositionClass().
+							getConstructor(int.class, int.class, int.class);
+					} catch (Exception e) {
+						throw new RuntimeException("Cannot find block position constructor.", e);
+					}
+				}
+				
+				// Construct the underlying BlockPosition
+				try {
+					Object result = blockPositionConstructor.newInstance(specific.x, specific.y, specific.z);
+					return result;
+				} catch (Exception e) {
+					throw new RuntimeException("Cannot construct BlockPosition.", e);
+				}
+			}
+			
+			@Override
+			public BlockPosition getSpecific(Object generic) {
+				if (MinecraftReflection.isBlockPosition(generic)) {
+					// Use a structure modifier
+					intModifier = new StructureModifier<Object>(generic.getClass(), null, false).withType(int.class);
+					
+					// Damn it all
+					if (intModifier.size() < 3) {
+						throw new IllegalStateException("Cannot read class " + generic.getClass() + " for its integer fields.");
+					}
+					
+					if (intModifier.size() >= 3) {
+						try {
+							StructureModifier<Integer> instance = intModifier.withTarget(generic);
+							BlockPosition result = new BlockPosition(instance.read(0), instance.read(1), instance.read(2));
+							return result;
+						} catch (FieldAccessException e) {
+							// This is an exeptional work-around, so we don't want to burden the caller with the messy details
+							throw new RuntimeException("Field access error.", e);
+						}
+					}
+				}
+				
+				// Otherwise, return NULL
+				return null;
+			}
+
+			// Thanks Java Generics!
+			@Override
+			public Class<BlockPosition> getSpecificType() {
+				return BlockPosition.class;
+			}
+		};
+	}
+		
+	@Override
+	public boolean equals(Object obj) {
+		// Fast checks
+		if (this == obj) return true;
+		if (obj == null) return false;
+		
+		// Only compare objects of similar type
+		if (obj instanceof BlockPosition) {
+			BlockPosition other = (BlockPosition) obj;
+			return x == other.x && y == other.y && z == other.z;
+		}
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(x, y, z);
+	}
+
+	@Override
+	public String toString() {
+		return "BlockPosition [x=" + x + ", y=" + y + ", z=" + z + "]";
+	}
+}

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

@@ -124,7 +124,7 @@ public class BukkitConverters {
 	 * @author Kristian
 	 * @param <T> - type that can be converted.
 	 */
-	private static abstract class IgnoreNullConverter<TType> implements EquivalentConverter<TType> {
+	public static abstract class IgnoreNullConverter<TType> implements EquivalentConverter<TType> {
 		@Override
 		public final Object getGeneric(Class<?> genericType, TType specific) {
 			if (specific != null)
@@ -158,20 +158,20 @@ public class BukkitConverters {
 		
 		@Override
 		public boolean equals(Object obj) {
-			// Very short
-			if (this == obj)
-				return true;
-			if (obj == null)
-				return false;
-			
-			// See if they're equivalent
+			if (this == obj) return true;
+
 			if (obj instanceof EquivalentConverter) {
-				@SuppressWarnings("rawtypes")
-				EquivalentConverter other = (EquivalentConverter) obj;
-				return Objects.equal(this.getSpecificType(), other.getSpecificType());
+				EquivalentConverter<?> that = (EquivalentConverter<?>) obj;
+				return Objects.equal(this.getSpecificType(), that.getSpecificType());
 			}
+
 			return false;
 		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hashCode(this.getSpecificType());
+		}
 	}
 	
 	/**
@@ -194,23 +194,23 @@ public class BukkitConverters {
 
 		@Override
 		public boolean equals(Object obj) {
-			// More shortcuts
-			if (obj == this)
-				return true;
-			if (obj == null)
-				return false;
-			
+			if (obj == this) return true;
+
 			// Add another constraint
 			if (obj instanceof WorldSpecificConverter && super.equals(obj)) {
-				@SuppressWarnings("rawtypes")
-				WorldSpecificConverter other = (WorldSpecificConverter) obj;
-				
-				return Objects.equal(world, other.world);
+				WorldSpecificConverter<?> that = (WorldSpecificConverter<?>) obj;
+				return Objects.equal(this.world, that.world);
 			}
+
 			return false;
 		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hashCode(this.getSpecificType(), this.world);
+		}
 	}
-	
+
 	/**
 	 * Retrieve an equivalent converter for a map of generic keys and primitive values.
 	 * @param <T> Key type
@@ -713,24 +713,24 @@ public class BukkitConverters {
 	 * @return Item stack converter.
 	 */
 	public static EquivalentConverter<ItemStack> getItemStackConverter() {
-		return new IgnoreNullConverter<ItemStack>() {
+		return new EquivalentConverter<ItemStack>() {
 			@Override
-			protected Object getGenericValue(Class<?> genericType, ItemStack specific) {
-				return MinecraftReflection.getMinecraftItemStack(specific);
-			}
-			
-			@Override
-			protected ItemStack getSpecificValue(Object generic) {
+			public ItemStack getSpecific(Object generic) {
 				return MinecraftReflection.getBukkitItemStack(generic);
 			}
-			
+
+			@Override
+			public Object getGeneric(Class<?> genericType, ItemStack specific) {
+				return MinecraftReflection.getMinecraftItemStack(specific);
+			}
+
 			@Override
 			public Class<ItemStack> getSpecificType() {
 				return ItemStack.class;
 			}
 		};
 	}
-	
+
 	/**
 	 * Retrieve the converter for the ServerPing packet in {@link PacketType.Status.Server#OUT_SERVER_INFO}.
 	 * @return Server ping converter.

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

@@ -1,51 +1,50 @@
-/**
- *  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 net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.chat.ComponentSerializer;
-
-/**
- * Utility class for converting between the BungeeCord Chat API and ProtocolLib's wrapper
- * <p>
- * Note: The BungeeCord Chat API is not included in CraftBukkit.
- * @author dmulloy2
- */
-
-public final class ComponentConverter {
-
-	private ComponentConverter() {
-	}
-
-	/**
-	 * Converts a {@link WrappedChatComponent} into an array of {@link BaseComponent}s
-	 * @param wrapper ProtocolLib wrapper
-	 * @return BaseComponent array
-	 */
-	public static BaseComponent[] fromWrapper(WrappedChatComponent wrapper) {
-		return ComponentSerializer.parse(wrapper.getJson());
-	}
-
-	/**
-	 * Converts an array of {@link BaseComponent}s into a ProtocolLib wrapper
-	 * @param components BaseComponent array
-	 * @return ProtocolLib wrapper
-	 */
-	public static WrappedChatComponent fromBaseComponent(BaseComponent... components) {
-		return WrappedChatComponent.fromJson(ComponentSerializer.toString(components));
-	}
-}
+/**
+ *  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 net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.chat.ComponentSerializer;
+
+/**
+ * Utility class for converting between the BungeeCord Chat API and ProtocolLib's wrapper
+ * <p>
+ * Note: The BungeeCord Chat API is not included in CraftBukkit.
+ * @author dmulloy2
+ */
+public final class ComponentConverter {
+
+	private ComponentConverter() {
+	}
+
+	/**
+	 * Converts a {@link WrappedChatComponent} into an array of {@link BaseComponent}s
+	 * @param wrapper ProtocolLib wrapper
+	 * @return BaseComponent array
+	 */
+	public static BaseComponent[] fromWrapper(WrappedChatComponent wrapper) {
+		return ComponentSerializer.parse(wrapper.getJson());
+	}
+
+	/**
+	 * Converts an array of {@link BaseComponent}s into a ProtocolLib wrapper
+	 * @param components BaseComponent array
+	 * @return ProtocolLib wrapper
+	 */
+	public static WrappedChatComponent fromBaseComponent(BaseComponent... components) {
+		return WrappedChatComponent.fromJson(ComponentSerializer.toString(components));
+	}
+}

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

@@ -0,0 +1,59 @@
+/**
+ *  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.wrappers;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+
+/**
+ * Handles component parsing in 1.8
+ * @author dmulloy2
+ */
+public class ComponentParser {
+
+	private ComponentParser() {
+	}
+
+	public static Object deserialize(Object gson, Class<?> component, StringReader str) {
+		try {
+			com.google.gson.stream.JsonReader reader = new com.google.gson.stream.JsonReader(str);
+			reader.setLenient(true);
+			return ((com.google.gson.Gson) gson).getAdapter(component).read(reader);
+		} catch (IOException ex) {
+			throw new RuntimeException("Failed to read JSON", ex);
+		} catch (LinkageError er) {
+			return deserializeLegacy(gson, component, str);
+		}
+	}
+
+	// Should only be needed on 1.8.
+	private static Object deserializeLegacy(Object gson, Class<?> component, StringReader str) {
+		try {
+			Class<?> readerClass = Class.forName("org.bukkit.craftbukkit.libs.com.google.gson.stream.JsonReader");
+			Object reader = readerClass.getConstructor(StringReader.class).newInstance(str);
+			Method setLenient = readerClass.getMethod("setLenienent", boolean.class);
+			setLenient.invoke(reader, true);
+			Method getAdapter = gson.getClass().getMethod("getAdapter", Class.class);
+			Object adapter = getAdapter.invoke(gson, component);
+			Method read = adapter.getClass().getMethod("read", readerClass);
+			return read.invoke(adapter, reader);
+		} catch (ReflectiveOperationException ex) {
+			throw new RuntimeException("Failed to read JSON", ex);
+		}
+	}
+}

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

@@ -1,6 +1,7 @@
 package com.comphenix.protocol.wrappers;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import org.bukkit.GameMode;
@@ -226,7 +227,7 @@ public abstract class EnumWrappers {
 			BY_NAME = new HashMap<String, Particle>();
 
 			for (Particle particle : values()) {
-				BY_NAME.put(particle.getName().toLowerCase(), particle);
+				BY_NAME.put(particle.getName().toLowerCase(Locale.ENGLISH), particle);
 				BY_ID.put(particle.getId(), particle);
 			}
 		}
@@ -264,7 +265,7 @@ public abstract class EnumWrappers {
 		}
 
 		public static Particle getByName(String name) {
-			return BY_NAME.get(name.toLowerCase());
+			return BY_NAME.get(name.toLowerCase(Locale.ENGLISH));
 		}
 
 		public static Particle getById(int id) {
@@ -302,7 +303,7 @@ public abstract class EnumWrappers {
 		}
 
 		public static SoundCategory getByKey(String key) {
-			return LOOKUP.get(key.toLowerCase());
+			return LOOKUP.get(key.toLowerCase(Locale.ENGLISH));
 		}
 	}
 
@@ -320,6 +321,15 @@ public abstract class EnumWrappers {
 		OFF_HAND;
 	}
 
+	public enum Direction {
+		DOWN(),
+		UP(),
+		NORTH(),
+		SOUTH(),
+		WEST(),
+		EAST();
+	}
+
 	private static Class<?> PROTOCOL_CLASS = null;
 	private static Class<?> CLIENT_COMMAND_CLASS = null;
 	private static Class<?> CHAT_VISIBILITY_CLASS = null;
@@ -338,6 +348,7 @@ public abstract class EnumWrappers {
 	private static Class<?> SOUND_CATEGORY_CLASS = null;
 	private static Class<?> ITEM_SLOT_CLASS = null;
 	private static Class<?> HAND_CLASS = null;
+	private static Class<?> DIRECTION_CLASS = null;
 
 	private static boolean INITIALIZED = false;
 	private static Map<Class<?>, EquivalentConverter<?>> FROM_NATIVE = Maps.newHashMap();
@@ -373,6 +384,7 @@ public abstract class EnumWrappers {
 		SOUND_CATEGORY_CLASS = getEnum(PacketType.Play.Server.CUSTOM_SOUND_EFFECT.getPacketClass(), 0);
 		ITEM_SLOT_CLASS = getEnum(PacketType.Play.Server.ENTITY_EQUIPMENT.getPacketClass(), 0);
 		HAND_CLASS = getEnum(PacketType.Play.Client.USE_ENTITY.getPacketClass(), 1);
+		DIRECTION_CLASS = getEnum(PacketType.Play.Client.USE_ITEM.getPacketClass(), 0);
 
 		associate(PROTOCOL_CLASS, Protocol.class, getClientCommandConverter());
 		associate(CLIENT_COMMAND_CLASS, ClientCommand.class, getClientCommandConverter());
@@ -392,6 +404,7 @@ public abstract class EnumWrappers {
 		associate(SOUND_CATEGORY_CLASS, SoundCategory.class, getSoundCategoryConverter());
 		associate(ITEM_SLOT_CLASS, ItemSlot.class, getItemSlotConverter());
 		associate(HAND_CLASS, Hand.class, getHandConverter());
+		associate(DIRECTION_CLASS, Direction.class, getDirectionConverter());
 		INITIALIZED = true;
 	}
 
@@ -515,6 +528,11 @@ public abstract class EnumWrappers {
 		return HAND_CLASS;
 	}
 
+	public static Class<?> getDirectionClass() {
+		initialize();
+		return DIRECTION_CLASS;
+	}
+
 	// Get the converters
 	public static EquivalentConverter<Protocol> getProtocolConverter() {
 		return new EnumConverter<Protocol>(Protocol.class);
@@ -588,6 +606,10 @@ public abstract class EnumWrappers {
 		return new EnumConverter<Hand>(Hand.class);
 	}
 
+	public static EquivalentConverter<Direction> getDirectionConverter() {
+		return new EnumConverter<Direction>(Direction.class);
+	}
+
 	/**
 	 * Retrieve a generic enum converter for use with StructureModifiers.
 	 * @param enumClass - Enum class

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

@@ -1,142 +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.wrappers;
-
-import java.lang.reflect.Constructor;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.utility.MinecraftReflection;
-
-/**
- * Represents a MinecraftKey in 1.9.
- * <p>
- * Keys are in the format {@code prefix:key}
- * 
- * @author dmulloy2
- */
-
-public class MinecraftKey {
-	private final String prefix;
-	private final String key;
-
-	/**
-	 * Constructs a new key with a given prefix and key.
-	 * 
-	 * @param prefix The prefix, usually minecraft.
-	 * @param key The key, the part we care about
-	 */
-	public MinecraftKey(String prefix, String key) {
-		this.prefix = prefix;
-		this.key = key;
-	}
-
-	/**
-	 * Constructs a new key with minecraft prefix and a key.
-	 * @param key The key
-	 */
-	public MinecraftKey(String key) {
-		this("minecraft", key);
-	}
-
-	/**
-	 * Creates a MinecraftKey wrapper from a Minecraft handle.
-	 * @param handle The handle
-	 * @return The resulting key
-	 */
-	public static MinecraftKey fromHandle(Object handle) {
-		StructureModifier<String> modifier = new StructureModifier<String>(handle.getClass()).withTarget(handle).withType(String.class);
-		return new MinecraftKey(modifier.read(0), modifier.read(1));
-	}
-
-	/**
-	 * Creates a MinecraftKey wrapper from an Enum constant. The resulting key
-	 * is lower case, with underscores replaced by periods.
-	 * @param value The value
-	 * @return The resulting key
-	 */
-	public static MinecraftKey fromEnum(Enum<?> value) {
-		return new MinecraftKey(value.name().toLowerCase().replace("_", "."));
-	}
-
-	/**
-	 * Gets the prefix of this MinecraftKey. It is minecraft by default.
-	 * @return The prefix
-	 */
-	public String getPrefix() {
-		return prefix;
-	}
-
-	/**
-	 * Gets the key of this MinecraftKey. It is generally the important part.
-	 * @return The key
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * Gets the full key of this MinecraftKey. It is in the format of
-	 * {@code prefix:key}
-	 * @return The full key
-	 */
-	public String getFullKey() {
-		return prefix + ":" + key;
-	}
-
-	/**
-	 * Returns this key back into Enum format, upper case with periods replaced
-	 * by underscores.
-	 * @return The enum format
-	 */
-	public String getEnumFormat() {
-		return key.toUpperCase().replace(".", "_");
-	}
-
-	private static Constructor<?> constructor = null;
-
-	public static EquivalentConverter<MinecraftKey> getConverter() {
-		return new EquivalentConverter<MinecraftKey>() {
-			@Override
-			public MinecraftKey getSpecific(Object generic) {
-				return MinecraftKey.fromHandle(generic);
-			}
-
-			@Override
-			public Object getGeneric(Class<?> genericType, MinecraftKey specific) {
-				if (constructor == null) {
-					try {
-						constructor = MinecraftReflection.getMinecraftKeyClass().getConstructor(String.class, String.class);
-					} catch (ReflectiveOperationException e) {
-						throw new RuntimeException("Failed to obtain MinecraftKey constructor", e);
-					}
-				}
-
-				try {
-					return constructor.newInstance(specific.getPrefix(), specific.getKey());
-				} catch (ReflectiveOperationException e) {
-					throw new RuntimeException("Failed to create new MinecraftKey", e);
-				}
-			}
-
-			@Override
-			public Class<MinecraftKey> getSpecificType() {
-				return MinecraftKey.class;
-			}
-		};
-	}
-}
+/**
+ *  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.wrappers;
+
+import java.lang.reflect.Constructor;
+import java.util.Locale;
+
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+/**
+ * Represents a MinecraftKey in 1.9.
+ * <p>
+ * Keys are in the format {@code prefix:key}
+ * 
+ * @author dmulloy2
+ */
+
+public class MinecraftKey {
+	private final String prefix;
+	private final String key;
+
+	/**
+	 * Constructs a new key with a given prefix and key.
+	 * 
+	 * @param prefix The prefix, usually minecraft.
+	 * @param key The key, the part we care about
+	 */
+	public MinecraftKey(String prefix, String key) {
+		this.prefix = prefix;
+		this.key = key;
+	}
+
+	/**
+	 * Constructs a new key with minecraft prefix and a key.
+	 * @param key The key
+	 */
+	public MinecraftKey(String key) {
+		this("minecraft", key);
+	}
+
+	/**
+	 * Creates a MinecraftKey wrapper from a Minecraft handle.
+	 * @param handle The handle
+	 * @return The resulting key
+	 */
+	public static MinecraftKey fromHandle(Object handle) {
+		StructureModifier<String> modifier = new StructureModifier<String>(handle.getClass()).withTarget(handle).withType(String.class);
+		return new MinecraftKey(modifier.read(0), modifier.read(1));
+	}
+
+	/**
+	 * Creates a MinecraftKey wrapper from an Enum constant. The resulting key
+	 * is lower case, with underscores replaced by periods.
+	 * @param value The value
+	 * @return The resulting key
+	 */
+	public static MinecraftKey fromEnum(Enum<?> value) {
+		return new MinecraftKey(value.name().toLowerCase(Locale.ENGLISH).replace("_", "."));
+	}
+
+	/**
+	 * Gets the prefix of this MinecraftKey. It is minecraft by default.
+	 * @return The prefix
+	 */
+	public String getPrefix() {
+		return prefix;
+	}
+
+	/**
+	 * Gets the key of this MinecraftKey. It is generally the important part.
+	 * @return The key
+	 */
+	public String getKey() {
+		return key;
+	}
+
+	/**
+	 * Gets the full key of this MinecraftKey. It is in the format of
+	 * {@code prefix:key}
+	 * @return The full key
+	 */
+	public String getFullKey() {
+		return prefix + ":" + key;
+	}
+
+	/**
+	 * Returns this key back into Enum format, upper case with periods replaced
+	 * by underscores.
+	 * @return The enum format
+	 */
+	public String getEnumFormat() {
+		return key.toUpperCase(Locale.ENGLISH).replace(".", "_");
+	}
+
+	private static Constructor<?> constructor = null;
+
+	public static EquivalentConverter<MinecraftKey> getConverter() {
+		return new EquivalentConverter<MinecraftKey>() {
+			@Override
+			public MinecraftKey getSpecific(Object generic) {
+				return MinecraftKey.fromHandle(generic);
+			}
+
+			@Override
+			public Object getGeneric(Class<?> genericType, MinecraftKey specific) {
+				if (constructor == null) {
+					try {
+						constructor = MinecraftReflection.getMinecraftKeyClass().getConstructor(String.class, String.class);
+					} catch (ReflectiveOperationException e) {
+						throw new RuntimeException("Failed to obtain MinecraftKey constructor", e);
+					}
+				}
+
+				try {
+					return constructor.newInstance(specific.getPrefix(), specific.getKey());
+				} catch (ReflectiveOperationException e) {
+					throw new RuntimeException("Failed to create new MinecraftKey", e);
+				}
+			}
+
+			@Override
+			public Class<MinecraftKey> getSpecificType() {
+				return MinecraftKey.class;
+			}
+		};
+	}
+}

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

@@ -1,268 +1,268 @@
-/**
- *  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.Array;
-import java.lang.reflect.Constructor;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.utility.MinecraftReflection;
-
-/**
- * Represents a single block change.
- * 
- * @author dmulloy2
- */
-
-public class MultiBlockChangeInfo {
-	private static Constructor<?> constructor;
-	private static Class<?> nmsClass = MinecraftReflection.getMultiBlockChangeInfoClass();
-
-	private short location;
-	private WrappedBlockData data;
-	private ChunkCoordIntPair chunk;
-
-	public MultiBlockChangeInfo(short location, WrappedBlockData data, ChunkCoordIntPair chunk) {
-		this.location = location;
-		this.data = data;
-		this.chunk = chunk;
-	}
-
-	public MultiBlockChangeInfo(Location location, WrappedBlockData data) {
-		this.data = data;
-		this.chunk = new ChunkCoordIntPair(location.getBlockX() >> 4, location.getBlockZ() >> 4);
-		this.setLocation(location);
-	}
-
-	/**
-	 * Returns this block change's absolute Location in a given World.
-	 * 
-	 * @param world World for the location
-	 * @return This block change's absolute Location
-	 */
-	public Location getLocation(World world) {
-		return new Location(world, getAbsoluteX(), getY(), getAbsoluteZ());
-	}
-
-	/**
-	 * Sets this block change's absolute Location.
-	 * 
-	 * @param location This block change's new location
-	 */
-	public void setLocation(Location location) {
-		setLocation(location.getBlockX(), location.getBlockY(), location.getBlockZ());
-	}
-
-	/**
-	 * Sets this block change's absolute coordinates.
-	 *
-	 * @param x X coordinate
-	 * @param y Y coordinate
-	 * @param z Z coordinate
-	 */
-	public void setLocation(int x, int y, int z) {
-		x = x & 15;
-		z = z & 15;
-
-		this.location = (short) (x << 12 | z << 8 | y);
-	}
-
-	/**
-	 * Gets this block change's relative x coordinate.
-	 * 
-	 * @return Relative X coordinate
-	 */
-	public int getX() {
-		return location >> 12 & 15;
-	}
-
-	/**
-	 * Gets this block change's absolute x coordinate.
-	 *
-	 * @return Absolute X coordinate
-	 */
-	public int getAbsoluteX() {
-		return (chunk.getChunkX() << 4) + getX();
-	}
-
-	/**
-	 * Sets this block change's absolute x coordinate.
-	 * 
-	 * @param x New x coordinate
-	 */
-	public void setX(int x) {
-		setLocation(x, getY(), getZ());
-	}
-
-	/**
-	 * Gets this block change's y coordinate.
-	 * 
-	 * @return Y coordinate
-	 */
-	public int getY() {
-		return location & 255;
-	}
-
-	/**
-	 * Sets this block change's y coordinate
-	 * 
-	 * @param y New y coordinate
-	 */
-	public void setY(int y) {
-		setLocation(getX(), y, getZ());
-	}
-
-	/**
-	 * Gets this block change's relative z coordinate.
-	 * 
-	 * @return Relative Z coordinate
-	 */
-	public int getZ() {
-		return location >> 8 & 15;
-	}
-
-	/**
-	 * Gets this block change's absolute z coordinate.
-	 *
-	 * @return Absolute Z coordinate
-	 */
-	public int getAbsoluteZ() {
-		return (chunk.getChunkZ() << 4) + getZ();
-	}
-
-	/**
-	 * Sets this block change's relative z coordinate.
-	 * 
-	 * @param z New z coordinate
-	 */
-	public void setZ(int z) {
-		setLocation(getX(), getY(), z);
-	}
-
-	/**
-	 * Gets this block change's block data.
-	 * 
-	 * @return The block data
-	 */
-	public WrappedBlockData getData() {
-		return data;
-	}
-
-	/**
-	 * Sets this block change's block data.
-	 * 
-	 * @param data New block data
-	 */
-	public void setData(WrappedBlockData data) {
-		this.data = data;
-	}
-
-	/**
-	 * Gets the chunk this block change occured in.
-	 * 
-	 * @return The chunk
-	 */
-	public ChunkCoordIntPair getChunk() {
-		return chunk;
-	}
-
-	public static EquivalentConverter<MultiBlockChangeInfo> getConverter(final ChunkCoordIntPair chunk) {
-		return new EquivalentConverter<MultiBlockChangeInfo>() {
-
-			@Override
-			public MultiBlockChangeInfo getSpecific(Object generic) {
-				StructureModifier<Object> modifier = new StructureModifier<Object>(generic.getClass(), null, false).withTarget(generic);
-
-				StructureModifier<Short> shorts = modifier.withType(short.class);
-				short location = shorts.read(0);
-
-				StructureModifier<WrappedBlockData> dataModifier = modifier.withType(MinecraftReflection.getIBlockDataClass(),
-						BukkitConverters.getWrappedBlockDataConverter());
-				WrappedBlockData data = dataModifier.read(0);
-
-				return new MultiBlockChangeInfo(location, data, chunk);
-			}
-
-			@Override
-			public Object getGeneric(Class<?> genericType, MultiBlockChangeInfo specific) {
-				try {
-					if (constructor == null) {
-						constructor = nmsClass.getConstructor(
-								PacketType.Play.Server.MULTI_BLOCK_CHANGE.getPacketClass(),
-								short.class,
-								MinecraftReflection.getIBlockDataClass()
-						);
-					}
-
-					return constructor.newInstance(
-							null,
-							specific.location,
-							BukkitConverters.getWrappedBlockDataConverter().getGeneric(MinecraftReflection.getIBlockDataClass(), specific.data)
-					);
-				} catch (Throwable ex) {
-					throw new RuntimeException("Failed to construct MultiBlockChangeInfo instance.", ex);
-				}
-			}
-
-			@Override
-			public Class<MultiBlockChangeInfo> getSpecificType() {
-				return MultiBlockChangeInfo.class;
-			}
-		};
-	}
-
-	public static EquivalentConverter<MultiBlockChangeInfo[]> getArrayConverter(final ChunkCoordIntPair chunk) {
-		return new EquivalentConverter<MultiBlockChangeInfo[]>() {
-			private final EquivalentConverter<MultiBlockChangeInfo> converter = MultiBlockChangeInfo.getConverter(chunk);
-
-			@Override
-			public MultiBlockChangeInfo[] getSpecific(Object generic) {
-				Object[] array = (Object[]) generic;
-				MultiBlockChangeInfo[] result = new MultiBlockChangeInfo[array.length];
-
-				// Unwrap every item
-				for (int i = 0; i < result.length; i++) {
-					result[i] = converter.getSpecific(array[i]);
-				}
-
-				return result;
-			}
-
-			@Override
-			public Object getGeneric(Class<?> genericType, MultiBlockChangeInfo[] specific) {
-				Object[] result = (Object[]) Array.newInstance(nmsClass, specific.length);
-
-				// Wrap every item
-				for (int i = 0; i < result.length; i++) {
-					result[i] = converter.getGeneric(nmsClass, specific[i]);
-				}
-
-				return result;
-			}
-
-			@Override
-			public Class<MultiBlockChangeInfo[]> getSpecificType() {
-				return MultiBlockChangeInfo[].class;
-			}
-		};
-	}
-}
+/**
+ *  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.Array;
+import java.lang.reflect.Constructor;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+/**
+ * Represents a single block change.
+ * 
+ * @author dmulloy2
+ */
+
+public class MultiBlockChangeInfo {
+	private static Constructor<?> constructor;
+	private static Class<?> nmsClass = MinecraftReflection.getMultiBlockChangeInfoClass();
+
+	private short location;
+	private WrappedBlockData data;
+	private ChunkCoordIntPair chunk;
+
+	public MultiBlockChangeInfo(short location, WrappedBlockData data, ChunkCoordIntPair chunk) {
+		this.location = location;
+		this.data = data;
+		this.chunk = chunk;
+	}
+
+	public MultiBlockChangeInfo(Location location, WrappedBlockData data) {
+		this.data = data;
+		this.chunk = new ChunkCoordIntPair(location.getBlockX() >> 4, location.getBlockZ() >> 4);
+		this.setLocation(location);
+	}
+
+	/**
+	 * Returns this block change's absolute Location in a given World.
+	 * 
+	 * @param world World for the location
+	 * @return This block change's absolute Location
+	 */
+	public Location getLocation(World world) {
+		return new Location(world, getAbsoluteX(), getY(), getAbsoluteZ());
+	}
+
+	/**
+	 * Sets this block change's absolute Location.
+	 * 
+	 * @param location This block change's new location
+	 */
+	public void setLocation(Location location) {
+		setLocation(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+	}
+
+	/**
+	 * Sets this block change's absolute coordinates.
+	 *
+	 * @param x X coordinate
+	 * @param y Y coordinate
+	 * @param z Z coordinate
+	 */
+	public void setLocation(int x, int y, int z) {
+		x = x & 15;
+		z = z & 15;
+
+		this.location = (short) (x << 12 | z << 8 | y);
+	}
+
+	/**
+	 * Gets this block change's relative x coordinate.
+	 * 
+	 * @return Relative X coordinate
+	 */
+	public int getX() {
+		return location >> 12 & 15;
+	}
+
+	/**
+	 * Gets this block change's absolute x coordinate.
+	 *
+	 * @return Absolute X coordinate
+	 */
+	public int getAbsoluteX() {
+		return (chunk.getChunkX() << 4) + getX();
+	}
+
+	/**
+	 * Sets this block change's absolute x coordinate.
+	 * 
+	 * @param x New x coordinate
+	 */
+	public void setX(int x) {
+		setLocation(x, getY(), getZ());
+	}
+
+	/**
+	 * Gets this block change's y coordinate.
+	 * 
+	 * @return Y coordinate
+	 */
+	public int getY() {
+		return location & 255;
+	}
+
+	/**
+	 * Sets this block change's y coordinate
+	 * 
+	 * @param y New y coordinate
+	 */
+	public void setY(int y) {
+		setLocation(getX(), y, getZ());
+	}
+
+	/**
+	 * Gets this block change's relative z coordinate.
+	 * 
+	 * @return Relative Z coordinate
+	 */
+	public int getZ() {
+		return location >> 8 & 15;
+	}
+
+	/**
+	 * Gets this block change's absolute z coordinate.
+	 *
+	 * @return Absolute Z coordinate
+	 */
+	public int getAbsoluteZ() {
+		return (chunk.getChunkZ() << 4) + getZ();
+	}
+
+	/**
+	 * Sets this block change's relative z coordinate.
+	 * 
+	 * @param z New z coordinate
+	 */
+	public void setZ(int z) {
+		setLocation(getX(), getY(), z);
+	}
+
+	/**
+	 * Gets this block change's block data.
+	 * 
+	 * @return The block data
+	 */
+	public WrappedBlockData getData() {
+		return data;
+	}
+
+	/**
+	 * Sets this block change's block data.
+	 * 
+	 * @param data New block data
+	 */
+	public void setData(WrappedBlockData data) {
+		this.data = data;
+	}
+
+	/**
+	 * Gets the chunk this block change occured in.
+	 * 
+	 * @return The chunk
+	 */
+	public ChunkCoordIntPair getChunk() {
+		return chunk;
+	}
+
+	public static EquivalentConverter<MultiBlockChangeInfo> getConverter(final ChunkCoordIntPair chunk) {
+		return new EquivalentConverter<MultiBlockChangeInfo>() {
+
+			@Override
+			public MultiBlockChangeInfo getSpecific(Object generic) {
+				StructureModifier<Object> modifier = new StructureModifier<Object>(generic.getClass(), null, false).withTarget(generic);
+
+				StructureModifier<Short> shorts = modifier.withType(short.class);
+				short location = shorts.read(0);
+
+				StructureModifier<WrappedBlockData> dataModifier = modifier.withType(MinecraftReflection.getIBlockDataClass(),
+						BukkitConverters.getWrappedBlockDataConverter());
+				WrappedBlockData data = dataModifier.read(0);
+
+				return new MultiBlockChangeInfo(location, data, chunk);
+			}
+
+			@Override
+			public Object getGeneric(Class<?> genericType, MultiBlockChangeInfo specific) {
+				try {
+					if (constructor == null) {
+						constructor = nmsClass.getConstructor(
+								PacketType.Play.Server.MULTI_BLOCK_CHANGE.getPacketClass(),
+								short.class,
+								MinecraftReflection.getIBlockDataClass()
+						);
+					}
+
+					return constructor.newInstance(
+							null,
+							specific.location,
+							BukkitConverters.getWrappedBlockDataConverter().getGeneric(MinecraftReflection.getIBlockDataClass(), specific.data)
+					);
+				} catch (Throwable ex) {
+					throw new RuntimeException("Failed to construct MultiBlockChangeInfo instance.", ex);
+				}
+			}
+
+			@Override
+			public Class<MultiBlockChangeInfo> getSpecificType() {
+				return MultiBlockChangeInfo.class;
+			}
+		};
+	}
+
+	public static EquivalentConverter<MultiBlockChangeInfo[]> getArrayConverter(final ChunkCoordIntPair chunk) {
+		return new EquivalentConverter<MultiBlockChangeInfo[]>() {
+			private final EquivalentConverter<MultiBlockChangeInfo> converter = MultiBlockChangeInfo.getConverter(chunk);
+
+			@Override
+			public MultiBlockChangeInfo[] getSpecific(Object generic) {
+				Object[] array = (Object[]) generic;
+				MultiBlockChangeInfo[] result = new MultiBlockChangeInfo[array.length];
+
+				// Unwrap every item
+				for (int i = 0; i < result.length; i++) {
+					result[i] = converter.getSpecific(array[i]);
+				}
+
+				return result;
+			}
+
+			@Override
+			public Object getGeneric(Class<?> genericType, MultiBlockChangeInfo[] specific) {
+				Object[] result = (Object[]) Array.newInstance(nmsClass, specific.length);
+
+				// Wrap every item
+				for (int i = 0; i < result.length; i++) {
+					result[i] = converter.getGeneric(nmsClass, specific[i]);
+				}
+
+				return result;
+			}
+
+			@Override
+			public Class<MultiBlockChangeInfo[]> getSpecificType() {
+				return MultiBlockChangeInfo[].class;
+			}
+		};
+	}
+}

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

@@ -1,189 +1,189 @@
-/**
- *  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.Constructor;
-
-import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
-import com.google.common.base.Objects;
-
-/**
- * Represents an immutable PlayerInfoData in the PLAYER_INFO packet.
- * @author dmulloy2
- */
-public class PlayerInfoData {
-	private static Constructor<?> constructor;
-
-	private final int latency;
-	private final NativeGameMode gameMode;
-	private final WrappedGameProfile profile;
-	private final WrappedChatComponent displayName;
-
-	// This is the same order as the NMS class, minus the packet (which isn't a field)
-	public PlayerInfoData(WrappedGameProfile profile, int latency, NativeGameMode gameMode, WrappedChatComponent displayName) {
-		this.profile = profile;
-		this.latency = latency;
-		this.gameMode = gameMode;
-		this.displayName = displayName;
-	}
-
-	/**
-	 * Gets the GameProfile of the player represented by this data.
-	 * @return The GameProfile
-	 */
-	public WrappedGameProfile getProfile() {
-		return profile;
-	}
-
-	/**
-	 * @deprecated Replaced by {@link #getLatency()}
-	 */
-	@Deprecated
-	public int getPing() {
-		return latency;
-	}
-
-	/**
-	 * Gets the latency between the client and the server.
-	 * @return The latency
-	 */
-	public int getLatency() {
-		return latency;
-	}
-
-	/**
-	 * Gets the GameMode of the player represented by this data.
-	 * @return The GameMode
-	 */
-	public NativeGameMode getGameMode() {
-		return gameMode;
-	}
-
-	/**
-	 * Gets the display name of the player represented by this data.
-	 * @return The display name
-	 */
-	public WrappedChatComponent getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * Used to convert between NMS PlayerInfoData and the wrapper instance.
-	 * @return A new converter.
-	 */
-	public static EquivalentConverter<PlayerInfoData> getConverter() {
-		return new EquivalentConverter<PlayerInfoData>() {
-			@Override
-			public Object getGeneric(Class<?> genericType, PlayerInfoData specific) {
-				if (constructor == null) {
-					try {
-						// public PlayerInfoData(Packet, GameProfile, int, GameMode, ChatComponent)
-						constructor = MinecraftReflection.getPlayerInfoDataClass().getConstructor(
-								MinecraftReflection.getMinecraftClass("PacketPlayOutPlayerInfo"),
-								MinecraftReflection.getGameProfileClass(),
-								int.class,
-								EnumWrappers.getGameModeClass(),
-								MinecraftReflection.getIChatBaseComponentClass()
-						);
-					} catch (Exception e) {
-						throw new RuntimeException("Cannot find PlayerInfoData constructor.", e);
-					}
-				}
-
-				// Attempt to construct the underlying PlayerInfoData
-
-				try {
-					// public PlayerInfoData(null, GameProfile, ping, GameMode, ChatComponent)
-					// The packet isn't a field, so it can be null
-					Object result = constructor.newInstance(
-							null,
-							specific.profile.handle,
-							specific.latency,
-							EnumWrappers.getGameModeConverter().getGeneric(EnumWrappers.getGameModeClass(), specific.gameMode),
-							specific.displayName != null ? specific.displayName.handle : null
-					);
-					return result;
-				} catch (Exception e) {
-					throw new RuntimeException("Failed to construct PlayerInfoData.", e);
-				}
-			}
-
-			@Override
-			public PlayerInfoData getSpecific(Object generic) {
-				if (MinecraftReflection.isPlayerInfoData(generic)) {
-					StructureModifier<Object> modifier = new StructureModifier<Object>(generic.getClass(), null, false)
-							.withTarget(generic);
-
-					StructureModifier<WrappedGameProfile> gameProfiles = modifier.withType(
-							MinecraftReflection.getGameProfileClass(), BukkitConverters.getWrappedGameProfileConverter());
-					WrappedGameProfile gameProfile = gameProfiles.read(0);
-
-					StructureModifier<Integer> ints = modifier.withType(int.class);
-					int latency = ints.read(0);
-
-					StructureModifier<NativeGameMode> gameModes = modifier.withType(
-							EnumWrappers.getGameModeClass(), EnumWrappers.getGameModeConverter());
-					NativeGameMode gameMode = gameModes.read(0);
-
-					StructureModifier<WrappedChatComponent> displayNames = modifier.withType(
-							MinecraftReflection.getIChatBaseComponentClass(), BukkitConverters.getWrappedChatComponentConverter());
-					WrappedChatComponent displayName = displayNames.read(0);
-					
-					return new PlayerInfoData(gameProfile, latency, gameMode, displayName);
-				}
-
-				// Otherwise, return null
-				return null;
-			}
-
-			// Thanks Java Generics!
-			@Override
-			public Class<PlayerInfoData> getSpecificType() {
-				return PlayerInfoData.class;
-			}
-		};
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		// Fast checks
-		if (this == obj) return true;
-		if (obj == null) return false;
-		
-		// Only compare objects of similar type
-		if (obj instanceof PlayerInfoData) {
-			PlayerInfoData other = (PlayerInfoData) obj;
-			return profile.equals(other.profile) && latency == other.latency && gameMode == other.gameMode
-					&& displayName.equals(other.displayName);
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-		return Objects.hashCode(latency, gameMode, profile, displayName);
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PlayerInfoData[latency=%s, gameMode=%s, profile=%s, displayName=%s",
-				latency, gameMode, profile, displayName);
-	}
-}
+/**
+ *  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.Constructor;
+
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
+import com.google.common.base.Objects;
+
+/**
+ * Represents an immutable PlayerInfoData in the PLAYER_INFO packet.
+ * @author dmulloy2
+ */
+public class PlayerInfoData {
+	private static Constructor<?> constructor;
+
+	private final int latency;
+	private final NativeGameMode gameMode;
+	private final WrappedGameProfile profile;
+	private final WrappedChatComponent displayName;
+
+	// This is the same order as the NMS class, minus the packet (which isn't a field)
+	public PlayerInfoData(WrappedGameProfile profile, int latency, NativeGameMode gameMode, WrappedChatComponent displayName) {
+		this.profile = profile;
+		this.latency = latency;
+		this.gameMode = gameMode;
+		this.displayName = displayName;
+	}
+
+	/**
+	 * Gets the GameProfile of the player represented by this data.
+	 * @return The GameProfile
+	 */
+	public WrappedGameProfile getProfile() {
+		return profile;
+	}
+
+	/**
+	 * @deprecated Replaced by {@link #getLatency()}
+	 */
+	@Deprecated
+	public int getPing() {
+		return latency;
+	}
+
+	/**
+	 * Gets the latency between the client and the server.
+	 * @return The latency
+	 */
+	public int getLatency() {
+		return latency;
+	}
+
+	/**
+	 * Gets the GameMode of the player represented by this data.
+	 * @return The GameMode
+	 */
+	public NativeGameMode getGameMode() {
+		return gameMode;
+	}
+
+	/**
+	 * Gets the display name of the player represented by this data.
+	 * @return The display name
+	 */
+	public WrappedChatComponent getDisplayName() {
+		return displayName;
+	}
+
+	/**
+	 * Used to convert between NMS PlayerInfoData and the wrapper instance.
+	 * @return A new converter.
+	 */
+	public static EquivalentConverter<PlayerInfoData> getConverter() {
+		return new EquivalentConverter<PlayerInfoData>() {
+			@Override
+			public Object getGeneric(Class<?> genericType, PlayerInfoData specific) {
+				if (constructor == null) {
+					try {
+						// public PlayerInfoData(Packet, GameProfile, int, GameMode, ChatComponent)
+						constructor = MinecraftReflection.getPlayerInfoDataClass().getConstructor(
+								MinecraftReflection.getMinecraftClass("PacketPlayOutPlayerInfo"),
+								MinecraftReflection.getGameProfileClass(),
+								int.class,
+								EnumWrappers.getGameModeClass(),
+								MinecraftReflection.getIChatBaseComponentClass()
+						);
+					} catch (Exception e) {
+						throw new RuntimeException("Cannot find PlayerInfoData constructor.", e);
+					}
+				}
+
+				// Attempt to construct the underlying PlayerInfoData
+
+				try {
+					// public PlayerInfoData(null, GameProfile, ping, GameMode, ChatComponent)
+					// The packet isn't a field, so it can be null
+					Object result = constructor.newInstance(
+							null,
+							specific.profile.handle,
+							specific.latency,
+							EnumWrappers.getGameModeConverter().getGeneric(EnumWrappers.getGameModeClass(), specific.gameMode),
+							specific.displayName != null ? specific.displayName.handle : null
+					);
+					return result;
+				} catch (Exception e) {
+					throw new RuntimeException("Failed to construct PlayerInfoData.", e);
+				}
+			}
+
+			@Override
+			public PlayerInfoData getSpecific(Object generic) {
+				if (MinecraftReflection.isPlayerInfoData(generic)) {
+					StructureModifier<Object> modifier = new StructureModifier<Object>(generic.getClass(), null, false)
+							.withTarget(generic);
+
+					StructureModifier<WrappedGameProfile> gameProfiles = modifier.withType(
+							MinecraftReflection.getGameProfileClass(), BukkitConverters.getWrappedGameProfileConverter());
+					WrappedGameProfile gameProfile = gameProfiles.read(0);
+
+					StructureModifier<Integer> ints = modifier.withType(int.class);
+					int latency = ints.read(0);
+
+					StructureModifier<NativeGameMode> gameModes = modifier.withType(
+							EnumWrappers.getGameModeClass(), EnumWrappers.getGameModeConverter());
+					NativeGameMode gameMode = gameModes.read(0);
+
+					StructureModifier<WrappedChatComponent> displayNames = modifier.withType(
+							MinecraftReflection.getIChatBaseComponentClass(), BukkitConverters.getWrappedChatComponentConverter());
+					WrappedChatComponent displayName = displayNames.read(0);
+					
+					return new PlayerInfoData(gameProfile, latency, gameMode, displayName);
+				}
+
+				// Otherwise, return null
+				return null;
+			}
+
+			// Thanks Java Generics!
+			@Override
+			public Class<PlayerInfoData> getSpecificType() {
+				return PlayerInfoData.class;
+			}
+		};
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		// Fast checks
+		if (this == obj) return true;
+		if (obj == null) return false;
+		
+		// Only compare objects of similar type
+		if (obj instanceof PlayerInfoData) {
+			PlayerInfoData other = (PlayerInfoData) obj;
+			return profile.equals(other.profile) && latency == other.latency && gameMode == other.gameMode
+					&& displayName.equals(other.displayName);
+		}
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(latency, gameMode, profile, displayName);
+	}
+
+	@Override
+	public String toString() {
+		return String.format("PlayerInfoData[latency=%s, gameMode=%s, profile=%s, displayName=%s",
+				latency, gameMode, profile, displayName);
+	}
+}

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

@@ -0,0 +1,129 @@
+/**
+ * (c) 2016 dmulloy2
+ */
+package com.comphenix.protocol.wrappers;
+
+import java.lang.reflect.Constructor;
+
+import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.BukkitConverters.IgnoreNullConverter;
+
+/**
+ * @author dmulloy2
+ */
+public class Vector3F {
+	protected float x;
+	protected float y;
+	protected float z;
+
+	public Vector3F() {
+		this(0, 0, 0);
+	}
+
+	public Vector3F(float x, float y, float z) {
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+
+	public float getX() {
+		return x;
+	}
+
+	public Vector3F setX(float x) {
+		this.x = x;
+		return this;
+	}
+
+	public float getY() {
+		return y;
+	}
+
+	public Vector3F setY(float y) {
+		this.y = y;
+		return this;
+	}
+
+	public float getZ() {
+		return z;
+	}
+
+	public Vector3F setZ(float z) {
+		this.z = z;
+		return this;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Float.floatToIntBits(x);
+		result = prime * result + Float.floatToIntBits(y);
+		result = prime * result + Float.floatToIntBits(z);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+
+		if (obj instanceof Vector3F) {
+			Vector3F that = (Vector3F) obj;
+			if (Float.floatToIntBits(x) != Float.floatToIntBits(that.x))
+				return false;
+			if (Float.floatToIntBits(y) != Float.floatToIntBits(that.y))
+				return false;
+			if (Float.floatToIntBits(z) != Float.floatToIntBits(that.z))
+				return false;
+			return true;
+		}
+
+		return false;
+	}
+
+	private static Constructor<?> constructor = null;
+	private static Class<?> clazz = MinecraftReflection.getMinecraftClass("Vector3f");
+
+	public static Class<?> getMinecraftClass() {
+		return clazz;
+	}
+
+	public static EquivalentConverter<Vector3F> getConverter() {
+		return new IgnoreNullConverter<Vector3F>() {
+
+			@Override
+			public Class<Vector3F> getSpecificType() {
+				return Vector3F.class;
+			}
+
+			@Override
+			protected Object getGenericValue(Class<?> genericType, Vector3F specific) {
+				if (constructor == null) {
+					try {
+						constructor = clazz.getConstructor(float.class, float.class, float.class);
+					} catch (ReflectiveOperationException ex) {
+						throw new RuntimeException("Failed to find constructor for Vector3f", ex);
+					}
+				}
+	
+				try {
+					return constructor.newInstance(specific.x, specific.y, specific.z);
+				} catch (ReflectiveOperationException ex) {
+					throw new RuntimeException("Failed to create new instance of Vector3f", ex);
+				}
+			}
+
+			@Override
+			protected Vector3F getSpecificValue(Object generic) {
+				StructureModifier<Float> modifier = new StructureModifier<Float>(generic.getClass())
+						.withTarget(generic).withType(float.class);
+				float x = modifier.read(0);
+				float y = modifier.read(1);
+				float z = modifier.read(2);
+				return new Vector3F(x, y, z);
+			}
+		};
+	}
+}

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

@@ -1,166 +1,183 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2015 dmulloy2
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program;
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307 USA
- */
-package com.comphenix.protocol.wrappers;
-
-import java.lang.reflect.Modifier;
-
-import org.bukkit.Material;
-
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.MethodAccessor;
-import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
-import com.comphenix.protocol.utility.MinecraftReflection;
-
-/**
- * Represents a wrapper around IBlockData.
- *
- * @author dmulloy2
- */
-
-public class WrappedBlockData extends AbstractWrapper {
-	private static final Class<?> MAGIC_NUMBERS = MinecraftReflection.getCraftBukkitClass("util.CraftMagicNumbers");
-	private static final Class<?> IBLOCK_DATA = MinecraftReflection.getIBlockDataClass();
-	private static final Class<?> BLOCK = MinecraftReflection.getBlockClass();
-
-	private static MethodAccessor FROM_LEGACY_DATA = null;
-	private static MethodAccessor TO_LEGACY_DATA = null;
-	private static MethodAccessor GET_NMS_BLOCK = null;
-	private static MethodAccessor GET_BLOCK = null;
-
-	static {
-		FuzzyReflection fuzzy = FuzzyReflection.fromClass(BLOCK);
-		FuzzyMethodContract contract = FuzzyMethodContract.newBuilder()
-				.banModifier(Modifier.STATIC)
-				.parameterExactArray(int.class)
-				.returnTypeExact(IBLOCK_DATA)
-				.build();
-		FROM_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract));
-
-		contract = FuzzyMethodContract.newBuilder()
-				.banModifier(Modifier.STATIC)
-				.parameterExactArray(IBLOCK_DATA)
-				.returnTypeExact(int.class)
-				.build();
-		TO_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract, "toLegacyData"));
-
-		fuzzy = FuzzyReflection.fromClass(MAGIC_NUMBERS);
-		GET_NMS_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
-				new Class<?>[] { Material.class }));
-
-		fuzzy = FuzzyReflection.fromClass(IBLOCK_DATA);
-		GET_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
-				new Class<?>[0]));
-	}
-
-	public WrappedBlockData(Object handle) {
-		super(IBLOCK_DATA);
-		setHandle(handle);
-	}
-
-	/**
-	 * Retrieves the type of this BlockData.
-	 * @return The type of this BlockData.
-	 */
-	public Material getType() {
-		Object block = GET_BLOCK.invoke(handle);
-		return BukkitConverters.getBlockConverter().getSpecific(block);
-	}
-
-	/**
-	 * Retrieves the type id of this BlockData.
-	 * @return The type id of this BlockData.
-	 * @deprecated ID's are deprecated
-	 */
-	@Deprecated
-	public int getTypeId() {
-		Object block = GET_BLOCK.invoke(handle);
-		return BukkitConverters.getBlockIDConverter().getSpecific(block);
-	}
-
-	/**
-	 * Retrieves the data of this BlockData.
-	 * @return The data of this BlockData.
-	 */
-	public int getData() {
-		Object block = GET_BLOCK.invoke(handle);
-		return (Integer) TO_LEGACY_DATA.invoke(block, handle);
-	}
-
-	/**
-	 * Sets the type of this BlockData.
-	 * @param type New type
-	 */
-	public void setType(Material type) {
-		setTypeAndData(type, 0);
-	}
-
-	/**
-	 * Sets the data of this BlockData.
-	 * @param data New data
-	 */
-	public void setData(int data) {
-		setTypeAndData(getType(), data);
-	}
-
-	/**
-	 * Sets the type and data of this BlockData.
-	 * @param type New type
-	 * @param data New data
-	 */
-	public void setTypeAndData(Material type, int data) {
-		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
-		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
-		setHandle(blockData);
-	}
-
-	/**
-	 * Creates a new BlockData instance with the given type and no data.
-	 * @param type Block type
-	 * @return New BlockData
-	 */
-	public static WrappedBlockData createData(Material type) {
-		return createData(type, 0);
-	}
-
-	/**
-	 * Creates a new BlockData instance with the given type and data.
-	 * @param type Block type
-	 * @param data Block data
-	 * @return New BlockData
-	 */
-	public static WrappedBlockData createData(Material type, int data) {
-		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
-		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
-		return new WrappedBlockData(blockData);
-	}
-
-	@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 - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2015 dmulloy2
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307 USA
+ */
+package com.comphenix.protocol.wrappers;
+
+import java.lang.reflect.Modifier;
+
+import org.bukkit.Material;
+
+import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
+import com.comphenix.protocol.utility.MinecraftReflection;
+
+/**
+ * Represents a wrapper around IBlockData.
+ *
+ * @author dmulloy2
+ */
+
+public class WrappedBlockData extends AbstractWrapper {
+	private static final Class<?> MAGIC_NUMBERS = MinecraftReflection.getCraftBukkitClass("util.CraftMagicNumbers");
+	private static final Class<?> IBLOCK_DATA = MinecraftReflection.getIBlockDataClass();
+	private static final Class<?> BLOCK = MinecraftReflection.getBlockClass();
+
+	private static MethodAccessor FROM_LEGACY_DATA = null;
+	private static MethodAccessor TO_LEGACY_DATA = null;
+	private static MethodAccessor GET_NMS_BLOCK = null;
+	private static MethodAccessor GET_BLOCK = null;
+
+	static {
+		FuzzyReflection fuzzy = FuzzyReflection.fromClass(BLOCK);
+		FuzzyMethodContract contract = FuzzyMethodContract.newBuilder()
+				.banModifier(Modifier.STATIC)
+				.parameterExactArray(int.class)
+				.returnTypeExact(IBLOCK_DATA)
+				.build();
+		FROM_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract));
+
+		contract = FuzzyMethodContract.newBuilder()
+				.banModifier(Modifier.STATIC)
+				.parameterExactArray(IBLOCK_DATA)
+				.returnTypeExact(int.class)
+				.build();
+		TO_LEGACY_DATA = Accessors.getMethodAccessor(fuzzy.getMethod(contract, "toLegacyData"));
+
+		fuzzy = FuzzyReflection.fromClass(MAGIC_NUMBERS);
+		GET_NMS_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
+				new Class<?>[] { Material.class }));
+
+		fuzzy = FuzzyReflection.fromClass(IBLOCK_DATA);
+		GET_BLOCK = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("getBlock", BLOCK,
+				new Class<?>[0]));
+	}
+
+	public WrappedBlockData(Object handle) {
+		super(IBLOCK_DATA);
+		setHandle(handle);
+	}
+
+	/**
+	 * Retrieves the type of this BlockData.
+	 * @return The type of this BlockData.
+	 */
+	public Material getType() {
+		Object block = GET_BLOCK.invoke(handle);
+		return BukkitConverters.getBlockConverter().getSpecific(block);
+	}
+
+	/**
+	 * Retrieves the type id of this BlockData.
+	 * @return The type id of this BlockData.
+	 * @deprecated ID's are deprecated
+	 */
+	@Deprecated
+	public int getTypeId() {
+		Object block = GET_BLOCK.invoke(handle);
+		return BukkitConverters.getBlockIDConverter().getSpecific(block);
+	}
+
+	/**
+	 * Retrieves the data of this BlockData.
+	 * @return The data of this BlockData.
+	 */
+	public int getData() {
+		Object block = GET_BLOCK.invoke(handle);
+		return (Integer) TO_LEGACY_DATA.invoke(block, handle);
+	}
+
+	/**
+	 * Sets the type of this BlockData.
+	 * @param type New type
+	 */
+	public void setType(Material type) {
+		setTypeAndData(type, 0);
+	}
+
+	/**
+	 * Sets the data of this BlockData.
+	 * @param data New data
+	 */
+	public void setData(int data) {
+		setTypeAndData(getType(), data);
+	}
+
+	/**
+	 * Sets the type and data of this BlockData.
+	 * @param type New type
+	 * @param data New data
+	 */
+	public void setTypeAndData(Material type, int data) {
+		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
+		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
+		setHandle(blockData);
+	}
+
+	/**
+	 * Creates a new BlockData instance with the given type and no data.
+	 * @param type Block type
+	 * @return New BlockData
+	 */
+	public static WrappedBlockData createData(Material type) {
+		return createData(type, 0);
+	}
+
+	/**
+	 * Creates a new BlockData instance with the given type and data.
+	 * @param type Block type
+	 * @param data Block data
+	 * @return New BlockData
+	 */
+	public static WrappedBlockData createData(Material type, int data) {
+		Object nmsBlock = GET_NMS_BLOCK.invoke(null, type);
+		Object blockData = FROM_LEGACY_DATA.invoke(nmsBlock, data);
+		return new WrappedBlockData(blockData);
+	}
+
+	/**
+	 * Retrieve a deep copy of the current wrapper object.
+	 * @return The cloned object.
+	 */
+	public WrappedBlockData deepClone() {
+		return WrappedBlockData.createData(getType(), getData());
+	}
+
+	@Override
+	public String toString() {
+		return "WrappedBlockData[handle=" + handle + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + getType().hashCode();
+		result = prime * result + getData();
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o instanceof WrappedBlockData) {
+			WrappedBlockData that = (WrappedBlockData) o;
+			return this.getType() == that.getType() && getData() == that.getData();
+		}
+
+		return false;
+	}
 }

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

@@ -1,10 +1,10 @@
 package com.comphenix.protocol.wrappers;
 
-import java.lang.reflect.Method;
-import java.util.List;
+import java.io.StringReader;
 
 import org.bukkit.ChatColor;
 
+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;
@@ -19,18 +19,35 @@ import com.google.common.base.Preconditions;
 public class WrappedChatComponent extends AbstractWrapper {
 	private static final Class<?> SERIALIZER = MinecraftReflection.getChatSerializerClass();
 	private static final Class<?> COMPONENT = MinecraftReflection.getIChatBaseComponentClass();
+	private static final Class<?> GSON_CLASS = MinecraftReflection.getMinecraftGsonClass();
+
+	private static Object GSON = null;
+	private static MethodAccessor DESERIALIZE = null;
+
 	private static MethodAccessor SERIALIZE_COMPONENT = null;
-	private static MethodAccessor DESERIALIZE_COMPONENT = null;
 	private static MethodAccessor CONSTRUCT_COMPONENT = null;
 	private static ConstructorAccessor CONSTRUCT_TEXT_COMPONENT = null;
-	
+
 	static {
-		FuzzyReflection fuzzy = FuzzyReflection.fromClass(SERIALIZER);
+		FuzzyReflection fuzzy = FuzzyReflection.fromClass(SERIALIZER, true);
 
 		// Retrieve the correct methods
 		SERIALIZE_COMPONENT = Accessors.getMethodAccessor(fuzzy.getMethodByParameters("serialize", /* a */
 				String.class, new Class<?>[] { COMPONENT }));
-		DESERIALIZE_COMPONENT = findDeserialize(fuzzy);
+
+		try {
+			GSON = FieldUtils.readStaticField(fuzzy.getFieldByType("gson", GSON_CLASS), true);
+		} catch (IllegalAccessException ex) {
+			throw new RuntimeException("Failed to obtain GSON field", ex);
+		}
+
+		try {
+			DESERIALIZE = Accessors.getMethodAccessor(FuzzyReflection.fromClass(MinecraftReflection.getMinecraftClass("ChatDeserializer"), true)
+				.getMethodByParameters("deserialize", Object.class, new Class<?>[] { GSON_CLASS, String.class, Class.class, boolean.class }));
+		} catch (IllegalArgumentException ex) {
+			// We'll handle it in the ComponentParser
+			DESERIALIZE = null;
+		}
 
 		// Get a component from a standard Minecraft message
 		CONSTRUCT_COMPONENT = Accessors.getMethodAccessor(MinecraftReflection.getCraftChatMessage(), "fromString", String.class);
@@ -39,23 +56,17 @@ public class WrappedChatComponent extends AbstractWrapper {
 		CONSTRUCT_TEXT_COMPONENT = Accessors.getConstructorAccessor(MinecraftReflection.getChatComponentTextClass(), String.class);
 	}
 
-	private static MethodAccessor findDeserialize(FuzzyReflection fuzzy) {
-		List<Method> methods = fuzzy.getMethodListByParameters(COMPONENT, new Class<?>[] { String.class });
-		if (methods.isEmpty()) {
-			throw new IllegalArgumentException("Unable to find deserialize method in " + fuzzy.getSource().getName());
+	private static Object deserialize(String json) {
+		// Should be non-null on 1.9 and up
+		if (DESERIALIZE != null) {
+			return DESERIALIZE.invoke(null, GSON, json, COMPONENT, true);
 		}
 
-		// Try to find b, we want leniency
-		for (Method method : methods) {
-			if (method.getName().equals("b")) {
-				return Accessors.getMethodAccessor(method);
-			}
-		}
-
-		// Oh well
-		return Accessors.getMethodAccessor(methods.get(0));
+		// Mock leniency behavior in 1.8
+		StringReader str = new StringReader(json);
+		return ComponentParser.deserialize(GSON, COMPONENT, str);
 	}
-	
+
 	private transient String cache;
 	
 	private WrappedChatComponent(Object handle, String cache) {
@@ -79,7 +90,7 @@ public class WrappedChatComponent extends AbstractWrapper {
 	 * @return The chat component wrapper.
 	 */
 	public static WrappedChatComponent fromJson(String json) {
-		return new WrappedChatComponent(DESERIALIZE_COMPONENT.invoke(null, json), json);
+		return new WrappedChatComponent(deserialize(json), json);
 	}
 	
 	/**
@@ -127,7 +138,7 @@ public class WrappedChatComponent extends AbstractWrapper {
 	 * @param obj - the JSON that represents the new component.
 	 */
 	public void setJson(String obj) {
-		this.handle = DESERIALIZE_COMPONENT.invoke(null, obj);
+		this.handle = deserialize(obj);
 		this.cache = obj;
 	}
 
@@ -138,24 +149,9 @@ public class WrappedChatComponent extends AbstractWrapper {
 	public WrappedChatComponent deepClone() {
 		return fromJson(getJson());
 	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this)
-			return true;
-		if (obj instanceof WrappedChatComponent) {
-			return ((WrappedChatComponent) obj).handle.equals(handle);
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-		return handle.hashCode();
-	}
 
 	@Override
 	public String toString() {
 		return "WrappedChatComponent[json=" + getJson() + "]";
 	}
-}
+}

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

@@ -19,7 +19,6 @@ package com.comphenix.protocol.wrappers;
 
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.utility.MinecraftReflection;
-import com.google.common.base.Objects;
 
 /**
  * Allows access to a chunk coordinate.
@@ -161,24 +160,6 @@ public class WrappedChunkCoordinate extends AbstractWrapper implements Comparabl
 			return ((Comparable<Object>) handle).compareTo(other.handle);
 	}
 
-	@Override
-	public boolean equals(Object other) {
-		if (other instanceof WrappedChunkCoordinate) {
-			WrappedChunkCoordinate wrapper = (WrappedChunkCoordinate) other;
-			return Objects.equal(handle, wrapper.handle);
-		}
-		
-		// It's tempting to handle the ChunkCoordinate case too, but then
-		// the equals() method won't be commutative, causing a.equals(b) to
-		// be different to b.equals(a).
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-		return handle.hashCode();
-	}
-
 	@Override
 	public String toString() {
 		return String.format("ChunkCoordinate [x: %s, y: %s, z: %s]", getX(), getY(), getZ());

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

@@ -17,6 +17,7 @@
 package com.comphenix.protocol.wrappers;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -25,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Entity;
@@ -43,9 +45,10 @@ import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.collection.ConvertedMap;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableBiMap;
 
 /**
- * Represents a DataWatcher in 1.9
+ * Represents a DataWatcher in 1.8 thru 1.10
  * 
  * @author dmulloy2
  */
@@ -108,8 +111,14 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	public WrappedDataWatcher(List<WrappedWatchableObject> objects) {
 		this();
 
-		for (WrappedWatchableObject object : objects) {
-			setObject(object.getWatcherObject(), object);
+		if (MinecraftReflection.watcherObjectExists()) {
+			for (WrappedWatchableObject object : objects) {
+				setObject(object.getWatcherObject(), object);
+			}
+		} else {
+			for (WrappedWatchableObject object : objects) {
+				setObject(object.getIndex(), object);
+			}
 		}
 	}
 
@@ -216,6 +225,14 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		}
 	}
 
+	/**
+	 * @deprecated Renamed to {@link #remove(int)}
+	 */
+	@Deprecated
+	public WrappedWatchableObject removeObject(int index) {
+		return remove(index);
+	}
+
 	/**
 	 * Removes the item at a given index.
 	 * 
@@ -234,7 +251,15 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * @return True if it does, false if not
 	 */
 	public boolean hasIndex(int index) {
-		return getMap().containsKey(index);
+		return getObject(index) != null;
+	}
+
+	/**
+	 * Returns a set containing all the registered indexes
+	 * @return The set
+	 */
+	public Set<Integer> indexSet() {
+		return getMap().keySet();
 	}
 
 	/**
@@ -321,46 +346,73 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * Retrieve a watchable object by index.
 	 * 
 	 * @param index Index of the object to retrieve.
-	 * @return The watched object.
+	 * @return The watched object or null if it doesn't exist.
 	 */
 	public Object getObject(int index) {
-		return getObject(new WrappedDataWatcherObject(index, null));
+		return getObject(WrappedDataWatcherObject.fromIndex(index));
 	}
 
 	/**
 	 * Retrieve a watchable object by watcher object.
 	 * 
 	 * @param object The watcher object
-	 * @return The watched object
+	 * @return The watched object or null if it doesn't exist.
 	 */
 	public Object getObject(WrappedDataWatcherObject object) {
 		Validate.notNull(object, "Watcher object cannot be null!");
 
 		if (GETTER == null) {
-			FuzzyReflection fuzzy = FuzzyReflection.fromClass(handleType);
-			GETTER = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+			FuzzyReflection fuzzy = FuzzyReflection.fromClass(handleType, true);
+
+			if (MinecraftReflection.watcherObjectExists()) {			
+				GETTER = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
 					.parameterExactType(object.getHandleType())
 					.returnTypeExact(Object.class)
 					.build(), "get"));
+			} else {
+				GETTER = Accessors.getMethodAccessor(fuzzy.getMethod(FuzzyMethodContract.newBuilder()
+					.parameterExactType(int.class)
+					.returnTypeExact(MinecraftReflection.getDataWatcherItemClass())
+					.build()));
+			}
 		}
 
-		Object value = GETTER.invoke(handle, object.getHandle());
-		return WrappedWatchableObject.getWrapped(value);
+		try {
+			Object value = GETTER.invoke(handle, object.getHandle());
+			return WrappedWatchableObject.getWrapped(value);
+		} catch (RuntimeException ex) {
+			// Nothing exists at this index
+			return null;
+		}
 	}
 
 	// ---- Object Setters
 
 	/**
-	 * Sets the DataWatcher Item at a given index to a new value.
+	 * Sets the DataWatcher Item at a given index to a new value. In 1.9 and up,
+	 * you cannot register objects without a watcher object.
 	 * 
 	 * @param index Index of the object to set
 	 * @param value New value
+	 * @param update Whether or not to inform the client
 	 * 
-	 * @see {@link #setObject(WrappedDataWatcherObject, Object)}
+	 * @see {@link #setObject(WrappedDataWatcherObject, Object, boolean)}
+	 * @throws IllegalArgumentException in 1.9 and up if there isn't already an
+	 * 		object at this index
+	 */
+	public void setObject(int index, Object value, boolean update) {
+		if (MinecraftReflection.watcherObjectExists() && !hasIndex(index)) {
+			throw new IllegalArgumentException("You cannot register objects without a watcher object!");
+		}
+
+		setObject(WrappedDataWatcherObject.fromIndex(index), value, update);
+	}
+
+	/**
+	 * Shortcut for {@link #setObject(int, Object, boolean)}
 	 */
 	public void setObject(int index, Object value) {
-		Validate.isTrue(hasIndex(index), "You cannot register objects without the watcher object!");
-		setObject(index, null, value);
+		setObject(index, value, false);
 	}
 
 	/**
@@ -369,11 +421,39 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * @param index Index of the object to set
 	 * @param Serializer Serializer from {@link Serializer#get(Class)}
 	 * @param value New value
+	 * @param update Whether or not to inform the client
 	 * 
 	 * @see {@link #setObject(WrappedDataWatcherObject, Object)}
 	 */
+	public void setObject(int index, Serializer serializer, Object value, boolean update) {
+		setObject(new WrappedDataWatcherObject(index, serializer), value, update);
+	}
+
+	/**
+	 * Alias for {@link #setObject(int, Serializer, Object, boolean)}
+	 */
 	public void setObject(int index, Serializer serializer, Object value) {
-		setObject(new WrappedDataWatcherObject(index, serializer), value);
+		setObject(new WrappedDataWatcherObject(index, serializer), value, false);
+	}
+
+	/**
+	 * Sets the DataWatcher Item at a given index to a new value.
+	 * 
+	 * @param index Index of the object to set
+	 * @param value New value
+	 * @param update Whether or not to inform the client
+	 * 
+	 * @see {@link #setObject(int, Object, boolean)}
+	 */
+	public void setObject(int index, WrappedWatchableObject value, boolean update) {
+		setObject(index, value.getRawValue(), update);
+	}
+
+	/**
+	 * Alias for {@link #setObject(int, WrappedWatchableObject, boolean)}
+	 */
+	public void setObject(int index, WrappedWatchableObject value) {
+		setObject(index, value.getRawValue(), false);
 	}
 
 	/**
@@ -381,11 +461,19 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * 
 	 * @param object Associated watcher object
 	 * @param value Wrapped value
+	 * @param update Whether or not to inform the client
 	 * 
 	 * @see {@link #setObject(WrappedDataWatcherObject, Object)}
 	 */
+	public void setObject(WrappedDataWatcherObject object, WrappedWatchableObject value, boolean update) {
+		setObject(object, value.getRawValue(), update);
+	}
+
+	/**
+	 * Shortcut for {@link #setObject(WrappedDataWatcherObject, WrappedWatchableObject, boolean)}
+	 */
 	public void setObject(WrappedDataWatcherObject object, WrappedWatchableObject value) {
-		setObject(object, value.getRawValue());
+		setObject(object, value.getRawValue(), false);
 	}
 
 	/**
@@ -399,27 +487,46 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * @throws IllegalArgumentException If the watcher object is null or must
 	 * 			have a serializer and does not have one.
 	 */
-	public void setObject(WrappedDataWatcherObject object, Object value) {
+	public void setObject(WrappedDataWatcherObject object, Object value, boolean update) {
 		Validate.notNull(object, "Watcher object cannot be null!");
 
-		if (SETTER == null || REGISTER == null) {
+		if (SETTER == null && REGISTER == null) {
 			FuzzyReflection fuzzy = FuzzyReflection.fromClass(handleType, true);
 			FuzzyMethodContract contract = FuzzyMethodContract.newBuilder()
 					.banModifier(Modifier.STATIC)
 					.requireModifier(Modifier.PUBLIC)
 					.parameterExactArray(object.getHandleType(), Object.class)
 					.build();
-			SETTER = Accessors.getMethodAccessor(fuzzy.getMethod(contract, "set"));
-			REGISTER = Accessors.getMethodAccessor(fuzzy.getMethod(contract, "register"));
+			List<Method> methods = fuzzy.getMethodList(contract);
+			for (Method method : methods) {
+				if (method.getName().equals("set") || method.getName().equals("watch")) {
+					SETTER = Accessors.getMethodAccessor(method);
+				} else {
+					REGISTER = Accessors.getMethodAccessor(method);
+				}
+			}
 		}
 
+		// Unwrap the object
+		value = WrappedWatchableObject.getUnwrapped(value);
+
 		if (hasIndex(object.getIndex())) {
-			SETTER.invoke(handle, object.getHandle(), WrappedWatchableObject.getUnwrapped(value));
+			SETTER.invoke(handle, object.getHandle(), value);
 		} else {
-			Serializer serializer = object.getSerializer();
-			Validate.notNull(serializer, "You must specify a serializer to register an object!");
-			REGISTER.invoke(handle, object.getHandle(), WrappedWatchableObject.getUnwrapped(value));
+			object.checkSerializer();
+			REGISTER.invoke(handle, object.getHandle(), value);
 		}
+
+		if (update) {
+			getWatchableObject(object.getIndex()).setDirtyState(update);
+		}
+	}
+
+	/**
+	 * Shortcut for {@link #setObject(WrappedDataWatcherObject, Object, boolean)}
+	 */
+	public void setObject(WrappedDataWatcherObject object, Object value) {
+		setObject(object, value, false);
 	}
 
 	// ---- Utility Methods
@@ -432,8 +539,14 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	public WrappedDataWatcher deepClone() {
 		WrappedDataWatcher clone = new WrappedDataWatcher(getEntity());
 
-		for (WrappedWatchableObject wrapper : this) {
-			clone.setObject(wrapper.getWatcherObject(), wrapper);
+		if (MinecraftReflection.watcherObjectExists()) {
+			for (WrappedWatchableObject wrapper : this) {
+				clone.setObject(wrapper.getWatcherObject(), wrapper);
+			}
+		} else {
+			for (WrappedWatchableObject wrapper : this) {
+				clone.setObject(wrapper.getIndex(), wrapper);
+			}
 		}
 
 		return clone;
@@ -479,26 +592,37 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		ENTITY_FIELD.set(handle, BukkitUnwrapper.getInstance().unwrapItem(entity));
 	}
 
+	private static final ImmutableBiMap<Class<?>, Integer> CLASS_TO_ID = new ImmutableBiMap.Builder<Class<?>, Integer>()
+			.put(Byte.class, 0)
+			.put(Short.class, 1)
+			.put(Integer.class, 2)
+			.put(Float.class, 3)
+			.put(String.class, 4)
+			.put(MinecraftReflection.getItemStackClass(), 5)
+			.put(MinecraftReflection.getBlockPositionClass(), 6)
+			.put(Vector3F.getMinecraftClass(), 7)
+			.build();
+
 	/**
-	 * No longer supported in 1.9 due to the removal of a consistent type <-> ID map.
+	 * Retrieves the type ID associated with a given class. No longer supported
+	 * in 1.9 and up due to the removal of type IDs.
 	 * 
-	 * @param clazz
-	 * @return Null
+	 * @param clazz Class to find ID for
+	 * @return The ID, or null if not found
 	 */
-	@Deprecated
 	public static Integer getTypeID(Class<?> clazz) {
-		return null;
+		return CLASS_TO_ID.get(clazz);
 	}
 
 	/**
-	 * No longer supported in 1.9 due to the removal of a consistent type <-> ID map.
+	 * Retrieves the class associated with a given type ID. No longer
+	 * supported in 1.9 and up due to the removal of type IDs.
 	 * 
-	 * @param typeID
-	 * @return Null
+	 * @param typeID ID to find Class for
+	 * @return The Class, or null if not found
 	 */
-	@Deprecated
 	public static Class<?> getTypeClass(int typeID) {
-		return null;
+		return CLASS_TO_ID.inverse().get(typeID);
 	}
 
 	@Override
@@ -544,12 +668,16 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * 
 	 * @author dmulloy2
 	 */
-	public static class WrappedDataWatcherObject extends AbstractWrapper {
+	public static class WrappedDataWatcherObject {
 		private static final Class<?> HANDLE_TYPE = MinecraftReflection.getDataWatcherObjectClass();
 		private static ConstructorAccessor constructor = null;
 		private static MethodAccessor getSerializer = null;
 
-		private final StructureModifier<Object> modifier;
+		private StructureModifier<Object> modifier;
+		private Object handle;
+
+		protected WrappedDataWatcherObject() {
+		}
 
 		/**
 		 * Creates a new watcher object from a NMS handle.
@@ -557,9 +685,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		 * @param handle The handle
 		 */
 		public WrappedDataWatcherObject(Object handle) {
-			super(HANDLE_TYPE);
-
-			setHandle(handle);
+			this.handle = handle;
 			this.modifier = new StructureModifier<Object>(HANDLE_TYPE).withTarget(handle);
 		}
 
@@ -573,6 +699,14 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 			this(newHandle(index, serializer));
 		}
 
+		static WrappedDataWatcherObject fromIndex(int index) {
+			if (MinecraftReflection.watcherObjectExists()) {
+				return new WrappedDataWatcherObject(index, null);
+			} else {
+				return new DummyWatcherObject(index);
+			}
+		}
+
 		private static Object newHandle(int index, Serializer serializer) {
 			if (constructor == null) {
 				constructor = Accessors.getConstructorAccessor(HANDLE_TYPE.getConstructors()[0]);
@@ -616,6 +750,18 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 			}
 		}
 
+		public void checkSerializer() {
+			Validate.notNull(getSerializer(), "You must specify a serializer to register an object!");
+		}
+
+		public Object getHandle() {
+			return handle;
+		}
+
+		public Class<?> getHandleType() {
+			return HANDLE_TYPE;
+		}
+
 		@Override
 		public String toString() {
 			return "DataWatcherObject[index=" + getIndex() + ", serializer=" + getSerializer() + "]";
@@ -624,7 +770,6 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		@Override
 		public boolean equals(Object obj) {
 			if (obj == this) return true;
-			if (obj == null) return false;
 
 			if (obj instanceof WrappedDataWatcherObject) {
 				WrappedDataWatcherObject other = (WrappedDataWatcherObject) obj;
@@ -633,6 +778,57 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 
 			return false;
 		}
+
+		@Override
+		public int hashCode() {
+			return handle.hashCode();
+		}
+	}
+
+	private static class DummyWatcherObject extends WrappedDataWatcherObject {
+		private final int index;
+
+		public DummyWatcherObject(int index) {
+			this.index = index;
+		}
+
+		@Override
+		public int getIndex() {
+			return index;
+		}
+
+		@Override
+		public Serializer getSerializer() {
+			return null;
+		}
+
+		@Override
+		public Object getHandle() {
+			return getIndex();
+		}
+
+		@Override
+		public Class<?> getHandleType() {
+			return int.class;
+		}
+
+		@Override
+		public void checkSerializer() {
+			// Do nothing
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == this) return true;
+			if (obj == null) return false;
+
+			if (obj instanceof DummyWatcherObject) {
+				DummyWatcherObject that = (DummyWatcherObject) obj;
+				return this.index == that.index;
+			}
+
+			return false;
+		}
 	}
 
 	/**
@@ -768,7 +964,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		 * @return The serializer, or null if none exists
 		 */
 		public static Serializer fromHandle(Object handle) {
-			Validate.notNull("Handle cannot be null!");
+			Validate.notNull("handle cannot be null!");
 			initialize();
 
 			for (Serializer serializer : REGISTRY) {
@@ -820,5 +1016,67 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 				}
 			}
 		}
+
+		// ---- Helper methods
+
+		/**
+		 * Gets the serializer for IChatBaseComponents
+		 * @return The serializer
+		 */
+		public static Serializer getChatComponentSerializer() {
+			return get(MinecraftReflection.getIChatBaseComponentClass());
+		}
+
+		/**
+		 * Gets the serializer for ItemStacks
+		 * @param optional If true, objects <b>must</b> be wrapped in an {@link Optional}
+		 * @return The serializer
+		 */
+		public static Serializer getItemStackSerializer(boolean optional) {
+			return get(MinecraftReflection.getItemStackClass(), optional);
+		}
+
+		/**
+		 * Gets the serializer for BlockData
+		 * @param optional If true, objects <b>must</b> be wrapped in an {@link Optional}
+		 * @return The serializer
+		 */
+		public static Serializer getBlockDataSerializer(boolean optional) {
+			return get(MinecraftReflection.getIBlockDataClass(), optional);
+		}
+
+		/**
+		 * Gets the serializer for Vector3Fs
+		 * @return The serializer
+		 */
+		public static Serializer getVectorSerializer() {
+			return get(Vector3F.getMinecraftClass());
+		}
+
+		/**
+		 * Gets the serializer for BlockPositions
+		 * @param optional If true, objects <b>must</b> be wrapped in an {@link Optional}
+		 * @return The serializer
+		 */
+		public static Serializer getBlockPositionSerializer(boolean optional) {
+			return get(MinecraftReflection.getBlockPositionClass(), optional);
+		}
+
+		/**
+		 * Gets the serializer for Directions
+		 * @return The serializer
+		 */
+		public static Serializer getDirectionSerializer() {
+			return get(EnumWrappers.getDirectionClass());
+		}
+
+		/**
+		 * Gets the serializer for UUIDs
+		 * @param optional If true, objects <b>must</b> be wrapped in an {@link Optional}
+		 * @return The serializer
+		 */
+		public static Serializer getUUIDSerializer(boolean optional) {
+			return get(UUID.class, optional);
+		}
 	}
 }

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

@@ -333,4 +333,4 @@ public class WrappedGameProfile extends AbstractWrapper {
 
 		return false;
 	}
-}
+}

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

@@ -1,9 +1,5 @@
 package com.comphenix.protocol.wrappers;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.base64.Base64;
-
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayInputStream;
@@ -19,14 +15,13 @@ import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.injector.BukkitUnwrapper;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 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.MethodAccessor;
+import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
 import com.comphenix.protocol.utility.Util;
@@ -34,25 +29,18 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.io.ByteStreams;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.base64.Base64;
+
 /**
  * Represents a server ping packet data.
  * @author Kristian
  */
 public class WrappedServerPing extends AbstractWrapper {
-	/**
-	 * Lookup of Minecraft versions and ping version numbers.
-	 */
-	private static ImmutableMap<MinecraftVersion, Integer> VERSION_NUMBERS = ImmutableMap.<MinecraftVersion, Integer>builder()
-			.put(MinecraftVersion.WORLD_UPDATE, 4)
-			.put(MinecraftVersion.SKIN_UPDATE, 5)
-			.put(MinecraftVersion.BOUNTIFUL_UPDATE, 47)
-			.build();
-	private static MinecraftVersion LAST_VERSION = MinecraftVersion.BOUNTIFUL_UPDATE;
-
 	private static Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
 	private static Class<?> GAME_PROFILE_ARRAY = MinecraftReflection.getArrayClass(GAME_PROFILE);
 
@@ -101,7 +89,7 @@ public class WrappedServerPing extends AbstractWrapper {
 	/**
 	 * Construct a new server ping initialized with a zero player count, and zero maximum.
 	 * <p>
-	 * Note that the version string is set to 1.8.
+	 * Note that the version string is set to 1.9.4.
 	 */
 	public WrappedServerPing() {
 		super(MinecraftReflection.getServerPingClass());
@@ -129,14 +117,8 @@ public class WrappedServerPing extends AbstractWrapper {
 	 * Reset the version string to the default state.
 	 */
 	protected void resetVersion() {
-		ProtocolManager manager = ProtocolLibrary.getProtocolManager();
-		MinecraftVersion minecraftVersion = LAST_VERSION;
-
-		// Fetch the latest known version
-		if (manager != null) {
-			minecraftVersion = manager.getMinecraftVersion();
-		}
-		version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), VERSION_NUMBERS.get(minecraftVersion));
+		MinecraftVersion minecraftVersion = MinecraftVersion.getCurrentVersion();
+		version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), MinecraftProtocolVersion.getCurrentVersion());
 		VERSION.set(handle, version);
 	}
 

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

@@ -132,15 +132,16 @@ public class WrappedSignedProperty extends AbstractWrapper {
 	}
 	
 	@Override
-	public boolean equals(Object object){
+	public boolean equals(Object object) {
+		if (object == this) return true;
+		
 		if (object instanceof WrappedSignedProperty) {
-			if (!super.equals(object))
-				return false;
 			WrappedSignedProperty that = (WrappedSignedProperty) object;
 			return Objects.equal(this.getName(), that.getName())
 				&& Objects.equal(this.getValue(), that.getValue())
 				&& Objects.equal(this.getSignature(), that.getSignature());
 		}
+
 		return false;
 	}
 

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

@@ -82,21 +82,4 @@ public class WrappedStatistic extends AbstractWrapper {
 	public String toString() {
 		return String.valueOf(handle);
 	}
-	
-	@Override
-	public int hashCode() {
-		return handle.hashCode();
-	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this)
-			return true;
-		
-		if (obj instanceof WrappedGameProfile) {
-			WrappedStatistic other = (WrappedStatistic) obj;
-			return handle.equals(other.handle);
-		}
-		return false;
-	}
 }

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

@@ -1,232 +1,291 @@
-/**
- *  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.wrappers;
-
-import org.bukkit.inventory.ItemStack;
-
-import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
-
-/**
- * Represents a DataWatcher Item in 1.9.
- * @author dmulloy2
- */
-
-public class WrappedWatchableObject extends AbstractWrapper {
-	private static final Class<?> HANDLE_TYPE = MinecraftReflection.getDataWatcherItemClass();
-	private static ConstructorAccessor constructor;
-
-	private final StructureModifier<Object> modifier;
-
-	/**
-	 * Constructs a wrapped watchable object around an existing NMS data watcher item.
-	 * @param handle Data watcher item
-	 */
-	public WrappedWatchableObject(Object handle) {
-		super(HANDLE_TYPE);
-		setHandle(handle);
-		this.modifier = new StructureModifier<Object>(handleType).withTarget(handle);
-	}
-
-	/**
-	 * Constructs a wrapped watchable object with a given watcher object and initial value.
-	 * @param watcherObject Watcher object
-	 * @param value Initial value
-	 */
-	public WrappedWatchableObject(WrappedDataWatcherObject watcherObject, Object value) {
-		this(newHandle(watcherObject, value));
-	}
-
-	private static Object newHandle(WrappedDataWatcherObject watcherObject, Object value) {
-		if (constructor == null) {
-			constructor = Accessors.getConstructorAccessor(HANDLE_TYPE.getConstructors()[0]);
-		}
-
-		return constructor.invoke(watcherObject.getHandle(), value);
-	}
-
-	// ---- Getter methods
-
-	/**
-	 * Gets this Item's watcher object, which contains the index and serializer.
-	 * @return The watcher object
-	 */
-	public WrappedDataWatcherObject getWatcherObject() {
-		return new WrappedDataWatcherObject(modifier.read(0));
-	}
-
-	/**
-	 * Gets this Item's index from the watcher object
-	 * @return The index
-	 */
-	public int getIndex() {
-		return getWatcherObject().getIndex();
-	}
-
-	/**
-	 * Gets the wrapped value of this data watcher item.
-	 * @return The wrapped value
-	 */
-	public Object getValue() {
-		return getWrapped(getRawValue());
-	}
-
-	/**
-	 * Gets the raw value of this data watcher item.
-	 * @return Raw value
-	 */
-	public Object getRawValue() {
-		return modifier.readSafely(1);
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Sets the value of this item.
-	 * @param value New value
-	 * @param updateClient Whether or not to update the client
-	 */
-	public void setValue(Object value, boolean updateClient) {
-		modifier.write(1, getUnwrapped(value));
-
-		if (updateClient) {
-			setDirtyState(true);
-		}
-	}
-
-	/**
-	 * Sets the value of this item.
-	 * @param value New value
-	 */
-	public void setValue(Object value) {
-		setValue(value, false);
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Whether or not the value must be synchronized with the client.
-	 * @return True if it must, false if not
-	 */
-	public boolean getDirtyState() {
-		return (boolean) modifier.read(2);
-	}
-
-	/**
-	 * Sets this item's dirty state
-	 * @param dirty New state
-	 */
-	public void setDirtyState(boolean dirty) {
-		modifier.write(2, dirty);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) return true;
-		if (obj == null) return false;
-
-		if (obj instanceof WrappedWatchableObject) {
-			// watcher object, value, dirty state
-			WrappedWatchableObject other = (WrappedWatchableObject) obj;
-			return getWatcherObject().equals(other.getWatcherObject())
-					&& getRawValue().equals(other.getRawValue())
-					&& getDirtyState() == other.getDirtyState();
-		}
-
-		return false;
-	}
-
-	@Override
-	public String toString() {
-		return "DataWatcherItem[object=" + getWatcherObject() + ", value=" + getValue() + ", dirty=" + getDirtyState() + "]";
-	}
-}
+/**
+ *  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.wrappers;
+
+import static com.comphenix.protocol.utility.MinecraftReflection.is;
+
+import org.bukkit.inventory.ItemStack;
+
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
+import com.google.common.base.Optional;
+
+/**
+ * Represents a DataWatcher Item in 1.8 thru 1.10.
+ * @author dmulloy2
+ */
+public class WrappedWatchableObject extends AbstractWrapper {
+	private static final Class<?> HANDLE_TYPE = MinecraftReflection.getDataWatcherItemClass();
+	private static Integer VALUE_INDEX = null;
+
+	private static ConstructorAccessor constructor;
+
+	private final StructureModifier<Object> modifier;
+
+	/**
+	 * Constructs a DataWatcher Item wrapper from an existing NMS data watcher item.
+	 * @param handle Data watcher item
+	 */
+	public WrappedWatchableObject(Object handle) {
+		super(HANDLE_TYPE);
+		setHandle(handle);
+		this.modifier = new StructureModifier<Object>(handleType).withTarget(handle);
+	}
+
+	/**
+	 * Constructs a DataWatcher Item wrapper from a given index and initial value.
+	 * <p>
+	 * Not recommended in 1.9 and up.
+	 * @param index Index of the Item
+	 * @param value Initial value
+	 */
+	public WrappedWatchableObject(int index, Object value) {
+		this(newHandle(WrappedDataWatcherObject.fromIndex(index), value));
+	}
+
+	/**
+	 * Constructs a DataWatcher Item wrapper from a given watcher object and initial value.
+	 * @param watcherObject Watcher object
+	 * @param value Initial value
+	 */
+	public WrappedWatchableObject(WrappedDataWatcherObject watcherObject, Object value) {
+		this(newHandle(watcherObject, value));
+	}
+
+	private static Object newHandle(WrappedDataWatcherObject watcherObject, Object value) {
+		if (constructor == null) {
+			constructor = Accessors.getConstructorAccessor(HANDLE_TYPE.getConstructors()[0]);
+		}
+
+		if (MinecraftReflection.watcherObjectExists()) {
+			return constructor.invoke(watcherObject.getHandle(), value);
+		} else {
+			// new WatchableObject(classId, index, value)
+			return constructor.invoke(WrappedDataWatcher.getTypeID(value.getClass()), watcherObject.getIndex(), value);
+		}
+	}
+
+	// ---- Getter methods
+
+	/**
+	 * Gets this Item's watcher object, which contains the index and serializer.
+	 * @return The watcher object
+	 */
+	public WrappedDataWatcherObject getWatcherObject() {
+		return new WrappedDataWatcherObject(modifier.read(0));
+	}
+
+	/**
+	 * Gets this Item's index from the watcher object
+	 * @return The index
+	 */
+	public int getIndex() {
+		if (MinecraftReflection.watcherObjectExists()) {
+			return getWatcherObject().getIndex();
+		}
+
+		return modifier.<Integer>withType(int.class).read(1);
+	}
+
+	/**
+	 * Gets the wrapped value of this data watcher item.
+	 * @return The wrapped value
+	 */
+	public Object getValue() {
+		return getWrapped(getRawValue());
+	}
+
+	/**
+	 * Gets the raw value of this data watcher item.
+	 * @return Raw value
+	 */
+	public Object getRawValue() {
+		if (VALUE_INDEX == null) {
+			VALUE_INDEX = MinecraftReflection.watcherObjectExists() ? 1 : 2;
+		}
+
+		return modifier.readSafely(VALUE_INDEX);
+	}
+
+	/**
+	 * Sets the value of this item.
+	 * @param value New value
+	 * @param updateClient Whether or not to update the client
+	 */
+	public void setValue(Object value, boolean updateClient) {
+		if (VALUE_INDEX == null) {
+			VALUE_INDEX = MinecraftReflection.watcherObjectExists() ? 1 : 2;
+		}
+
+		modifier.write(VALUE_INDEX, getUnwrapped(value));
+
+		if (updateClient) {
+			setDirtyState(true);
+		}
+	}
+
+	/**
+	 * Sets the value of this item.
+	 * @param value New value
+	 */
+	public void setValue(Object value) {
+		setValue(value, false);
+	}
+
+	/**
+	 * Whether or not the value must be synchronized with the client.
+	 * @return True if it must, false if not
+	 */
+	public boolean getDirtyState() {
+		return modifier.<Boolean>withType(boolean.class).read(0);
+	}
+
+	/**
+	 * Sets this item's dirty state
+	 * @param dirty New state
+	 */
+	public void setDirtyState(boolean dirty) {
+		modifier.<Boolean>withType(boolean.class).write(0, dirty);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+
+		if (obj instanceof WrappedWatchableObject) {
+			WrappedWatchableObject that = (WrappedWatchableObject) obj;
+			return this.getIndex() == that.getIndex() &&
+					this.getRawValue().equals(that.getRawValue()) &&
+					this.getDirtyState() == that.getDirtyState();
+		}
+
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + getIndex();
+		result = prime * result + getRawValue().hashCode();
+		result = prime * result + (getDirtyState() ? 1231 : 1237);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "DataWatcherItem[index=" + getIndex() + ", value=" + getValue() + ", dirty=" + getDirtyState() + "]";
+	}
+
+	// ---- Wrapping
+
+	/**
+	 * Retrieve the wrapped object value, if needed. All non-primitive objects
+	 * with {@link Serializer}s should be covered by this.
+	 * 
+	 * @param value - the raw NMS object to wrap.
+	 * @return The wrapped object.
+	 */
+	@SuppressWarnings("rawtypes")
+	static Object getWrapped(Object value) {
+		// Handle watcher items first
+		if (is(MinecraftReflection.getDataWatcherItemClass(), value)) {
+			return getWrapped(new WrappedWatchableObject(value).getRawValue());
+		}
+
+		// Then deal with optionals
+		if (value instanceof Optional) {
+			Optional<?> optional = (Optional<?>) value;
+			if (optional.isPresent()) {
+				return Optional.of(getWrapped(optional.get()));
+			} else {
+				return Optional.absent();
+			}
+		}
+
+		// Current supported classes
+		if (is(MinecraftReflection.getIChatBaseComponentClass(), value)) {
+			return WrappedChatComponent.fromHandle(value);
+		} else if (is(MinecraftReflection.getItemStackClass(), value)) {
+			return BukkitConverters.getItemStackConverter().getSpecific(value);
+		} else if (is(MinecraftReflection.getIBlockDataClass(), value)) {
+			return BukkitConverters.getWrappedBlockDataConverter().getSpecific(value);
+		} else if (is (Vector3F.getMinecraftClass(), value)) {
+			return Vector3F.getConverter().getSpecific(value);
+		} else if (is(MinecraftReflection.getBlockPositionClass(), value)) {
+			return BlockPosition.getConverter().getSpecific(value);
+		} else if (is(EnumWrappers.getDirectionClass(), value)) {
+			return EnumWrappers.getDirectionConverter().getSpecific(value);
+		}
+
+		// Legacy classes
+		if (is(MinecraftReflection.getChunkCoordinatesClass(), value)) {
+			return new WrappedChunkCoordinate((Comparable) value);
+		} else if (is(MinecraftReflection.getChunkPositionClass(), value)) {
+			return ChunkPosition.getConverter().getSpecific(value);
+		}
+
+		return value;
+	}
+
+	/**
+	 * Retrieve the raw NMS value.
+	 * 
+	 * @param wrapped - the wrapped position.
+	 * @return The raw NMS object.
+	 */
+	// Must be kept in sync with getWrapped!
+	static Object getUnwrapped(Object wrapped) {
+		if (wrapped instanceof Optional) {
+			Optional<?> optional = (Optional<?>) wrapped;
+			if (optional.isPresent()) {
+				return Optional.of(getUnwrapped(optional.get()));
+			} else {
+				return Optional.absent();
+			}
+		}
+
+		// Current supported classes
+		if (wrapped instanceof WrappedChatComponent) {
+			return ((WrappedChatComponent) wrapped).getHandle();
+		} else if (wrapped instanceof ItemStack) {
+			return BukkitConverters.getItemStackConverter().getGeneric(MinecraftReflection.getItemStackClass(), (ItemStack) wrapped);
+		} else if (wrapped instanceof WrappedBlockData) {
+			return BukkitConverters.getWrappedBlockDataConverter().getGeneric(MinecraftReflection.getIBlockDataClass(), (WrappedBlockData) wrapped);
+		} else if (wrapped instanceof Vector3F) {
+			return Vector3F.getConverter().getGeneric(Vector3F.getMinecraftClass(), (Vector3F) wrapped);
+		} else if (wrapped instanceof BlockPosition) {
+			return BlockPosition.getConverter().getGeneric(MinecraftReflection.getBlockPositionClass(), (BlockPosition) wrapped);
+		} else if (wrapped instanceof Direction) {
+			return EnumWrappers.getDirectionConverter().getGeneric(EnumWrappers.getDirectionClass(), (Direction) wrapped);
+		}
+
+		// Legacy classes
+		if (wrapped instanceof ChunkPosition) {
+			return ChunkPosition.getConverter().getGeneric(MinecraftReflection.getChunkPositionClass(), (ChunkPosition) wrapped);
+		} else if (wrapped instanceof WrappedChunkCoordinate) {
+			return ((WrappedChunkCoordinate) wrapped).getHandle();
+		}
+
+		return wrapped;
+	}
+}

modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java

@@ -9,4 +9,4 @@ package com.comphenix.protocol.wrappers.collection;
  */
 public interface BiFunction<T1, T2, TResult> {
 	public TResult apply(T1 arg1, T2 arg2);
-}
+}

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java

@@ -84,4 +84,4 @@ public interface NbtBase<TType> {
 	 * @return The cloned tag.
 	 */
 	public abstract NbtBase<TType> deepClone();
-}
+}

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java

@@ -350,4 +350,4 @@ public interface NbtCompound extends NbtBase<Map<String, NbtBase<?>>>, Iterable<
 	 */
 	@Override
 	public abstract Iterator<NbtBase<?>> iterator();
-}
+}

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java

@@ -137,4 +137,4 @@ public interface NbtList<TType> extends NbtBase<List<NbtBase<TType>>>, Iterable<
 	 */
 	@Override
 	public abstract Iterator<TType> iterator();
-}
+}

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java

@@ -46,7 +46,7 @@ class TileEntityAccessor<T extends BlockState> {
 	private boolean writeDetected;
 	private boolean readDetected;
 
-	private TileEntityAccessor() {
+	TileEntityAccessor() {
 		// Do nothing
 	}
 
@@ -59,27 +59,30 @@ class TileEntityAccessor<T extends BlockState> {
 		if (tileEntityField != null) {
 			this.tileEntityField = tileEntityField;
 			Class<?> type = tileEntityField.getField().getType();
-
-			// Possible read/write methods
-			try {
-				findMethodsUsingASM();
-			} catch (IOException ex1) {
-				try {
-					// Much slower though
-					findMethodUsingCGLib(state);
-				} catch (Exception ex2) {
-					throw new RuntimeException("Cannot find read/write methods in " + type, ex2);
-				}
-			}
-
-			// Ensure we found them
-			if (readCompound == null)
-				throw new RuntimeException("Unable to find read method in " + type);
-			if (writeCompound == null)
-				throw new RuntimeException("Unable to find write method in " + type);
+			findMethods(type, state);
 		}
 	}
 
+	void findMethods(Class<?> type, T state) {
+		// Possible read/write methods
+		try {
+			findMethodsUsingASM();
+		} catch (IOException ex1) {
+			try {
+				// Much slower though
+				findMethodUsingCGLib(state);
+			} catch (Exception ex2) {
+				throw new RuntimeException("Cannot find read/write methods in " + type, ex2);
+			}
+		}
+
+		// Ensure we found them
+		if (readCompound == null)
+			throw new RuntimeException("Unable to find read method in " + type);
+		if (writeCompound == null)
+			throw new RuntimeException("Unable to find write method in " + type);
+	}
+
 	/**
 	 * Find the read/write methods in TileEntity.
 	 * @throws IOException If we cannot find these methods.
@@ -90,7 +93,7 @@ class TileEntityAccessor<T extends BlockState> {
 		final ClassReader reader = new ClassReader(tileEntityClass.getCanonicalName());
 
 		final String tagCompoundName = getJarName(MinecraftReflection.getNBTCompoundClass());
-		final String expectedDesc = "(L" + tagCompoundName + ";)V";
+		final String expectedDesc = "(L" + tagCompoundName + ";)";
 
 		reader.accept(new EmptyClassVisitor() {
 			@Override
@@ -98,7 +101,7 @@ class TileEntityAccessor<T extends BlockState> {
 				final String methodName = name;
 
 				// Detect read/write calls to NBTTagCompound
-				if (expectedDesc.equals(desc)) {
+				if (desc.startsWith(expectedDesc)) {
 					return new EmptyMethodVisitor() {
 						private int readMethods;
 						private int writeMethods;
@@ -106,9 +109,9 @@ class TileEntityAccessor<T extends BlockState> {
 						@Override
 						public void visitMethodInsn(int opcode, String owner, String name, String desc) {
 							// This must be a virtual call on NBTTagCompound that accepts a String
-							if (opcode == Opcodes.INVOKEVIRTUAL &&
-								tagCompoundName.equals(owner) &&
-								desc.startsWith("(Ljava/lang/String")) {
+							if (opcode == Opcodes.INVOKEVIRTUAL
+									&& tagCompoundName.equals(owner)
+									&& desc.startsWith("(Ljava/lang/String")) {
 
 								// Is this a write call?
 								if (desc.endsWith(")V")) {
@@ -126,10 +129,12 @@ class TileEntityAccessor<T extends BlockState> {
 							} else if (writeMethods > readMethods) {
 								writeCompound = Accessors.getMethodAccessor(tileEntityClass, methodName, nbtCompoundClass);
 							}
+
 							super.visitEnd();
 						}
 					};
 				}
+
 				return null;
 			}
 		}, 0);

modules/ProtocolLib/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ProtocolLib</artifactId>
   <name>ProtocolLib</name>
-  <version>4.0.0</version>
+  <version>4.2.0</version>
 
   <description>Provides read/write access to the Minecraft protocol.</description>
   <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
@@ -19,6 +19,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.number></project.build.number>
+    <project.fullVersion>${project.version}</project.fullVersion>
   </properties>
 
   <build>
@@ -87,11 +88,11 @@
             <manifestEntries>
               <Main-Class>com.comphenix.protocol.Application</Main-Class>
               <Implementation-Title>ProtocolLib</Implementation-Title>
-              <Implementation-Version>${project.version}${project.build.number}</Implementation-Version>
+              <Implementation-Version>${project.fullVersion}</Implementation-Version>
               <Implementation-Vendor>dmulloy2</Implementation-Vendor>
             </manifestEntries>
           </archive>
-          <finalName>ProtocolLib</finalName>
+          <finalName>${project.name}</finalName>
         </configuration>
       </plugin>
 
@@ -121,6 +122,7 @@
       </activation>
       <properties>
         <project.build.number>-b${env.BUILD_NUMBER}</project.build.number>
+        <project.fullVersion>${project.version}${project.build.number}</project.fullVersion>
       </properties>
     </profile>
 
@@ -132,6 +134,9 @@
           <value>true</value>
         </property>
       </activation>
+      <properties>
+        <project.fullVersion>${project.version}</project.fullVersion>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -162,6 +167,7 @@
             </executions>
           </plugin>
 
+          <!-- TODO: Look into signing releases
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -176,6 +182,7 @@
               </execution>
             </executions>
           </plugin>
+          -->
 
         </plugins>
       </build>
@@ -222,7 +229,7 @@
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
       <artifactId>ProtocolLib-API</artifactId>
-      <version>4.0</version>
+      <version>${project.version}</version>
     </dependency>
     <!-- Included with Minecraft
     <dependency>
@@ -234,13 +241,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.11.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.11.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

modules/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();
-	}
-}

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

@@ -22,6 +22,7 @@ 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;
@@ -252,16 +253,34 @@ 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) {
 			ProtocolLogger.log(Level.SEVERE, "Failed to create dump:", ex);

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

@@ -4,6 +4,7 @@ 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;
@@ -53,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) {

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

@@ -52,6 +52,7 @@ import com.comphenix.protocol.updater.Updater.UpdateType;
 import com.comphenix.protocol.utility.ChatExtensions;
 import com.comphenix.protocol.utility.EnhancerFactory;
 import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Util;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
@@ -148,9 +149,17 @@ public class ProtocolLib extends JavaPlugin {
 
 	@Override
 	public void onLoad() {
-		// Load configuration
-		logger = getLoggerSafely();
-		Application.registerPrimaryThread();
+		// Logging
+		logger = getLogger();
+		ProtocolLogger.init(this);
+
+		int java = Util.getJavaVersion();
+		if (java < 8 && !getConfig().getBoolean("ignoreJava", false)) {
+			logger.warning("Detected outdated Java version: Java " + java);
+			logger.warning("It is recommended that you update to Java 8 as soon as possible.");
+			logger.warning("Future versions of ProtocolLib many not support Java " + java + ".");
+			logger.warning("Java 8 will allow for much faster reflection performance.");
+		}
 
 		// Initialize enhancer factory
 		EnhancerFactory.getInstance().setClassLoader(getClassLoader());
@@ -648,26 +657,6 @@ public class ProtocolLib 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 metrics instance used to measure users of this library.
 	 * <p>
@@ -678,4 +667,4 @@ public class ProtocolLib extends JavaPlugin {
 	public Statistics getStatistics() {
 		return statistics;
 	}
-}
+}

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

@@ -17,17 +17,15 @@
 
 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.Map;
-import java.util.Set;
 
+import org.apache.commons.lang.Validate;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -54,62 +52,44 @@ class EntityUtilities {
 	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 updateEntity2(Entity entity, List<Player> observers) {
+		EntityTrackerEntry entry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+
+		List<EntityPlayer> nmsPlayers = getNmsPlayers(observers);
+
+		entry.trackedPlayers.removeAll(nmsPlayers);
+		entry.scanPlayers(nmsPlayers);
+	}
+	*/
+
 	public static void updateEntity(Entity entity, List<Player> observers) throws FieldAccessException {
+		if (entity == null || !entity.isValid()) {
+			return;
+		}
+
 		try {
-			//EntityTrackerEntry trackEntity = (EntityTrackerEntry) tracker.trackedEntities.get(entity.getEntityId());
 			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
+			if (trackerEntry == null) {
+				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + ".");
+			}
 
 			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);
+			Collection<?> trackedPlayers = getTrackedPlayers(trackedPlayersField, trackerEntry);
 			List<Object> nmsPlayers = unwrapBukkit(observers);
-			
-			// trackEntity.trackedPlayers.clear();
+
 			trackedPlayers.removeAll(nmsPlayers);
 			
 			// We have to rely on a NAME once again. Damn it.
-			// TODO: Make sure this stays up to date with version changes - 1.9
+			// TODO: Make sure this stays up to date with version changes - 1.8 - 1.10
 			if (scanPlayersMethod == null) {
 				scanPlayersMethod = trackerEntry.getClass().getMethod("scanPlayers", List.class);
 			}
-			
-			//trackEntity.scanPlayers(server.players);
-			scanPlayersMethod.invoke(trackerEntry, nmsPlayers);
-			
+
+			scanPlayersMethod.invoke(trackerEntry, nmsPlayers);			
 		} catch (IllegalArgumentException e) {
 			throw e;
 		} catch (IllegalAccessException e) {
@@ -130,28 +110,23 @@ class EntityUtilities {
 	 * @throws FieldAccessException If reflection failed.
 	 */
 	public static List<Player> getEntityTrackers(Entity entity) {
+		if (entity == null || !entity.isValid()) {
+			return new ArrayList<>();
+		}
+
 		try {
 			List<Player> result = new ArrayList<Player>();
-			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
 
+			Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
 			if (trackerEntry == null) {
-				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + (entity.isDead() ? " - entity is dead." : "."));
+				throw new IllegalArgumentException("Cannot find entity trackers for " + entity + ".");
 			}
 
 			if (trackedPlayersField == null) {
 				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
 			}
 
-			Collection<?> trackedPlayers = null;
-			Object value = FieldUtils.readField(trackedPlayersField, trackerEntry, false);
-
-			if (value instanceof Collection) {
-				trackedPlayers = (Collection<?>) value;
-			} else if (value instanceof Map) { // PaperSpigot
-				trackedPlayers = ((Map<?, ?>) value).keySet();
-			} else { // Please, no more changes
-				throw new IllegalStateException("trackedPlayers field was an unknown type: expected Set or Map, but got " + value.getClass());
-			}
+			Collection<?> trackedPlayers = getTrackedPlayers(trackedPlayersField, trackerEntry);
 
 			// Wrap every player - we also ensure that the underlying tracker list is immutable
 			for (Object tracker : trackedPlayers) {
@@ -159,20 +134,38 @@ class EntityUtilities {
 					result.add((Player) MinecraftReflection.getBukkitEntity(tracker));
 				}
 			}
-			return result;
 
+			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
-	 */
+
+	// Damn you, Paper
+	private static Collection<?> getTrackedPlayers(Field field, Object entry) throws IllegalAccessException {
+		Validate.notNull(field, "Cannot find 'trackedPlayers' field.");
+		Validate.notNull(entry, "entry cannot be null!");
+
+		Object value = FieldUtils.readField(field, entry, false);
+
+		if (value instanceof Collection) {
+			return (Collection<?>) value;
+		} else if (value instanceof Map) {
+			return ((Map<?, ?>) value).keySet();
+		} else {
+			// Please. No more changes.
+			throw new IllegalStateException("trackedPlayers field was an unknown type: expected Collection or Map, but got " + value.getClass());
+		}
+	}
+
+	/*
+	private static EntityTrackerEntry getEntityTrackerEntry2(World world, int entityID) {
+		WorldServer worldServer = ((CraftWorld) world).getHandle();
+		EntityTracker tracker = worldServer.tracker;
+		return tracker.trackedEntities.get(entityID);
+	}
+	*/
+
 	private static Object getEntityTrackerEntry(World world, int entityID) throws FieldAccessException, IllegalArgumentException {
 		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
 		Object worldServer = unwrapper.unwrapItem(world);
@@ -189,29 +182,18 @@ class EntityUtilities {
 		} catch (IllegalAccessException e) {
 			throw new FieldAccessException("Cannot access 'tracker' field due to security limitations.", e);
 		}
-		
+
+		// Looking for an IntHashMap in the tracker entry
 		if (trackedEntitiesField == null) {
-			@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);
+			trackedEntitiesField = FuzzyReflection.fromObject(tracker, false)
+					.getFieldByType("trackedEntities", MinecraftReflection.getIntHashMapClass());
 		}
-		
-		// Read the entity hashmap
+
+		// Read the map
 		Object trackedEntities = null;
 
 		try {
-			trackedEntities = FieldUtils.readField(trackedEntitiesField, tracker, true);
+			trackedEntities = FieldUtils.readField(trackedEntitiesField, tracker, false);
 		} catch (IllegalAccessException e) {
 			throw new FieldAccessException("Cannot access 'trackedEntities' field due to security limitations.", e);
 		}
@@ -221,7 +203,7 @@ class EntityUtilities {
 
 	/**
 	 * Retrieve entity from a ID, even it it's newly created.
-	 * @return The asssociated entity.
+	 * @return The associated entity.
 	 * @throws FieldAccessException Reflection error.
 	 */
 	public static Entity getEntityFromID(World world, int entityID) throws FieldAccessException {
@@ -256,7 +238,6 @@ class EntityUtilities {
 	}
 
 	private static List<Object> unwrapBukkit(List<Player> players) {
-		
 		List<Object> output = Lists.newArrayList();
 		BukkitUnwrapper unwrapper = new BukkitUnwrapper();
 		

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

@@ -91,4 +91,4 @@ public interface ListenerInvoker {
 	 */
 	@Deprecated
 	public abstract Class<?> getPacketClassFromID(int packetID, boolean forceVanilla);
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java

@@ -582,23 +582,23 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 	 * @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;
+		// Try to find the login packet class
+		if (PACKET_LOGIN_CLIENT == null) {
+			PACKET_LOGIN_CLIENT = PacketType.Login.Client.START.getPacketClass();
 		}
-		if (loginClient == null) {
-			loginClient = Accessors.getFieldAccessor(PACKET_LOGIN_CLIENT, MinecraftReflection.getGameProfileClass(), true);
-			LOGIN_GAME_PROFILE = loginClient;
+
+		// If we can't, there's an issue
+		if (PACKET_LOGIN_CLIENT == null) {
+			throw new IllegalStateException("Failed to obtain login start packet. Did you build Spigot with BuildTools?");
+		}
+
+		if (LOGIN_GAME_PROFILE == null) {
+			LOGIN_GAME_PROFILE = Accessors.getFieldAccessor(PACKET_LOGIN_CLIENT, MinecraftReflection.getGameProfileClass(), true);
 		}
 
 		// 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));
+		if (PACKET_LOGIN_CLIENT.equals(packetClass)) {
+			WrappedGameProfile profile = WrappedGameProfile.fromHandle(LOGIN_GAME_PROFILE.get(packet));
 
 			// Save the channel injector
 			factory.cacheInjector(profile.getName(), this);
@@ -671,7 +671,7 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 				MinecraftMethods.getSendPacketMethod().invoke(getPlayerConnection(), packet);
 			}
 		} catch (Throwable ex) {
-			ProtocolLibrary.getErrorReporter().reportWarning(factory.getPlugin(),
+			ProtocolLibrary.getErrorReporter().reportWarning(this,
 					Report.newBuilder(REPORT_CANNOT_SEND_PACKET).messageParam(packet, playerName).error(ex).build());
 		}
 	}
@@ -716,7 +716,7 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 	 */
 	private Object getPlayerConnection() {
 		if (playerConnection == null) {
-			playerConnection = MinecraftFields.getPlayerConnection(player);
+			playerConnection = MinecraftFields.getPlayerConnection(getPlayer());
 		}
 		return playerConnection;
 	}
@@ -923,4 +923,4 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 	public Channel getChannel() {
 		return originalChannel;
 	}
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java

@@ -63,4 +63,4 @@ public interface ChannelListener {
      * @return TRUE if it is, FALSE otherwise.
      */
 	boolean isDebug();
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/Injector.java

@@ -94,4 +94,4 @@ public interface Injector {
 	 * @param player - the more up-to-date player.
 	 */
 	public abstract void setUpdatedPlayer(Player player);
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java

@@ -1,371 +1,371 @@
-/**
- *  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 io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.ChannelPromise;
-import io.netty.util.concurrent.EventExecutorGroup;
-
-import java.net.SocketAddress;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * A pipeline proxy.
- * @author Kristian
- */
-public class PipelineProxy implements ChannelPipeline {
-	protected final ChannelPipeline pipeline;
-	protected final Channel channel;
-
-	public PipelineProxy(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);
-	}
-}
+/**
+ *  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 io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.EventExecutorGroup;
+
+import java.net.SocketAddress;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * A pipeline proxy.
+ * @author Kristian
+ */
+public class PipelineProxy implements ChannelPipeline {
+	protected final ChannelPipeline pipeline;
+	protected final Channel channel;
+
+	public PipelineProxy(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/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java

@@ -62,4 +62,4 @@ public class LegacyNetworkMarker extends NetworkMarker {
 			throw new RuntimeException("Cannot add header.", e);
 		}
 	}
-}
+}

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

@@ -76,4 +76,4 @@ public interface PacketInjector {
 	 * Perform any necessary cleanup before unloading ProtocolLib.
 	 */
 	public abstract void cleanupAll();
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java

@@ -202,4 +202,4 @@ public interface PlayerInjectionHandler {
 	public abstract boolean hasMainThreadListener(PacketType type);
 
 	public abstract Channel getChannel(Player player);
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java

@@ -367,4 +367,4 @@ class ReplacedArrayList<TKey> extends ArrayList<TKey> {
 		revertAll();
 		super.finalize();
 	}
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java

@@ -80,4 +80,4 @@ public abstract class AbstractInputStreamLookup {
 	 * Invoked when the injection should be undone.
 	 */
 	public abstract void cleanupAll();
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InjectorContainer.java

@@ -18,4 +18,4 @@ class InjectorContainer {
 			throw new IllegalArgumentException("Injector cannot be NULL.");
 		this.injector = injector;
 	}
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java

@@ -40,4 +40,4 @@ class QueuedSendPacket {
 	public boolean isFiltered() {
 		return filtered;
 	}
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java

@@ -68,4 +68,4 @@ public interface SocketInjector {
 	 * @param updatedPlayer - the real Bukkit player.
 	 */
 	public abstract void setUpdatedPlayer(Player updatedPlayer);
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java

@@ -51,4 +51,4 @@ public abstract class AbstractPacketInjector implements PacketInjector {
 	public void cleanupAll() {
 		reveivedFilters.clear();
 	}
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java

@@ -80,4 +80,4 @@ public abstract class AbstractPlayerHandler implements PlayerInjectionHandler {
 	public void checkListener(Set<PacketListener> listeners) {
 		// Yes, really
 	}
-}
+}

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

@@ -750,4 +750,4 @@ public class Metrics {
             return plotter.name.equals(name) && plotter.getValue() == getValue();
         }
     }
-}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/BukkitUpdater.java

@@ -1,417 +1,417 @@
-/*
- * Updater for Bukkit.
- *
- * This class provides the means to safely and easily update a plugin, or check to see if it is updated using dev.bukkit.org
- */
-
-// Somewhat modified by aadnk.
-package com.comphenix.protocol.updater;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.error.Report;
-
-/**
- * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.
- * <p/>
- * <b>VERY, VERY IMPORTANT</b>: Because there are no standards for adding auto-update toggles in your plugin's config, this system provides NO CHECK WITH YOUR CONFIG to make sure the user has allowed auto-updating.
- * <br>
- * It is a <b>BUKKIT POLICY</b> that you include a boolean value in your config that prevents the auto-updater from running <b>AT ALL</b>.
- * <br>
- * If you fail to include this option in your config, your plugin will be <b>REJECTED</b> when you attempt to submit it to dev.bukkit.org.
- * <p/>
- * An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set to false you may NOT run the auto-updater.
- * <br>
- * If you are unsure about these rules, please read the plugin submission guidelines: http://goo.gl/8iU5l
- *
- * @author Gravity
- * @version 2.0
- */
-
-public class BukkitUpdater extends Updater {
-    private URL url; // Connecting to RSS
-    private File file; // The plugin's file
-    private Thread thread; // Updater thread
-
-    private int id = -1; // Project's Curse ID
-    private String apiKey = null; // BukkitDev ServerMods API key
-    private static final String TITLE_VALUE = "name"; 			// Gets remote file's title
-    private static final String LINK_VALUE = "downloadUrl"; 	// Gets remote file's download link
-    private static final String TYPE_VALUE = "releaseType"; 	// Gets remote file's release type
-    private static final String VERSION_VALUE = "gameVersion";  // Gets remote file's build version
-	private static final Object FILE_NAME = "fileName";			// Gets remote file's name
-    private static final String QUERY = "/servermods/files?projectIds="; // Path to GET
-    private static final String HOST = "https://api.curseforge.com"; // Slugs will be appended to this to get to the project's RSS feed
-
-    // private static final String[] NO_UPDATE_TAG = { "-DEV", "-PRE", "-SNAPSHOT" }; // If the version number contains one of these, don't update.
-    private static final int BYTE_SIZE = 1024; // Used for downloading files
-
-    private YamlConfiguration config; // Config file
-    private String updateFolder;// The folder that downloads will be placed in
-
-    /**
-     * Initialize the updater.
-     * <p>
-     * Call {@link #start()} to actually start looking (and downloading) updates.
-     *
-     * @param plugin   The plugin that is checking for an update.
-     * @param id       The dev.bukkit.org id of the project
-     * @param file     The file that the plugin is running from, get this by doing this.getFile() from within your main class.
-     * @param type     Specify the type of update this will be. See {@link UpdateType}
-     * @param announce True if the program should announce the progress of new updates in console
-     */
-    public BukkitUpdater(Plugin plugin, int id, File file, UpdateType type, boolean announce) {
-        super(plugin, type, announce);
-
-        this.file = file;
-        this.id = id;
-        this.updateFolder = plugin.getServer().getUpdateFolder();
-
-        File dataFolder = plugin.getDataFolder();
-        if (dataFolder != null) {
-	        final File pluginFile = plugin.getDataFolder().getParentFile();
-	        final File updaterFile = new File(pluginFile, "Updater");
-	        final File updaterConfigFile = new File(updaterFile, "config.yml");
-
-	        if (!updaterFile.exists()) {
-	            updaterFile.mkdir();
-	        }
-	        if (!updaterConfigFile.exists()) {
-	            try {
-	                updaterConfigFile.createNewFile();
-	            } catch (final IOException e) {
-	                plugin.getLogger().severe("The updater could not create a configuration in " + updaterFile.getAbsolutePath());
-	                e.printStackTrace();
-	            }
-	        }
-	        this.config = YamlConfiguration.loadConfiguration(updaterConfigFile);
-
-	        this.config.options().header("This configuration file affects all plugins using the Updater system (version 2+ - http://forums.bukkit.org/threads/96681/ )" + '\n'
-	                + "If you wish to use your API key, read http://wiki.bukkit.org/ServerMods_API and place it below." + '\n'
-	                + "Some updating systems will not adhere to the disabled value, but these may be turned off in their plugin's configuration.");
-	        this.config.addDefault("api-key", "PUT_API_KEY_HERE");
-	        this.config.addDefault("disable", false);
-
-	        if (this.config.get("api-key", null) == null) {
-	            this.config.options().copyDefaults(true);
-	            try {
-	                this.config.save(updaterConfigFile);
-	            } catch (final IOException e) {
-	                plugin.getLogger().severe("The updater could not save the configuration in " + updaterFile.getAbsolutePath());
-	                e.printStackTrace();
-	            }
-	        }
-
-	        if (this.config.getBoolean("disable")) {
-	            this.result = UpdateResult.DISABLED;
-	            return;
-	        }
-
-	        String key = this.config.getString("api-key");
-	        if (key.equalsIgnoreCase("PUT_API_KEY_HERE") || key.equals("")) {
-	            key = null;
-	        }
-
-	        this.apiKey = key;
-        }
-
-        try {
-            this.url = new URL(BukkitUpdater.HOST + BukkitUpdater.QUERY + id);
-        } catch (final MalformedURLException e) {
-            plugin.getLogger().severe("The project ID provided for updating, " + id + " is invalid.");
-            this.result = UpdateResult.FAIL_BADID;
-            e.printStackTrace();
-        }
-    }
-    
-    // aadnk - decouple the thread start and the constructor.
-    /**
-     * Begin looking for updates.
-     * @param type - the update type.
-     */
-    public void start(UpdateType type) {
-    	waitForThread();
-    	
-    	this.type = type;
-        this.thread = new Thread(new UpdateRunnable());
-        this.thread.start();
-    }
-    
-    /**
-     * Save an update from dev.bukkit.org into the server's update folder.
-     */
-    private void saveFile(File folder, String file, String u) {
-        if (!folder.exists()) {
-            folder.mkdir();
-        }
-        BufferedInputStream in = null;
-        FileOutputStream fout = null;
-        try {
-            // Download the file
-            final URL url = new URL(u);
-            final int fileLength = url.openConnection().getContentLength();
-            in = new BufferedInputStream(url.openStream());
-            fout = new FileOutputStream(folder.getAbsolutePath() + "/" + file);
-
-            final byte[] data = new byte[BukkitUpdater.BYTE_SIZE];
-            int count;
-            if (this.announce) {
-                this.plugin.getLogger().info("About to download a new update: " + this.versionName);
-            }
-            long downloaded = 0;
-            while ((count = in.read(data, 0, BukkitUpdater.BYTE_SIZE)) != -1) {
-                downloaded += count;
-                fout.write(data, 0, count);
-                final int percent = (int) ((downloaded * 100) / fileLength);
-                if (this.announce && ((percent % 10) == 0)) {
-                    this.plugin.getLogger().info("Downloading update: " + percent + "% of " + fileLength + " bytes.");
-                }
-            }
-            //Just a quick check to make sure we didn't leave any files from last time...
-            for (final File xFile : new File(this.plugin.getDataFolder().getParent(), this.updateFolder).listFiles()) {
-                if (xFile.getName().endsWith(".zip")) {
-                    xFile.delete();
-                }
-            }
-            // Check to see if it's a zip file, if it is, unzip it.
-            final File dFile = new File(folder.getAbsolutePath() + "/" + file);
-            if (dFile.getName().endsWith(".zip")) {
-                // Unzip
-                this.unzip(dFile.getCanonicalPath());
-            }
-            if (this.announce) {
-                this.plugin.getLogger().info("Finished updating.");
-            }
-        } catch (final Exception ex) {
-            this.plugin.getLogger().warning("The auto-updater tried to download a new update, but was unsuccessful.");
-            this.result = BukkitUpdater.UpdateResult.FAIL_DOWNLOAD;
-        } finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-                if (fout != null) {
-                    fout.close();
-                }
-            } catch (final Exception ex) {
-            }
-        }
-    }
-
-    /**
-     * Part of Zip-File-Extractor, modified by Gravity for use with Bukkit
-     */
-    private void unzip(String file) {
-        try {
-            final File fSourceZip = new File(file);
-            final String zipPath = file.substring(0, file.length() - 4);
-            ZipFile zipFile = new ZipFile(fSourceZip);
-            Enumeration<? extends ZipEntry> e = zipFile.entries();
-            while (e.hasMoreElements()) {
-                ZipEntry entry = e.nextElement();
-                File destinationFilePath = new File(zipPath, entry.getName());
-                destinationFilePath.getParentFile().mkdirs();
-                if (entry.isDirectory()) {
-                    continue;
-                } else {
-                    final BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
-                    int b;
-                    final byte buffer[] = new byte[BukkitUpdater.BYTE_SIZE];
-                    final FileOutputStream fos = new FileOutputStream(destinationFilePath);
-                    final BufferedOutputStream bos = new BufferedOutputStream(fos, BukkitUpdater.BYTE_SIZE);
-                    while ((b = bis.read(buffer, 0, BukkitUpdater.BYTE_SIZE)) != -1) {
-                        bos.write(buffer, 0, b);
-                    }
-                    bos.flush();
-                    bos.close();
-                    bis.close();
-                    final String name = destinationFilePath.getName();
-                    if (name.endsWith(".jar") && this.pluginFile(name)) {
-                        destinationFilePath.renameTo(new File(this.plugin.getDataFolder().getParent(), this.updateFolder + "/" + name));
-                    }
-                }
-                entry = null;
-                destinationFilePath = null;
-            }
-            e = null;
-            zipFile.close();
-            zipFile = null;
-
-            // Move any plugin data folders that were included to the right place, Bukkit won't do this for us.
-            for (final File dFile : new File(zipPath).listFiles()) {
-                if (dFile.isDirectory()) {
-                    if (this.pluginFile(dFile.getName())) {
-                        final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName()); // Get current dir
-                        final File[] contents = oFile.listFiles(); // List of existing files in the current dir
-                        for (final File cFile : dFile.listFiles()) // Loop through all the files in the new dir
-                        {
-                            boolean found = false;
-                            for (final File xFile : contents) // Loop through contents to see if it exists
-                            {
-                                if (xFile.getName().equals(cFile.getName())) {
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            if (!found) {
-                                // Move the new file into the current dir
-                                cFile.renameTo(new File(oFile.getCanonicalFile() + "/" + cFile.getName()));
-                            } else {
-                                // This file already exists, so we don't need it anymore.
-                                cFile.delete();
-                            }
-                        }
-                    }
-                }
-                dFile.delete();
-            }
-            new File(zipPath).delete();
-            fSourceZip.delete();
-        } catch (final IOException ex) {
-            this.plugin.getLogger().warning("The auto-updater tried to unzip a new update file, but was unsuccessful.");
-            this.result = BukkitUpdater.UpdateResult.FAIL_DOWNLOAD;
-            ex.printStackTrace();
-        }
-        new File(file).delete();
-    }
-
-    /**
-     * Check if the name of a jar is one of the plugins currently installed, used for extracting the correct files out of a zip.
-     */
-    private boolean pluginFile(String name) {
-        for (final File file : new File("plugins").listFiles()) {
-            if (file.getName().equals(name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Evaluate whether the version number is marked showing that it should not be updated by this program
-     */
-    /* private boolean hasTag(String version) {
-        for (final String string : BukkitUpdater.NO_UPDATE_TAG) {
-            if (version.contains(string)) {
-                return true;
-            }
-        }
-        return false;
-    } */
-
-    public boolean read() {
-        try {
-            final URLConnection conn = this.url.openConnection();
-            conn.setConnectTimeout(5000);
-
-            if (this.apiKey != null) {
-                conn.addRequestProperty("X-API-Key", this.apiKey);
-            }
-            conn.addRequestProperty("User-Agent", "Updater (by Gravity)");
-            conn.setDoOutput(true);
-
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            final String response = reader.readLine();
-
-            final JSONArray array = (JSONArray) JSONValue.parse(response);
-
-            if (array.size() == 0) {
-                this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
-                this.result = UpdateResult.FAIL_BADID;
-                return false;
-            }
-
-            final JSONObject jsonObject = (JSONObject) array.get(array.size() - 1);
-            this.versionFileName = (String) jsonObject.get(BukkitUpdater.FILE_NAME);
-			this.versionName = (String) jsonObject.get(BukkitUpdater.TITLE_VALUE);
-            this.versionLink = (String) jsonObject.get(BukkitUpdater.LINK_VALUE);
-            this.versionType = (String) jsonObject.get(BukkitUpdater.TYPE_VALUE);
-            this.versionGameVersion = (String) jsonObject.get(BukkitUpdater.VERSION_VALUE);
-
-            return true;
-        } catch (final IOException e) {
-            if (e.getMessage().contains("HTTP response code: 403")) {
-                this.plugin.getLogger().warning("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
-                this.plugin.getLogger().warning("Please double-check your configuration to ensure it is correct.");
-                this.result = UpdateResult.FAIL_APIKEY;
-            } else {
-                this.plugin.getLogger().warning("The updater could not contact dev.bukkit.org for updating.");
-                this.plugin.getLogger().warning("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
-                this.result = UpdateResult.FAIL_DBO;
-            }
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    // aadnk - added listeners
-    private class UpdateRunnable implements Runnable {
-        @Override
-        public void run() {
-        	try {
-	            if (BukkitUpdater.this.url != null) {
-	                // Obtain the results of the project's file feed
-	                if (BukkitUpdater.this.read()) {
-	                    if (BukkitUpdater.this.versionCheck(BukkitUpdater.this.versionName)) {
-	                        performUpdate();
-	                    }
-	                }
-	            }
-        	} catch (Exception e) {
-        		// Any generic error will be handled here
-				ProtocolLibrary.getErrorReporter().reportDetailed(
-					BukkitUpdater.this, Report.newBuilder(REPORT_CANNOT_UPDATE_PLUGIN).error(e).callerParam(this));
-	            
-        	} finally {
-        		// Invoke the listeners on the main thread
-        		for (Runnable listener : listeners) {
-        			plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, listener);
-        		}
-        	}
-        }
-
-		private void performUpdate() {
-			if ((BukkitUpdater.this.versionLink != null) && (BukkitUpdater.this.type != UpdateType.NO_DOWNLOAD)) {
-			    final File pluginFolder = plugin.getDataFolder().getParentFile();
-				File destinationFolder = new File(pluginFolder, updateFolder);
-			    String name = BukkitUpdater.this.file.getName(); 
-			    
-			    // If it's a zip file, it shouldn't be downloaded as the plugin's name
-			    if (BukkitUpdater.this.versionLink.endsWith(".zip")) {
-			        name = versionFileName;
-			    }	    
-				BukkitUpdater.this.saveFile(
-			    	destinationFolder, 
-			    	name, 
-			    	BukkitUpdater.this.versionLink
-			    );
-			} else {
-			    BukkitUpdater.this.result = UpdateResult.UPDATE_AVAILABLE;
-			}
-		}
-    }
-
-	@Override
-	public String getRemoteVersion() {
-		return getLatestName();
-	}
-}
+/*
+ * Updater for Bukkit.
+ *
+ * This class provides the means to safely and easily update a plugin, or check to see if it is updated using dev.bukkit.org
+ */
+
+// Somewhat modified by aadnk.
+package com.comphenix.protocol.updater;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.error.Report;
+
+/**
+ * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.
+ * <p/>
+ * <b>VERY, VERY IMPORTANT</b>: Because there are no standards for adding auto-update toggles in your plugin's config, this system provides NO CHECK WITH YOUR CONFIG to make sure the user has allowed auto-updating.
+ * <br>
+ * It is a <b>BUKKIT POLICY</b> that you include a boolean value in your config that prevents the auto-updater from running <b>AT ALL</b>.
+ * <br>
+ * If you fail to include this option in your config, your plugin will be <b>REJECTED</b> when you attempt to submit it to dev.bukkit.org.
+ * <p/>
+ * An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set to false you may NOT run the auto-updater.
+ * <br>
+ * If you are unsure about these rules, please read the plugin submission guidelines: http://goo.gl/8iU5l
+ *
+ * @author Gravity
+ * @version 2.0
+ */
+
+public class BukkitUpdater extends Updater {
+    private URL url; // Connecting to RSS
+    private File file; // The plugin's file
+    private Thread thread; // Updater thread
+
+    private int id = -1; // Project's Curse ID
+    private String apiKey = null; // BukkitDev ServerMods API key
+    private static final String TITLE_VALUE = "name"; 			// Gets remote file's title
+    private static final String LINK_VALUE = "downloadUrl"; 	// Gets remote file's download link
+    private static final String TYPE_VALUE = "releaseType"; 	// Gets remote file's release type
+    private static final String VERSION_VALUE = "gameVersion";  // Gets remote file's build version
+	private static final Object FILE_NAME = "fileName";			// Gets remote file's name
+    private static final String QUERY = "/servermods/files?projectIds="; // Path to GET
+    private static final String HOST = "https://api.curseforge.com"; // Slugs will be appended to this to get to the project's RSS feed
+
+    // private static final String[] NO_UPDATE_TAG = { "-DEV", "-PRE", "-SNAPSHOT" }; // If the version number contains one of these, don't update.
+    private static final int BYTE_SIZE = 1024; // Used for downloading files
+
+    private YamlConfiguration config; // Config file
+    private String updateFolder;// The folder that downloads will be placed in
+
+    /**
+     * Initialize the updater.
+     * <p>
+     * Call {@link #start()} to actually start looking (and downloading) updates.
+     *
+     * @param plugin   The plugin that is checking for an update.
+     * @param id       The dev.bukkit.org id of the project
+     * @param file     The file that the plugin is running from, get this by doing this.getFile() from within your main class.
+     * @param type     Specify the type of update this will be. See {@link UpdateType}
+     * @param announce True if the program should announce the progress of new updates in console
+     */
+    public BukkitUpdater(Plugin plugin, int id, File file, UpdateType type, boolean announce) {
+        super(plugin, type, announce);
+
+        this.file = file;
+        this.id = id;
+        this.updateFolder = plugin.getServer().getUpdateFolder();
+
+        File dataFolder = plugin.getDataFolder();
+        if (dataFolder != null) {
+	        final File pluginFile = plugin.getDataFolder().getParentFile();
+	        final File updaterFile = new File(pluginFile, "Updater");
+	        final File updaterConfigFile = new File(updaterFile, "config.yml");
+
+	        if (!updaterFile.exists()) {
+	            updaterFile.mkdir();
+	        }
+	        if (!updaterConfigFile.exists()) {
+	            try {
+	                updaterConfigFile.createNewFile();
+	            } catch (final IOException e) {
+	                plugin.getLogger().severe("The updater could not create a configuration in " + updaterFile.getAbsolutePath());
+	                e.printStackTrace();
+	            }
+	        }
+	        this.config = YamlConfiguration.loadConfiguration(updaterConfigFile);
+
+	        this.config.options().header("This configuration file affects all plugins using the Updater system (version 2+ - http://forums.bukkit.org/threads/96681/ )" + '\n'
+	                + "If you wish to use your API key, read http://wiki.bukkit.org/ServerMods_API and place it below." + '\n'
+	                + "Some updating systems will not adhere to the disabled value, but these may be turned off in their plugin's configuration.");
+	        this.config.addDefault("api-key", "PUT_API_KEY_HERE");
+	        this.config.addDefault("disable", false);
+
+	        if (this.config.get("api-key", null) == null) {
+	            this.config.options().copyDefaults(true);
+	            try {
+	                this.config.save(updaterConfigFile);
+	            } catch (final IOException e) {
+	                plugin.getLogger().severe("The updater could not save the configuration in " + updaterFile.getAbsolutePath());
+	                e.printStackTrace();
+	            }
+	        }
+
+	        if (this.config.getBoolean("disable")) {
+	            this.result = UpdateResult.DISABLED;
+	            return;
+	        }
+
+	        String key = this.config.getString("api-key");
+	        if (key.equalsIgnoreCase("PUT_API_KEY_HERE") || key.equals("")) {
+	            key = null;
+	        }
+
+	        this.apiKey = key;
+        }
+
+        try {
+            this.url = new URL(BukkitUpdater.HOST + BukkitUpdater.QUERY + id);
+        } catch (final MalformedURLException e) {
+            plugin.getLogger().severe("The project ID provided for updating, " + id + " is invalid.");
+            this.result = UpdateResult.FAIL_BADID;
+            e.printStackTrace();
+        }
+    }
+    
+    // aadnk - decouple the thread start and the constructor.
+    /**
+     * Begin looking for updates.
+     * @param type - the update type.
+     */
+    public void start(UpdateType type) {
+    	waitForThread();
+    	
+    	this.type = type;
+        this.thread = new Thread(new UpdateRunnable());
+        this.thread.start();
+    }
+    
+    /**
+     * Save an update from dev.bukkit.org into the server's update folder.
+     */
+    private void saveFile(File folder, String file, String u) {
+        if (!folder.exists()) {
+            folder.mkdir();
+        }
+        BufferedInputStream in = null;
+        FileOutputStream fout = null;
+        try {
+            // Download the file
+            final URL url = new URL(u);
+            final int fileLength = url.openConnection().getContentLength();
+            in = new BufferedInputStream(url.openStream());
+            fout = new FileOutputStream(folder.getAbsolutePath() + "/" + file);
+
+            final byte[] data = new byte[BukkitUpdater.BYTE_SIZE];
+            int count;
+            if (this.announce) {
+                this.plugin.getLogger().info("About to download a new update: " + this.versionName);
+            }
+            long downloaded = 0;
+            while ((count = in.read(data, 0, BukkitUpdater.BYTE_SIZE)) != -1) {
+                downloaded += count;
+                fout.write(data, 0, count);
+                final int percent = (int) ((downloaded * 100) / fileLength);
+                if (this.announce && ((percent % 10) == 0)) {
+                    this.plugin.getLogger().info("Downloading update: " + percent + "% of " + fileLength + " bytes.");
+                }
+            }
+            //Just a quick check to make sure we didn't leave any files from last time...
+            for (final File xFile : new File(this.plugin.getDataFolder().getParent(), this.updateFolder).listFiles()) {
+                if (xFile.getName().endsWith(".zip")) {
+                    xFile.delete();
+                }
+            }
+            // Check to see if it's a zip file, if it is, unzip it.
+            final File dFile = new File(folder.getAbsolutePath() + "/" + file);
+            if (dFile.getName().endsWith(".zip")) {
+                // Unzip
+                this.unzip(dFile.getCanonicalPath());
+            }
+            if (this.announce) {
+                this.plugin.getLogger().info("Finished updating.");
+            }
+        } catch (final Exception ex) {
+            this.plugin.getLogger().warning("The auto-updater tried to download a new update, but was unsuccessful.");
+            this.result = BukkitUpdater.UpdateResult.FAIL_DOWNLOAD;
+        } finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+                if (fout != null) {
+                    fout.close();
+                }
+            } catch (final Exception ex) {
+            }
+        }
+    }
+
+    /**
+     * Part of Zip-File-Extractor, modified by Gravity for use with Bukkit
+     */
+    private void unzip(String file) {
+        try {
+            final File fSourceZip = new File(file);
+            final String zipPath = file.substring(0, file.length() - 4);
+            ZipFile zipFile = new ZipFile(fSourceZip);
+            Enumeration<? extends ZipEntry> e = zipFile.entries();
+            while (e.hasMoreElements()) {
+                ZipEntry entry = e.nextElement();
+                File destinationFilePath = new File(zipPath, entry.getName());
+                destinationFilePath.getParentFile().mkdirs();
+                if (entry.isDirectory()) {
+                    continue;
+                } else {
+                    final BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
+                    int b;
+                    final byte buffer[] = new byte[BukkitUpdater.BYTE_SIZE];
+                    final FileOutputStream fos = new FileOutputStream(destinationFilePath);
+                    final BufferedOutputStream bos = new BufferedOutputStream(fos, BukkitUpdater.BYTE_SIZE);
+                    while ((b = bis.read(buffer, 0, BukkitUpdater.BYTE_SIZE)) != -1) {
+                        bos.write(buffer, 0, b);
+                    }
+                    bos.flush();
+                    bos.close();
+                    bis.close();
+                    final String name = destinationFilePath.getName();
+                    if (name.endsWith(".jar") && this.pluginFile(name)) {
+                        destinationFilePath.renameTo(new File(this.plugin.getDataFolder().getParent(), this.updateFolder + "/" + name));
+                    }
+                }
+                entry = null;
+                destinationFilePath = null;
+            }
+            e = null;
+            zipFile.close();
+            zipFile = null;
+
+            // Move any plugin data folders that were included to the right place, Bukkit won't do this for us.
+            for (final File dFile : new File(zipPath).listFiles()) {
+                if (dFile.isDirectory()) {
+                    if (this.pluginFile(dFile.getName())) {
+                        final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName()); // Get current dir
+                        final File[] contents = oFile.listFiles(); // List of existing files in the current dir
+                        for (final File cFile : dFile.listFiles()) // Loop through all the files in the new dir
+                        {
+                            boolean found = false;
+                            for (final File xFile : contents) // Loop through contents to see if it exists
+                            {
+                                if (xFile.getName().equals(cFile.getName())) {
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if (!found) {
+                                // Move the new file into the current dir
+                                cFile.renameTo(new File(oFile.getCanonicalFile() + "/" + cFile.getName()));
+                            } else {
+                                // This file already exists, so we don't need it anymore.
+                                cFile.delete();
+                            }
+                        }
+                    }
+                }
+                dFile.delete();
+            }
+            new File(zipPath).delete();
+            fSourceZip.delete();
+        } catch (final IOException ex) {
+            this.plugin.getLogger().warning("The auto-updater tried to unzip a new update file, but was unsuccessful.");
+            this.result = BukkitUpdater.UpdateResult.FAIL_DOWNLOAD;
+            ex.printStackTrace();
+        }
+        new File(file).delete();
+    }
+
+    /**
+     * Check if the name of a jar is one of the plugins currently installed, used for extracting the correct files out of a zip.
+     */
+    private boolean pluginFile(String name) {
+        for (final File file : new File("plugins").listFiles()) {
+            if (file.getName().equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Evaluate whether the version number is marked showing that it should not be updated by this program
+     */
+    /* private boolean hasTag(String version) {
+        for (final String string : BukkitUpdater.NO_UPDATE_TAG) {
+            if (version.contains(string)) {
+                return true;
+            }
+        }
+        return false;
+    } */
+
+    public boolean read() {
+        try {
+            final URLConnection conn = this.url.openConnection();
+            conn.setConnectTimeout(5000);
+
+            if (this.apiKey != null) {
+                conn.addRequestProperty("X-API-Key", this.apiKey);
+            }
+            conn.addRequestProperty("User-Agent", "Updater (by Gravity)");
+            conn.setDoOutput(true);
+
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            final String response = reader.readLine();
+
+            final JSONArray array = (JSONArray) JSONValue.parse(response);
+
+            if (array.size() == 0) {
+                this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
+                this.result = UpdateResult.FAIL_BADID;
+                return false;
+            }
+
+            final JSONObject jsonObject = (JSONObject) array.get(array.size() - 1);
+            this.versionFileName = (String) jsonObject.get(BukkitUpdater.FILE_NAME);
+			this.versionName = (String) jsonObject.get(BukkitUpdater.TITLE_VALUE);
+            this.versionLink = (String) jsonObject.get(BukkitUpdater.LINK_VALUE);
+            this.versionType = (String) jsonObject.get(BukkitUpdater.TYPE_VALUE);
+            this.versionGameVersion = (String) jsonObject.get(BukkitUpdater.VERSION_VALUE);
+
+            return true;
+        } catch (final IOException e) {
+            if (e.getMessage().contains("HTTP response code: 403")) {
+                this.plugin.getLogger().warning("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
+                this.plugin.getLogger().warning("Please double-check your configuration to ensure it is correct.");
+                this.result = UpdateResult.FAIL_APIKEY;
+            } else {
+                this.plugin.getLogger().warning("The updater could not contact dev.bukkit.org for updating.");
+                this.plugin.getLogger().warning("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
+                this.result = UpdateResult.FAIL_DBO;
+            }
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    // aadnk - added listeners
+    private class UpdateRunnable implements Runnable {
+        @Override
+        public void run() {
+        	try {
+	            if (BukkitUpdater.this.url != null) {
+	                // Obtain the results of the project's file feed
+	                if (BukkitUpdater.this.read()) {
+	                    if (BukkitUpdater.this.versionCheck(BukkitUpdater.this.versionName)) {
+	                        performUpdate();
+	                    }
+	                }
+	            }
+        	} catch (Exception e) {
+        		// Any generic error will be handled here
+				ProtocolLibrary.getErrorReporter().reportDetailed(
+					BukkitUpdater.this, Report.newBuilder(REPORT_CANNOT_UPDATE_PLUGIN).error(e).callerParam(this));
+	            
+        	} finally {
+        		// Invoke the listeners on the main thread
+        		for (Runnable listener : listeners) {
+        			plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, listener);
+        		}
+        	}
+        }
+
+		private void performUpdate() {
+			if ((BukkitUpdater.this.versionLink != null) && (BukkitUpdater.this.type != UpdateType.NO_DOWNLOAD)) {
+			    final File pluginFolder = plugin.getDataFolder().getParentFile();
+				File destinationFolder = new File(pluginFolder, updateFolder);
+			    String name = BukkitUpdater.this.file.getName(); 
+			    
+			    // If it's a zip file, it shouldn't be downloaded as the plugin's name
+			    if (BukkitUpdater.this.versionLink.endsWith(".zip")) {
+			        name = versionFileName;
+			    }	    
+				BukkitUpdater.this.saveFile(
+			    	destinationFolder, 
+			    	name, 
+			    	BukkitUpdater.this.versionLink
+			    );
+			} else {
+			    BukkitUpdater.this.result = UpdateResult.UPDATE_AVAILABLE;
+			}
+		}
+    }
+
+	@Override
+	public String getRemoteVersion() {
+		return getLatestName();
+	}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java

@@ -1,120 +1,120 @@
-/**
- *  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.updater;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.logging.Level;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.error.Report;
-import com.comphenix.protocol.utility.Closer;
-import com.google.common.base.Charsets;
-
-/**
- * Adapted version of the Bukkit updater for use with Spigot resources
- * @author dmulloy2
- */
-
-public final class SpigotUpdater extends Updater {
-	private String remoteVersion;
-
-	public SpigotUpdater(Plugin plugin, UpdateType type, boolean announce) {
-		super(plugin, type, announce);
-	}
-
-	@Override
-	public void start(UpdateType type) {
-    	waitForThread();
-  
-    	this.type = type;
-        this.thread = new Thread(new SpigotUpdateRunnable());
-        this.thread.start();
-	}
-
-	@Override
-	public String getResult() {
-		waitForThread();
-		return String.format(result.toString(), remoteVersion, plugin.getDescription().getVersion(), RESOURCE_URL);
-	}
-
-	private class SpigotUpdateRunnable implements Runnable {
-
-		@Override
-		public void run() {
-			try {
-				String version = getSpigotVersion();
-				remoteVersion = version;
-
-				if (versionCheck(version)) {
-					result = UpdateResult.SPIGOT_UPDATE_AVAILABLE;
-				} else {
-					result = UpdateResult.NO_UPDATE;
-				}
-			} catch (Throwable ex) {
-				if (ProtocolLibrary.getConfig().isDebug()) {
-					ProtocolLibrary.getErrorReporter().reportDetailed(
-							SpigotUpdater.this, Report.newBuilder(REPORT_CANNOT_UPDATE_PLUGIN).error(ex).callerParam(this));
-				} else {
-					plugin.getLogger().log(Level.WARNING, "Failed to check for updates: " + ex);
-				}
-
-				ProtocolLibrary.disableUpdates();
-			} finally {
-				// Invoke the listeners on the main thread
-				for (Runnable listener : listeners) {
-					plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, listener);
-				}
-			}
-		}
-	}
-
-	private static final String PROTOCOL = "https://";
-	private static final String RESOURCE_URL = PROTOCOL + "www.spigotmc.org/resources/protocollib.1997/";
-	private static final String API_URL = PROTOCOL + "www.spigotmc.org/api/general.php";
-	private static final String ACTION = "POST";
-
-	private static final int ID = 1997;
-	private static final byte[] API_KEY = ("key=98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4&resource=" + ID).getBytes(Charsets.UTF_8);
-
-	public String getSpigotVersion() throws IOException {
-		Closer closer = Closer.create();
-
-		try {
-			HttpURLConnection con = (HttpURLConnection) new URL(API_URL).openConnection();
-			con.setDoOutput(true);
-			con.setRequestMethod(ACTION);
-			con.getOutputStream().write(API_KEY);
-
-			InputStreamReader isr = closer.register(new InputStreamReader(con.getInputStream()));
-			BufferedReader br = closer.register(new BufferedReader(isr));
-			return br.readLine();
-		} finally {
-			closer.close();
-		}
-	}
-
-	@Override
-	public String getRemoteVersion() {
-		return remoteVersion;
-	}
-}
+/**
+ *  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.updater;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.logging.Level;
+
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.utility.Closer;
+import com.google.common.base.Charsets;
+
+/**
+ * Adapted version of the Bukkit updater for use with Spigot resources
+ * @author dmulloy2
+ */
+
+public final class SpigotUpdater extends Updater {
+	private String remoteVersion;
+
+	public SpigotUpdater(Plugin plugin, UpdateType type, boolean announce) {
+		super(plugin, type, announce);
+	}
+
+	@Override
+	public void start(UpdateType type) {
+    	waitForThread();
+  
+    	this.type = type;
+        this.thread = new Thread(new SpigotUpdateRunnable());
+        this.thread.start();
+	}
+
+	@Override
+	public String getResult() {
+		waitForThread();
+		return String.format(result.toString(), remoteVersion, plugin.getDescription().getVersion(), RESOURCE_URL);
+	}
+
+	private class SpigotUpdateRunnable implements Runnable {
+
+		@Override
+		public void run() {
+			try {
+				String version = getSpigotVersion();
+				remoteVersion = version;
+
+				if (versionCheck(version)) {
+					result = UpdateResult.SPIGOT_UPDATE_AVAILABLE;
+				} else {
+					result = UpdateResult.NO_UPDATE;
+				}
+			} catch (Throwable ex) {
+				if (ProtocolLibrary.getConfig().isDebug()) {
+					ProtocolLibrary.getErrorReporter().reportDetailed(
+							SpigotUpdater.this, Report.newBuilder(REPORT_CANNOT_UPDATE_PLUGIN).error(ex).callerParam(this));
+				} else {
+					plugin.getLogger().log(Level.WARNING, "Failed to check for updates: " + ex);
+				}
+
+				ProtocolLibrary.disableUpdates();
+			} finally {
+				// Invoke the listeners on the main thread
+				for (Runnable listener : listeners) {
+					plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, listener);
+				}
+			}
+		}
+	}
+
+	private static final String PROTOCOL = "https://";
+	private static final String RESOURCE_URL = PROTOCOL + "www.spigotmc.org/resources/protocollib.1997/";
+	private static final String API_URL = PROTOCOL + "www.spigotmc.org/api/general.php";
+	private static final String ACTION = "POST";
+
+	private static final int ID = 1997;
+	private static final byte[] API_KEY = ("key=98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4&resource=" + ID).getBytes(Charsets.UTF_8);
+
+	public String getSpigotVersion() throws IOException {
+		Closer closer = Closer.create();
+
+		try {
+			HttpURLConnection con = (HttpURLConnection) new URL(API_URL).openConnection();
+			con.setDoOutput(true);
+			con.setRequestMethod(ACTION);
+			con.getOutputStream().write(API_KEY);
+
+			InputStreamReader isr = closer.register(new InputStreamReader(con.getInputStream()));
+			BufferedReader br = closer.register(new BufferedReader(isr));
+			return br.readLine();
+		} finally {
+			closer.close();
+		}
+	}
+
+	@Override
+	public String getRemoteVersion() {
+		return remoteVersion;
+	}
+}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/Updater.java

@@ -1,296 +1,306 @@
-/**
- *  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.updater;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.bukkit.plugin.Plugin;
-
-import com.comphenix.protocol.ProtocolLib;
-import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.utility.MinecraftVersion;
-import com.comphenix.protocol.utility.Util;
-import com.google.common.base.Preconditions;
-
-/**
- * @author dmulloy2
- */
-
-public abstract class Updater {
-	protected Plugin plugin;
-
-	protected String versionName;
-	protected String versionLink;
-	protected String versionType;
-	protected String versionGameVersion;
-	protected String versionFileName;
-
-	protected UpdateType type;
-	protected boolean announce;
-
-	protected Thread thread;
-	protected UpdateResult result = UpdateResult.SUCCESS;
-	protected List<Runnable> listeners = new CopyOnWriteArrayList<Runnable>();
-
-	public static final ReportType REPORT_CANNOT_UPDATE_PLUGIN = new ReportType("Cannot update ProtocolLib.");
-
-	protected Updater(Plugin plugin, UpdateType type, boolean announce) {
-		this.plugin = plugin;
-		this.type = type;
-		this.announce = announce;
-	}
-
-	public boolean versionCheck(String title) {
-        if (this.type != UpdateType.NO_VERSION_CHECK) {
-            String version = this.plugin.getDescription().getVersion();
-
-            boolean devBuild = false;
-            if (version.contains("-SNAPSHOT") || version.contains("-BETA")) {
-            	devBuild = true;
-            	version = version.substring(0, version.indexOf("-"));
-            }
-
-            final String[] splitTitle = title.split(" ");
-            String remoteVersion;
-
-            if (splitTitle.length == 2) {
-            	remoteVersion = splitTitle[1].split("-")[0];
-            } else if (this instanceof SpigotUpdater) {
-            	remoteVersion = splitTitle[0];
-			} else {
-				// The file's name did not contain the string 'vVersion'
-				final String authorInfo = this.plugin.getDescription().getAuthors().size() == 0 ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
-				this.plugin.getLogger().warning("The author of this plugin " + authorInfo + " has misconfigured their Auto Update system");
-				this.plugin.getLogger().warning("File versions should follow the format 'PluginName VERSION[-SNAPSHOT]'");
-				this.plugin.getLogger().warning("Please notify the author of this error.");
-				this.result = BukkitUpdater.UpdateResult.FAIL_NOVERSION;
-				return false;
-			}
-
-			// Parse the version
-            if (remoteVersion.startsWith("v")) {
-            	remoteVersion = remoteVersion.substring(1);
-            }
-
-			MinecraftVersion parsedRemote = new MinecraftVersion(remoteVersion);
-			MinecraftVersion parsedCurrent = new MinecraftVersion(plugin.getDescription().getVersion());
-
-			if (devBuild && parsedRemote.equals(parsedCurrent)) {
-				// They're using a dev build and this version has been released
-				return !remoteVersion.contains("-BETA") && !remoteVersion.contains("-SNAPSHOT");
-			}
-
-			// The remote version has to be greater
-			if (parsedRemote.compareTo(parsedCurrent) <= 0) {
-				// We already have the latest version, or this build is tagged for no-update
-				this.result = BukkitUpdater.UpdateResult.NO_UPDATE;
-				return false;
-			}
-		}
-		return true;
-	}
-
-    /**
-     * Add a listener to be executed when we have determined if an update is available.
-     * <p>
-     * The listener will be executed on the main thread.
-     * @param listener - the listener to add.
-     */
-    public void addListener(Runnable listener) {
-    	listeners.add(Preconditions.checkNotNull(listener, "listener cannot be NULL"));
-    }
-    
-    /**
-     * Remove a listener.
-     * @param listener - the listener to remove.
-     * @return TRUE if the listener was removed, FALSE otherwise.
-     */
-    public boolean removeListener(Runnable listener) {
-    	return listeners.remove(listener);
-    }
-    
-    /**
-     * Get the result of the update process.
-     */
-    public String getResult() {
-        this.waitForThread();
-        return this.result.toString();
-    }
-
-    /**
-     * Get the latest version's release type (release, beta, or alpha).
-     */
-    public String getLatestType() {
-        this.waitForThread();
-        return this.versionType;
-    }
-
-    /**
-     * Get the latest version's game version.
-     */
-    public String getLatestGameVersion() {
-        this.waitForThread();
-        return this.versionGameVersion;
-    }
-
-    /**
-     * Get the latest version's name.
-     */
-    public String getLatestName() {
-        this.waitForThread();
-        return this.versionName;
-    }
-
-    /**
-     * Get the latest version's file link.
-     */
-    public String getLatestFileLink() {
-        this.waitForThread();
-        return this.versionLink;
-    }
-
-    /**
-     * As the result of Updater output depends on the thread's completion, it is necessary to wait for the thread to finish
-     * before allowing anyone to check the result.
-     */
-    protected void waitForThread() {
-    	if (thread != null && thread.isAlive()) {
-    		try {
-    			thread.join();
-    		} catch (InterruptedException ex) {
-    			ex.printStackTrace();
-    		}
-    	}
-    }
-
-    /**
-     * Determine if we are already checking for an update.
-     * @return TRUE if we are, FALSE otherwise.
-     */
-    public boolean isChecking() {
-    	return this.thread != null && this.thread.isAlive();
-    }
-
-    /**
-     * Allows the dev to specify the type of update that will be run.
-     */
-    public enum UpdateType {
-        /**
-         * Run a version check, and then if the file is out of date, download the newest version.
-         */
-        DEFAULT,
-        /**
-         * Don't run a version check, just find the latest update and download it.
-         */
-        NO_VERSION_CHECK,
-        /**
-         * Get information about the version and the download size, but don't actually download anything.
-         */
-        NO_DOWNLOAD
-    }
-
-    /**
-     * Gives the dev the result of the update process. Can be obtained by called getResult().
-     */
-    public enum UpdateResult {
-        /**
-         * The updater found an update, and has readied it to be loaded the next time the server restarts/reloads.
-         */
-        SUCCESS("The updater found an update, and has readied it to be loaded the next time the server restarts/reloads."),
-        
-        /**
-         * The updater did not find an update, and nothing was downloaded.
-         */
-        NO_UPDATE("The updater did not find an update, and nothing was downloaded."),
-        
-        /**
-         * The server administrator has disabled the updating system
-         */
-        DISABLED("The server administrator has disabled the updating system"),
-        
-        /**
-         * The updater found an update, but was unable to download it.
-         */
-        FAIL_DOWNLOAD("The updater found an update, but was unable to download it."),
-        
-        /**
-         * For some reason, the updater was unable to contact dev.bukkit.org to download the file.
-         */
-        FAIL_DBO("For some reason, the updater was unable to contact dev.bukkit.org to download the file.")
-        ,
-        /**
-         * When running the version check, the file on DBO did not contain the a version in the format 'vVersion' such as 'v1.0'.
-         */
-        FAIL_NOVERSION("When running the version check, the file on DBO did not contain the a version in the format 'vVersion' such as 'v1.0'."),
-        
-        /**
-         * The id provided by the plugin running the updater was invalid and doesn't exist on DBO.
-         */
-        FAIL_BADID("The id provided by the plugin running the updater was invalid and doesn't exist on DBO."),
-        
-        /**
-         * The server administrator has improperly configured their API key in the configuration
-         */
-        FAIL_APIKEY("The server administrator has improperly configured their API key in the configuration"),
-        
-        /**
-         * The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded.
-         */
-        UPDATE_AVAILABLE("The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded."),
-
-        /**
-         * The updater found an update at Spigot
-         */
-        SPIGOT_UPDATE_AVAILABLE("The updater found an update: %s (Running %s). Download at %s");
-
-        private final String description;
-        
-        private UpdateResult(String description) {
-            this.description = description;
-        }
-        
-        @Override
-        public String toString() {
-        	return description;
-        }
-    }
-
-	public static Updater create(ProtocolLib protocolLib, int id, File file, UpdateType type, boolean announce) {
-		if (Util.isUsingSpigot()) {
-			return new SpigotUpdater(protocolLib, type, announce);
-		} else {
-			return new BukkitUpdater(protocolLib, id, file, type, announce);
-		}
-	}
-
-	public abstract void start(UpdateType type);
-
-	public boolean shouldNotify() {
-		switch (result) {
-			case SPIGOT_UPDATE_AVAILABLE:
-			case SUCCESS:
-			case UPDATE_AVAILABLE:
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public abstract String getRemoteVersion();
-}
+/**
+ *  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.updater;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.bukkit.plugin.Plugin;
+
+import com.comphenix.protocol.ProtocolLib;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Util;
+import com.google.common.base.Preconditions;
+
+/**
+ * @author dmulloy2
+ */
+
+public abstract class Updater {
+	protected Plugin plugin;
+
+	protected String versionName;
+	protected String versionLink;
+	protected String versionType;
+	protected String versionGameVersion;
+	protected String versionFileName;
+
+	protected UpdateType type;
+	protected boolean announce;
+
+	protected Thread thread;
+	protected UpdateResult result = UpdateResult.SUCCESS;
+	protected List<Runnable> listeners = new CopyOnWriteArrayList<Runnable>();
+
+	public static final ReportType REPORT_CANNOT_UPDATE_PLUGIN = new ReportType("Cannot update ProtocolLib.");
+
+	protected Updater(Plugin plugin, UpdateType type, boolean announce) {
+		this.plugin = plugin;
+		this.type = type;
+		this.announce = announce;
+	}
+
+	public boolean versionCheck(String title) {
+		if (this.type != UpdateType.NO_VERSION_CHECK) {
+			String version = this.plugin.getDescription().getVersion();
+
+			// Extract the version from the response
+			String[] split = title.split(" ");
+			String remote = "Unknown";
+
+			if (split.length == 2) { // BukkitDev
+				remote = split[1];
+			} else if (this instanceof SpigotUpdater) { // Spigot resource
+				remote = split[0];
+			} else { // Misconfigured
+				// The file's name did not contain the string 'vVersion'
+				String authorInfo = this.plugin.getDescription().getAuthors().size() == 0 ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
+				plugin.getLogger().warning("The author of this plugin " + authorInfo + " has misconfigured their Auto Update system");
+				plugin.getLogger().warning("File versions should follow the format 'PluginName VERSION[-SNAPSHOT]'");
+				plugin.getLogger().warning("Please notify the author of this error.");
+				this.result = BukkitUpdater.UpdateResult.FAIL_NOVERSION;
+				return false;
+			}
+
+			// Check if the local version is a dev build
+
+			boolean devBuild = false;
+			if (version.contains("-SNAPSHOT") || version.contains("-BETA")) {
+				devBuild = true;
+				version = version.substring(0, version.indexOf("-"));
+			}
+
+			// Remove the v
+			if (remote.startsWith("v")) {
+				remote = remote.substring(1);
+			}
+
+			// Remove the build number if it snuck in there
+			if (version.contains("-b")) {
+				version = version.substring(0, version.lastIndexOf("-"));
+			}
+
+			// Parse it and our local version
+			MinecraftVersion parsedRemote = new MinecraftVersion(remote);
+			MinecraftVersion parsedCurrent = new MinecraftVersion(version);
+
+			if (devBuild && parsedRemote.equals(parsedCurrent)) {
+				// They're using a dev build and this version has been released
+				return !remote.contains("-BETA") && !remote.contains("-SNAPSHOT");
+			}
+
+			// The remote version has to be greater
+			if (parsedRemote.compareTo(parsedCurrent) <= 0) {
+				// We already have the latest version, or this build is tagged for no-update
+				this.result = BukkitUpdater.UpdateResult.NO_UPDATE;
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+    /**
+     * Add a listener to be executed when we have determined if an update is available.
+     * <p>
+     * The listener will be executed on the main thread.
+     * @param listener - the listener to add.
+     */
+    public void addListener(Runnable listener) {
+    	listeners.add(Preconditions.checkNotNull(listener, "listener cannot be NULL"));
+    }
+    
+    /**
+     * Remove a listener.
+     * @param listener - the listener to remove.
+     * @return TRUE if the listener was removed, FALSE otherwise.
+     */
+    public boolean removeListener(Runnable listener) {
+    	return listeners.remove(listener);
+    }
+    
+    /**
+     * Get the result of the update process.
+     */
+    public String getResult() {
+        this.waitForThread();
+        return this.result.toString();
+    }
+
+    /**
+     * Get the latest version's release type (release, beta, or alpha).
+     */
+    public String getLatestType() {
+        this.waitForThread();
+        return this.versionType;
+    }
+
+    /**
+     * Get the latest version's game version.
+     */
+    public String getLatestGameVersion() {
+        this.waitForThread();
+        return this.versionGameVersion;
+    }
+
+    /**
+     * Get the latest version's name.
+     */
+    public String getLatestName() {
+        this.waitForThread();
+        return this.versionName;
+    }
+
+    /**
+     * Get the latest version's file link.
+     */
+    public String getLatestFileLink() {
+        this.waitForThread();
+        return this.versionLink;
+    }
+
+    /**
+     * As the result of Updater output depends on the thread's completion, it is necessary to wait for the thread to finish
+     * before allowing anyone to check the result.
+     */
+    protected void waitForThread() {
+    	if (thread != null && thread.isAlive()) {
+    		try {
+    			thread.join();
+    		} catch (InterruptedException ex) {
+    			ex.printStackTrace();
+    		}
+    	}
+    }
+
+    /**
+     * Determine if we are already checking for an update.
+     * @return TRUE if we are, FALSE otherwise.
+     */
+    public boolean isChecking() {
+    	return this.thread != null && this.thread.isAlive();
+    }
+
+    /**
+     * Allows the dev to specify the type of update that will be run.
+     */
+    public enum UpdateType {
+        /**
+         * Run a version check, and then if the file is out of date, download the newest version.
+         */
+        DEFAULT,
+        /**
+         * Don't run a version check, just find the latest update and download it.
+         */
+        NO_VERSION_CHECK,
+        /**
+         * Get information about the version and the download size, but don't actually download anything.
+         */
+        NO_DOWNLOAD
+    }
+
+    /**
+     * Gives the dev the result of the update process. Can be obtained by called getResult().
+     */
+    public enum UpdateResult {
+        /**
+         * The updater found an update, and has readied it to be loaded the next time the server restarts/reloads.
+         */
+        SUCCESS("The updater found an update, and has readied it to be loaded the next time the server restarts/reloads."),
+        
+        /**
+         * The updater did not find an update, and nothing was downloaded.
+         */
+        NO_UPDATE("The updater did not find an update, and nothing was downloaded."),
+        
+        /**
+         * The server administrator has disabled the updating system
+         */
+        DISABLED("The server administrator has disabled the updating system"),
+        
+        /**
+         * The updater found an update, but was unable to download it.
+         */
+        FAIL_DOWNLOAD("The updater found an update, but was unable to download it."),
+        
+        /**
+         * For some reason, the updater was unable to contact dev.bukkit.org to download the file.
+         */
+        FAIL_DBO("For some reason, the updater was unable to contact dev.bukkit.org to download the file.")
+        ,
+        /**
+         * When running the version check, the file on DBO did not contain the a version in the format 'vVersion' such as 'v1.0'.
+         */
+        FAIL_NOVERSION("When running the version check, the file on DBO did not contain the a version in the format 'vVersion' such as 'v1.0'."),
+        
+        /**
+         * The id provided by the plugin running the updater was invalid and doesn't exist on DBO.
+         */
+        FAIL_BADID("The id provided by the plugin running the updater was invalid and doesn't exist on DBO."),
+        
+        /**
+         * The server administrator has improperly configured their API key in the configuration
+         */
+        FAIL_APIKEY("The server administrator has improperly configured their API key in the configuration"),
+        
+        /**
+         * The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded.
+         */
+        UPDATE_AVAILABLE("The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded."),
+
+        /**
+         * The updater found an update at Spigot
+         */
+        SPIGOT_UPDATE_AVAILABLE("The updater found an update: %s (Running %s). Download at %s");
+
+        private final String description;
+        
+        private UpdateResult(String description) {
+            this.description = description;
+        }
+        
+        @Override
+        public String toString() {
+        	return description;
+        }
+    }
+
+	public static Updater create(ProtocolLib protocolLib, int id, File file, UpdateType type, boolean announce) {
+		if (Util.isUsingSpigot()) {
+			return new SpigotUpdater(protocolLib, type, announce);
+		} else {
+			return new BukkitUpdater(protocolLib, id, file, type, announce);
+		}
+	}
+
+	public abstract void start(UpdateType type);
+
+	public boolean shouldNotify() {
+		switch (result) {
+			case SPIGOT_UPDATE_AVAILABLE:
+			case SUCCESS:
+			case UPDATE_AVAILABLE:
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	public abstract String getRemoteVersion();
+}

modules/ProtocolLib/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ProtocolLib
-version: ${project.version}${project.build.number}
+version: ${project.fullVersion}
 description: Provides read/write access to the Minecraft protocol.
 authors: [dmulloy2, comphenix]