Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-27 21:26:17 +01:00
Code Issues Projects Releases Wiki Activity

Update StreamSerializer to 1.8

Browse Source
This commit is contained in:
Dan Mulloy 2014-12-28 13:09:29 -05:00
parent 687db088ec
commit 7d5e1b9c34
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
View File

@ -88,8 +88,8 @@ public class StreamSerializer {
/** /**
* Read or deserialize an item stack from an underlying input stream. * Read or deserialize an item stack from an underlying input stream.
* <p> * <p>
* To supply a byte array, wrap it in a {@link java.io.ByteArrayInputStream ByteArrayInputStream} * To supply a byte array, wrap it in a {@link java.io.ByteArrayInputStream ByteArrayInputStream}
* and {@link java.io.DataInputStream DataInputStream}. * and {@link java.io.DataInputStream DataInputStream}.
* *
* @param input - the target input stream. * @param input - the target input stream.
* @return The resulting item stack, or NULL if the serialized item stack was NULL. * @return The resulting item stack, or NULL if the serialized item stack was NULL.
@ -104,7 +104,7 @@ public class StreamSerializer {
if (READ_ITEM_METHOD == null) { if (READ_ITEM_METHOD == null) {
READ_ITEM_METHOD = Accessors.getMethodAccessor( READ_ITEM_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("readItemStack", getMethodByParameters("i", /* readItemStack */
MinecraftReflection.getItemStackClass(), new Class<?>[0]) MinecraftReflection.getItemStackClass(), new Class<?>[0])
); );
} }
@ -132,7 +132,7 @@ public class StreamSerializer {
} }
/** /**
* Read or deserialize an NBT compound from a input stream. * Read or deserialize an NBT compound from a input stream.
* @param input - the target input stream. * @param input - the target input stream.
* @return The resulting compound, or NULL. * @return The resulting compound, or NULL.
* @throws IOException If the operation failed due to reflection or corrupt data. * @throws IOException If the operation failed due to reflection or corrupt data.
@ -147,7 +147,7 @@ public class StreamSerializer {
if (READ_NBT_METHOD == null) { if (READ_NBT_METHOD == null) {
READ_NBT_METHOD = Accessors.getMethodAccessor( READ_NBT_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("readNbtCompound", getMethodByParameters("h", /* readNbtCompound */
MinecraftReflection.getNBTCompoundClass(), new Class<?>[0]) MinecraftReflection.getNBTCompoundClass(), new Class<?>[0])
); );
} }
@ -182,9 +182,9 @@ public class StreamSerializer {
/** /**
* Deserialize a string using the standard Minecraft UTF-16 encoding. * Deserialize a string using the standard Minecraft UTF-16 encoding.
* <p> * <p>
* Note that strings cannot exceed 32767 characters, regardless if maximum lenght. * Note that strings cannot exceed 32767 characters, regardless if maximum length.
* @param input - the input stream. * @param input - the input stream.
* @param maximumLength - the maximum lenght of the string. * @param maximumLength - the maximum length of the string.
* @return The deserialized string. * @return The deserialized string.
* @throws IOException * @throws IOException
*/ */
@ -192,15 +192,16 @@ public class StreamSerializer {
if (input == null) if (input == null)
throw new IllegalArgumentException("Input stream cannot be NULL."); throw new IllegalArgumentException("Input stream cannot be NULL.");
if (maximumLength > 32767) if (maximumLength > 32767)
throw new IllegalArgumentException("Maximum lenght cannot exceed 32767 characters."); throw new IllegalArgumentException("Maximum length cannot exceed 32767 characters.");
if (maximumLength < 0) if (maximumLength < 0)
throw new IllegalArgumentException("Maximum lenght cannot be negative."); throw new IllegalArgumentException("Maximum length cannot be negative.");
if (MinecraftReflection.isUsingNetty()) { if (MinecraftReflection.isUsingNetty()) {
if (READ_STRING_METHOD == null) { if (READ_STRING_METHOD == null) {
READ_STRING_METHOD = Accessors.getMethodAccessor( READ_STRING_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("readString", String.class, new Class<?>[] { int.class }) getMethodByParameters("c", /* readString */
String.class, new Class<?>[] { int.class })
); );
} }
return (String) READ_STRING_METHOD.invoke(ByteBufAdapter.packetReader(input), maximumLength); return (String) READ_STRING_METHOD.invoke(ByteBufAdapter.packetReader(input), maximumLength);
@ -238,8 +239,8 @@ public class StreamSerializer {
/** /**
* Write or serialize an item stack to the given output stream. * Write or serialize an item stack to the given output stream.
* <p> * <p>
* To supply a byte array, wrap it in a {@link java.io.ByteArrayOutputStream ByteArrayOutputStream} * To supply a byte array, wrap it in a {@link java.io.ByteArrayOutputStream ByteArrayOutputStream}
* and {@link java.io.DataOutputStream DataOutputStream}. * and {@link java.io.DataOutputStream DataOutputStream}.
* <p> * <p>
* Note: An ItemStack can be written to a stream even if it's NULL. * Note: An ItemStack can be written to a stream even if it's NULL.
* *
@ -258,7 +259,8 @@ public class StreamSerializer {
if (WRITE_ITEM_METHOD == null) { if (WRITE_ITEM_METHOD == null) {
WRITE_ITEM_METHOD = Accessors.getMethodAccessor( WRITE_ITEM_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("writeStack", MinecraftReflection.getItemStackClass()) getMethodByParameters("a", /* writeStack */
MinecraftReflection.getItemStackClass())
); );
} }
WRITE_ITEM_METHOD.invoke(ByteBufAdapter.packetWriter(output), nmsItem); WRITE_ITEM_METHOD.invoke(ByteBufAdapter.packetWriter(output), nmsItem);
@ -297,7 +299,8 @@ public class StreamSerializer {
if (WRITE_NBT_METHOD == null) { if (WRITE_NBT_METHOD == null) {
WRITE_NBT_METHOD = Accessors.getMethodAccessor( WRITE_NBT_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("writeNbtCompound", MinecraftReflection.getNBTCompoundClass()) getMethodByParameters("a", /* writeNbtCompound */
MinecraftReflection.getNBTCompoundClass())
); );
} }
WRITE_NBT_METHOD.invoke(ByteBufAdapter.packetWriter(output), handle); WRITE_NBT_METHOD.invoke(ByteBufAdapter.packetWriter(output), handle);
@ -336,7 +339,8 @@ public class StreamSerializer {
if (WRITE_STRING_METHOD == null) { if (WRITE_STRING_METHOD == null) {
WRITE_STRING_METHOD = Accessors.getMethodAccessor( WRITE_STRING_METHOD = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true). FuzzyReflection.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true).
getMethodByParameters("writeString", String.class) getMethodByParameters("a", /* writeString */
String.class)
); );
} }
WRITE_STRING_METHOD.invoke(ByteBufAdapter.packetWriter(output), text); WRITE_STRING_METHOD.invoke(ByteBufAdapter.packetWriter(output), text);