Add getters for block position

Fixes #6

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

@@ -66,6 +66,7 @@ import com.comphenix.protocol.reflect.instances.DefaultInstances;
 import com.comphenix.protocol.utility.MinecraftMethods;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.StreamSerializer;
+import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
 import com.comphenix.protocol.wrappers.ChunkPosition;
@@ -445,8 +446,11 @@ public class PacketContainer implements Serializable {
 	
 	/**
 	 * Retrieves a read/write structure for chunk positions.
+	 * 
+	 * @deprecated ChunkPosition no longer exists.
 	 * @return A modifier for a ChunkPosition.
 	 */
+	@Deprecated
 	public StructureModifier<ChunkPosition> getPositionModifier() {
 		// Convert to and from the Bukkit wrapper
 		return structureModifier.withType(
@@ -454,6 +458,17 @@ public class PacketContainer implements Serializable {
 				ChunkPosition.getConverter());
 	}
 
+	/**
+	 * Retrieves a read/write structure for block positions.
+	 * @return A modifier for a BlockPosition.
+	 */
+	public StructureModifier<BlockPosition> getBlockPositionModifier() {
+		// Convert to and from the Bukkit wrapper
+		return structureModifier.withType(
+				MinecraftReflection.getBlockPositionClass(),
+				BlockPosition.getConverter());
+	}
+
 	/**
 	 * Retrieves a read/write structure for wrapped ChunkCoordIntPairs.
 	 * @return A modifier for ChunkCoordIntPair.
@@ -498,8 +513,11 @@ public class PacketContainer implements Serializable {
 	 * <p>
 	 * This modifier will automatically marshall between the visible ProtocolLib ChunkPosition and the
 	 * internal Minecraft ChunkPosition.
+	 * 
+	 * @deprecated ChunkPosition no longer exists.
 	 * @return A modifier for ChunkPosition list fields.
 	 */
+	@Deprecated
 	public StructureModifier<List<ChunkPosition>> getPositionCollectionModifier() {
 		// Convert to and from the ProtocolLib wrapper
 		return structureModifier.withType(
@@ -510,6 +528,24 @@ 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
+	 * internal Minecraft BlockPosition.
+	 *
+	 * @return A modifier for ChunkPosition list fields.
+	 */
+	public StructureModifier<List<BlockPosition>> getBlockPositionCollectionModifier() {
+		// Convert to and from the ProtocolLib wrapper
+		return structureModifier.withType(
+			Collection.class,
+			BukkitConverters.getListConverter(
+					MinecraftReflection.getBlockPositionClass(),
+					BlockPosition.getConverter())
+		);
+	}
+
 	/**
 	 * Retrieves a read/write structure for collections of watchable objects.
 	 * <p>
@@ -702,6 +738,7 @@ public class PacketContainer implements Serializable {
 			public Cloner apply(@Nullable BuilderParameters param) {
 				return new FieldCloner(param.getAggregateCloner(), param.getInstanceProvider()) {{
 					this.writer = new ObjectWriter() {
+						@Override
 						protected void transformField(StructureModifier<Object> modifierSource,
 													  StructureModifier<Object> modifierDest, int fieldIndex) {
 							// No need to clone inflated buffers
@@ -833,6 +870,7 @@ public class PacketContainer implements Serializable {
 	private static class ItemStackArrayConverter implements EquivalentConverter<ItemStack[]> {
 		final EquivalentConverter<ItemStack> stackConverter = BukkitConverters.getItemStackConverter();
 		
+		@Override
 		public Object getGeneric(Class<?>genericType, ItemStack[] specific) {
 			Class<?> nmsStack = MinecraftReflection.getItemStackClass();
 			Object[] result = (Object[]) Array.newInstance(nmsStack, specific.length);