diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java index 306f66a59..031c0d7e3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java @@ -123,6 +123,7 @@ public class Connection { Thread handleThread = new Thread(() -> { while (getConnectionState() != ConnectionState.DISCONNECTED) { while (handlingQueue.size() > 0) { + handlingQueue.get(0).log(); handlingQueue.get(0).handle(getHandler()); handlingQueue.remove(0); } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketEncryptionKeyRequest.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketEncryptionKeyRequest.java index e42eb328c..11736a6bc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketEncryptionKeyRequest.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketEncryptionKeyRequest.java @@ -20,8 +20,6 @@ public class PacketEncryptionKeyRequest implements ClientboundPacket { verifyToken = buffer.readBytes(buffer.readShort()); // read length, then the bytes break; } // ToDo - - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginDisconnect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginDisconnect.java index c14b630dc..71f2e4351 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginDisconnect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginDisconnect.java @@ -13,7 +13,6 @@ public class PacketLoginDisconnect implements ClientboundPacket { @Override public void read(InPacketBuffer buffer, ProtocolVersion v) { reason = buffer.readChatComponent(); - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java index 9892d7e76..8236f51d2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java @@ -16,8 +16,6 @@ public class PacketLoginSuccess implements ClientboundPacket { public void read(InPacketBuffer buffer, ProtocolVersion v) { uuid = UUID.fromString(buffer.readString()); username = buffer.readString(); - - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java index d93a9ce65..371b650f9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java @@ -19,7 +19,6 @@ public class PacketChangeGameState implements ClientboundPacket { value = buffer.readFloat(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChatMessage.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChatMessage.java index dce118ff2..00265d491 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChatMessage.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChatMessage.java @@ -18,7 +18,6 @@ public class PacketChatMessage implements ClientboundPacket { c = buffer.readChatComponent(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkBulk.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkBulk.java index 42da49dcd..cc3a747e6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkBulk.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkBulk.java @@ -103,7 +103,6 @@ public class PacketChunkBulk implements ClientboundPacket { } break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java index 0d1e757f8..588dd6f49 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java @@ -18,7 +18,6 @@ public class PacketDisconnect implements ClientboundPacket { reason = buffer.readChatComponent(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketHeldItemChangeReceiving.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketHeldItemChangeReceiving.java index f4304f1b1..75992d013 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketHeldItemChangeReceiving.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketHeldItemChangeReceiving.java @@ -16,7 +16,6 @@ public class PacketHeldItemChangeReceiving implements ClientboundPacket { slot = buffer.readByte(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java index f8ce3ce06..527299d30 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java @@ -38,7 +38,6 @@ public class PacketJoinGame implements ClientboundPacket { levelType = LevelType.byType(buffer.readString()); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketKeepAlive.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketKeepAlive.java index d61c3066f..b2fd4cc53 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketKeepAlive.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketKeepAlive.java @@ -17,7 +17,6 @@ public class PacketKeepAlive implements ClientboundPacket { id = buffer.readInteger(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java index 1b7fce233..7e41beea1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java @@ -22,7 +22,6 @@ public class PacketPlayerInfo implements ClientboundPacket { break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceiving.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceiving.java index 82e1f4ded..070019107 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceiving.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceiving.java @@ -19,7 +19,6 @@ public class PacketPluginMessageReceiving implements ClientboundPacket { data = buffer.readBytes(buffer.readShort()); // first read length, then the data break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSetExperience.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSetExperience.java index f8abca70d..d4758f0f7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSetExperience.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSetExperience.java @@ -22,7 +22,6 @@ public class PacketSetExperience implements ClientboundPacket { total = buffer.readShort(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnLocation.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnLocation.java index 1ecc95fe2..29440744a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnLocation.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnLocation.java @@ -21,7 +21,6 @@ public class PacketSpawnLocation implements ClientboundPacket { loc = new Location(x, y, z); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTimeUpdate.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTimeUpdate.java index b3173517b..f601d20be 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTimeUpdate.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTimeUpdate.java @@ -19,7 +19,6 @@ public class PacketTimeUpdate implements ClientboundPacket { timeOfDay = buffer.readLong(); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java index f2f42ee49..7517d0b41 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java @@ -21,7 +21,6 @@ public class PacketUpdateHealth implements ClientboundPacket { saturation = (float) (Math.round(buffer.readFloat() * 10) / 10.0); break; } - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusPong.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusPong.java index c0c0f20c9..9b4f418a3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusPong.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusPong.java @@ -12,7 +12,6 @@ public class PacketStatusPong implements ClientboundPacket { @Override public void read(InPacketBuffer buffer, ProtocolVersion v) { this.id = buffer.readLong(); - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusResponse.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusResponse.java index 227d579fe..415f39b19 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusResponse.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/status/PacketStatusResponse.java @@ -14,7 +14,6 @@ public class PacketStatusResponse implements ClientboundPacket { public void read(InPacketBuffer buffer, ProtocolVersion v) { // no version checking, is the same in all versions (1.7.x - 1.15.2) response = new ServerListPing(buffer.readJson()); - log(); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java index ab7d03ad9..1df6ca9b2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java @@ -16,6 +16,7 @@ public class PacketHandshake implements ServerboundPacket { this.port = port; this.nextState = nextState; this.version = version; + log(); } public PacketHandshake(String address, int version) { @@ -23,11 +24,11 @@ public class PacketHandshake implements ServerboundPacket { this.version = version; this.port = ProtocolDefinition.DEFAULT_PORT; this.nextState = ConnectionState.STATUS; + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); // 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)); buffer.writeVarInt((nextState == ConnectionState.STATUS ? -1 : version)); // get best protocol version diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketEncryptionResponse.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketEncryptionResponse.java index d9dffe893..45be12bab 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketEncryptionResponse.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketEncryptionResponse.java @@ -21,6 +21,7 @@ public class PacketEncryptionResponse implements ServerboundPacket { this.secretKey = secret; this.secret = CryptManager.encryptData(key, secret.getEncoded()); this.token = CryptManager.encryptData(key, token); + log(); } @@ -30,7 +31,6 @@ public class PacketEncryptionResponse implements ServerboundPacket { @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_ENCRYPTION_RESPONSE)); switch (v) { case VERSION_1_7_10: diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketLoginStart.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketLoginStart.java index 53bfae3d6..972654c8e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketLoginStart.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/login/PacketLoginStart.java @@ -13,15 +13,16 @@ public class PacketLoginStart implements ServerboundPacket { public PacketLoginStart(Player p) { username = p.getPlayerName(); + log(); } public PacketLoginStart(String username) { this.username = username; + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); // 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)); buffer.writeString((username == null) ? "Player132" : username); diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java index af28ffccc..5c4b7e3e7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java @@ -16,12 +16,12 @@ public class PacketClientSettings implements ServerboundPacket { public PacketClientSettings(Locale locale, int renderDistance) { this.locale = locale; this.renderDistance = (byte) renderDistance; + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_CLIENT_SETTINGS)); switch (v) { case VERSION_1_7_10: diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketHeldItemChangeSending.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketHeldItemChangeSending.java index 75b4ba763..1732297a3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketHeldItemChangeSending.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketHeldItemChangeSending.java @@ -12,16 +12,17 @@ public class PacketHeldItemChangeSending implements ServerboundPacket { public PacketHeldItemChangeSending(byte slot) { this.slot = slot; + log(); } public PacketHeldItemChangeSending(int slot) { this.slot = (byte) slot; + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_HELD_ITEM_CHANGE)); switch (v) { case VERSION_1_7_10: diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketKeepAliveResponse.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketKeepAliveResponse.java index 9bd0ec4e3..cd8a47d21 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketKeepAliveResponse.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketKeepAliveResponse.java @@ -12,12 +12,12 @@ public class PacketKeepAliveResponse implements ServerboundPacket { public PacketKeepAliveResponse(int id) { this.id = id; + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.LOGIN_LOGIN_START)); switch (v) { case VERSION_1_7_10: diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPluginMessageSending.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPluginMessageSending.java index c7c21a205..dfdd82d1d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPluginMessageSending.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPluginMessageSending.java @@ -14,17 +14,18 @@ public class PacketPluginMessageSending implements ServerboundPacket { public PacketPluginMessageSending(String channel, byte[] data) { this.channel = channel; this.data = data; + log(); } public PacketPluginMessageSending(String channel, String data) { this.channel = channel; this.data = data.getBytes(); + log(); } @Override public OutPacketBuffer write(ProtocolVersion v) { - log(); OutPacketBuffer buffer = new OutPacketBuffer(v.getPacketCommand(Packets.Serverbound.PLAY_PLUGIN_MESSAGE)); switch (v) { case VERSION_1_7_10: