From d02a80299f9215262ce69930ae43b951d8225d4d Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 6 May 2021 13:58:05 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocol/src/main/java/mc/protocol/NettyServer.java       | 5 +++--
 .../src/main/java/mc/protocol/PacketInboundHandler.java   | 4 ++--
 protocol/src/main/java/mc/protocol/api/Server.java        | 3 ++-
 protocol/src/main/java/mc/protocol/di/ProtocolModule.java | 8 ++++----
 .../main/java/mc/protocol/{utils => event}/EventBus.java  | 2 +-
 .../java/mc/protocol/{utils => event}/SimpleEventBus.java | 3 ++-
 .../main/java/mc/protocol/io/codec/ProtocolDecoder.java   | 2 +-
 .../java/mc/protocol/{utils => pool}/PacketFactory.java   | 2 +-
 .../main/java/mc/protocol/{utils => pool}/PacketPool.java | 2 +-
 9 files changed, 17 insertions(+), 14 deletions(-)
 rename protocol/src/main/java/mc/protocol/{utils => event}/EventBus.java (94%)
 rename protocol/src/main/java/mc/protocol/{utils => event}/SimpleEventBus.java (92%)
 rename protocol/src/main/java/mc/protocol/{utils => pool}/PacketFactory.java (96%)
 rename protocol/src/main/java/mc/protocol/{utils => pool}/PacketPool.java (96%)

diff --git a/protocol/src/main/java/mc/protocol/NettyServer.java b/protocol/src/main/java/mc/protocol/NettyServer.java
index d94f053..9980d56 100644
--- a/protocol/src/main/java/mc/protocol/NettyServer.java
+++ b/protocol/src/main/java/mc/protocol/NettyServer.java
@@ -17,8 +17,8 @@ import mc.protocol.io.codec.ProtocolDecoder;
 import mc.protocol.io.codec.ProtocolEncoder;
 import mc.protocol.io.codec.ProtocolSplitter;
 import mc.protocol.packets.ClientSidePacket;
-import mc.protocol.utils.EventBus;
-import mc.protocol.utils.PacketPool;
+import mc.protocol.event.EventBus;
+import mc.protocol.pool.PacketPool;
 
 import javax.annotation.Nonnull;
 import java.util.LinkedHashMap;
@@ -58,6 +58,7 @@ public class NettyServer implements Server {
 	}
 
 	@Override
+	@SuppressWarnings("java:S2326") // Сонар, ты бредишь
 	public <P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler) {
 		this.eventBus.subscribe(state, packetClass, eventHandler);
 	}
diff --git a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java b/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
index 20feab1..ad7cd16 100644
--- a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
+++ b/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
@@ -4,8 +4,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.RequiredArgsConstructor;
 import mc.protocol.packets.ClientSidePacket;
-import mc.protocol.utils.EventBus;
-import mc.protocol.utils.PacketPool;
+import mc.protocol.event.EventBus;
+import mc.protocol.pool.PacketPool;
 
 @RequiredArgsConstructor
 public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSidePacket> {
diff --git a/protocol/src/main/java/mc/protocol/api/Server.java b/protocol/src/main/java/mc/protocol/api/Server.java
index e0b8777..93b213f 100644
--- a/protocol/src/main/java/mc/protocol/api/Server.java
+++ b/protocol/src/main/java/mc/protocol/api/Server.java
@@ -2,7 +2,7 @@ package mc.protocol.api;
 
 import mc.protocol.State;
 import mc.protocol.packets.ClientSidePacket;
-import mc.protocol.utils.EventBus;
+import mc.protocol.event.EventBus;
 
 import java.util.function.Consumer;
 
@@ -13,5 +13,6 @@ public interface Server {
 	void onNewConnect(Consumer<ConnectionContext> consumer);
 	void onDisonnect(Consumer<ConnectionContext> consumer);
 
+	@SuppressWarnings("java:S2326") // Сонар, ты бредишь
 	<P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler);
 }
diff --git a/protocol/src/main/java/mc/protocol/di/ProtocolModule.java b/protocol/src/main/java/mc/protocol/di/ProtocolModule.java
index b4c1d0d..09e2b61 100644
--- a/protocol/src/main/java/mc/protocol/di/ProtocolModule.java
+++ b/protocol/src/main/java/mc/protocol/di/ProtocolModule.java
@@ -7,10 +7,10 @@ import mc.protocol.State;
 import mc.protocol.api.Server;
 import mc.protocol.packets.ClientSidePacket;
 import mc.protocol.packets.UnknownPacket;
-import mc.protocol.utils.EventBus;
-import mc.protocol.utils.PacketFactory;
-import mc.protocol.utils.PacketPool;
-import mc.protocol.utils.SimpleEventBus;
+import mc.protocol.event.EventBus;
+import mc.protocol.pool.PacketFactory;
+import mc.protocol.pool.PacketPool;
+import mc.protocol.event.SimpleEventBus;
 import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 
diff --git a/protocol/src/main/java/mc/protocol/utils/EventBus.java b/protocol/src/main/java/mc/protocol/event/EventBus.java
similarity index 94%
rename from protocol/src/main/java/mc/protocol/utils/EventBus.java
rename to protocol/src/main/java/mc/protocol/event/EventBus.java
index 1409e8e..e9d6e66 100644
--- a/protocol/src/main/java/mc/protocol/utils/EventBus.java
+++ b/protocol/src/main/java/mc/protocol/event/EventBus.java
@@ -1,4 +1,4 @@
-package mc.protocol.utils;
+package mc.protocol.event;
 
 import mc.protocol.State;
 import mc.protocol.api.ConnectionContext;
diff --git a/protocol/src/main/java/mc/protocol/utils/SimpleEventBus.java b/protocol/src/main/java/mc/protocol/event/SimpleEventBus.java
similarity index 92%
rename from protocol/src/main/java/mc/protocol/utils/SimpleEventBus.java
rename to protocol/src/main/java/mc/protocol/event/SimpleEventBus.java
index 4061e58..1c0c576 100644
--- a/protocol/src/main/java/mc/protocol/utils/SimpleEventBus.java
+++ b/protocol/src/main/java/mc/protocol/event/SimpleEventBus.java
@@ -1,8 +1,9 @@
-package mc.protocol.utils;
+package mc.protocol.event;
 
 import mc.protocol.State;
 import mc.protocol.api.ConnectionContext;
 import mc.protocol.packets.ClientSidePacket;
+import mc.protocol.utils.Table;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class SimpleEventBus implements EventBus {
diff --git a/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java
index ec8d9a3..eb24736 100644
--- a/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java
+++ b/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java
@@ -12,7 +12,7 @@ import mc.protocol.api.ConnectionContext;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.packets.ClientSidePacket;
 import mc.protocol.packets.UnknownPacket;
-import mc.protocol.utils.PacketPool;
+import mc.protocol.pool.PacketPool;
 
 import javax.annotation.Nonnull;
 import java.util.List;
diff --git a/protocol/src/main/java/mc/protocol/utils/PacketFactory.java b/protocol/src/main/java/mc/protocol/pool/PacketFactory.java
similarity index 96%
rename from protocol/src/main/java/mc/protocol/utils/PacketFactory.java
rename to protocol/src/main/java/mc/protocol/pool/PacketFactory.java
index 8c17dca..f0caf1a 100644
--- a/protocol/src/main/java/mc/protocol/utils/PacketFactory.java
+++ b/protocol/src/main/java/mc/protocol/pool/PacketFactory.java
@@ -1,4 +1,4 @@
-package mc.protocol.utils;
+package mc.protocol.pool;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/protocol/src/main/java/mc/protocol/utils/PacketPool.java b/protocol/src/main/java/mc/protocol/pool/PacketPool.java
similarity index 96%
rename from protocol/src/main/java/mc/protocol/utils/PacketPool.java
rename to protocol/src/main/java/mc/protocol/pool/PacketPool.java
index 447d7c2..932fec1 100644
--- a/protocol/src/main/java/mc/protocol/utils/PacketPool.java
+++ b/protocol/src/main/java/mc/protocol/pool/PacketPool.java
@@ -1,4 +1,4 @@
-package mc.protocol.utils;
+package mc.protocol.pool;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;