log packet to packet handling thread

This commit is contained in:
bixilon 2020-06-05 22:18:56 +02:00
parent 841d3bc624
commit 00fc8ec051
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
26 changed files with 12 additions and 27 deletions

View File

@ -123,6 +123,7 @@ public class Connection {
Thread handleThread = new Thread(() -> { Thread handleThread = new Thread(() -> {
while (getConnectionState() != ConnectionState.DISCONNECTED) { while (getConnectionState() != ConnectionState.DISCONNECTED) {
while (handlingQueue.size() > 0) { while (handlingQueue.size() > 0) {
handlingQueue.get(0).log();
handlingQueue.get(0).handle(getHandler()); handlingQueue.get(0).handle(getHandler());
handlingQueue.remove(0); handlingQueue.remove(0);
} }

View File

@ -20,8 +20,6 @@ public class PacketEncryptionKeyRequest implements ClientboundPacket {
verifyToken = buffer.readBytes(buffer.readShort()); // read length, then the bytes verifyToken = buffer.readBytes(buffer.readShort()); // read length, then the bytes
break; break;
} // ToDo } // ToDo
log();
} }
@Override @Override

View File

@ -13,7 +13,6 @@ public class PacketLoginDisconnect implements ClientboundPacket {
@Override @Override
public void read(InPacketBuffer buffer, ProtocolVersion v) { public void read(InPacketBuffer buffer, ProtocolVersion v) {
reason = buffer.readChatComponent(); reason = buffer.readChatComponent();
log();
} }
@Override @Override

View File

@ -16,8 +16,6 @@ public class PacketLoginSuccess implements ClientboundPacket {
public void read(InPacketBuffer buffer, ProtocolVersion v) { public void read(InPacketBuffer buffer, ProtocolVersion v) {
uuid = UUID.fromString(buffer.readString()); uuid = UUID.fromString(buffer.readString());
username = buffer.readString(); username = buffer.readString();
log();
} }
@Override @Override

View File

@ -19,7 +19,6 @@ public class PacketChangeGameState implements ClientboundPacket {
value = buffer.readFloat(); value = buffer.readFloat();
break; break;
} }
log();
} }
@Override @Override

View File

@ -18,7 +18,6 @@ public class PacketChatMessage implements ClientboundPacket {
c = buffer.readChatComponent(); c = buffer.readChatComponent();
break; break;
} }
log();
} }
@Override @Override

View File

@ -103,7 +103,6 @@ public class PacketChunkBulk implements ClientboundPacket {
} }
break; break;
} }
log();
} }
@Override @Override

View File

@ -18,7 +18,6 @@ public class PacketDisconnect implements ClientboundPacket {
reason = buffer.readChatComponent(); reason = buffer.readChatComponent();
break; break;
} }
log();
} }
@Override @Override

View File

@ -16,7 +16,6 @@ public class PacketHeldItemChangeReceiving implements ClientboundPacket {
slot = buffer.readByte(); slot = buffer.readByte();
break; break;
} }
log();
} }
@Override @Override

View File

@ -38,7 +38,6 @@ public class PacketJoinGame implements ClientboundPacket {
levelType = LevelType.byType(buffer.readString()); levelType = LevelType.byType(buffer.readString());
break; break;
} }
log();
} }
@Override @Override

View File

@ -17,7 +17,6 @@ public class PacketKeepAlive implements ClientboundPacket {
id = buffer.readInteger(); id = buffer.readInteger();
break; break;
} }
log();
} }
@Override @Override

View File

@ -22,7 +22,6 @@ public class PacketPlayerInfo implements ClientboundPacket {
break; break;
} }
log();
} }
@Override @Override

View File

@ -19,7 +19,6 @@ public class PacketPluginMessageReceiving implements ClientboundPacket {
data = buffer.readBytes(buffer.readShort()); // first read length, then the data data = buffer.readBytes(buffer.readShort()); // first read length, then the data
break; break;
} }
log();
} }
@Override @Override

View File

@ -22,7 +22,6 @@ public class PacketSetExperience implements ClientboundPacket {
total = buffer.readShort(); total = buffer.readShort();
break; break;
} }
log();
} }
@Override @Override

View File

@ -21,7 +21,6 @@ public class PacketSpawnLocation implements ClientboundPacket {
loc = new Location(x, y, z); loc = new Location(x, y, z);
break; break;
} }
log();
} }
@Override @Override

View File

@ -19,7 +19,6 @@ public class PacketTimeUpdate implements ClientboundPacket {
timeOfDay = buffer.readLong(); timeOfDay = buffer.readLong();
break; break;
} }
log();
} }
@Override @Override

View File

@ -21,7 +21,6 @@ public class PacketUpdateHealth implements ClientboundPacket {
saturation = (float) (Math.round(buffer.readFloat() * 10) / 10.0); saturation = (float) (Math.round(buffer.readFloat() * 10) / 10.0);
break; break;
} }
log();
} }
@Override @Override

View File

@ -12,7 +12,6 @@ public class PacketStatusPong implements ClientboundPacket {
@Override @Override
public void read(InPacketBuffer buffer, ProtocolVersion v) { public void read(InPacketBuffer buffer, ProtocolVersion v) {
this.id = buffer.readLong(); this.id = buffer.readLong();
log();
} }
@Override @Override

View File

@ -14,7 +14,6 @@ public class PacketStatusResponse implements ClientboundPacket {
public void read(InPacketBuffer buffer, ProtocolVersion v) { public void read(InPacketBuffer buffer, ProtocolVersion v) {
// no version checking, is the same in all versions (1.7.x - 1.15.2) // no version checking, is the same in all versions (1.7.x - 1.15.2)
response = new ServerListPing(buffer.readJson()); response = new ServerListPing(buffer.readJson());
log();
} }
@Override @Override

View File

@ -16,6 +16,7 @@ public class PacketHandshake implements ServerboundPacket {
this.port = port; this.port = port;
this.nextState = nextState; this.nextState = nextState;
this.version = version; this.version = version;
log();
} }
public PacketHandshake(String address, int version) { public PacketHandshake(String address, int version) {
@ -23,11 +24,11 @@ public class PacketHandshake implements ServerboundPacket {
this.version = version; this.version = version;
this.port = ProtocolDefinition.DEFAULT_PORT; this.port = ProtocolDefinition.DEFAULT_PORT;
this.nextState = ConnectionState.STATUS; this.nextState = ConnectionState.STATUS;
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
// no version checking, is the same in all versions (1.7.x - 1.15.2) // no version checking, is the same in all versions (1.7.x - 1.15.2)
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.STATUS_REQUEST)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.STATUS_REQUEST));
buffer.writeVarInt((nextState == ConnectionState.STATUS ? -1 : version)); // get best protocol version buffer.writeVarInt((nextState == ConnectionState.STATUS ? -1 : version)); // get best protocol version

View File

@ -21,6 +21,7 @@ public class PacketEncryptionResponse implements ServerboundPacket {
this.secretKey = secret; this.secretKey = secret;
this.secret = CryptManager.encryptData(key, secret.getEncoded()); this.secret = CryptManager.encryptData(key, secret.getEncoded());
this.token = CryptManager.encryptData(key, token); this.token = CryptManager.encryptData(key, token);
log();
} }
@ -30,7 +31,6 @@ public class PacketEncryptionResponse implements ServerboundPacket {
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_ENCRYPTION_RESPONSE)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_ENCRYPTION_RESPONSE));
switch (v) { switch (v) {
case VERSION_1_7_10: case VERSION_1_7_10:

View File

@ -13,15 +13,16 @@ public class PacketLoginStart implements ServerboundPacket {
public PacketLoginStart(Player p) { public PacketLoginStart(Player p) {
username = p.getPlayerName(); username = p.getPlayerName();
log();
} }
public PacketLoginStart(String username) { public PacketLoginStart(String username) {
this.username = username; this.username = username;
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
// no version checking, is the same in all versions (1.7.x - 1.15.2) // no version checking, is the same in all versions (1.7.x - 1.15.2)
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_LOGIN_START)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_LOGIN_START));
buffer.writeString((username == null) ? "Player132" : username); buffer.writeString((username == null) ? "Player132" : username);

View File

@ -16,12 +16,12 @@ public class PacketClientSettings implements ServerboundPacket {
public PacketClientSettings(Locale locale, int renderDistance) { public PacketClientSettings(Locale locale, int renderDistance) {
this.locale = locale; this.locale = locale;
this.renderDistance = (byte) renderDistance; this.renderDistance = (byte) renderDistance;
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_CLIENT_SETTINGS)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_CLIENT_SETTINGS));
switch (v) { switch (v) {
case VERSION_1_7_10: case VERSION_1_7_10:

View File

@ -12,16 +12,17 @@ public class PacketHeldItemChangeSending implements ServerboundPacket {
public PacketHeldItemChangeSending(byte slot) { public PacketHeldItemChangeSending(byte slot) {
this.slot = slot; this.slot = slot;
log();
} }
public PacketHeldItemChangeSending(int slot) { public PacketHeldItemChangeSending(int slot) {
this.slot = (byte) slot; this.slot = (byte) slot;
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_HELD_ITEM_CHANGE)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_HELD_ITEM_CHANGE));
switch (v) { switch (v) {
case VERSION_1_7_10: case VERSION_1_7_10:

View File

@ -12,12 +12,12 @@ public class PacketKeepAliveResponse implements ServerboundPacket {
public PacketKeepAliveResponse(int id) { public PacketKeepAliveResponse(int id) {
this.id = id; this.id = id;
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_LOGIN_START)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_LOGIN_START));
switch (v) { switch (v) {
case VERSION_1_7_10: case VERSION_1_7_10:

View File

@ -14,17 +14,18 @@ public class PacketPluginMessageSending implements ServerboundPacket {
public PacketPluginMessageSending(String channel, byte[] data) { public PacketPluginMessageSending(String channel, byte[] data) {
this.channel = channel; this.channel = channel;
this.data = data; this.data = data;
log();
} }
public PacketPluginMessageSending(String channel, String data) { public PacketPluginMessageSending(String channel, String data) {
this.channel = channel; this.channel = channel;
this.data = data.getBytes(); this.data = data.getBytes();
log();
} }
@Override @Override
public OutPacketBuffer write(ProtocolVersion v) { public OutPacketBuffer write(ProtocolVersion v) {
log();
OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_PLUGIN_MESSAGE)); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_PLUGIN_MESSAGE));
switch (v) { switch (v) {
case VERSION_1_7_10: case VERSION_1_7_10: