PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3855: Create protocol sub-packages data & util

Browse Source
This commit is contained in:
Janmm14
2025-07-14 11:22:38 +02:00
committed by GitHub
parent c13e6df67e
commit 3a5c731826
31 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
View File

@@ -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

5
protocol/src/main/java/net/md_5/bungee/protocol/ChatChain.java → protocol/src/main/java/net/md_5/bungee/protocol/data/ChatChain.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/Location.java → protocol/src/main/java/net/md_5/bungee/protocol/data/Location.java
View File

@@ -1,4 +1,4 @@
package net.md_5.bungee.protocol;
package net.md_5.bungee.protocol.data;
import lombok.Data;

2
protocol/src/main/java/net/md_5/bungee/protocol/NumberFormat.java → protocol/src/main/java/net/md_5/bungee/protocol/data/NumberFormat.java
View File

@@ -1,4 +1,4 @@
package net.md_5.bungee.protocol;
package net.md_5.bungee.protocol.data;
import lombok.Data;

2
protocol/src/main/java/net/md_5/bungee/protocol/PlayerPublicKey.java → protocol/src/main/java/net/md_5/bungee/protocol/data/PlayerPublicKey.java
View File

@@ -1,4 +1,4 @@
package net.md_5.bungee.protocol;
package net.md_5.bungee.protocol.data;
import lombok.Data;

2
protocol/src/main/java/net/md_5/bungee/protocol/Property.java → protocol/src/main/java/net/md_5/bungee/protocol/data/Property.java
View File

@@ -1,4 +1,4 @@
package net.md_5.bungee.protocol;
package net.md_5.bungee.protocol.data;
import lombok.AllArgsConstructor;
import lombok.Data;

5
protocol/src/main/java/net/md_5/bungee/protocol/SeenMessages.java → protocol/src/main/java/net/md_5/bungee/protocol/data/SeenMessages.java
View File

@@ -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

4
protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChat.java
View File

@@ -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

4
protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
View File

@@ -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

4
protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItemUpdate.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
View File

@@ -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

4
protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java
View File

@@ -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

4
protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialog.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/ShowDialogDirect.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
View File

@@ -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

2
protocol/src/main/java/net/md_5/bungee/protocol/Either.java → protocol/src/main/java/net/md_5/bungee/protocol/util/Either.java
View File

@@ -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;

2
protocol/src/main/java/net/md_5/bungee/protocol/TagUtil.java → protocol/src/main/java/net/md_5/bungee/protocol/util/TagUtil.java
View File

@@ -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;

2
protocol/src/test/java/net/md_5/bungee/protocol/TagUtilTest.java → protocol/src/test/java/net/md_5/bungee/protocol/util/TagUtilTest.java
View File

@@ -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;

2
proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
View File

@@ -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;

2
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@@ -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;

2
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@@ -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;

2
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -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;

2
proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
View File

@@ -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

2
proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@@ -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

2
proxy/src/main/java/net/md_5/bungee/tab/TabList.java
View File

@@ -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;