diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java index a548a3d..b49e602 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java similarity index 85% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java index be82f07..27899bb 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java @@ -2,7 +2,7 @@ * DmitriyMX * 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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java index 70aa84a..2388a18 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-17 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java similarity index 92% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java index 6cb98bd..19588cb 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java index 0e02a01..ed53d63 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java index a0a2ab2..5d8ba26 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java similarity index 72% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java index ca9f073..99ea558 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java index e3654c7..7c98c8f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java similarity index 94% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java index b9c2a2e..8715253 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java index 341ca67..469dbe7 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java similarity index 89% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java index b21e14b..a607038 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java similarity index 90% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java index 986af29..78b18e1 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java similarity index 70% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java index b57c56a..ab96afc 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.ToString; import mc.core.network.CSPacket; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java similarity index 94% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java index 4e1082e..a14d28f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java @@ -2,7 +2,7 @@ * DmitriyMX * 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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java index 356b6a3..6eb009e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-12 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java index 803d925..5eef306 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-12 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java similarity index 91% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java index e4d1169..0a3c1cf 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-27 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java index 305ec8a..bb465a5 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java similarity index 99% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java index 9f19bf1..55d0d7a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java similarity index 84% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java index 2f811ac..aa9d0a6 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java index 33a2f54..d5ad7d4 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java similarity index 89% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java index 6000085..2772287 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java similarity index 84% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java index 376d7a1..62faf07 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java similarity index 90% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java index 21f1a2e..3d9780a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Setter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java index b2766fc..6699865 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.*; import lombok.extern.slf4j.Slf4j; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java similarity index 93% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java index 2b3eb6e..0aa379f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java +++ b/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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java similarity index 93% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java index 3505581..15a4352 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import com.google.gson.JsonObject; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java similarity index 83% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java index e17160e..dedda2e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -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; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java similarity index 97% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java index a85045a..f829b5a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java similarity index 85% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java index 5bcfe15..4fdbea5 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java +++ b/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; diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java index 5f4e772..0089bc7 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java index d17cba5..44590c4 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java index 585a88d..2e0ee69 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java +++ b/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 { Class 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); diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java index 5602221..927ac82 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java index 3ff9af1..b9d441f 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java index c0ced7f..897e195 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java index c1675ba..90c4ce5 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java +++ b/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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java index 10c48fc..ede6451 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java +++ b/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.StatusResponsePacket; +import mc.core.network.proto_1_12_2.packets.clientside.StatusRequestPacket; +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; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java index 960297a..fd1b837 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java +++ b/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.TimeUpdatePacket; -import mc.core.network.proto_1_12_2.packets.TitlePacket; +import mc.core.network.proto_1_12_2.packets.serverside.ChatMessageServerPacket; +import mc.core.network.proto_1_12_2.packets.serverside.TimeUpdatePacket; +import mc.core.network.proto_1_12_2.packets.serverside.TitlePacket; import mc.core.text.Text; import mc.core.text.Title;