Fix the StreamSerializer

String-based methods will still work, but deserializing from a data
input stream has been deprecated since it depends on hacky code

Fixes #31, Fixes #125

Author: dmulloy2

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

@@ -61,10 +61,6 @@ public static WrappedByteBuf createPacketBuffer() {
 		return getCompat().createPacketBuffer();
 	}
 
-	public static WrappedByteBuf allocateUnpooled() {
-		return getCompat().allocateUnpooled();
-	}
-
 	public static Class<?> getGenericFutureListenerArray() {
 		return getCompat().getGenericFutureListenerArray();
 	}
@@ -92,4 +88,12 @@ public static WrappedByteBuf packetReader(DataInputStream input) {
 	public static WrappedByteBuf packetWriter(DataOutputStream output) {
 		return getCompat().packetWriter(output);
 	}
+
+	public static WrappedByteBuf copiedBuffer(byte[] array) {
+		return getCompat().copiedBuffer(array);
+	}
+
+	public static WrappedByteBuf buffer() {
+		return getCompat().buffer();
+	}
 }

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

@@ -30,11 +30,14 @@
  * @author dmulloy2
  */
 
+// TODO: Sort out packet readers/writers
 public interface NettyCompat {
 
 	WrappedByteBuf createPacketBuffer();
 
-	WrappedByteBuf allocateUnpooled();
+	WrappedByteBuf copiedBuffer(byte[] array);
+
+	WrappedByteBuf buffer();
 
 	Class<?> getGenericFutureListenerArray();
 

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

@@ -41,4 +41,6 @@ public interface WrappedByteBuf {
 	void writeByte(int i);
 
 	void writeBytes(byte[] bytes);
+
+	byte[] array();
 }

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

@@ -55,11 +55,6 @@ public WrappedByteBuf createPacketBuffer() {
 		}
 	}
 
-	@Override
-	public WrappedByteBuf allocateUnpooled() {
-		return new NettyByteBuf(UnpooledByteBufAllocator.DEFAULT.buffer());
-	}
-
 	@Override
 	public Class<?> getGenericFutureListenerArray() {
 		return GenericFutureListener[].class;
@@ -97,4 +92,14 @@ public WrappedByteBuf packetReader(DataInputStream input) {
 	public WrappedByteBuf packetWriter(DataOutputStream output) {
 		return new NettyByteBuf(NettyByteBufAdapter.packetWriter(output));
 	}
+
+	@Override
+	public WrappedByteBuf copiedBuffer(byte[] array) {
+		return new NettyByteBuf(Unpooled.copiedBuffer(array));
+	}
+
+	@Override
+	public WrappedByteBuf buffer() {
+		return new NettyByteBuf(Unpooled.buffer());
+	}
 }

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

@@ -75,4 +75,9 @@ public void writeByte(int i) {
 	public void writeBytes(byte[] bytes) {
 		handle.get().writeBytes(bytes);
 	}
+
+	@Override
+	public byte[] array() {
+		return handle.get().array();
+	}
 }

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

@@ -174,7 +174,7 @@ public Object intercept(Object obj, Method method, Object[] args, MethodProxy pr
 			// Create our proxy object
 			Object javaProxy = enhancer.create(
 					new Class<?>[] { MinecraftReflection.getByteBufClass() },
-					new Object[] { Netty.allocateUnpooled().getHandle() }
+					new Object[] { Netty.buffer().getHandle() }
 			);
 
 			Object lookPacket = new PacketContainer(PacketType.Play.Client.CLOSE_WINDOW).getHandle();