Finish InPacket & OutPacket implementations

This commit is contained in:
P0nk
2021-06-20 21:27:50 +02:00
parent f3faee2e16
commit aaf4b558f3
5 changed files with 24 additions and 26 deletions

View File

@@ -11,15 +11,12 @@ public class ByteBufInPacket implements InPacket {
this.byteBuf = byteBuf; this.byteBuf = byteBuf;
} }
@Override
public short getHeader() {
return byteBuf.getShortLE(0);
}
@Override @Override
public byte[] getBytes() { public byte[] getBytes() {
// TODO implement byte[] bytes = new byte[byteBuf.readableBytes()];
throw new UnsupportedOperationException(); int readerIndex = byteBuf.readerIndex();
byteBuf.getBytes(readerIndex, bytes);
return bytes;
} }
@Override @Override
@@ -51,20 +48,25 @@ public class ByteBufInPacket implements InPacket {
@Override @Override
public String readString() { public String readString() {
// TODO short length = readShort();
return null; char[] characters = new char[length];
for(int i = 0; i < length; i++) {
characters[i] = (char) readByte();
}
return String.valueOf(characters);
} }
@Override @Override
public byte[] readBytes(int bytesToRead) { public byte[] readBytes(int numberOfBytes) {
byte[] bytes = new byte[bytesToRead]; byte[] bytes = new byte[numberOfBytes];
byteBuf.readBytes(bytes); byteBuf.readBytes(bytes);
return bytes; return bytes;
} }
@Override @Override
public void skip(int bytesToSkip) { public void skip(int numberOfBytes) {
byteBuf.skipBytes(bytesToSkip); byteBuf.skipBytes(numberOfBytes);
} }
@Override @Override

View File

@@ -23,15 +23,12 @@ public class ByteBufOutPacket implements OutPacket {
this.byteBuf = byteBuf; this.byteBuf = byteBuf;
} }
@Override
public short getHeader() {
return byteBuf.getShortLE(0);
}
@Override @Override
public byte[] getBytes() { public byte[] getBytes() {
// TODO implement byte[] bytes = new byte[byteBuf.readableBytes()];
throw new UnsupportedOperationException(); int readerIndex = byteBuf.readerIndex();
byteBuf.getBytes(readerIndex, bytes);
return bytes;
} }
@Override @Override
@@ -50,7 +47,7 @@ public class ByteBufOutPacket implements OutPacket {
} }
@Override @Override
public void writeShort(short value) { public void writeShort(int value) {
byteBuf.writeShortLE(value); byteBuf.writeShortLE(value);
} }
@@ -82,7 +79,7 @@ public class ByteBufOutPacket implements OutPacket {
} }
@Override @Override
public void skip(int bytesToSkip) { public void skip(int numberOfBytes) {
writeBytes(new byte[bytesToSkip]); writeBytes(new byte[numberOfBytes]);
} }
} }

View File

@@ -9,7 +9,7 @@ public interface InPacket extends Packet {
long readLong(); long readLong();
Point readPoint(); Point readPoint();
String readString(); String readString();
byte[] readBytes(int bytesToRead); byte[] readBytes(int numberOfBytes);
void skip(int numberOfBytes); void skip(int numberOfBytes);
int available(); int available();
void seek(int byteOffset); void seek(int byteOffset);

View File

@@ -10,7 +10,7 @@ public interface OutPacket extends Packet {
void writeByte(byte value); void writeByte(byte value);
void writeByte(int value); void writeByte(int value);
void writeBytes(byte[] value); void writeBytes(byte[] value);
void writeShort(short value); void writeShort(int value);
void writeInt(int value); void writeInt(int value);
void writeLong(long value); void writeLong(long value);
void writeBoolean(boolean value); void writeBoolean(boolean value);

View File

@@ -1,6 +1,5 @@
package net.packet; package net.packet;
public interface Packet { public interface Packet {
short getHeader();
byte[] getBytes(); byte[] getBytes();
} }