разделили сетевые пакеты по java пакетам

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java

@@ -1,7 +1,3 @@
-/*
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-08
- */
 package mc.core.network.proto_1_12_2;
 
 import com.google.common.collect.ImmutableMap;
@@ -11,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import mc.core.network.CSPacket;
 import mc.core.network.SCPacket;
 import mc.core.network.proto_1_12_2.packets.*;
+import mc.core.network.proto_1_12_2.packets.clientside.*;
+import mc.core.network.proto_1_12_2.packets.serverside.*;
 
 import java.util.Map;
 

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-06-17
  */
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import mc.core.network.CSPacket;
 import mc.core.network.NetInputStream;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-17
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.ToString;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-10
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-17
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import mc.core.network.CSPacket;
 import mc.core.network.NetInputStream;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-10
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.ToString;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import lombok.Getter;
 import lombok.ToString;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import lombok.Getter;
 import mc.core.network.CSPacket;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import lombok.Getter;
 import mc.core.network.CSPacket;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-10
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.ToString;
 import mc.core.network.CSPacket;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-06-17
  */
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.clientside;
 
 import mc.core.network.CSPacket;
 import mc.core.network.NetInputStream;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.clientside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-12
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.ToString;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-07-12
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-07-27
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-24
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.serverside;
 
 import com.flowpowered.nbt.CompoundTag;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-10
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.NoArgsConstructor;
 import lombok.Setter;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-07-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Setter;
 import lombok.ToString;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-07-11
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.serverside;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-10
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import com.google.gson.JsonObject;
 import lombok.Setter;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-24
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java

@@ -1,8 +1,4 @@
-/*
+package mc.core.network.proto_1_12_2.packets.serverside;
- * DmitriyMX <dimon550@gmail.com>
- * 2018-06-24
- */
-package mc.core.network.proto_1_12_2.packets;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java

@@ -1,4 +1,4 @@
-package mc.core.network.proto_1_12_2.packets;
+package mc.core.network.proto_1_12_2.packets.serverside;
 
 import lombok.Setter;
 import mc.core.network.NetOutputStream;

proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java

@@ -4,6 +4,7 @@ import com.flowpowered.nbt.*;
 import javafx.util.Pair;
 import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream;
 import mc.core.network.proto_1_12_2.packets.DumbChunkData.DumbChunkSection;
+import mc.core.network.proto_1_12_2.packets.serverside.ChunkDataPacket;
 import mc.core.world.Biome;
 import mc.core.world.block.*;
 import mc.core.world.chunk.Chunk;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java

@@ -15,7 +15,7 @@ import mc.core.eventbus.EventBus;
 import mc.core.network.Server;
 import mc.core.network.StartServerException;
 import mc.core.network.proto_1_12_2.State;
-import mc.core.network.proto_1_12_2.packets.StatusResponsePacket;
+import mc.core.network.proto_1_12_2.packets.serverside.StatusResponsePacket;
 import mc.core.player.Player;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java

@@ -47,7 +47,7 @@ public class PacketDecoder extends ReplayingDecoder<CSPacket> {
 
         Class<? extends CSPacket> packetClass = state.getClientSidePacket(packetId);
         if (packetClass == null) {
-            log.warn("Unknown packet: {}:0x{}", state.name(), hexPacketId);
+            log.warn("Unknown packet: {}:0x{}", state.name(), hexPacketId); //TODO
             in.skipBytes(leftDataPacket);
         } else {
             netStream.setDataSize(leftDataPacket);

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java

@@ -7,9 +7,9 @@ import mc.core.eventbus.events.SC_ChunkUnloadEvent;
 import mc.core.eventbus.events.SC_PlayerMoveEvent;
 import mc.core.network.NetChannel;
 import mc.core.network.proto_1_12_2.TeleportManager;
-import mc.core.network.proto_1_12_2.packets.ChunkDataPacket;
+import mc.core.network.proto_1_12_2.packets.serverside.ChunkDataPacket;
 import mc.core.network.proto_1_12_2.packets.PlayerPositionAndLookPacket;
-import mc.core.network.proto_1_12_2.packets.UnloadChunkPacket;
+import mc.core.network.proto_1_12_2.packets.serverside.UnloadChunkPacket;
 import mc.core.utils.CompactedCoords;
 import mc.core.world.chunk.Chunk;
 

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java

@@ -7,7 +7,7 @@ package mc.core.network.proto_1_12_2.netty.handlers;
 import io.netty.channel.Channel;
 import lombok.extern.slf4j.Slf4j;
 import mc.core.network.proto_1_12_2.State;
-import mc.core.network.proto_1_12_2.packets.HandshakePacket;
+import mc.core.network.proto_1_12_2.packets.clientside.HandshakePacket;
 import org.springframework.stereotype.Component;
 
 import static mc.core.network.proto_1_12_2.netty.NettyServer.ATTR_STATE;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java

@@ -9,6 +9,8 @@ import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.netty.KeepAliveThread;
 import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel;
 import mc.core.network.proto_1_12_2.packets.*;
+import mc.core.network.proto_1_12_2.packets.clientside.LoginStartPacket;
+import mc.core.network.proto_1_12_2.packets.serverside.*;
 import mc.core.player.Player;
 import mc.core.player.PlayerManager;
 import mc.core.player.PlayerMode;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java

@@ -8,6 +8,7 @@ import mc.core.eventbus.EventBus;
 import mc.core.eventbus.events.CS_PlayerMoveEvent;
 import mc.core.network.proto_1_12_2.TeleportManager;
 import mc.core.network.proto_1_12_2.packets.*;
+import mc.core.network.proto_1_12_2.packets.clientside.*;
 import mc.core.player.Player;
 import mc.core.player.PlayerSettings;
 import org.springframework.beans.factory.annotation.Autowired;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java

@@ -7,8 +7,8 @@ package mc.core.network.proto_1_12_2.netty.handlers;
 import io.netty.channel.Channel;
 import mc.core.Config;
 import mc.core.network.proto_1_12_2.packets.PingPacket;
-import mc.core.network.proto_1_12_2.packets.StatusRequestPacket;
+import mc.core.network.proto_1_12_2.packets.clientside.StatusRequestPacket;
-import mc.core.network.proto_1_12_2.packets.StatusResponsePacket;
+import mc.core.network.proto_1_12_2.packets.serverside.StatusResponsePacket;
 import mc.core.player.PlayerManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java

@@ -9,9 +9,9 @@ import lombok.RequiredArgsConstructor;
 import mc.core.chat.MessageType;
 import mc.core.network.NetChannel;
 import mc.core.network.SCPacket;
-import mc.core.network.proto_1_12_2.packets.ChatMessageServerPacket;
+import mc.core.network.proto_1_12_2.packets.serverside.ChatMessageServerPacket;
-import mc.core.network.proto_1_12_2.packets.TimeUpdatePacket;
+import mc.core.network.proto_1_12_2.packets.serverside.TimeUpdatePacket;
-import mc.core.network.proto_1_12_2.packets.TitlePacket;
+import mc.core.network.proto_1_12_2.packets.serverside.TitlePacket;
 import mc.core.text.Text;
 import mc.core.text.Title;