From 41acf32cb8ebe969a1e09e1066f238baa69a6233 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 9 Jul 2021 12:26:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20po?= =?UTF-8?q?ol=20=D1=84=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=20=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20utils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocol/build.gradle | 1 - protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java | 3 +-- .../src/main/java/mc/protocol/packets/ClientSidePacket.java | 2 +- .../java/mc/protocol/packets/play/server/ChunkDataPacket.java | 2 +- .../src/main/java/mc/protocol/pool/ProtocolObjectPool.java | 1 + utils/build.gradle | 4 ++++ .../src/main/java/mc/utils}/pool/MultiObjectPool.java | 2 +- .../src/main/java/mc/utils}/pool/ObjectPool.java | 2 +- .../src/main/java/mc/utils}/pool/Passivable.java | 2 +- .../main/java/mc/utils}/pool/PassivableMultiObjectPool.java | 2 +- .../src/main/java/mc/utils}/pool/PassivableObjectPool.java | 2 +- .../java/mc/utils}/pool/PassivablePooledObjectFactory.java | 2 +- .../src/main/java/mc/utils}/pool/SimpleObjectPool.java | 2 +- .../main/java/mc/utils}/pool/SimplePooledObjectFactory.java | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/MultiObjectPool.java (83%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/ObjectPool.java (76%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/Passivable.java (67%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/PassivableMultiObjectPool.java (96%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/PassivableObjectPool.java (96%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/PassivablePooledObjectFactory.java (92%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/SimpleObjectPool.java (95%) rename {protocol/src/main/java/mc/protocol => utils/src/main/java/mc/utils}/pool/SimplePooledObjectFactory.java (95%) diff --git a/protocol/build.gradle b/protocol/build.gradle index 11e45f2..9458488 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -3,7 +3,6 @@ apply from: rootDir.toPath().resolve('logic.gradle').toFile() dependencies { api project(':utils') - implementation libs.objpool implementation libs.netty.transport implementation libs.netty.codec implementation libs.json diff --git a/protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java b/protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java index e599781..ec865ea 100644 --- a/protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java +++ b/protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java @@ -3,13 +3,12 @@ package mc.protocol.buffer; import io.netty.buffer.ByteBuf; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; -import lombok.Setter; import lombok.ToString; import lombok.experimental.Delegate; import lombok.extern.slf4j.Slf4j; import mc.protocol.model.text.Text; import mc.protocol.model.text.TextSerializer; -import mc.protocol.pool.Passivable; +import mc.utils.pool.Passivable; import java.nio.charset.StandardCharsets; import java.util.UUID; diff --git a/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java b/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java index e133a1d..060561e 100644 --- a/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java +++ b/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java @@ -1,7 +1,7 @@ package mc.protocol.packets; import mc.protocol.buffer.NetByteBuf; -import mc.protocol.pool.Passivable; +import mc.utils.pool.Passivable; /** * Пакеты отправляемые клиентом. diff --git a/protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java index 89af3dc..b64be40 100644 --- a/protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java +++ b/protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java @@ -4,7 +4,7 @@ import io.netty.buffer.Unpooled; import lombok.Data; import mc.protocol.buffer.NetByteBuf; import mc.protocol.packets.ServerSidePacket; -import mc.protocol.pool.ObjectPool; +import mc.utils.pool.ObjectPool; import mc.protocol.pool.ProtocolObjectPool; /** diff --git a/protocol/src/main/java/mc/protocol/pool/ProtocolObjectPool.java b/protocol/src/main/java/mc/protocol/pool/ProtocolObjectPool.java index 7763289..2c50852 100644 --- a/protocol/src/main/java/mc/protocol/pool/ProtocolObjectPool.java +++ b/protocol/src/main/java/mc/protocol/pool/ProtocolObjectPool.java @@ -7,6 +7,7 @@ import mc.protocol.buffer.NetByteBuf; import mc.protocol.model.Location; import mc.protocol.model.Look; import mc.protocol.packets.ClientSidePacket; +import mc.utils.pool.*; @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ProtocolObjectPool { diff --git a/utils/build.gradle b/utils/build.gradle index 9a11526..dc7b095 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -1 +1,5 @@ apply from: rootDir.toPath().resolve('logic.gradle').toFile() + +dependencies { + implementation libs.objpool +} \ No newline at end of file diff --git a/protocol/src/main/java/mc/protocol/pool/MultiObjectPool.java b/utils/src/main/java/mc/utils/pool/MultiObjectPool.java similarity index 83% rename from protocol/src/main/java/mc/protocol/pool/MultiObjectPool.java rename to utils/src/main/java/mc/utils/pool/MultiObjectPool.java index e7dcbbd..6541c1e 100644 --- a/protocol/src/main/java/mc/protocol/pool/MultiObjectPool.java +++ b/utils/src/main/java/mc/utils/pool/MultiObjectPool.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; public interface MultiObjectPool { diff --git a/protocol/src/main/java/mc/protocol/pool/ObjectPool.java b/utils/src/main/java/mc/utils/pool/ObjectPool.java similarity index 76% rename from protocol/src/main/java/mc/protocol/pool/ObjectPool.java rename to utils/src/main/java/mc/utils/pool/ObjectPool.java index 0fd1df1..d106f20 100644 --- a/protocol/src/main/java/mc/protocol/pool/ObjectPool.java +++ b/utils/src/main/java/mc/utils/pool/ObjectPool.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; public interface ObjectPool { diff --git a/protocol/src/main/java/mc/protocol/pool/Passivable.java b/utils/src/main/java/mc/utils/pool/Passivable.java similarity index 67% rename from protocol/src/main/java/mc/protocol/pool/Passivable.java rename to utils/src/main/java/mc/utils/pool/Passivable.java index 856f776..2008ce0 100644 --- a/protocol/src/main/java/mc/protocol/pool/Passivable.java +++ b/utils/src/main/java/mc/utils/pool/Passivable.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; public interface Passivable { diff --git a/protocol/src/main/java/mc/protocol/pool/PassivableMultiObjectPool.java b/utils/src/main/java/mc/utils/pool/PassivableMultiObjectPool.java similarity index 96% rename from protocol/src/main/java/mc/protocol/pool/PassivableMultiObjectPool.java rename to utils/src/main/java/mc/utils/pool/PassivableMultiObjectPool.java index c25bc40..f428881 100644 --- a/protocol/src/main/java/mc/protocol/pool/PassivableMultiObjectPool.java +++ b/utils/src/main/java/mc/utils/pool/PassivableMultiObjectPool.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; import java.util.HashMap; import java.util.Map; diff --git a/protocol/src/main/java/mc/protocol/pool/PassivableObjectPool.java b/utils/src/main/java/mc/utils/pool/PassivableObjectPool.java similarity index 96% rename from protocol/src/main/java/mc/protocol/pool/PassivableObjectPool.java rename to utils/src/main/java/mc/utils/pool/PassivableObjectPool.java index e9facea..f42a2d8 100644 --- a/protocol/src/main/java/mc/protocol/pool/PassivableObjectPool.java +++ b/utils/src/main/java/mc/utils/pool/PassivableObjectPool.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; import lombok.SneakyThrows; import org.apache.commons.pool2.impl.GenericObjectPool; diff --git a/protocol/src/main/java/mc/protocol/pool/PassivablePooledObjectFactory.java b/utils/src/main/java/mc/utils/pool/PassivablePooledObjectFactory.java similarity index 92% rename from protocol/src/main/java/mc/protocol/pool/PassivablePooledObjectFactory.java rename to utils/src/main/java/mc/utils/pool/PassivablePooledObjectFactory.java index 8ed82eb..f6eaff1 100644 --- a/protocol/src/main/java/mc/protocol/pool/PassivablePooledObjectFactory.java +++ b/utils/src/main/java/mc/utils/pool/PassivablePooledObjectFactory.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; import org.apache.commons.pool2.PooledObject; diff --git a/protocol/src/main/java/mc/protocol/pool/SimpleObjectPool.java b/utils/src/main/java/mc/utils/pool/SimpleObjectPool.java similarity index 95% rename from protocol/src/main/java/mc/protocol/pool/SimpleObjectPool.java rename to utils/src/main/java/mc/utils/pool/SimpleObjectPool.java index b0402bb..f0283be 100644 --- a/protocol/src/main/java/mc/protocol/pool/SimpleObjectPool.java +++ b/utils/src/main/java/mc/utils/pool/SimpleObjectPool.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; import lombok.SneakyThrows; import org.apache.commons.pool2.impl.GenericObjectPool; diff --git a/protocol/src/main/java/mc/protocol/pool/SimplePooledObjectFactory.java b/utils/src/main/java/mc/utils/pool/SimplePooledObjectFactory.java similarity index 95% rename from protocol/src/main/java/mc/protocol/pool/SimplePooledObjectFactory.java rename to utils/src/main/java/mc/utils/pool/SimplePooledObjectFactory.java index 9a0694b..9e59941 100644 --- a/protocol/src/main/java/mc/protocol/pool/SimplePooledObjectFactory.java +++ b/utils/src/main/java/mc/utils/pool/SimplePooledObjectFactory.java @@ -1,4 +1,4 @@ -package mc.protocol.pool; +package mc.utils.pool; import lombok.RequiredArgsConstructor; import org.apache.commons.pool2.BasePooledObjectFactory;