From 3a5c7318260028d5ba8fff99d667f369c48a237b Mon Sep 17 00:00:00 2001
From: Janmm14 <Janmm14@users.noreply.github.com>
Date: Mon, 14 Jul 2025 11:22:38 +0200
Subject: [PATCH] #3855: Create protocol sub-packages data & util

---
 .../main/java/net/md_5/bungee/protocol/DefinedPacket.java    | 5 +++++
 .../java/net/md_5/bungee/protocol/{ => data}/ChatChain.java  | 5 ++++-
 .../java/net/md_5/bungee/protocol/{ => data}/Location.java   | 2 +-
 .../net/md_5/bungee/protocol/{ => data}/NumberFormat.java    | 2 +-
 .../net/md_5/bungee/protocol/{ => data}/PlayerPublicKey.java | 2 +-
 .../java/net/md_5/bungee/protocol/{ => data}/Property.java   | 2 +-
 .../net/md_5/bungee/protocol/{ => data}/SeenMessages.java    | 5 ++++-
 .../java/net/md_5/bungee/protocol/packet/ClientChat.java     | 4 ++--
 .../java/net/md_5/bungee/protocol/packet/ClientCommand.java  | 4 ++--
 .../src/main/java/net/md_5/bungee/protocol/packet/Login.java | 2 +-
 .../java/net/md_5/bungee/protocol/packet/LoginRequest.java   | 2 +-
 .../java/net/md_5/bungee/protocol/packet/LoginSuccess.java   | 2 +-
 .../java/net/md_5/bungee/protocol/packet/PlayerListItem.java | 4 ++--
 .../md_5/bungee/protocol/packet/PlayerListItemUpdate.java    | 2 +-
 .../main/java/net/md_5/bungee/protocol/packet/Respawn.java   | 2 +-
 .../net/md_5/bungee/protocol/packet/ScoreboardObjective.java | 4 ++--
 .../net/md_5/bungee/protocol/packet/ScoreboardScore.java     | 2 +-
 .../java/net/md_5/bungee/protocol/packet/ServerLinks.java    | 2 +-
 .../java/net/md_5/bungee/protocol/packet/ShowDialog.java     | 4 ++--
 .../net/md_5/bungee/protocol/packet/ShowDialogDirect.java    | 2 +-
 .../src/main/java/net/md_5/bungee/protocol/packet/Team.java  | 2 +-
 .../java/net/md_5/bungee/protocol/{ => util}/Either.java     | 2 +-
 .../java/net/md_5/bungee/protocol/{ => util}/TagUtil.java    | 2 +-
 .../net/md_5/bungee/protocol/{ => util}/TagUtilTest.java     | 2 +-
 proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java      | 2 +-
 proxy/src/main/java/net/md_5/bungee/ServerConnector.java     | 2 +-
 proxy/src/main/java/net/md_5/bungee/UserConnection.java      | 2 +-
 .../main/java/net/md_5/bungee/connection/InitialHandler.java | 2 +-
 .../main/java/net/md_5/bungee/connection/LoginResult.java    | 2 +-
 .../main/java/net/md_5/bungee/connection/UpstreamBridge.java | 2 +-
 proxy/src/main/java/net/md_5/bungee/tab/TabList.java         | 2 +-
 31 files changed, 46 insertions(+), 35 deletions(-)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/ChatChain.java (91%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/Location.java (75%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/NumberFormat.java (83%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/PlayerPublicKey.java (80%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/Property.java (87%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => data}/SeenMessages.java (84%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => util}/Either.java (96%)
 rename protocol/src/main/java/net/md_5/bungee/protocol/{ => util}/TagUtil.java (99%)
 rename protocol/src/test/java/net/md_5/bungee/protocol/{ => util}/TagUtilTest.java (99%)

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 1ccca2f0..2f7f301e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -26,6 +26,11 @@ import net.md_5.bungee.nbt.Tag;
 import net.md_5.bungee.nbt.TypedTag;
 import net.md_5.bungee.nbt.limit.NBTLimiter;
 import net.md_5.bungee.nbt.type.EndTag;
+import net.md_5.bungee.protocol.data.NumberFormat;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
+import net.md_5.bungee.protocol.data.Property;
+import net.md_5.bungee.protocol.util.Either;
+import net.md_5.bungee.protocol.util.TagUtil;
 
 @RequiredArgsConstructor
 public abstract class DefinedPacket
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ChatChain.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/ChatChain.java
similarity index 91%
rename from protocol/src/main/java/net/md_5/bungee/protocol/ChatChain.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/ChatChain.java
index 7cc79e4f..0faf7429 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ChatChain.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/ChatChain.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
@@ -9,6 +9,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Location.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/Location.java
similarity index 75%
rename from protocol/src/main/java/net/md_5/bungee/protocol/Location.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/Location.java
index e6a9f894..61648026 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Location.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/Location.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import lombok.Data;
 
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/NumberFormat.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/NumberFormat.java
similarity index 83%
rename from protocol/src/main/java/net/md_5/bungee/protocol/NumberFormat.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/NumberFormat.java
index d1cefe3b..1c4bb9eb 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/NumberFormat.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/NumberFormat.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import lombok.Data;
 
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/PlayerPublicKey.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/PlayerPublicKey.java
similarity index 80%
rename from protocol/src/main/java/net/md_5/bungee/protocol/PlayerPublicKey.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/PlayerPublicKey.java
index 7f2cc798..c06c9310 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/PlayerPublicKey.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/PlayerPublicKey.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import lombok.Data;
 
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Property.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/Property.java
similarity index 87%
rename from protocol/src/main/java/net/md_5/bungee/protocol/Property.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/Property.java
index 2e0b1d73..c786aa2b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Property.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/Property.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/SeenMessages.java b/protocol/src/main/java/net/md_5/bungee/protocol/data/SeenMessages.java
similarity index 84%
rename from protocol/src/main/java/net/md_5/bungee/protocol/SeenMessages.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/data/SeenMessages.java
index 9f0b452a..80332e53 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/SeenMessages.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/data/SeenMessages.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.data;
 
 import io.netty.buffer.ByteBuf;
 import java.util.BitSet;
@@ -6,6 +6,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java
index 86bb03cf..b399a723 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java
@@ -6,10 +6,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
-import net.md_5.bungee.protocol.ChatChain;
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import net.md_5.bungee.protocol.SeenMessages;
+import net.md_5.bungee.protocol.data.ChatChain;
+import net.md_5.bungee.protocol.data.SeenMessages;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
index f86fcd08..31104505 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
@@ -9,10 +9,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
-import net.md_5.bungee.protocol.ChatChain;
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import net.md_5.bungee.protocol.SeenMessages;
+import net.md_5.bungee.protocol.data.ChatChain;
+import net.md_5.bungee.protocol.data.SeenMessages;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
index cb423644..dc8c3704 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
@@ -10,8 +10,8 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.nbt.Tag;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Location;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.Location;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
index e62a3a03..d9cadc25 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
@@ -8,8 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.PlayerPublicKey;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
index daa6d183..4da4d147 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
@@ -8,8 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.Property;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
index 67a54ecc..26d4d10e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
@@ -8,9 +8,9 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.PlayerPublicKey;
-import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
+import net.md_5.bungee.protocol.data.Property;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItemUpdate.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItemUpdate.java
index 40492bd6..5ceca9c3 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItemUpdate.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItemUpdate.java
@@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.PlayerPublicKey;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
 import net.md_5.bungee.protocol.packet.PlayerListItem.Item;
 
 @Data
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
index 8fb44881..650932cb 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
@@ -8,8 +8,8 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.nbt.Tag;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Location;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.Location;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
index a37617fd..2b23124c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
@@ -9,9 +9,9 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
-import net.md_5.bungee.protocol.NumberFormat;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.NumberFormat;
+import net.md_5.bungee.protocol.util.Either;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
index d77826a7..e4f533a3 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
@@ -8,8 +8,8 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.NumberFormat;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.NumberFormat;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java
index 5df25c24..9e4b1533 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java
@@ -8,8 +8,8 @@ import lombok.NoArgsConstructor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.util.Either;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialog.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialog.java
index 8bdd30dc..95a6d601 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialog.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialog.java
@@ -11,9 +11,9 @@ import net.md_5.bungee.nbt.TypedTag;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.ChatSerializer;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import net.md_5.bungee.protocol.TagUtil;
+import net.md_5.bungee.protocol.util.Either;
+import net.md_5.bungee.protocol.util.TagUtil;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialogDirect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialogDirect.java
index 8a6ce652..8862417e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialogDirect.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialogDirect.java
@@ -6,8 +6,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.api.dialog.Dialog;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.util.Either;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
index 96f10fb9..496d694a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
@@ -10,8 +10,8 @@ import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.protocol.AbstractPacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.util.Either;
 
 @Data
 @NoArgsConstructor
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Either.java b/protocol/src/main/java/net/md_5/bungee/protocol/util/Either.java
similarity index 96%
rename from protocol/src/main/java/net/md_5/bungee/protocol/Either.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/util/Either.java
index c994c134..09f27ea2 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Either.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/util/Either.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.util;
 
 import java.util.function.Function;
 import lombok.AccessLevel;
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/TagUtil.java b/protocol/src/main/java/net/md_5/bungee/protocol/util/TagUtil.java
similarity index 99%
rename from protocol/src/main/java/net/md_5/bungee/protocol/TagUtil.java
rename to protocol/src/main/java/net/md_5/bungee/protocol/util/TagUtil.java
index 74b963eb..21f564fa 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/TagUtil.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/util/TagUtil.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.util;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
diff --git a/protocol/src/test/java/net/md_5/bungee/protocol/TagUtilTest.java b/protocol/src/test/java/net/md_5/bungee/protocol/util/TagUtilTest.java
similarity index 99%
rename from protocol/src/test/java/net/md_5/bungee/protocol/TagUtilTest.java
rename to protocol/src/test/java/net/md_5/bungee/protocol/util/TagUtilTest.java
index d186f888..aa33f371 100644
--- a/protocol/src/test/java/net/md_5/bungee/protocol/TagUtilTest.java
+++ b/protocol/src/test/java/net/md_5/bungee/protocol/util/TagUtilTest.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.protocol;
+package net.md_5.bungee.protocol.util;
 
 import static org.junit.jupiter.api.Assertions.*;
 import com.google.gson.Gson;
diff --git a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
index a8b77678..aa4e2c07 100644
--- a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
+++ b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
@@ -27,7 +27,7 @@ import net.md_5.bungee.jni.NativeCode;
 import net.md_5.bungee.jni.cipher.BungeeCipher;
 import net.md_5.bungee.jni.cipher.JavaCipher;
 import net.md_5.bungee.jni.cipher.NativeCipher;
-import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
 import net.md_5.bungee.protocol.packet.EncryptionResponse;
 
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index d47f5ef9..7dec06d4 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -35,7 +35,6 @@ import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PacketHandler;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
@@ -60,6 +59,7 @@ import net.md_5.bungee.protocol.packet.ScoreboardScoreReset;
 import net.md_5.bungee.protocol.packet.SetCompression;
 import net.md_5.bungee.protocol.packet.StartConfiguration;
 import net.md_5.bungee.protocol.packet.ViewDistance;
+import net.md_5.bungee.protocol.util.Either;
 import net.md_5.bungee.util.AddressUtil;
 import net.md_5.bungee.util.BufUtil;
 import net.md_5.bungee.util.QuietException;
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 9d2e05f8..0e01e4c8 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -50,7 +50,6 @@ import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.ChatSerializer;
 import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.Either;
 import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
@@ -66,6 +65,7 @@ import net.md_5.bungee.protocol.packet.ShowDialogDirect;
 import net.md_5.bungee.protocol.packet.StoreCookie;
 import net.md_5.bungee.protocol.packet.SystemChat;
 import net.md_5.bungee.protocol.packet.Transfer;
+import net.md_5.bungee.protocol.util.Either;
 import net.md_5.bungee.tab.ServerUnique;
 import net.md_5.bungee.tab.TabList;
 import net.md_5.bungee.util.CaseInsensitiveSet;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index fa1f2bef..b2c9926b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -58,9 +58,9 @@ import net.md_5.bungee.netty.cipher.CipherDecoder;
 import net.md_5.bungee.netty.cipher.CipherEncoder;
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.PacketWrapper;
-import net.md_5.bungee.protocol.PlayerPublicKey;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.data.PlayerPublicKey;
 import net.md_5.bungee.protocol.packet.CookieRequest;
 import net.md_5.bungee.protocol.packet.CookieResponse;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
index 59ce81e9..7bd72770 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
@@ -3,7 +3,7 @@ package net.md_5.bungee.connection;
 import com.google.gson.Gson;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.md_5.bungee.protocol.Property;
+import net.md_5.bungee.protocol.data.Property;
 
 @Data
 @AllArgsConstructor
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index dc7b643a..a6fb000d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -29,7 +29,6 @@ import net.md_5.bungee.netty.PacketHandler;
 import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import net.md_5.bungee.protocol.TagUtil;
 import net.md_5.bungee.protocol.packet.Chat;
 import net.md_5.bungee.protocol.packet.ClientChat;
 import net.md_5.bungee.protocol.packet.ClientCommand;
@@ -46,6 +45,7 @@ import net.md_5.bungee.protocol.packet.StartConfiguration;
 import net.md_5.bungee.protocol.packet.TabCompleteRequest;
 import net.md_5.bungee.protocol.packet.TabCompleteResponse;
 import net.md_5.bungee.protocol.packet.UnsignedClientCommand;
+import net.md_5.bungee.protocol.util.TagUtil;
 import net.md_5.bungee.util.AllowedCharacters;
 
 public class UpstreamBridge extends PacketHandler
diff --git a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
index a982655d..512147c2 100644
--- a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
@@ -5,7 +5,7 @@ import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.connection.LoginResult;
-import net.md_5.bungee.protocol.Property;
+import net.md_5.bungee.protocol.data.Property;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import net.md_5.bungee.protocol.packet.PlayerListItemRemove;
 import net.md_5.bungee.protocol.packet.PlayerListItemUpdate;