diff --git a/codechicken/lib/data/MCDataInput.java b/codechicken/lib/data/MCDataInput.java index 5474a11..d1169bd 100644 --- a/codechicken/lib/data/MCDataInput.java +++ b/codechicken/lib/data/MCDataInput.java @@ -10,9 +10,9 @@ public interface MCDataInput public long readLong(); public int readInt(); public short readShort(); - public int readUnsignedShort(); + public int readUShort(); public byte readByte(); - public int readUnsignedByte(); + public int readUByte(); public double readDouble(); public float readFloat(); public boolean readBoolean(); diff --git a/codechicken/lib/data/NBTDataWrapper.java b/codechicken/lib/data/NBTDataWrapper.java index 1b5b189..19cf013 100644 --- a/codechicken/lib/data/NBTDataWrapper.java +++ b/codechicken/lib/data/NBTDataWrapper.java @@ -162,7 +162,7 @@ public class NBTDataWrapper implements MCDataInput, MCDataOutput } @Override - public int readUnsignedShort() + public int readUShort() { return ((NBTTagShort)readTag()).data & 0xFFFF; } @@ -174,7 +174,7 @@ public class NBTDataWrapper implements MCDataInput, MCDataOutput } @Override - public int readUnsignedByte() + public int readUByte() { return ((NBTTagByte)readTag()).data & 0xFF; } diff --git a/codechicken/lib/packet/PacketCustom.java b/codechicken/lib/packet/PacketCustom.java index 9ea252f..73e6235 100644 --- a/codechicken/lib/packet/PacketCustom.java +++ b/codechicken/lib/packet/PacketCustom.java @@ -739,12 +739,12 @@ public final class PacketCustom implements MCDataInput, MCDataOutput } } - public int readUnsignedByte() + public int readUByte() { return readByte() & 0xFF; } - public int readUnsignedShort() + public int readUShort() { return readShort() & 0xFFFF; } @@ -859,9 +859,8 @@ public final class PacketCustom implements MCDataInput, MCDataOutput int length = datain.readUnsignedShort(); char[] chars = new char[length]; for(int i = 0; i < length; i++) - { chars[i] = readChar(); - } + return new String(chars); } catch(IOException e)