diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index 9d585bf..45f4156 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -13,7 +13,7 @@ import ru.nanit.limbo.LimboConstants; import ru.nanit.limbo.connection.pipeline.PacketDecoder; import ru.nanit.limbo.connection.pipeline.PacketEncoder; import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PreEncodedPacket; +import ru.nanit.limbo.protocol.PacketSnapshot; import ru.nanit.limbo.protocol.packets.PacketHandshake; import ru.nanit.limbo.protocol.packets.login.*; import ru.nanit.limbo.protocol.packets.play.*; @@ -39,23 +39,23 @@ import java.util.concurrent.ThreadLocalRandom; public class ClientConnection extends ChannelInboundHandlerAdapter { - private static PreEncodedPacket PACKET_LOGIN_SUCCESS; - private static PreEncodedPacket PACKET_JOIN_GAME; - private static PreEncodedPacket PACKET_PLUGIN_MESSAGE; - private static PreEncodedPacket PACKET_PLAYER_ABILITIES; - private static PreEncodedPacket PACKET_PLAYER_INFO; - private static PreEncodedPacket PACKET_DECLARE_COMMANDS; - private static PreEncodedPacket PACKET_PLAYER_POS; - private static PreEncodedPacket PACKET_JOIN_MESSAGE; - private static PreEncodedPacket PACKET_BOSS_BAR; + private static PacketSnapshot PACKET_LOGIN_SUCCESS; + private static PacketSnapshot PACKET_JOIN_GAME; + private static PacketSnapshot PACKET_PLUGIN_MESSAGE; + private static PacketSnapshot PACKET_PLAYER_ABILITIES; + private static PacketSnapshot PACKET_PLAYER_INFO; + private static PacketSnapshot PACKET_DECLARE_COMMANDS; + private static PacketSnapshot PACKET_PLAYER_POS; + private static PacketSnapshot PACKET_JOIN_MESSAGE; + private static PacketSnapshot PACKET_BOSS_BAR; - private static PreEncodedPacket PACKET_TITLE_TITLE; - private static PreEncodedPacket PACKET_TITLE_SUBTITLE; - private static PreEncodedPacket PACKET_TITLE_TIMES; + private static PacketSnapshot PACKET_TITLE_TITLE; + private static PacketSnapshot PACKET_TITLE_SUBTITLE; + private static PacketSnapshot PACKET_TITLE_TIMES; - private static PreEncodedPacket PACKET_TITLE_LEGACY_TITLE; - private static PreEncodedPacket PACKET_TITLE_LEGACY_SUBTITLE; - private static PreEncodedPacket PACKET_TITLE_LEGACY_TIMES; + private static PacketSnapshot PACKET_TITLE_LEGACY_TITLE; + private static PacketSnapshot PACKET_TITLE_LEGACY_SUBTITLE; + private static PacketSnapshot PACKET_TITLE_LEGACY_TIMES; private final LimboServer server; private final Channel channel; @@ -408,18 +408,18 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { PacketDeclareCommands declareCommands = new PacketDeclareCommands(); declareCommands.setCommands(Collections.emptyList()); - PACKET_LOGIN_SUCCESS = PreEncodedPacket.of(loginSuccess); - PACKET_JOIN_GAME = PreEncodedPacket.of(joinGame); - PACKET_PLAYER_ABILITIES = PreEncodedPacket.of(playerAbilities); - PACKET_PLAYER_POS = PreEncodedPacket.of(positionAndLook); - PACKET_PLAYER_INFO = PreEncodedPacket.of(info); - PACKET_DECLARE_COMMANDS = PreEncodedPacket.of(declareCommands); + PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess); + PACKET_JOIN_GAME = PacketSnapshot.of(joinGame); + PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities); + PACKET_PLAYER_POS = PacketSnapshot.of(positionAndLook); + PACKET_PLAYER_INFO = PacketSnapshot.of(info); + PACKET_DECLARE_COMMANDS = PacketSnapshot.of(declareCommands); if (server.getConfig().isUseBrandName()){ PacketPluginMessage pluginMessage = new PacketPluginMessage(); pluginMessage.setChannel("minecraft:brand"); pluginMessage.setMessage(server.getConfig().getBrandName()); - PACKET_PLUGIN_MESSAGE = PreEncodedPacket.of(pluginMessage); + PACKET_PLUGIN_MESSAGE = PacketSnapshot.of(pluginMessage); } if (server.getConfig().isUseJoinMessage()) { @@ -427,14 +427,14 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { joinMessage.setJsonData(server.getConfig().getJoinMessage()); joinMessage.setPosition(PacketChatMessage.Position.CHAT); joinMessage.setSender(UUID.randomUUID()); - PACKET_JOIN_MESSAGE = PreEncodedPacket.of(joinMessage); + PACKET_JOIN_MESSAGE = PacketSnapshot.of(joinMessage); } if (server.getConfig().isUseBossBar()) { PacketBossBar bossBar = new PacketBossBar(); bossBar.setBossBar(server.getConfig().getBossBar()); bossBar.setUuid(UUID.randomUUID()); - PACKET_BOSS_BAR = PreEncodedPacket.of(bossBar); + PACKET_BOSS_BAR = PacketSnapshot.of(bossBar); } if (server.getConfig().isUseTitle()) { @@ -463,13 +463,13 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { legacyTimes.setTitle(title); legacyTimes.setAction(PacketTitleLegacy.Action.SET_TIMES_AND_DISPLAY); - PACKET_TITLE_TITLE = PreEncodedPacket.of(packetTitle); - PACKET_TITLE_SUBTITLE = PreEncodedPacket.of(packetSubtitle); - PACKET_TITLE_TIMES = PreEncodedPacket.of(packetTimes); + PACKET_TITLE_TITLE = PacketSnapshot.of(packetTitle); + PACKET_TITLE_SUBTITLE = PacketSnapshot.of(packetSubtitle); + PACKET_TITLE_TIMES = PacketSnapshot.of(packetTimes); - PACKET_TITLE_LEGACY_TITLE = PreEncodedPacket.of(legacyTitle); - PACKET_TITLE_LEGACY_SUBTITLE = PreEncodedPacket.of(legacySubtitle); - PACKET_TITLE_LEGACY_TIMES = PreEncodedPacket.of(legacyTimes); + PACKET_TITLE_LEGACY_TITLE = PacketSnapshot.of(legacyTitle); + PACKET_TITLE_LEGACY_SUBTITLE = PacketSnapshot.of(legacySubtitle); + PACKET_TITLE_LEGACY_TIMES = PacketSnapshot.of(legacyTimes); } } } diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java index 95b4b43..7d06341 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import ru.nanit.limbo.protocol.ByteMessage; import ru.nanit.limbo.protocol.Packet; -import ru.nanit.limbo.protocol.PreEncodedPacket; +import ru.nanit.limbo.protocol.PacketSnapshot; import ru.nanit.limbo.protocol.registry.State; import ru.nanit.limbo.protocol.registry.Version; import ru.nanit.limbo.util.Logger; @@ -27,8 +27,8 @@ public class PacketEncoder extends MessageToByteEncoder { ByteMessage msg = new ByteMessage(out); int packetId; - if (packet instanceof PreEncodedPacket) { - packetId = registry.getPacketId(((PreEncodedPacket)packet).getWrappedPacket().getClass()); + if (packet instanceof PacketSnapshot) { + packetId = registry.getPacketId(((PacketSnapshot)packet).getWrappedPacket().getClass()); } else { packetId = registry.getPacketId(packet.getClass()); } diff --git a/src/main/java/ru/nanit/limbo/protocol/Direction.java b/src/main/java/ru/nanit/limbo/protocol/Direction.java deleted file mode 100644 index 9e67e48..0000000 --- a/src/main/java/ru/nanit/limbo/protocol/Direction.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.nanit.limbo.protocol; - -public enum Direction { - - CLIENT, - SERVER - -} diff --git a/src/main/java/ru/nanit/limbo/protocol/PreEncodedPacket.java b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java similarity index 80% rename from src/main/java/ru/nanit/limbo/protocol/PreEncodedPacket.java rename to src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java index 0905557..b6e0cbc 100644 --- a/src/main/java/ru/nanit/limbo/protocol/PreEncodedPacket.java +++ b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java @@ -5,12 +5,12 @@ import ru.nanit.limbo.protocol.registry.Version; import java.util.HashMap; import java.util.Map; -public class PreEncodedPacket implements PacketOut { +public class PacketSnapshot implements PacketOut { private final PacketOut packet; private final Map versionMessages; - public PreEncodedPacket(PacketOut packet) { + public PacketSnapshot(PacketOut packet) { this.packet = packet; this.versionMessages = new HashMap<>(); } @@ -19,7 +19,7 @@ public class PreEncodedPacket implements PacketOut { return packet; } - public PreEncodedPacket encodePacket() { + public PacketSnapshot encodePacket() { for (Version version : Version.values()) { ByteMessage encodedMessage = ByteMessage.create(); packet.encode(encodedMessage, version); @@ -45,7 +45,7 @@ public class PreEncodedPacket implements PacketOut { return packet.getClass().getSimpleName(); } - public static PreEncodedPacket of(PacketOut packet) { - return new PreEncodedPacket(packet).encodePacket(); + public static PacketSnapshot of(PacketOut packet) { + return new PacketSnapshot(packet).encodePacket(); } } diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java index 86997d9..84cf640 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java @@ -5,6 +5,7 @@ import ru.nanit.limbo.protocol.PacketOut; import ru.nanit.limbo.protocol.registry.Version; public class PacketPluginMessage implements PacketOut { + private String channel; private String message;