Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

немного привёл код в порядок

Browse Source
This commit is contained in:
DmitriyMX
2021-05-03 15:34:09 +03:00
parent 052593bc14
commit 5833aab62a
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java
View File

@@ -52,6 +52,7 @@ public class ProtocolDecoder extends ByteToMessageDecoder {
} else { } else {
ClientSidePacket packet = packetClass.getDeclaredConstructor().newInstance(); ClientSidePacket packet = packetClass.getDeclaredConstructor().newInstance();
packet.readSelf(netByteBuf); packet.readSelf(netByteBuf);
log.debug("IN: {}:{}", state, packet);
out.add(packet); out.add(packet);
} }
} }

2
protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java
View File

@@ -20,7 +20,7 @@ public class ProtocolEncoder extends MessageToByteEncoder<ServerSidePacket> {
State state = ctx.channel().attr(NetworkAttributes.STATE).get(); State state = ctx.channel().attr(NetworkAttributes.STATE).get();
int packetId = Objects.requireNonNull(state.getServerSidePacketId(packet.getClass())); int packetId = Objects.requireNonNull(state.getServerSidePacketId(packet.getClass()));
log.info("Send {}:{}", state, packet); log.debug("OUT: {}:{}", state, packet);
NetByteBuf buffer = new NetByteBuf(Unpooled.buffer()); NetByteBuf buffer = new NetByteBuf(Unpooled.buffer());
buffer.writeVarInt(packetId); buffer.writeVarInt(packetId);

19
server/src/main/java/mc/server/Main.java
View File

@@ -48,21 +48,10 @@ public class Main {
NettyServer server = NettyServer.createServer(); NettyServer server = NettyServer.createServer();
PacketHandler packetHandler = serverComponent.getPacketHandler(); PacketHandler packetHandler = serverComponent.getPacketHandler();
server.packetFlux(HandshakePacket.class) server.packetFlux(HandshakePacket.class).subscribe(packetHandler::onHandshake);
.doOnNext(channel -> log.info("{}", channel.getPacket())) server.packetFlux(PingPacket.class).subscribe(packetHandler::onKeepAlive);
.subscribe(packetHandler::onHandshake); server.packetFlux(StatusServerRequestPacket.class).subscribe(packetHandler::onServerStatus);
server.packetFlux(LoginStartPacket.class).subscribe(packetHandler::onLoginStart);
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.bind(config.server().host(), config.server().port()); server.bind(config.server().host(), config.server().port());
} }