From 5833aab62a6db0d60761f48106cfa5da9d87c63d Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 3 May 2021 15:34:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D1=91=D0=BB=20=D0=BA=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/protocol/io/codec/ProtocolDecoder.java | 1 + .../mc/protocol/io/codec/ProtocolEncoder.java | 2 +- server/src/main/java/mc/server/Main.java | 19 ++++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java index 8178276..1747153 100644 --- a/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java +++ b/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java @@ -52,6 +52,7 @@ public class ProtocolDecoder extends ByteToMessageDecoder { } else { ClientSidePacket packet = packetClass.getDeclaredConstructor().newInstance(); packet.readSelf(netByteBuf); + log.debug("IN: {}:{}", state, packet); out.add(packet); } } diff --git a/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java index 07d759a..146605a 100644 --- a/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java +++ b/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java @@ -20,7 +20,7 @@ public class ProtocolEncoder extends MessageToByteEncoder { State state = ctx.channel().attr(NetworkAttributes.STATE).get(); int packetId = Objects.requireNonNull(state.getServerSidePacketId(packet.getClass())); - log.info("Send {}:{}", state, packet); + log.debug("OUT: {}:{}", state, packet); NetByteBuf buffer = new NetByteBuf(Unpooled.buffer()); buffer.writeVarInt(packetId); diff --git a/server/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java index 61fd91d..b3120e2 100644 --- a/server/src/main/java/mc/server/Main.java +++ b/server/src/main/java/mc/server/Main.java @@ -48,21 +48,10 @@ public class Main { NettyServer server = NettyServer.createServer(); PacketHandler packetHandler = serverComponent.getPacketHandler(); - server.packetFlux(HandshakePacket.class) - .doOnNext(channel -> log.info("{}", channel.getPacket())) - .subscribe(packetHandler::onHandshake); - - server.packetFlux(PingPacket.class) - .doOnNext(channel -> log.info("{}", channel.getPacket())) - .subscribe(packetHandler::onKeepAlive); - - server.packetFlux(StatusServerRequestPacket.class) - .doOnNext(channel -> log.info("{}", channel.getPacket())) - .subscribe(packetHandler::onServerStatus); - - server.packetFlux(LoginStartPacket.class) - .doOnNext(channel -> log.info("{}", channel.getPacket())) - .subscribe(packetHandler::onLoginStart); + server.packetFlux(HandshakePacket.class).subscribe(packetHandler::onHandshake); + server.packetFlux(PingPacket.class).subscribe(packetHandler::onKeepAlive); + server.packetFlux(StatusServerRequestPacket.class).subscribe(packetHandler::onServerStatus); + server.packetFlux(LoginStartPacket.class).subscribe(packetHandler::onLoginStart); server.bind(config.server().host(), config.server().port()); }