Update version to 4.0.2 for release

Fixes #215

modules/API/pom.xml

@@ -196,13 +196,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.10.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.10.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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

@@ -39,12 +39,12 @@ public class ProtocolLibrary {
 	/**
 	 * The maximum version ProtocolLib has been tested with.
 	 */
-	public static final String MAXIMUM_MINECRAFT_VERSION = "1.9.4";
+	public static final String MAXIMUM_MINECRAFT_VERSION = "1.10.2";
 
 	/**
-	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.9.4) was released.
+	 * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.10.2) was released.
 	 */
-	public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-05-10";
+	public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-06-23";
 
 	/**
 	 * Plugins that are currently incompatible with ProtocolLib.

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;
@@ -105,11 +102,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.
  * 
@@ -659,15 +661,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()));
 	}
 	
 	/**
@@ -923,7 +929,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 +1082,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 +1230,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,6 +1263,94 @@ 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 {
+			Class<?> packetClass = PacketType.Play.Server.UPDATE_SIGN.getPacketClass();
+			if (packetClass.getName().contains("Sign")) {
+				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/reflect/cloning/BukkitCloner.java

@@ -25,6 +25,7 @@ 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 +62,11 @@ public class BukkitCloner implements Cloner {
 			addClass(5, MinecraftReflection.getDataWatcherSerializerClass());
 			addClass(6, MinecraftReflection.getMinecraftKeyClass());
 		}
+
+		try {
+			addClass(7, MinecraftReflection.getIBlockDataClass());
+		} catch (Throwable ex) {
+		}
 	}
 
 	private void addClass(int id, Class<?> clazz) {
@@ -112,7 +118,10 @@ 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());
 			default:
 				throw new IllegalArgumentException("Cannot clone objects of type " + source.getClass());
 		}

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

@@ -21,7 +21,7 @@ package com.comphenix.protocol.utility;
  */
 
 public final class Constants {
-	public static final String PACKAGE_VERSION = "v1_9_R2";
+	public static final String PACKAGE_VERSION = "v1_10_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/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,7 @@ 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);
 		return map;
 	}
 
@@ -50,7 +50,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/MinecraftVersion.java

@@ -44,6 +44,11 @@ public class MinecraftVersion implements Comparable<MinecraftVersion>, Serializa
 	 */
 	private static final Pattern VERSION_PATTERN = Pattern.compile(".*\\(.*MC.\\s*([a-zA-z0-9\\-\\.]+)\\s*\\)");
 
+	/**
+	 * 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/wrappers/WrappedBlockData.java

@@ -149,6 +149,14 @@ public class WrappedBlockData extends AbstractWrapper {
 		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 + "]";

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/WrappedWatchableObject.java

@@ -23,6 +23,7 @@ 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;
+import com.google.common.base.Optional;
 
 /**
  * Represents a DataWatcher Item in 1.9.
@@ -96,43 +97,6 @@ public class WrappedWatchableObject extends AbstractWrapper {
 		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
@@ -154,45 +118,6 @@ public class WrappedWatchableObject extends AbstractWrapper {
 		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
@@ -229,4 +154,66 @@ public class WrappedWatchableObject extends AbstractWrapper {
 	public String toString() {
 		return "DataWatcherItem[object=" + getWatcherObject() + ", value=" + getValue() + ", dirty=" + getDirtyState() + "]";
 	}
+
+	// ---- Wrapping
+
+	/**
+	 * 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) {
+		// Deal with optionals first
+		if (value instanceof Optional) {
+			Optional<?> optional = (Optional<?>) value;
+			if (optional.isPresent()) {
+				return Optional.of(getWrapped(optional.get()));
+			} else {
+				return Optional.absent();
+			}
+		}
+
+		if (MinecraftReflection.isItemStack(value)) {
+			return BukkitConverters.getItemStackConverter().getSpecific(value);
+		} else if (MinecraftReflection.isChunkCoordinates(value)) {
+			return new WrappedChunkCoordinate((Comparable) value);
+		} else if (MinecraftReflection.isBlockPosition(value)) {
+			return BlockPosition.getConverter().getSpecific(value);
+		} else if (MinecraftReflection.isChunkPosition(value)) {
+			return ChunkPosition.getConverter().getSpecific(value);
+		} else {
+			return value;
+		}
+	}
+
+	/**
+	 * Retrieve the raw NMS value.
+	 * 
+	 * @param wrapped - the wrapped position.
+	 * @return The raw NMS object.
+	 */
+	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();
+			}
+		}
+
+		if (wrapped instanceof ItemStack) {
+			return BukkitConverters.getItemStackConverter().getGeneric(MinecraftReflection.getItemStackClass(), (ItemStack) wrapped);
+		} else if (wrapped instanceof WrappedChunkCoordinate) {
+			return ((WrappedChunkCoordinate) wrapped).getHandle();
+		} else if (wrapped instanceof BlockPosition) {
+			return BlockPosition.getConverter().getGeneric(MinecraftReflection.getBlockPositionClass(), (BlockPosition) wrapped);
+		} else if (wrapped instanceof ChunkPosition) {
+			return ChunkPosition.getConverter().getGeneric(MinecraftReflection.getChunkPositionClass(), (ChunkPosition) wrapped);
+		} else {
+			return wrapped;
+		}
+	}
 }

modules/ProtocolLib/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ProtocolLib</artifactId>
   <name>ProtocolLib</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Provides read/write access to the Minecraft protocol.</description>
   <url>http://www.spigotmc.org/resources/protocollib.1997/</url>
@@ -234,13 +234,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <version>1.10.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.10.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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,40 @@ 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 {
 		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 + (entity.isDead() ? " - entity is dead." : "."));
+			}
 
 			if (trackedPlayersField == null) {
-				// This one is fairly easy
 				trackedPlayersField = FuzzyReflection.fromObject(trackerEntry).getFieldByType("java\\.util\\..*");
 			}
 			
 			// Phew, finally there.
-			Collection<?> trackedPlayers = (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) {
@@ -132,8 +108,8 @@ class EntityUtilities {
 	public static List<Player> getEntityTrackers(Entity entity) {
 		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." : "."));
 			}
@@ -142,16 +118,7 @@ class EntityUtilities {
 				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 +126,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 +174,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 +195,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 {

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

@@ -582,35 +582,26 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 	 * @param packet - the packet.
 	 */
 	protected void handleLogin(Class<?> packetClass, Object packet) {
-		try {
-			Class<?> loginClass = PACKET_LOGIN_CLIENT;
-			FieldAccessor loginClient = LOGIN_GAME_PROFILE;
+		// Try to find the login packet class
+		if (PACKET_LOGIN_CLIENT == null) {
+			PACKET_LOGIN_CLIENT = PacketType.Login.Client.START.getPacketClass();
+		}
 
-			// Initialize packet class and login
-			if (loginClass == null) {
-				loginClass = PacketType.Login.Client.START.getPacketClass();
-				PACKET_LOGIN_CLIENT = loginClass;
-			}
-			if (loginClient == null) {
-				loginClient = Accessors.getFieldAccessor(PACKET_LOGIN_CLIENT, MinecraftReflection.getGameProfileClass(), true);
-				LOGIN_GAME_PROFILE = loginClient;
-			}
+		// 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?");
+		}
 
-			// 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 (LOGIN_GAME_PROFILE == null) {
+			LOGIN_GAME_PROFILE = Accessors.getFieldAccessor(PACKET_LOGIN_CLIENT, MinecraftReflection.getGameProfileClass(), true);
+		}
 
-				// Save the channel injector
-				factory.cacheInjector(profile.getName(), this);
-			}
-		} catch (IllegalArgumentException ex) { // Thrown by FuzzyReflection#getFields()
-			System.err.println(String.format("[ProtocolLib] Encountered NPE in handleLogin(%s, %s)", packetClass, packet));
-			System.err.println("PACKET_LOGIN_CLIENT = " + PACKET_LOGIN_CLIENT);
-			System.err.println("LOGIN_GAME_PROFILE = " + LOGIN_GAME_PROFILE);
-			System.err.println("GameProfile class = " + MinecraftReflection.getGameProfileClass());
-			System.err.println("Provide this information in a new or existing issue");
-			throw ex;
+		// See if we are dealing with the login 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);
 		}
 	}
 

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

@@ -5,18 +5,18 @@ import static org.mockito.Mockito.when;
 
 import java.util.logging.Logger;
 
-import net.minecraft.server.v1_9_R2.DispenserRegistry;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemFactory;
-import org.bukkit.craftbukkit.v1_9_R2.util.Versioning;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_10_R1.util.Versioning;
 
 import com.comphenix.protocol.utility.Constants;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
 
+import net.minecraft.server.v1_10_R1.DispenserRegistry;
+
 /**
  * Used to ensure that ProtocolLib and Bukkit is prepared to be tested.
  *

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

@@ -14,7 +14,7 @@ import com.comphenix.protocol.PacketType.Sender;
 import com.comphenix.protocol.injector.netty.NettyProtocolRegistry;
 import com.comphenix.protocol.injector.netty.ProtocolRegistry;
 
-import net.minecraft.server.v1_9_R2.PacketLoginInStart;
+import net.minecraft.server.v1_10_R1.PacketLoginInStart;
 
 public class PacketTypeTest {
 

modules/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

@@ -28,16 +28,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
-import net.minecraft.server.v1_9_R2.AttributeModifier;
-import net.minecraft.server.v1_9_R2.DataWatcher;
-import net.minecraft.server.v1_9_R2.Entity;
-import net.minecraft.server.v1_9_R2.EntityLightning;
-import net.minecraft.server.v1_9_R2.MobEffect;
-import net.minecraft.server.v1_9_R2.MobEffectList;
-import net.minecraft.server.v1_9_R2.PacketPlayOutBoss;
-import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes;
-import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
-
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.bukkit.ChatColor;
@@ -76,6 +66,16 @@ import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.google.common.collect.Lists;
 
+import net.minecraft.server.v1_10_R1.AttributeModifier;
+import net.minecraft.server.v1_10_R1.DataWatcher;
+import net.minecraft.server.v1_10_R1.Entity;
+import net.minecraft.server.v1_10_R1.EntityLightning;
+import net.minecraft.server.v1_10_R1.MobEffect;
+import net.minecraft.server.v1_10_R1.MobEffectList;
+import net.minecraft.server.v1_10_R1.PacketPlayOutBoss;
+import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes;
+import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
+
 // Ensure that the CraftItemFactory is mockable
 @RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
 @PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })
@@ -520,6 +520,19 @@ public class PacketContainerTest {
 		UPDATE_PROPERTIES;
 	}
 
+	@Test
+	public void testComponentArrays() {
+		PacketContainer signChange = new PacketContainer(PacketType.Play.Server.TILE_ENTITY_DATA);
+		WrappedChatComponent[] components = new WrappedChatComponent[] {
+				WrappedChatComponent.fromText("hello world"), WrappedChatComponent.fromText(""),
+				WrappedChatComponent.fromText(""), WrappedChatComponent.fromText("")
+		};
+		signChange.getChatComponentArrays().write(0, components);
+
+		WrappedChatComponent[] back = signChange.getChatComponentArrays().read(0);
+		assertArrayEquals(components, back);
+	}
+
 	private static final List<PacketType> BLACKLISTED = Util.asList(
 			PacketType.Play.Client.CUSTOM_PAYLOAD, PacketType.Play.Server.CUSTOM_PAYLOAD,
 			PacketType.Play.Server.SET_COOLDOWN

modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java

@@ -18,18 +18,18 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import com.comphenix.protocol.BukkitInitialization;
 import com.mojang.authlib.GameProfile;
 
-import net.minecraft.server.v1_9_R2.ChatComponentText;
-import net.minecraft.server.v1_9_R2.ChunkCoordIntPair;
-import net.minecraft.server.v1_9_R2.DataWatcher;
-import net.minecraft.server.v1_9_R2.IBlockData;
-import net.minecraft.server.v1_9_R2.IChatBaseComponent;
-import net.minecraft.server.v1_9_R2.IChatBaseComponent.ChatSerializer;
-import net.minecraft.server.v1_9_R2.NBTCompressedStreamTools;
-import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
-import net.minecraft.server.v1_9_R2.PlayerConnection;
-import net.minecraft.server.v1_9_R2.ServerPing;
-import net.minecraft.server.v1_9_R2.ServerPing.ServerData;
-import net.minecraft.server.v1_9_R2.ServerPing.ServerPingPlayerSample;
+import net.minecraft.server.v1_10_R1.ChatComponentText;
+import net.minecraft.server.v1_10_R1.ChunkCoordIntPair;
+import net.minecraft.server.v1_10_R1.DataWatcher;
+import net.minecraft.server.v1_10_R1.IBlockData;
+import net.minecraft.server.v1_10_R1.IChatBaseComponent;
+import net.minecraft.server.v1_10_R1.IChatBaseComponent.ChatSerializer;
+import net.minecraft.server.v1_10_R1.NBTCompressedStreamTools;
+import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
+import net.minecraft.server.v1_10_R1.PlayerConnection;
+import net.minecraft.server.v1_10_R1.ServerPing;
+import net.minecraft.server.v1_10_R1.ServerPing.ServerData;
+import net.minecraft.server.v1_10_R1.ServerPing.ServerPingPlayerSample;
 
 @RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
 @PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })

modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java

@@ -8,8 +8,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import net.minecraft.server.v1_9_R2.IntHashMap;
-
 import org.bukkit.ChatColor;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
@@ -24,6 +22,8 @@ import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 
+import net.minecraft.server.v1_10_R1.IntHashMap;
+
 @RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
 @PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })
 //@PrepareForTest(CraftItemFactory.class)

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

@@ -16,15 +16,15 @@ public class ChunkCoordIntPairTest {
 
 	@Test
 	public void test() {
-		net.minecraft.server.v1_9_R2.ChunkCoordIntPair pair = new net.minecraft.server.v1_9_R2.ChunkCoordIntPair(1, 2);
+		net.minecraft.server.v1_10_R1.ChunkCoordIntPair pair = new net.minecraft.server.v1_10_R1.ChunkCoordIntPair(1, 2);
 		ChunkCoordIntPair specific = ChunkCoordIntPair.getConverter().getSpecific(pair);
 
 		assertEquals(1, specific.getChunkX());
 		assertEquals(2, specific.getChunkZ());
 
-		net.minecraft.server.v1_9_R2.ChunkCoordIntPair roundtrip =
-			(net.minecraft.server.v1_9_R2.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
-			getGeneric(net.minecraft.server.v1_9_R2.ChunkCoordIntPair.class, specific);
+		net.minecraft.server.v1_10_R1.ChunkCoordIntPair roundtrip =
+			(net.minecraft.server.v1_10_R1.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
+			getGeneric(net.minecraft.server.v1_10_R1.ChunkCoordIntPair.class, specific);
 
 		assertEquals(1, roundtrip.x);
 		assertEquals(2, roundtrip.z);

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

@@ -1,12 +1,6 @@
 package com.comphenix.protocol.wrappers;
 
 import static org.junit.Assert.assertEquals;
-import net.minecraft.server.v1_9_R2.EntityHuman.EnumChatVisibility;
-import net.minecraft.server.v1_9_R2.EnumDifficulty;
-import net.minecraft.server.v1_9_R2.EnumProtocol;
-import net.minecraft.server.v1_9_R2.PacketPlayInClientCommand.EnumClientCommand;
-import net.minecraft.server.v1_9_R2.PacketPlayInUseEntity.EnumEntityUseAction;
-import net.minecraft.server.v1_9_R2.WorldSettings.EnumGamemode;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -16,6 +10,13 @@ import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 
+import net.minecraft.server.v1_10_R1.EntityHuman.EnumChatVisibility;
+import net.minecraft.server.v1_10_R1.EnumDifficulty;
+import net.minecraft.server.v1_10_R1.EnumGamemode;
+import net.minecraft.server.v1_10_R1.EnumProtocol;
+import net.minecraft.server.v1_10_R1.PacketPlayInClientCommand.EnumClientCommand;
+import net.minecraft.server.v1_10_R1.PacketPlayInUseEntity.EnumEntityUseAction;
+
 public class EnumWrappersTest {
 	private static class EnumClass {
 		public EnumProtocol protocol;

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

@@ -6,10 +6,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import net.minecraft.server.v1_9_R2.AttributeModifier;
-import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes;
-import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
-
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -20,6 +16,10 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedAttributeModifier.Operation;
 import com.google.common.collect.Lists;
 
+import net.minecraft.server.v1_10_R1.AttributeModifier;
+import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes;
+import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
+
 public class WrappedAttributeTest {
 	private WrappedAttributeModifier doubleModifier;
 	private WrappedAttributeModifier constantModifier;

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

@@ -24,10 +24,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.UUID;
 
-import net.minecraft.server.v1_9_R2.EntityLightning;
-import net.minecraft.server.v1_9_R2.ItemStack;
-
-import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLightningStrike;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLightningStrike;
 import org.bukkit.entity.Entity;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,6 +34,9 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
 
+import net.minecraft.server.v1_10_R1.EntityLightning;
+import net.minecraft.server.v1_10_R1.ItemStack;
+
 /**
  * @author dmulloy2
  */
@@ -92,8 +92,8 @@ public class WrappedDataWatcherTest {
 
 	@Test
 	public void testSerializers() {
-		Serializer blockPos = Registry.get(net.minecraft.server.v1_9_R2.BlockPosition.class, false);
-		Serializer optionalBlockPos = Registry.get(net.minecraft.server.v1_9_R2.BlockPosition.class, true);
+		Serializer blockPos = Registry.get(net.minecraft.server.v1_10_R1.BlockPosition.class, false);
+		Serializer optionalBlockPos = Registry.get(net.minecraft.server.v1_10_R1.BlockPosition.class, true);
 		assertNotSame(blockPos, optionalBlockPos);
 
 		assertNull(Registry.get(ItemStack.class, false));

modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java

@@ -26,9 +26,6 @@ import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.DataOutputStream;
 
-import net.minecraft.server.v1_9_R2.ItemStack;
-import net.minecraft.server.v1_9_R2.Items;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,6 +35,9 @@ import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.nbt.io.NbtBinarySerializer;
 
+import net.minecraft.server.v1_10_R1.ItemStack;
+import net.minecraft.server.v1_10_R1.Items;
+
 @RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
 @PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })
 //@PrepareForTest(CraftItemFactory.class)