Merge pull request #1174 from booky10/feat/1.21.5-support

1.21.5 support

Author: retrooper

.github/workflows/gradle-publish.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

api/src/main/java/com/github/retrooper/packetevents/manager/server/ServerVersion.java

@@ -50,7 +50,7 @@ public enum ServerVersion {
     //1.20 and 1.20.1 have the same protocol version. 1.20.3 and 1.20.4 have the same protocol version. 1.20.5 and 1.20.6 have the same protocol version
     V_1_20(763), V_1_20_1(763), V_1_20_2(764), V_1_20_3(765), V_1_20_4(765), V_1_20_5(766), V_1_20_6(766),
     //1.21 and 1.21.1 have the same protocol version. 1.21.2 and 1.21.3 have the same protocol version
-    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768), V_1_21_4(769),
+    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768), V_1_21_4(769), V_1_21_5(770),
     //TODO UPDATE Add server version constant
     ERROR(-1, true);
 

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufHelper.java

@@ -239,6 +239,19 @@ public static Object resetWriterIndex(Object buffer) {
         return PacketEvents.getAPI().getNettyManager().getByteBufOperator().resetWriterIndex(buffer);
     }
 
+    public static Object allocateNewBuffer(Object buffer) {
+        return PacketEvents.getAPI().getNettyManager().getByteBufOperator().allocateNewBuffer(buffer);
+    }
+
+    public static int getByteSize(int value) {
+        for (int i = 1; i < 5; ++i) {
+            if ((value & -1 << i * 7) == 0) {
+                return i;
+            }
+        }
+        return 5;
+    }
+
     public static int readVarInt(Object buffer) {
         int value = 0;
         int length = 0;

api/src/main/java/com/github/retrooper/packetevents/netty/buffer/ByteBufOperator.java

@@ -74,6 +74,8 @@ public interface ByteBufOperator {
     Object markWriterIndex(Object buffer);
     Object resetWriterIndex(Object buffer);
 
+    Object allocateNewBuffer(Object buffer);
+
     default float readFloat(Object buffer) {
         return Float.intBitsToFloat(readInt(buffer));
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/Attributes.java

@@ -49,7 +49,7 @@ public static Attribute getByName(String name) {
         if (normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":generic.")
                 || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":player.")
                 || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":zombie.")) {
-            normedName = normedName.substring(name.indexOf('.') + 1);
+            normedName = normedName.substring(normedName.indexOf('.') + 1);
         }
         return REGISTRY.getByName(normedName);
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/ChatTypeDecoration.java

@@ -90,7 +90,7 @@ public static ChatTypeDecoration decode(NBT nbt, ClientVersion version) {
         }
         NBTCompound styleTag = compound.getCompoundTagOrNull("style");
         Style style = styleTag == null ? empty() :
-                AdventureSerializer.getNBTSerializer().deserializeStyle(styleTag);
+                AdventureSerializer.serializer(version).nbt().deserializeStyle(styleTag);
         return new ChatTypeDecoration(translationKey, params, style);
     }
 
@@ -104,8 +104,8 @@ public static NBT encode(ChatTypeDecoration decoration, ClientVersion version) {
         compound.setTag("translation_key", new NBTString(decoration.translationKey));
         compound.setTag("parameters", paramsTag);
         if (!decoration.style.isEmpty()) {
-            compound.setTag("style", AdventureSerializer.getNBTSerializer()
-                    .serializeStyle(decoration.style));
+            compound.setTag("style", AdventureSerializer.serializer(version)
+                    .nbt().serializeStyle(decoration.style));
         }
         return compound;
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/LastSeenMessages.java

@@ -1,5 +1,6 @@
 package com.github.retrooper.packetevents.protocol.chat;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.DataOutput;
@@ -86,12 +87,23 @@ public LastSeenMessages getLastSeenMessages() {
     }
 
     public static class Update {
+
         private final int offset;
         private final BitSet acknowledged;
+        private final byte checksum;
 
+        /**
+         * Checksum has been added with 1.21.5
+         */
+        @ApiStatus.Obsolete
         public Update(int offset, BitSet acknowledged) {
+            this(offset, acknowledged, (byte) 0);
+        }
+
+        public Update(int offset, BitSet acknowledged, byte checksum) {
             this.offset = offset;
             this.acknowledged = acknowledged;
+            this.checksum = checksum;
         }
 
         public int getOffset() {
@@ -101,5 +113,12 @@ public int getOffset() {
         public BitSet getAcknowledged() {
             return acknowledged;
         }
+
+        /**
+         * Added with 1.21.5
+         */
+        public byte getChecksum() {
+            return this.checksum;
+        }
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/Parsers.java

@@ -148,8 +148,8 @@ public static VersionedRegistry<Parser> getRegistry() {
     public static final Parser STYLE = define("style", null, null);
     public static final Parser MESSAGE = define("message", null, null);
     public static final Parser NBT_COMPOUND_TAG = define("nbt_compound_tag", null, null);
-    @Deprecated
-    public static final Parser NBT = NBT_COMPOUND_TAG;
+    @ApiStatus.Obsolete
+    public static final Parser NBT = define("nbt", null, null);
     public static final Parser NBT_TAG = define("nbt_tag", null, null);
     public static final Parser NBT_PATH = define("nbt_path", null, null);
     public static final Parser OBJECTIVE = define("objective", null, null);
@@ -210,6 +210,14 @@ public static VersionedRegistry<Parser> getRegistry() {
     public static final Parser LOOT_MODIFIER = define("loot_modifier", null, null);
     public static final Parser UUID = define("uuid", null, null);
 
+    /**
+     * Added with 1.21.5
+     */
+    public static final Parser RESOURCE_SELECTOR = define("resource_selector",
+            wrapper -> Collections.singletonList(wrapper.readIdentifier()),
+            (wrapper, value) -> wrapper.writeIdentifier((ResourceLocation) value.get(0))
+    );
+
     static {
         REGISTRY.unloadMappings();
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_3.java

@@ -10,7 +10,6 @@
 import java.time.Instant;
 import java.util.Optional;
 import java.util.UUID;
-//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
 public class ChatMessage_v1_19_3 extends ChatMessage_v1_16 {
     int index;
     byte[] signature;

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_21_5.java

@@ -0,0 +1,49 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2025 retrooper and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.retrooper.packetevents.protocol.chat.message;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.LastSeenMessages;
+import com.github.retrooper.packetevents.protocol.chat.filter.FilterMask;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+import java.util.UUID;
+
+//We'll extend ChatMessage_v1_19_3 for now, hopefully no breaking changes in the future
+public class ChatMessage_v1_21_5 extends ChatMessage_v1_19_3 {
+
+    int globalIndex;
+
+    public ChatMessage_v1_21_5(int globalIndex, UUID senderUUID, int index, byte[] signature, String plainContent,
+                               Instant timestamp, long salt, LastSeenMessages.Packed lastSeenMessagesPacked, @Nullable Component unsignedChatContent,
+                               FilterMask filterMask, ChatType.Bound chatFormatting) {
+        super(senderUUID, index, signature, plainContent, timestamp, salt, lastSeenMessagesPacked, unsignedChatContent, filterMask, chatFormatting);
+        this.globalIndex = globalIndex;
+    }
+
+    public int getGlobalIndex() {
+        return this.globalIndex;
+    }
+
+    public void setGlobalIndex(int globalIndex) {
+        this.globalIndex = globalIndex;
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/chat/message/reader/impl/ChatMessageProcessor_v1_21_5.java

@@ -0,0 +1,68 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2025 retrooper and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.retrooper.packetevents.protocol.chat.message.reader.impl;
+
+import com.github.retrooper.packetevents.protocol.chat.ChatType;
+import com.github.retrooper.packetevents.protocol.chat.LastSeenMessages;
+import com.github.retrooper.packetevents.protocol.chat.filter.FilterMask;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage;
+import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_21_5;
+import com.github.retrooper.packetevents.protocol.chat.message.reader.ChatMessageProcessor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class ChatMessageProcessor_v1_21_5 implements ChatMessageProcessor {
+
+    @Override
+    public ChatMessage readChatMessage(@NotNull PacketWrapper<?> wrapper) {
+        int globalIndex = wrapper.readVarInt();
+        UUID senderUUID = wrapper.readUUID();
+        int index = wrapper.readVarInt();
+        byte[] signature = wrapper.readOptional((w) -> w.readBytes(256));
+        String plainContent = wrapper.readString(256);
+        Instant timestamp = wrapper.readTimestamp();
+        long salt = wrapper.readLong();
+        LastSeenMessages.Packed lastSeenMessagesPacked = wrapper.readLastSeenMessagesPacked();
+        Component unsignedChatContent = wrapper.readOptional(PacketWrapper::readComponent);
+        FilterMask filterMask = wrapper.readFilterMask();
+        ChatType.Bound chatType = wrapper.readChatTypeBoundNetwork();
+
+        return new ChatMessage_v1_21_5(globalIndex, senderUUID, index, signature, plainContent, timestamp, salt, lastSeenMessagesPacked, unsignedChatContent, filterMask, chatType);
+    }
+
+    @Override
+    public void writeChatMessage(@NotNull PacketWrapper<?> wrapper, @NotNull ChatMessage data) {
+        ChatMessage_v1_21_5 newData = (ChatMessage_v1_21_5) data;
+        wrapper.writeInt(newData.getGlobalIndex());
+        wrapper.writeUUID(newData.getSenderUUID());
+        wrapper.writeVarInt(newData.getIndex());
+        wrapper.writeOptional(newData.getSignature(), PacketWrapper::writeBytes);
+        wrapper.writeString(newData.getPlainContent());
+        wrapper.writeTimestamp(newData.getTimestamp());
+        wrapper.writeLong(newData.getSalt());
+        wrapper.writeLastSeenMessagesPacked(newData.getLastSeenMessagesPacked());
+        wrapper.writeOptional(newData.getUnsignedChatContent().orElse(null), PacketWrapper::writeComponent);
+        wrapper.writeFilterMask(newData.getFilterMask());
+        wrapper.writeChatTypeBoundNetwork(newData.getChatFormatting());
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/color/DyeColor.java

@@ -18,6 +18,7 @@
 
 package com.github.retrooper.packetevents.protocol.color;
 
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import net.kyori.adventure.util.RGBLike;
 import org.jetbrains.annotations.NotNull;
 
@@ -54,6 +55,8 @@ public enum DyeColor implements RGBLike {
 
     BLACK(new Color(0x1d1d21), new Color(0x0), new Color(0x1e1b1b), 29);
 
+    private static final DyeColor[] COLORS = values();
+
     private final Color textureDiffuseColor;
 
     private final Color textColor;
@@ -70,6 +73,14 @@ public enum DyeColor implements RGBLike {
         this.mapColorId = mapColorId;
     }
 
+    public static DyeColor read(PacketWrapper<?> wrapper) {
+        return wrapper.readEnum(COLORS);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, DyeColor color) {
+        wrapper.writeEnum(color);
+    }
+
     public @NotNull Color color() {
         return this.textureDiffuseColor;
     }
@@ -100,4 +111,4 @@ public int blue() {
     public int mapColorId() {
         return this.mapColorId;
     }
-}
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentPredicate.java

@@ -31,6 +31,10 @@ public class ComponentPredicate implements Predicate<IComponentMap> {
 
     private List<ComponentValue<?>> requiredComponents;
 
+    public ComponentPredicate() {
+        this(new ArrayList<>());
+    }
+
     public ComponentPredicate(List<ComponentValue<?>> requiredComponents) {
         this.requiredComponents = requiredComponents;
     }