From 2b9f0214196d6bcff0e737bf9e77b39acd6f9e86 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 10 May 2021 18:57:53 +0300 Subject: [PATCH] refactoring: move package --- .../src/main/java/mc/protocol/{io => buffer}/NetByteBuf.java | 2 +- .../main/java/mc/protocol/{io => buffer}/NetIOException.java | 2 +- .../main/java/mc/protocol/handler/codec/ProtocolDecoder.java | 2 +- .../main/java/mc/protocol/handler/codec/ProtocolEncoder.java | 2 +- .../main/java/mc/protocol/handler/codec/ProtocolSplitter.java | 2 +- .../src/main/java/mc/protocol/packets/ClientSidePacket.java | 2 +- .../src/main/java/mc/protocol/packets/KeepAlivePacket.java | 2 +- .../src/main/java/mc/protocol/packets/ServerSidePacket.java | 2 +- .../mc/protocol/packets/handshaking/client/HandshakePacket.java | 2 +- .../java/mc/protocol/packets/login/client/LoginStartPacket.java | 2 +- .../java/mc/protocol/packets/login/server/DisconnectPacket.java | 2 +- .../mc/protocol/packets/login/server/LoginSuccessPacket.java | 2 +- .../packets/play/client/CPlayerPositionAndLookPacket.java | 2 +- .../mc/protocol/packets/play/client/ClientSettingsPacket.java | 2 +- .../mc/protocol/packets/play/client/EntityActionPacket.java | 2 +- .../java/mc/protocol/packets/play/client/PlayerLookPacket.java | 2 +- .../mc/protocol/packets/play/client/PlayerPositionPacket.java | 2 +- .../mc/protocol/packets/play/client/PluginMessagePacket.java | 2 +- .../mc/protocol/packets/play/client/TeleportConfirmPacket.java | 2 +- .../java/mc/protocol/packets/play/server/ChunkDataPacket.java | 2 +- .../java/mc/protocol/packets/play/server/JoinGamePacket.java | 2 +- .../mc/protocol/packets/play/server/PlayerAbilitiesPacket.java | 2 +- .../packets/play/server/SPlayerPositionAndLookPacket.java | 2 +- .../mc/protocol/packets/play/server/SpawnPositionPacket.java | 2 +- .../packets/status/client/StatusServerRequestPacket.java | 2 +- .../mc/protocol/packets/status/server/StatusServerResponse.java | 2 +- .../java/mc/protocol/{io => buffer}/NetByteBufReadTest.java | 2 +- .../java/mc/protocol/{io => buffer}/NetByteBufWriteTest.java | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) rename protocol-new/src/main/java/mc/protocol/{io => buffer}/NetByteBuf.java (99%) rename protocol-new/src/main/java/mc/protocol/{io => buffer}/NetIOException.java (82%) rename protocol-new/src/test/java/mc/protocol/{io => buffer}/NetByteBufReadTest.java (99%) rename protocol-new/src/test/java/mc/protocol/{io => buffer}/NetByteBufWriteTest.java (99%) diff --git a/protocol-new/src/main/java/mc/protocol/io/NetByteBuf.java b/protocol-new/src/main/java/mc/protocol/buffer/NetByteBuf.java similarity index 99% rename from protocol-new/src/main/java/mc/protocol/io/NetByteBuf.java rename to protocol-new/src/main/java/mc/protocol/buffer/NetByteBuf.java index d32834d..ef90751 100644 --- a/protocol-new/src/main/java/mc/protocol/io/NetByteBuf.java +++ b/protocol-new/src/main/java/mc/protocol/buffer/NetByteBuf.java @@ -1,4 +1,4 @@ -package mc.protocol.io; +package mc.protocol.buffer; import io.netty.buffer.ByteBuf; import lombok.EqualsAndHashCode; diff --git a/protocol-new/src/main/java/mc/protocol/io/NetIOException.java b/protocol-new/src/main/java/mc/protocol/buffer/NetIOException.java similarity index 82% rename from protocol-new/src/main/java/mc/protocol/io/NetIOException.java rename to protocol-new/src/main/java/mc/protocol/buffer/NetIOException.java index e7ac872..be0485a 100644 --- a/protocol-new/src/main/java/mc/protocol/io/NetIOException.java +++ b/protocol-new/src/main/java/mc/protocol/buffer/NetIOException.java @@ -1,4 +1,4 @@ -package mc.protocol.io; +package mc.protocol.buffer; public class NetIOException extends RuntimeException { diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java index a0ac2ee..cadf4f9 100644 --- a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java +++ b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java @@ -6,7 +6,7 @@ import io.netty.handler.codec.ByteToMessageDecoder; import lombok.extern.slf4j.Slf4j; import mc.protocol.NettyAttributes; import mc.protocol.State; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; import mc.protocol.pool.PacketObjectPool; diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java index 8707553..c357d52 100644 --- a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java +++ b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java @@ -7,7 +7,7 @@ import io.netty.handler.codec.MessageToByteEncoder; import lombok.extern.slf4j.Slf4j; import mc.protocol.NettyAttributes; import mc.protocol.State; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; @Slf4j diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java index e7a66da..0c8dc35 100644 --- a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java +++ b/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import java.util.List; diff --git a/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java b/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java index 5c268e4..060561e 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java @@ -1,6 +1,6 @@ package mc.protocol.packets; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.utils.pool.Passivable; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java b/protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java index e0ee7fe..adba0e6 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; /** * Пинг-пакет. diff --git a/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java b/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java index 086deb6..5a1902e 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java @@ -1,6 +1,6 @@ package mc.protocol.packets; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; /** * Пакеты отправляемые сервером. diff --git a/protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java b/protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java index 1c95075..e62b193 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; import mc.protocol.State; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java b/protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java index b89f4cc..a840659 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java b/protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java index 04418ec..7f0edcc 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java @@ -2,7 +2,7 @@ package mc.protocol.packets.login.server; import lombok.Data; import mc.protocol.State; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.text.Text; import mc.protocol.packets.ServerSidePacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java b/protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java index e1e481f..e69a66b 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets.login.server; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; import java.util.UUID; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java index f48b8d6..159a95a 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Location; import mc.protocol.model.Look; import mc.protocol.packets.ClientSidePacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java index 497fb1d..5c22527 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java @@ -3,7 +3,7 @@ package mc.protocol.packets.play.client; import lombok.*; import mc.protocol.utils.ChatMode; import mc.protocol.utils.MainHand; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java index f537a43..997dc07 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets.play.client; import lombok.*; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; import javax.annotation.Nullable; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java index 91ff620..4247613 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Look; import mc.protocol.packets.ClientSidePacket; import mc.protocol.pool.LookObjectPool; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java index ed44a02..85aa0a9 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Location; import mc.protocol.packets.ClientSidePacket; import mc.protocol.pool.LocationObjectPool; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java index 6a89caa..342c42d 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java index 47c0834..35d902f 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.play.server.SPlayerPositionAndLookPacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java index 62c48c3..514bb5a 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java @@ -2,7 +2,7 @@ package mc.protocol.packets.play.server; import io.netty.buffer.Unpooled; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java index c3e2ebe..ab335a0 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java @@ -4,7 +4,7 @@ import lombok.Data; import mc.protocol.utils.Difficulty; import mc.protocol.utils.GameMode; import mc.protocol.utils.LevelType; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java index b4eb69c..afa898e 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets.play.server; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; /** diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java index f4a54ec..d2d0c74 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets.play.server; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Location; import mc.protocol.model.Look; import mc.protocol.packets.ServerSidePacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java b/protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java index 3393adb..1f8aaa2 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets.play.server; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Location; import mc.protocol.packets.ServerSidePacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java b/protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java index 9dee695..ac82238 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java @@ -3,7 +3,7 @@ package mc.protocol.packets.status.client; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ServerSidePacket; diff --git a/protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java b/protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java index 544c10f..1e63c04 100644 --- a/protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java +++ b/protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java @@ -1,7 +1,7 @@ package mc.protocol.packets.status.server; import lombok.Data; -import mc.protocol.io.NetByteBuf; +import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; /** diff --git a/protocol-new/src/test/java/mc/protocol/io/NetByteBufReadTest.java b/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java similarity index 99% rename from protocol-new/src/test/java/mc/protocol/io/NetByteBufReadTest.java rename to protocol-new/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java index 95f724c..1fe676a 100644 --- a/protocol-new/src/test/java/mc/protocol/io/NetByteBufReadTest.java +++ b/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java @@ -1,4 +1,4 @@ -package mc.protocol.io; +package mc.protocol.buffer; import io.netty.buffer.Unpooled; import org.junit.jupiter.api.BeforeEach; diff --git a/protocol-new/src/test/java/mc/protocol/io/NetByteBufWriteTest.java b/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java similarity index 99% rename from protocol-new/src/test/java/mc/protocol/io/NetByteBufWriteTest.java rename to protocol-new/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java index a16ef3a..c1c101d 100644 --- a/protocol-new/src/test/java/mc/protocol/io/NetByteBufWriteTest.java +++ b/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java @@ -1,4 +1,4 @@ -package mc.protocol.io; +package mc.protocol.buffer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled;