From a3fcfcf65aeca1d81a61bf98fd02911754037311 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 10 May 2021 02:11:04 +0300 Subject: [PATCH] refactoring: Packet interfaces --- protocol-new/build.gradle | 2 ++ .../src/main/java/mc/protocol/packets/ClientSidePacket.java | 2 +- .../src/main/java/mc/protocol/packets/Packet.java | 4 ++-- .../src/main/java/mc/protocol/packets/ServerSidePacket.java | 0 utils/build.gradle | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) rename {protocol => protocol-new}/src/main/java/mc/protocol/packets/ClientSidePacket.java (86%) rename {protocol => protocol-new}/src/main/java/mc/protocol/packets/Packet.java (90%) rename {protocol => protocol-new}/src/main/java/mc/protocol/packets/ServerSidePacket.java (100%) diff --git a/protocol-new/build.gradle b/protocol-new/build.gradle index fc311c2..471a522 100644 --- a/protocol-new/build.gradle +++ b/protocol-new/build.gradle @@ -1,6 +1,8 @@ apply from: rootDir.toPath().resolve('logic.gradle').toFile() dependencies { + implementation project(':utils') + implementation libs.netty.transport implementation libs.netty.codec diff --git a/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java b/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java similarity index 86% rename from protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java rename to protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java index 1a10cd9..5c268e4 100644 --- a/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java +++ b/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets; import mc.protocol.io.NetByteBuf; -import mc.protocol.pool.Passivable; +import mc.utils.pool.Passivable; /** * Пакеты отправляемые клиентом. diff --git a/protocol/src/main/java/mc/protocol/packets/Packet.java b/protocol-new/src/main/java/mc/protocol/packets/Packet.java similarity index 90% rename from protocol/src/main/java/mc/protocol/packets/Packet.java rename to protocol-new/src/main/java/mc/protocol/packets/Packet.java index 02ce207..50a71fe 100644 --- a/protocol/src/main/java/mc/protocol/packets/Packet.java +++ b/protocol-new/src/main/java/mc/protocol/packets/Packet.java @@ -1,9 +1,9 @@ package mc.protocol.packets; /** - * Пакет. + * Сетевой пакет. * - *

Структура пакета

+ *

Структура

*
  * | FIELD       | TYPE   | NOTES                                     |
  * |-------------|--------|-------------------------------------------|
diff --git a/protocol/src/main/java/mc/protocol/packets/ServerSidePacket.java b/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java
similarity index 100%
rename from protocol/src/main/java/mc/protocol/packets/ServerSidePacket.java
rename to protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java
diff --git a/utils/build.gradle b/utils/build.gradle
index 7c8a3e4..8cb5346 100644
--- a/utils/build.gradle
+++ b/utils/build.gradle
@@ -1,5 +1,5 @@
 apply from: rootDir.toPath().resolve('logic.gradle').toFile()
 
 dependencies {
-    implementation libs.objpool
+    api libs.objpool
 }