From 8a6f37924ec042091c9784152a71b3e37db91172 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 9 May 2021 17:00:25 +0300 Subject: [PATCH] PingPacket -> KeepAlivePacket --- protocol/src/main/java/mc/protocol/State.java | 10 +++++----- .../{PingPacket.java => KeepAlivePacket.java} | 2 +- server/src/main/java/mc/server/Main.java | 6 +++--- server/src/main/java/mc/server/PacketHandler.java | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) rename protocol/src/main/java/mc/protocol/packets/{PingPacket.java => KeepAlivePacket.java} (94%) diff --git a/protocol/src/main/java/mc/protocol/State.java b/protocol/src/main/java/mc/protocol/State.java index 70cfb0f..a998fde 100644 --- a/protocol/src/main/java/mc/protocol/State.java +++ b/protocol/src/main/java/mc/protocol/State.java @@ -4,7 +4,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.Packet; -import mc.protocol.packets.PingPacket; +import mc.protocol.packets.KeepAlivePacket; import mc.protocol.packets.ServerSidePacket; import mc.protocol.packets.client.*; import mc.protocol.packets.server.*; @@ -24,12 +24,12 @@ public enum State { // client side Map.of( 0x00, StatusServerRequestPacket.class, - 0x01, PingPacket.class + 0x01, KeepAlivePacket.class ), // server side Map.of( StatusServerResponse.class, 0x00, - PingPacket.class, 0x01 + KeepAlivePacket.class, 0x01 ) ), LOGIN(2, @@ -47,7 +47,7 @@ public enum State { 0x00, TeleportConfirmPacket.class, 0x04, ClientSettingsPacket.class, 0x09, PluginMessagePacket.class, - 0x0B, PingPacket.class, + 0x0B, KeepAlivePacket.class, 0x0D, PlayerPositionPacket.class, 0x0E, CPlayerPositionAndLookPacket.class, 0x0F, PlayerLookPacket.class, @@ -55,7 +55,7 @@ public enum State { ), // client bound Map.of( - PingPacket.class, 0x1F, + KeepAlivePacket.class, 0x1F, ChunkDataPacket.class, 0x20, JoinGamePacket.class, 0x23, PlayerAbilitiesPacket.class,0x2C, diff --git a/protocol/src/main/java/mc/protocol/packets/PingPacket.java b/protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java similarity index 94% rename from protocol/src/main/java/mc/protocol/packets/PingPacket.java rename to protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java index 3b1ee48..bbafd99 100644 --- a/protocol/src/main/java/mc/protocol/packets/PingPacket.java +++ b/protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java @@ -25,7 +25,7 @@ import mc.protocol.io.NetByteBuf; * @see Keep Alive */ @Data -public class PingPacket implements ClientSidePacket, ServerSidePacket { +public class KeepAlivePacket implements ClientSidePacket, ServerSidePacket { private Long payload; diff --git a/server/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java index e330fec..3f943c7 100644 --- a/server/src/main/java/mc/server/Main.java +++ b/server/src/main/java/mc/server/Main.java @@ -12,7 +12,7 @@ import mc.protocol.api.Server; import mc.protocol.di.DaggerProtocolComponent; import mc.protocol.di.ProtocolComponent; import mc.protocol.di.ProtocolModule; -import mc.protocol.packets.PingPacket; +import mc.protocol.packets.KeepAlivePacket; import mc.protocol.packets.client.HandshakePacket; import mc.protocol.packets.client.LoginStartPacket; import mc.protocol.packets.client.StatusServerRequestPacket; @@ -60,10 +60,10 @@ public class Main { server.onDisonnect(connectionContext -> connectionContext.setState(null)); server.listenPacket(State.HANDSHAKING, HandshakePacket.class, packetHandler::onHandshake); - server.listenPacket(State.STATUS, PingPacket.class, packetHandler::onKeepAlive); + server.listenPacket(State.STATUS, KeepAlivePacket.class, packetHandler::onKeepAlive); server.listenPacket(State.STATUS, StatusServerRequestPacket.class, packetHandler::onServerStatus); server.listenPacket(State.LOGIN, LoginStartPacket.class, packetHandler::onLoginStart); - server.listenPacket(State.PLAY, PingPacket.class, packetHandler::onKeepAlivePlay); + server.listenPacket(State.PLAY, KeepAlivePacket.class, packetHandler::onKeepAlivePlay); server.bind(config.server().host(), config.server().port()); } diff --git a/server/src/main/java/mc/server/PacketHandler.java b/server/src/main/java/mc/server/PacketHandler.java index ca4e9f3..8a97201 100644 --- a/server/src/main/java/mc/server/PacketHandler.java +++ b/server/src/main/java/mc/server/PacketHandler.java @@ -7,7 +7,7 @@ import mc.protocol.api.ConnectionContext; import mc.protocol.model.Location; import mc.protocol.model.Look; import mc.protocol.model.ServerInfo; -import mc.protocol.packets.PingPacket; +import mc.protocol.packets.KeepAlivePacket; import mc.protocol.packets.client.HandshakePacket; import mc.protocol.packets.client.LoginStartPacket; import mc.protocol.packets.client.StatusServerRequestPacket; @@ -39,12 +39,12 @@ public class PacketHandler { context.setState(packet.getNextState()); } - public void onKeepAlive(ConnectionContext context, PingPacket packet) { + public void onKeepAlive(ConnectionContext context, KeepAlivePacket packet) { context.sendNow(packet); context.disconnect(); } - public void onKeepAlivePlay(ConnectionContext context, PingPacket packet) { + public void onKeepAlivePlay(ConnectionContext context, KeepAlivePacket packet) { try { TimeUnit.MILLISECONDS.sleep(50); context.sendNow(packet); @@ -124,10 +124,10 @@ public class PacketHandler { context.send(playerPositionAndLookPacket); - PingPacket pingPacket = new PingPacket(); - pingPacket.setPayload(System.currentTimeMillis()); + KeepAlivePacket keepAlivePacket = new KeepAlivePacket(); + keepAlivePacket.setPayload(System.currentTimeMillis()); - context.send(pingPacket); + context.send(keepAlivePacket); context.flushSending(); }