Merge feature 1.21.6

Author: basaigh

protocol/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     jacoco
 }
 
-version = "1.21.5-SNAPSHOT"
+version = "1.21.6-SNAPSHOT"
 description = "MCProtocolLib is a simple library for communicating with Minecraft clients and servers."
 
 dependencies {

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -1,6 +1,7 @@
 package org.geysermc.mcprotocollib.protocol.codec;
 
 import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundClearDialogPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomReportDetailsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
@@ -13,6 +14,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundTransferPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundUpdateTagsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundClientInformationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomClickActionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundPongPacket;
@@ -21,6 +23,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundResetChatPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundSelectKnownPacks;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundShowDialogConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundUpdateEnabledFeaturesPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundSelectKnownPacks;
@@ -49,6 +52,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundServerDataPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSetCameraPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundShowDialogGamePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSoundEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStopSoundPacket;
@@ -59,6 +63,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundTickingStepPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundUpdateAdvancementsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundUpdateRecipesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundAddEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundDamageEventPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundEntityEventPacket;
@@ -93,7 +98,6 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetExperiencePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHeldSlotPacket;
-import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundAddEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerClosePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket;
@@ -129,6 +133,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSoundPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundTagQueryPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundTrackedWaypointPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundInitializeBorderPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderCenterPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderLerpSizePacket;
@@ -190,6 +195,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundTeleportToEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundTestInstanceBlockActionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundChangeGameModePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
@@ -218,8 +224,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion(770)
-            .minecraftVersion("1.21.5")
+            .protocolVersion(771)
+            .minecraftVersion("1.21.6")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )
@@ -258,6 +264,8 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundSelectKnownPacks.class, ClientboundSelectKnownPacks::new)
                     .registerClientboundPacket(ClientboundCustomReportDetailsPacket.class, ClientboundCustomReportDetailsPacket::new)
                     .registerClientboundPacket(ClientboundServerLinksPacket.class, ClientboundServerLinksPacket::new)
+                    .registerClientboundPacket(ClientboundClearDialogPacket.class, ClientboundClearDialogPacket::new)
+                    .registerClientboundPacket(ClientboundShowDialogConfigurationPacket.class, ClientboundShowDialogConfigurationPacket::new)
                     .registerServerboundPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new)
                     .registerServerboundPacket(ServerboundCookieResponsePacket.class, ServerboundCookieResponsePacket::new)
                     .registerServerboundPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new)
@@ -266,6 +274,7 @@ public class MinecraftCodec {
                     .registerServerboundPacket(ServerboundPongPacket.class, ServerboundPongPacket::new)
                     .registerServerboundPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new)
                     .registerServerboundPacket(ServerboundSelectKnownPacks.class, ServerboundSelectKnownPacks::new)
+                    .registerServerboundPacket(ServerboundCustomClickActionPacket.class, ServerboundCustomClickActionPacket::new)
             ).state(ProtocolState.GAME, MinecraftPacketRegistry.builder()
                     .registerClientboundPacket(ClientboundDelimiterPacket.class, ClientboundDelimiterPacket::new)
                     .registerClientboundPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new)
@@ -398,10 +407,14 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundProjectilePowerPacket.class, ClientboundProjectilePowerPacket::new)
                     .registerClientboundPacket(ClientboundCustomReportDetailsPacket.class, ClientboundCustomReportDetailsPacket::new)
                     .registerClientboundPacket(ClientboundServerLinksPacket.class, ClientboundServerLinksPacket::new)
+                    .registerClientboundPacket(ClientboundTrackedWaypointPacket.class, ClientboundTrackedWaypointPacket::new)
+                    .registerClientboundPacket(ClientboundClearDialogPacket.class, ClientboundClearDialogPacket::new)
+                    .registerClientboundPacket(ClientboundShowDialogGamePacket.class, ClientboundShowDialogGamePacket::new)
                     .registerServerboundPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new)
                     .registerServerboundPacket(ServerboundBlockEntityTagQueryPacket.class, ServerboundBlockEntityTagQueryPacket::new)
                     .registerServerboundPacket(ServerboundSelectBundleItemPacket.class, ServerboundSelectBundleItemPacket::new)
                     .registerServerboundPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new)
+                    .registerServerboundPacket(ServerboundChangeGameModePacket.class, ServerboundChangeGameModePacket::new)
                     .registerServerboundPacket(ServerboundChatAckPacket.class, ServerboundChatAckPacket::new)
                     .registerServerboundPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new)
                     .registerServerboundPacket(ServerboundChatCommandSignedPacket.class, ServerboundChatCommandSignedPacket::new)
@@ -462,6 +475,7 @@ public class MinecraftCodec {
                     .registerServerboundPacket(ServerboundTestInstanceBlockActionPacket.class, ServerboundTestInstanceBlockActionPacket::new)
                     .registerServerboundPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new)
                     .registerServerboundPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new)
+                    .registerServerboundPacket(ServerboundCustomClickActionPacket.class, ServerboundCustomClickActionPacket::new)
             )
             .build();
 }

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java

@@ -244,6 +244,32 @@ public static <T> void writeList(ByteBuf buf, List<T> value, BiConsumer<ByteBuf,
         }
     }
 
+    public static <T> T readLengthPrefixed(ByteBuf buf, int maxLength, Function<ByteBuf, T> reader) {
+        int length = MinecraftTypes.readVarInt(buf);
+        if (length > maxLength) {
+            throw new IllegalArgumentException("Buffer is longer than maximum allowed length");
+        } else {
+            return reader.apply(buf);
+        }
+    }
+
+    public static <T> void writeLengthPrefixed(ByteBuf buf, int maxLength, T value, BiConsumer<ByteBuf, T> writer) {
+        ByteBuf buf2 = Unpooled.buffer();
+
+        try {
+            writer.accept(buf2, value);
+            int length = buf2.readableBytes();
+            if (length > maxLength) {
+                throw new IllegalArgumentException("Buffer is longer than maximum allowed length");
+            }
+
+            MinecraftTypes.writeVarInt(buf, length);
+            buf.writeBytes(buf2);
+        } finally {
+            buf2.release();
+        }
+    }
+
     public static <T> Holder<T> readHolder(ByteBuf buf, Function<ByteBuf, T> readCustom) {
         int registryId = MinecraftTypes.readVarInt(buf);
         return registryId == 0 ? Holder.ofCustom(readCustom.apply(buf)) : Holder.ofId(registryId - 1);
@@ -482,8 +508,7 @@ public static DataComponents readDataComponentPatch(ByteBuf buf, boolean untrust
         if (untrusted) {
             for (int k = 0; k < nonNullComponents; k++) {
                 DataComponentType<?> dataComponentType = DataComponentTypes.read(buf);
-                MinecraftTypes.readVarInt(buf);
-                DataComponent<?, ?> dataComponent = dataComponentType.readDataComponent(buf);
+                DataComponent<?, ?> dataComponent = MinecraftTypes.readLengthPrefixed(buf, Integer.MAX_VALUE, dataComponentType::readDataComponent);
                 dataComponents.put(dataComponentType, dataComponent);
             }
         } else {
@@ -525,11 +550,7 @@ public static void writeDataComponentPatch(ByteBuf buf, DataComponents dataCompo
                 for (DataComponent<?, ?> component : dataComponents.getDataComponents().values()) {
                     if (component.getValue() != null) {
                         MinecraftTypes.writeVarInt(buf, component.getType().getId());
-
-                        ByteBuf buf2 = Unpooled.buffer();
-                        component.write(buf2);
-                        MinecraftTypes.writeVarInt(buf, buf2.readableBytes());
-                        buf.writeBytes(buf2);
+                        MinecraftTypes.writeLengthPrefixed(buf, Integer.MAX_VALUE, component, (buf2, component2) -> component2.write(buf2));
                     }
                 }
             } else {

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java

@@ -21,6 +21,11 @@ public class CommandNode {
      */
     private final boolean executable;
 
+    /**
+     * Whether restricted commands are allowed.
+     */
+    private final boolean allowsRestricted;
+
     /**
      * Child node indices.
      */

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java

@@ -18,6 +18,7 @@ public enum CommandParser {
     ITEM_STACK,
     ITEM_PREDICATE,
     COLOR,
+    HEX_COLOR,
     COMPONENT,
     STYLE,
     MESSAGE,
@@ -55,6 +56,7 @@ public enum CommandParser {
     LOOT_TABLE,
     LOOT_PREDICATE,
     LOOT_MODIFIER,
+    DIALOG,
     UUID;
 
     private static final CommandParser[] VALUES = values();

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java

@@ -10,7 +10,6 @@
 
 public enum SuggestionType {
     ASK_SERVER,
-    ALL_RECIPES,
     AVAILABLE_SOUNDS,
     SUMMONABLE_ENTITIES;
 

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EntityEvent.java

@@ -69,7 +69,8 @@ public enum EntityEvent {
     LIVING_EQUIPMENT_BREAK_BODY,
     SHAKE,
     DROWN_PARTICLES,
-    SADDLE_BREAK;
+    SADDLE_BREAK,
+    RAVAGER_ROARED;
 
     private static final EntityEvent[] VALUES = values();
 

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java

@@ -40,6 +40,7 @@ enum Builtin implements AttributeType {
         BLOCK_BREAK_SPEED("minecraft:block_break_speed", 1, 0, 1024),
         BLOCK_INTERACTION_RANGE("minecraft:block_interaction_range", 4.5, 0, 64),
         BURNING_TIME("minecraft:burning_time", 1, 0, 1024),
+        CAMERA_DISTANCE("minecraft:camera_distance", 4, 0, 32),
         EXPLOSION_KNOCKBACK_RESISTANCE("minecraft:explosion_knockback_resistance", 0, 0, 1),
         ENTITY_INTERACTION_RANGE("minecraft:entity_interaction_range", 3, 0, 64),
         FALL_DAMAGE_MULTIPLIER("minecraft:fall_damage_multiplier", 1, 0, 100),
@@ -63,7 +64,9 @@ enum Builtin implements AttributeType {
         SUBMERGED_MINING_SPEED("minecraft:submerged_mining_speed", 0.2, 0, 20),
         SWEEPING_DAMAGE_RATIO("minecraft:sweeping_damage_ratio", 0, 0, 1),
         TEMPT_RANGE("minecraft:tempt_range", 10, 0, 2048),
-        WATER_MOVEMENT_EFFICIENCY("minecraft:water_movement_efficiency", 0, 0, 1);
+        WATER_MOVEMENT_EFFICIENCY("minecraft:water_movement_efficiency", 0, 0, 1),
+        WAYPOINT_TRANSMIT_RANGE("minecraft:waypoint_transmit_range", 0, 0, 6.0E7),
+        WAYPOINT_RECEIVE_RANGE("minecraft:waypoint_receive_range", 0, 0, 6.0E7);
 
         private final Key identifier;
         private final double def;

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerState.java

@@ -1,8 +1,6 @@
 package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum PlayerState {
-    START_SNEAKING,
-    STOP_SNEAKING,
     LEAVE_BED,
     START_SPRINTING,
     STOP_SPRINTING,

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/EntityType.java

@@ -59,6 +59,7 @@ public enum EntityType {
     FROG,
     FURNACE_MINECART,
     GHAST,
+    HAPPY_GHAST,
     GIANT,
     GLOW_ITEM_FRAME,
     GLOW_SQUID,