update: 2.8.0 release

fix: minecraft:air isn't empty in <1.11

.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
@@ -62,3 +62,9 @@ jobs:
         with:
           name: fabric-build
           path: fabric/build/libs
+
+      - name: Upload build artifacts sponge
+        uses: actions/upload-artifact@v4
+        with:
+          name: sponge-build
+          path: sponge/build/libs

.gitignore

@@ -123,3 +123,6 @@ run/
 .project
 .settings/
 .classpath
+
+# Build Source Kotlin
+/buildSrc/.kotlin/

README.md

@@ -1,19 +1,18 @@
 <!--suppress HtmlDeprecatedAttribute -->
 <div align="center">
-    <h2><i>packetevents</i></h2>
+    <h2><i>PacketEvents</i></h2>
+    <h3><i>A powerful networking library for Minecraft packet processing and manipulation.</i></h3>
     <a href="https://github.com/retrooper/packetevents/actions"><img src="https://img.shields.io/github/actions/workflow/status/retrooper/packetevents/gradle-publish.yml?style=for-the-badge&logo=github"></a>
     <a href="https://discord.gg/DVHxPPxHZc"><img src="https://img.shields.io/discord/721686193061888071?color=5562e9&logo=discord&logoColor=white&style=for-the-badge"></a>
     <img src="https://img.shields.io/github/license/retrooper/packetevents?style=for-the-badge&logo=github">
     <a href="https://bstats.org/plugin/bukkit/packetevents/11327"><img src="https://img.shields.io/bstats/servers/11327?style=for-the-badge"></a>
     <a href="https://github.com/retrooper/packetevents/releases"><img src="https://img.shields.io/github/downloads/retrooper/packetevents/total.svg?style=for-the-badge&logo=github"></a>
 </div>
-PacketEvents is emerging as a strong contender in the realm of Minecraft packet processing libraries. Designed to simplify packet manipulation while delivering high performance, this powerful tool aims to demystify the complexities of projects utilizing packets. Imbued with versatility, PacketEvents supports various platforms such as Spigot, BungeeCord, Velocity, and Fabric.
-
 <h3>Resources</h3>
 
 - [Read documentation](https://docs.packetevents.com/)
     - [Getting Started](https://docs.packetevents.com/getting-started)
-    - [JavaDocs](javadocs.packetevents.com) 
+    - [JavaDocs](https://javadocs.packetevents.com)
 - [Releases](https://github.com/retrooper/packetevents/releases/)
     - [GitHub](https://github.com/retrooper/packetevents/releases/)
     - [Modrinth](https://modrinth.com/plugin/packetevents)
@@ -36,7 +35,7 @@ PacketEvents is emerging as a strong contender in the realm of Minecraft packet
 <i>Here are some projects that we are heavily inspired by, thus we have integrated</i>\
 <i>small portions of their code into our work.</i>
 
-[Protocol Documentation for the Minecraft Java Edition](https://wiki.vg/Protocol)\
+[Protocol Documentation for the Minecraft Java Edition](https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol)\
 [ViaVersion](https://github.com/ViaVersion/ViaVersion)\
 [ProtocolSupport](https://github.com/ProtocolSupport/ProtocolSupport)\
 [adventure](https://github.com/KyoriPowered/adventure)\

api/build.gradle.kts

@@ -1,6 +1,6 @@
-import com.github.retrooper.compression.strategy.JsonArrayCompressionStrategy
-import com.github.retrooper.compression.strategy.JsonObjectCompressionStrategy
-import com.github.retrooper.compression.strategy.JsonToNbtStrategy
+import com.github.retrooper.compression.strategy.dir.JsonBase64DataDirStrategy
+import com.github.retrooper.compression.strategy.dir.JsonRegistryCompressionDirStrategy
+import com.github.retrooper.compression.strategy.dir.JsonToNbtDirStrategy
 import com.github.retrooper.excludeAdventure
 
 plugins {
@@ -38,79 +38,31 @@ dependencies {
     testImplementation(testlibs.mockbukkit)
     testImplementation(testlibs.slf4j)
     testImplementation(testlibs.bundles.junit)
+    testImplementation(libs.netty)
+    testImplementation(libs.classgraph)
 }
 
 mappingCompression {
     mappingDirectory = rootDir.resolve("mappings")
     outDirectory = project.layout.buildDirectory.dir("mappings/generated/assets/mappings")
 
-    with<JsonToNbtStrategy> {
-        compress("block/legacy_block_mappings.json")
-        compress("block/modern_block_mappings.json")
-
-        compress("enchantment/enchantment_type_data.json")
-
-        compress("stats/statistics.json")
-
-        compress("world/biome_data.json")
+    with<JsonToNbtDirStrategy> {
+        compress("data")
     }
-
-    with<JsonArrayCompressionStrategy> {
-        compress("attribute/attribute_mappings.json")
-
-        compress("block/block_entity_type_mappings.json")
-        compress("block/block_type_mappings.json")
-
-        compress("chat/chat_type_mappings.json")
-
-        compress("command/argument_parser_mappings.json")
-
-        compress("damage/damagetype_mappings.json")
-
-        compress("enchantment/effect_component_type.json")
-
-        compress("entity/entity_data_type_mappings.json")
-        compress("entity/painting_mappings.json")
-        compress("entity/wolf_variant_mappings.json")
-
-        compress("item/item_armor_material_mappings.json")
-        compress("item/item_banner_pattern_mappings.json")
-        compress("item/item_component_mappings.json")
-        compress("item/item_instrument_mappings.json")
-        compress("item/item_jukebox_song_mappings.json")
-        compress("item/item_map_decoration_type_mappings.json")
-        compress("item/item_potion_mappings.json")
-        compress("item/item_trim_material_mappings.json")
-        compress("item/item_trim_pattern_mappings.json")
-        compress("item/recipe_serializer_mappings.json")
-
-        compress("particle/particle_type_mappings.json")
-
-        compress("sound/sound_mappings.json")
-
-        compress("world/biome_mappings.json")
-        compress("world/world_position_source_mappings.json")
+    with<JsonBase64DataDirStrategy> {
+        compress("item_base_components")
     }
-
-    with<JsonObjectCompressionStrategy> {
-        compress("enchantment/enchantment_type_mappings.json")
-
-        compress("entity/entity_effect_mappings.json")
-        compress("entity/entity_type_mappings.json")
-        compress("entity/legacy_entity_type_mappings.json")
-
-        compress("item/item_type_mappings.json")
-
-        compress("world/dimension_type_mappings.json")
+    with<JsonRegistryCompressionDirStrategy> {
+        compress("registries")
     }
 }
 
 tasks {
+    assemble {
+        setDependsOn(dependsOn.filterNot { it == "shadowNoAdventure" })
+    }
+
     javadoc {
-        setDestinationDir(file("${project.layout.buildDirectory.asFile.get()}/docs/javadoc"))
-        options {
-            (this as CoreJavadocOptions).addBooleanOption("Xdoclint:none", true)
-        }
         mustRunAfter(generateVersionsFile)
     }
 
@@ -138,7 +90,9 @@ tasks {
     shadowJar {
         exclude {
             val path = it.path
-            path.startsWith("net/kyori") && !path.startsWith("net/kyori/adventure/text/serializer") && !path.startsWith("net/kyori/option")
+            path.startsWith("net/kyori") && !path.startsWith("net/kyori/adventure/text/serializer") && !path.startsWith(
+                "net/kyori/option"
+            )
         }
     }
 }

api/src/main/java/com/github/retrooper/packetevents/annotations/RuntimeObsolete.java

@@ -0,0 +1,28 @@
+package com.github.retrooper.packetevents.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
+
+/**
+ * Marks an API element as obsolete and makes this information available
+ * at runtime via reflection. Use in conjunction with an IDE-recognized
+ * annotation like @ApiStatus.Obsolete if IDE warnings are also desired.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD}) // Adjust targets as needed
+public @interface RuntimeObsolete {
+    /**
+     * Specifies in which version the API became obsolete.
+     * Should generally match the value in the corresponding @ApiStatus.Obsolete annotation.
+     */
+    String since() default "";
+
+    /**
+     * Optional: Add a reason or replacement suggestion.
+     */
+    String reason() default "";
+}

api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java

@@ -36,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -123,8 +124,15 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
         return channel;
     }
 
+    public SocketAddress getAddress() {
+        return ChannelHelper.remoteAddress(this.channel);
+    }
+
+    /**
+     * <strong>WARNING:</strong> This doesn't support local addresses or unix sockets.
+     */
     public InetSocketAddress getSocketAddress() {
-        return (InetSocketAddress) ChannelHelper.remoteAddress(channel);
+        return (InetSocketAddress) this.getAddress();
     }
 
     @Override
@@ -137,6 +145,9 @@ public abstract class ProtocolPacketEvent extends PacketEvent implements PlayerE
         return (T) player;
     }
 
+    /**
+     * Gets the connection state this packet has been sent/received in.
+     */
     public ConnectionState getConnectionState() {
         return connectionState;
     }

api/src/main/java/com/github/retrooper/packetevents/injector/ChannelInjector.java

@@ -18,9 +18,11 @@
 
 package com.github.retrooper.packetevents.injector;
 
+import com.github.retrooper.packetevents.protocol.PacketSide;
 import com.github.retrooper.packetevents.protocol.player.User;
 
 public interface ChannelInjector {
+
     default boolean isServerBound() {
         return true;
     }
@@ -33,5 +35,11 @@ public interface ChannelInjector {
 
     void setPlayer(Object channel, Object player);
 
+    boolean isPlayerSet(Object channel);
+
     boolean isProxy();
+
+    default PacketSide getPacketSide() {
+        return PacketSide.SERVER;
+    }
 }

api/src/main/java/com/github/retrooper/packetevents/manager/InternalPacketListener.java

@@ -30,6 +30,7 @@ import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import com.github.retrooper.packetevents.util.LogManager;
 import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import com.github.retrooper.packetevents.wrapper.configuration.server.WrapperConfigServerRegistryData;
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
@@ -37,8 +38,6 @@ import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServer
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerJoinGame;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerRespawn;
 
-import java.net.InetSocketAddress;
-
 public class InternalPacketListener extends PacketListenerAbstract {
 
     public InternalPacketListener() {
@@ -66,7 +65,7 @@ public class InternalPacketListener extends PacketListenerAbstract {
 
             //Map username with channel
             synchronized (channel) {
-                ProtocolManager.CHANNELS.put(profile.getUUID(), channel);
+                PacketEvents.getAPI().getProtocolManager().setChannel(profile.getUUID(), channel);
             }
 
             PacketEvents.getAPI().getLogManager().debug("Mapped player UUID with their channel.");
@@ -124,16 +123,18 @@ public class InternalPacketListener extends PacketListenerAbstract {
     public void onPacketReceive(PacketReceiveEvent event) {
         User user = event.getUser();
         if (event.getPacketType() == PacketType.Handshaking.Client.HANDSHAKE) {
-            Object channel = event.getChannel();
-            InetSocketAddress address = event.getSocketAddress();
-            WrapperHandshakingClientHandshake handshake = new WrapperHandshakingClientHandshake(event);
-            ConnectionState nextState = handshake.getNextConnectionState();
-            ClientVersion clientVersion = handshake.getClientVersion();
-            //Update client version for this event call(and user)
+            WrapperHandshakingClientHandshake packet = new WrapperHandshakingClientHandshake(event);
+            ClientVersion clientVersion = packet.getClientVersion();
+            ConnectionState state = packet.getNextConnectionState();
+
+            LogManager logger = PacketEvents.getAPI().getLogManager();
+            if (logger.isDebug()) {
+                logger.debug("Processed handshake for " + event.getAddress() + ": "
+                        + state.name() + " / " + packet.getClientVersion().getReleaseName());
+            }
+
             user.setClientVersion(clientVersion);
-            PacketEvents.getAPI().getLogManager().debug("Processed " + address.getHostString() + ":" + address.getPort() + "'s client version. Client Version: " + clientVersion.getReleaseName());
-            //Transition into LOGIN or STATUS connection state immediately, to remain in sync with vanilla
-            user.setConnectionState(nextState);
+            user.setConnectionState(state);
         } else if (event.getPacketType() == PacketType.Login.Client.LOGIN_SUCCESS_ACK) {
             user.setDecoderState(ConnectionState.CONFIGURATION);
         } else if (event.getPacketType() == PacketType.Play.Client.CONFIGURATION_ACK) {

api/src/main/java/com/github/retrooper/packetevents/manager/player/PlayerManager.java

@@ -19,10 +19,12 @@
 package com.github.retrooper.packetevents.manager.player;
 
 import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.ProtocolPacketEvent;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 public interface PlayerManager {
@@ -34,7 +36,17 @@ public interface PlayerManager {
 
     User getUser(@NotNull Object player);
 
-    default ConnectionState getConnectionState(@NotNull Object player) {
+    /**
+     * <strong>WARNING</strong>: Usage of this method should be avoided. Please use either
+     * {@link User#getDecoderState()} or {@link User#getEncoderState()}.<br>
+     * To access the specific state a packet event was sent/received in, use {@link ProtocolPacketEvent#getConnectionState()}.
+     * <p>
+     * Since 1.20.2, the Minecraft protocol allows the decoder/encoder connection states to de-sync.
+     *
+     * @throws IllegalStateException if encoder/decoder connection states do not match
+     */
+    @ApiStatus.Obsolete
+    default ConnectionState getConnectionState(@NotNull Object player) throws IllegalStateException {
         return getUser(player).getConnectionState();
     }
 

api/src/main/java/com/github/retrooper/packetevents/manager/protocol/ProtocolManager.java

@@ -33,8 +33,10 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 public interface ProtocolManager {
+    @ApiStatus.Internal
     Map<UUID, Object> CHANNELS = new ConcurrentHashMap<>();
     // Use SocketAddress because ProtocolLib wraps Channels with NettyChannelProxy class
+    @ApiStatus.Internal
     Map<Object, User> USERS = new ConcurrentHashMap<>();
 
     default Collection<User> getUsers() {
@@ -150,11 +152,13 @@ public interface ProtocolManager {
         return USERS.get(pipeline);
     }
 
+    @ApiStatus.Internal
     default User removeUser(Object channel) {
         Object pipeline = ChannelHelper.getPipeline(channel);
         return USERS.remove(pipeline);
     }
 
+    @ApiStatus.Internal
     default void setUser(Object channel, User user) {
         synchronized (channel) {
             Object pipeline = ChannelHelper.getPipeline(channel);
@@ -166,4 +170,23 @@ public interface ProtocolManager {
     default Object getChannel(UUID uuid) {
         return CHANNELS.get(uuid);
     }
+
+    @ApiStatus.Internal
+    default void setChannel(UUID uuid, Object channel) {
+        CHANNELS.put(uuid, channel);
+    }
+
+    @ApiStatus.Internal
+    default void removeChannel(Object channel) {
+        CHANNELS.values().remove(channel);
+    }
+
+    @ApiStatus.Internal
+    default void removeChannelById(UUID uuid) {
+        CHANNELS.remove(uuid);
+    }
+
+    default boolean hasChannel(Object channel) {
+        return CHANNELS.containsValue(channel);
+    }
 }

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

@@ -34,7 +34,7 @@ public enum ServerVersion {
     //TODO Rename to MinecraftVersion?
     V_1_7_10(5),
     V_1_8(47), V_1_8_3(47), V_1_8_8(47),
-    V_1_9(107), V_1_9_2(109), V_1_9_4(110),
+    V_1_9(107), V_1_9_1(108), V_1_9_2(109), V_1_9_4(110),
     //1.10 and 1.10.1 are redundant
     V_1_10(210), V_1_10_1(210), V_1_10_2(210),
     V_1_11(315), V_1_11_2(316),
@@ -49,8 +49,8 @@ public enum ServerVersion {
     V_1_19(759), V_1_19_1(760), V_1_19_2(760), V_1_19_3(761), V_1_19_4(762),
     //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
-    V_1_21(767), V_1_21_1(767),
+    //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_5(770),
     //TODO UPDATE Add server version constant
     ERROR(-1, true);
 

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

@@ -31,4 +31,6 @@ public interface ByteBufAllocationOperator {
 
     Object compositeBuffer();
     Object compositeBuffer(int maxNumComponents);
+
+    Object emptyBuffer();
 }

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

@@ -239,6 +239,19 @@ public class ByteBufHelper {
         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/netty/buffer/UnpooledByteBufAllocationHelper.java

@@ -52,4 +52,8 @@ public class UnpooledByteBufAllocationHelper {
     public static Object compositeBuffer(int maxNumComponents) {
         return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().compositeBuffer(maxNumComponents);
     }
+
+    public static Object emptyBuffer() {
+        return PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().emptyBuffer();
+    }
 }

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

@@ -18,7 +18,35 @@
 
 package com.github.retrooper.packetevents.protocol.attribute;
 
+import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.MathUtil;
 
 public interface Attribute extends MappedEntity {
+
+    @Override
+    default ResourceLocation getName() {
+        return this.getName(PacketEvents.getAPI().getServerManager().getVersion().toClientVersion());
+    }
+
+    ResourceLocation getName(ClientVersion version);
+
+    default double sanitizeValue(double value) {
+        return this.sanitizeValue(value, PacketEvents.getAPI().getServerManager().getVersion().toClientVersion());
+    }
+
+    default double sanitizeValue(double value, ClientVersion version) {
+        if (!Double.isNaN(value)) {
+            return MathUtil.clamp(value, this.getMinValue(), this.getMaxValue());
+        }
+        return this.getMinValue();
+    }
+
+    double getDefaultValue();
+
+    double getMinValue();
+
+    double getMaxValue();
 }

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

@@ -20,98 +20,337 @@ package com.github.retrooper.packetevents.protocol.attribute;
 
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.mappings.MappingHelper;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilder;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
+import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
+public final class Attributes {
 
-public class Attributes {
+    private static final VersionedRegistry<Attribute> REGISTRY = new VersionedRegistry<>("attribute");
 
-    private static final Map<String, Attribute> ATTRIBUTE_MAP = new HashMap<>();
-    private static final Map<Byte, Map<Integer, Attribute>> ATTRIBUTE_ID_MAP = new HashMap<>();
-    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("attribute/attribute_mappings");
-
-    public static Attribute define(String key) {
-        TypesBuilderData data = TYPES_BUILDER.define(key);
-        Attribute attribute = new Attribute() {
-            @Override
-            public ResourceLocation getName() {
-                return data.getName();
-            }
-
-            @Override
-            public int getId(ClientVersion version) {
-                return MappingHelper.getId(version, TYPES_BUILDER, data);
-            }
-
-            @Override
-            public boolean equals(Object obj) {
-                if (obj instanceof Attribute) {
-                    return this.getName().equals(((Attribute) obj).getName());
-                }
-                return false;
-            }
-        };
-
-        MappingHelper.registerMapping(TYPES_BUILDER, ATTRIBUTE_MAP, ATTRIBUTE_ID_MAP, attribute);
-        return attribute;
+    private Attributes() {
+    }
+
+    private static Attribute define(
+            String key, @Nullable String legacyPrefix,
+            double def, double min, double max
+    ) {
+        return REGISTRY.define(key, data ->
+                new StaticAttribute(data, legacyPrefix, def, min, max));
+    }
+
+    public static VersionedRegistry<Attribute> getRegistry() {
+        return REGISTRY;
     }
 
-    // with minecraft:key
     public static Attribute getByName(String name) {
-        return ATTRIBUTE_MAP.get(name);
+        // "remapping" to support < 1.21.2
+        String normedName = ResourceLocation.normString(name);
+        if (normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":generic.")
+                || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":player.")
+                || normedName.startsWith(ResourceLocation.VANILLA_NAMESPACE + ":zombie.")) {
+            normedName = normedName.substring(normedName.indexOf('.') + 1);
+        }
+        return REGISTRY.getByName(normedName);
     }
 
     public static Attribute getById(ClientVersion version, int id) {
-        int index = TYPES_BUILDER.getDataIndex(version);
-        Map<Integer, Attribute> idMap = ATTRIBUTE_ID_MAP.get((byte) index);
-        return idMap.get(id);
+        return REGISTRY.getById(version, id);
     }
 
-    public static final Attribute GENERIC_ARMOR = define("generic.armor");
-    public static final Attribute GENERIC_ARMOR_TOUGHNESS = define("generic.armor_toughness");
-    public static final Attribute GENERIC_ATTACK_DAMAGE = define("generic.attack_damage");
-    public static final Attribute GENERIC_ATTACK_KNOCKBACK = define("generic.attack_knockback");
-    public static final Attribute GENERIC_ATTACK_SPEED = define("generic.attack_speed");
-    public static final Attribute GENERIC_FLYING_SPEED = define("generic.flying_speed");
-    public static final Attribute GENERIC_FOLLOW_RANGE = define("generic.follow_range");
-    @ApiStatus.Obsolete // renamed in 1.20.5
-    public static final Attribute HORSE_JUMP_STRENGTH = define("horse.jump_strength");
-    public static final Attribute GENERIC_KNOCKBACK_RESISTANCE = define("generic.knockback_resistance");
-    public static final Attribute GENERIC_LUCK = define("generic.luck");
-    public static final Attribute GENERIC_MAX_HEALTH = define("generic.max_health");
-    public static final Attribute GENERIC_MOVEMENT_SPEED = define("generic.movement_speed");
-    public static final Attribute ZOMBIE_SPAWN_REINFORCEMENTS = define("zombie.spawn_reinforcements");
+    public static final Attribute ARMOR = define("armor",
+            "generic", 0d, 0d, 30d);
+    public static final Attribute ARMOR_TOUGHNESS = define("armor_toughness",
+            "generic", 0d, 0d, 20d);
+    public static final Attribute ATTACK_DAMAGE = define("attack_damage",
+            "generic", 2d, 0d, 2048d);
+    public static final Attribute ATTACK_KNOCKBACK = define("attack_knockback",
+            "generic", 0d, 0d, 5d);
+    public static final Attribute ATTACK_SPEED = define("attack_speed",
+            "generic", 4d, 0d, 1024d);
+    public static final Attribute FLYING_SPEED = define("flying_speed",
+            "generic", 0.4d, 0d, 1024d);
+    public static final Attribute FOLLOW_RANGE = define("follow_range",
+            "generic", 32d, 0d, 2048d);
+    public static final Attribute KNOCKBACK_RESISTANCE = define("knockback_resistance",
+            "generic", 0d, 0d, 1d);
+    public static final Attribute LUCK = define("luck",
+            "generic", 0d, -1024d, 1024d);
+    public static final Attribute MAX_HEALTH = define("max_health",
+            "generic", 20d, 1d, 1024d);
+    public static final Attribute MOVEMENT_SPEED = define("movement_speed",
+            "generic", 0.7d, 0d, 1024d);
+    public static final Attribute SPAWN_REINFORCEMENTS = define("spawn_reinforcements",
+            "zombie", 0d, 0d, 1d);
 
-    // Added in 1.20.2
-    public static final Attribute GENERIC_MAX_ABSORPTION = define("generic.max_absorption");
+    /**
+     * Added with 1.20.2
+     */
+    public static final Attribute MAX_ABSORPTION = define("max_absorption",
+            "generic", 0d, 0d, 2048d);
 
-    // Added in 1.20.5
-    public static final Attribute PLAYER_BLOCK_BREAK_SPEED = define("player.block_break_speed");
-    public static final Attribute PLAYER_BLOCK_INTERACTION_RANGE = define("player.block_interaction_range");
-    public static final Attribute PLAYER_ENTITY_INTERACTION_RANGE = define("player.entity_interaction_range");
-    public static final Attribute GENERIC_FALL_DAMAGE_MULTIPLIER = define("generic.fall_damage_multiplier");
-    public static final Attribute GENERIC_GRAVITY = define("generic.gravity");
-    public static final Attribute GENERIC_JUMP_STRENGTH = define("generic.jump_strength");
-    public static final Attribute GENERIC_SAFE_FALL_DISTANCE = define("generic.safe_fall_distance");
-    public static final Attribute GENERIC_SCALE = define("generic.scale");
-    public static final Attribute GENERIC_STEP_HEIGHT = define("generic.step_height");
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute BLOCK_BREAK_SPEED = define("block_break_speed",
+            "player", 1d, 0d, 1024d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute BLOCK_INTERACTION_RANGE = define("block_interaction_range",
+            "player", 4.5d, 0d, 64d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute ENTITY_INTERACTION_RANGE = define("entity_interaction_range",
+            "player", 3d, 0d, 64d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute FALL_DAMAGE_MULTIPLIER = define("fall_damage_multiplier",
+            "generic", 1d, 0d, 100d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute GRAVITY = define("gravity",
+            "generic", 0.08d, -1d, 1d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute JUMP_STRENGTH = define("jump_strength",
+            "generic", 0.42d, 0d, 32d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute SAFE_FALL_DISTANCE = define("safe_fall_distance",
+            "generic", 3d, 0d, 1024d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute SCALE = define("scale",
+            "generic", 1d, 1d / 16d, 16d);
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute STEP_HEIGHT = define("step_height",
+            "generic", 0.6d, 0d, 10d);
 
-    // Added in 1.21
-    public static final Attribute GENERIC_BURNING_TIME = define("generic.burning_time");
-    public static final Attribute GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE = define("generic.explosion_knockback_resistance");
-    public static final Attribute PLAYER_MINING_EFFICIENCY = define("player.mining_efficiency");
-    public static final Attribute GENERIC_MOVEMENT_EFFICIENCY = define("generic.movement_efficiency");
-    public static final Attribute GENERIC_OXYGEN_BONUS = define("generic.oxygen_bonus");
-    public static final Attribute PLAYER_SNEAKING_SPEED = define("player.sneaking_speed");
-    public static final Attribute PLAYER_SUBMERGED_MINING_SPEED = define("player.submerged_mining_speed");
-    public static final Attribute PLAYER_SWEEPING_DAMAGE_RATIO = define("player.sweeping_damage_ratio");
-    public static final Attribute GENERIC_WATER_MOVEMENT_EFFICIENCY = define("generic.water_movement_efficiency");
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute BURNING_TIME = define("burning_time",
+            "generic", 0d, 1d, 1024d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute EXPLOSION_KNOCKBACK_RESISTANCE = define("explosion_knockback_resistance",
+            "generic", 0d, 0d, 1d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute MINING_EFFICIENCY = define("mining_efficiency",
+            "player", 0d, 0d, 1024d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute MOVEMENT_EFFICIENCY = define("movement_efficiency",
+            "generic", 0d, 0d, 1d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute OXYGEN_BONUS = define("oxygen_bonus",
+            "generic", 0d, 0d, 1024d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SNEAKING_SPEED = define("sneaking_speed",
+            "player", 0.3d, 0d, 1d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SUBMERGED_MINING_SPEED = define("submerged_mining_speed",
+            "player", 0.2d, 0d, 20d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SWEEPING_DAMAGE_RATIO = define("sweeping_damage_ratio",
+            "player", 0d, 0d, 1d);
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute WATER_MOVEMENT_EFFICIENCY = define("water_movement_efficiency",
+            "generic", 0d, 0d, 1d);
+
+    /**
+     * Added with 1.21.2
+     */
+    public static final Attribute TEMPT_RANGE = define("tempt_range",
+            null, 10d, 0d, 2048d);
+
+    /**
+     * This attribute has been renamed in 1.20.5 to {@link #JUMP_STRENGTH}
+     */
+    @ApiStatus.Obsolete
+    public static final Attribute HORSE_JUMP_STRENGTH = define("horse.jump_strength",
+            null, 0.7d, 0d, 2d);
+
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ARMOR = ARMOR;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ARMOR_TOUGHNESS = ARMOR_TOUGHNESS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_DAMAGE = ATTACK_DAMAGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_KNOCKBACK = ATTACK_KNOCKBACK;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_SPEED = ATTACK_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FLYING_SPEED = FLYING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FOLLOW_RANGE = FOLLOW_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_KNOCKBACK_RESISTANCE = KNOCKBACK_RESISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_LUCK = LUCK;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MAX_HEALTH = MAX_HEALTH;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MOVEMENT_SPEED = MOVEMENT_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute ZOMBIE_SPAWN_REINFORCEMENTS = SPAWN_REINFORCEMENTS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MAX_ABSORPTION = MAX_ABSORPTION;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_BLOCK_BREAK_SPEED = BLOCK_BREAK_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_BLOCK_INTERACTION_RANGE = BLOCK_INTERACTION_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_ENTITY_INTERACTION_RANGE = ENTITY_INTERACTION_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FALL_DAMAGE_MULTIPLIER = FALL_DAMAGE_MULTIPLIER;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_GRAVITY = GRAVITY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_JUMP_STRENGTH = JUMP_STRENGTH;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_SAFE_FALL_DISTANCE = SAFE_FALL_DISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_SCALE = SCALE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_STEP_HEIGHT = STEP_HEIGHT;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_BURNING_TIME = BURNING_TIME;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE = EXPLOSION_KNOCKBACK_RESISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_MINING_EFFICIENCY = MINING_EFFICIENCY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MOVEMENT_EFFICIENCY = MOVEMENT_EFFICIENCY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_OXYGEN_BONUS = OXYGEN_BONUS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SNEAKING_SPEED = SNEAKING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SUBMERGED_MINING_SPEED = SUBMERGED_MINING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SWEEPING_DAMAGE_RATIO = SWEEPING_DAMAGE_RATIO;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_WATER_MOVEMENT_EFFICIENCY = WATER_MOVEMENT_EFFICIENCY;
 
     static {
-        TYPES_BUILDER.unloadFileMappings();
+        REGISTRY.unloadMappings();
     }
 }

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

@@ -0,0 +1,71 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.attribute;
+
+import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+public class StaticAttribute extends AbstractMappedEntity implements Attribute {
+
+    private final @Nullable ResourceLocation legacyName;
+    private final double defaultValue;
+    private final double minValue;
+    private final double maxValue;
+
+    @ApiStatus.Internal
+    public StaticAttribute(
+            @Nullable TypesBuilderData data, String legacyPrefix,
+            double defaultValue, double minValue, double maxValue
+    ) {
+        super(data);
+        this.defaultValue = defaultValue;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.legacyName = legacyPrefix == null || data == null ? null : new ResourceLocation(
+                data.getName().getNamespace(), legacyPrefix + "." + data.getName().getKey());
+    }
+
+    @Override
+    public ResourceLocation getName(ClientVersion version) {
+        if (this.data == null) {
+            throw new UnsupportedOperationException();
+        }
+        return version.isNewerThanOrEquals(ClientVersion.V_1_21_2) || this.legacyName == null
+                ? this.data.getName() : this.legacyName;
+    }
+
+    @Override
+    public double getDefaultValue() {
+        return this.defaultValue;
+    }
+
+    @Override
+    public double getMinValue() {
+        return this.minValue;
+    }
+
+    @Override
+    public double getMaxValue() {
+        return this.maxValue;
+    }
+}

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

@@ -20,6 +20,7 @@ package com.github.retrooper.packetevents.protocol.chat;
 
 import com.github.retrooper.packetevents.protocol.chat.message.ChatMessage_v1_19_1;
 import com.github.retrooper.packetevents.protocol.mapper.CopyableEntity;
+import com.github.retrooper.packetevents.protocol.mapper.DeepComparableEntity;
 import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
 import com.github.retrooper.packetevents.protocol.nbt.NBT;
 import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
@@ -37,7 +38,7 @@ import java.util.Objects;
 
 import static com.github.retrooper.packetevents.util.adventure.AdventureIndexUtil.indexValueOrThrow;
 
-public interface ChatType extends MappedEntity, CopyableEntity<ChatType> {
+public interface ChatType extends MappedEntity, CopyableEntity<ChatType>, DeepComparableEntity {
 
     @UnknownNullability("only nullable for 1.19")
     ChatTypeDecoration getChatDecoration();

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

@@ -90,7 +90,7 @@ public class ChatTypeDecoration {
         }
         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 class ChatTypeDecoration {
         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/ChatTypes.java

@@ -31,8 +31,7 @@ import static com.github.retrooper.packetevents.protocol.chat.ChatTypeDecoration
 
 public final class ChatTypes {
 
-    private static final VersionedRegistry<ChatType> REGISTRY = new VersionedRegistry<>(
-            "chat_type", "chat/chat_type_mappings");
+    private static final VersionedRegistry<ChatType> REGISTRY = new VersionedRegistry<>("chat_type");
 
     private ChatTypes() {
     }

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 class LastSeenMessages {
     }
 
     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 class LastSeenMessages {
         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

@@ -19,58 +19,54 @@
 package com.github.retrooper.packetevents.protocol.chat;
 
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
+import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
-import com.github.retrooper.packetevents.util.mappings.MappingHelper;
-import com.github.retrooper.packetevents.util.mappings.TypesBuilder;
 import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
+import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-public class Parsers {
+public final class Parsers {
 
-    private static final List<Parser> ALL_PARSERS = new ArrayList<>(); // support for old methods
-    private static final Map<String, Parser> PARSER_MAP = new HashMap<>();
-    private static final Map<Byte, Map<Integer, Parser>> PARSER_ID_MAP = new HashMap<>();
-    private static final TypesBuilder TYPES_BUILDER = new TypesBuilder("command/argument_parser_mappings");
+    private static final VersionedRegistry<Parser> REGISTRY = new VersionedRegistry<>("argument_type");
 
+    private Parsers() {
+    }
+
+    @ApiStatus.Internal
     public static Parser define(String key) {
         return define(key, null, null);
     }
 
+    @ApiStatus.Internal
     public static Parser define(String key, @Nullable Reader reader, @Nullable Writer writer) {
-        TypesBuilderData data = TYPES_BUILDER.define(key);
-        Parser parser = new Parser(data, reader, writer);
-
-        ALL_PARSERS.add(parser);
-        MappingHelper.registerMapping(TYPES_BUILDER, PARSER_MAP, PARSER_ID_MAP, parser);
-        return parser;
+        return REGISTRY.define(key, data -> new Parser(data, reader, writer));
     }
 
-    // with key
     public static Parser getByName(String name) {
-        return PARSER_MAP.get(name);
+        return REGISTRY.getByName(name);
     }
 
     public static Parser getById(ClientVersion version, int id) {
-        int index = TYPES_BUILDER.getDataIndex(version);
-        Map<Integer, Parser> idMap = PARSER_ID_MAP.get((byte) index);
-        return idMap.get(id);
+        return REGISTRY.getById(version, id);
     }
 
     public static List<Parser> getParsers() {
-        return Collections.unmodifiableList(ALL_PARSERS);
+        return new ArrayList<>(REGISTRY.getEntries());
+    }
+
+    public static VersionedRegistry<Parser> getRegistry() {
+        return REGISTRY;
     }
 
     public static final Parser BRIGADIER_BOOL = define("brigadier:bool", null, null);
@@ -152,8 +148,8 @@ public class Parsers {
     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);
@@ -214,8 +210,16 @@ public class Parsers {
     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 {
-        TYPES_BUILDER.unloadFileMappings();
+        REGISTRY.unloadMappings();
     }
 
     @FunctionalInterface
@@ -224,9 +228,8 @@ public class Parsers {
     @FunctionalInterface
     public interface Writer extends BiConsumer<PacketWrapper<?>, List<Object>> {}
 
-    public static final class Parser implements MappedEntity {
+    public static final class Parser extends AbstractMappedEntity {
 
-        private final TypesBuilderData data;
         private final Reader reader;
         private final Writer writer;
 
@@ -239,8 +242,9 @@ public class Parsers {
             );
         }
 
-        private Parser(TypesBuilderData data, @Nullable Reader reader, Writer writer) {
-            this.data = data;
+        @ApiStatus.Internal
+        public Parser(@Nullable TypesBuilderData data, @Nullable Reader reader, @Nullable Writer writer) {
+            super(data);
             this.reader = reader;
             this.writer = writer;
         }
@@ -257,24 +261,5 @@ public class Parsers {
                 this.writer.accept(wrapper, properties);
             }
         }
-
-        @Override
-        public ResourceLocation getName() {
-            return this.data.getName();
-        }
-
-        @Override
-        public int getId(ClientVersion version) {
-            int index = TYPES_BUILDER.getDataIndex(version);
-            return this.data.getData()[index];
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof Parser) {
-                return this.getName().equals(((Parser) obj).getName());
-            }
-            return false;
-        }
     }
 }

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

@@ -20,6 +20,7 @@ package com.github.retrooper.packetevents.protocol.chat;
 
 import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
 import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 
@@ -39,6 +40,7 @@ public class StaticChatType extends AbstractMappedEntity implements ChatType {
         this(null, chatDecoration, null, narrationDecoration, null);
     }
 
+    @ApiStatus.Internal
     public StaticChatType(
             @Nullable TypesBuilderData data,
             ChatTypeDecoration chatDecoration,
@@ -56,6 +58,7 @@ public class StaticChatType extends AbstractMappedEntity implements ChatType {
         this(null, chatDecoration, overlayDecoration, narrationDecoration, narrationPriority);
     }
 
+    @ApiStatus.Internal
     public StaticChatType(
             @Nullable TypesBuilderData data,
             @UnknownNullability("only nullable for 1.19") ChatTypeDecoration chatDecoration,
@@ -96,6 +99,7 @@ public class StaticChatType extends AbstractMappedEntity implements ChatType {
         return this.narrationPriority;
     }
 
+    @Override
     public boolean deepEquals(Object obj) {
         if (this == obj) return true;
         if (!(obj instanceof StaticChatType)) return false;
@@ -107,6 +111,7 @@ public class StaticChatType extends AbstractMappedEntity implements ChatType {
         return this.narrationPriority == that.narrationPriority;
     }
 
+    @Override
     public int deepHashCode() {
         return Objects.hash(super.hashCode(), this.chatDecoration, this.overlayDecoration, this.narrationDecoration, this.narrationPriority);
     }

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

@@ -10,7 +10,6 @@ import org.jetbrains.annotations.Nullable;
 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.writeVarInt(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/AlphaColor.java

@@ -0,0 +1,146 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.color;
+
+import com.github.retrooper.packetevents.protocol.nbt.NBT;
+import com.github.retrooper.packetevents.protocol.nbt.NBTFloat;
+import com.github.retrooper.packetevents.protocol.nbt.NBTInt;
+import com.github.retrooper.packetevents.protocol.nbt.NBTList;
+import com.github.retrooper.packetevents.protocol.nbt.NBTNumber;
+import com.github.retrooper.packetevents.protocol.nbt.NBTType;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.util.MathUtil;
+import org.jetbrains.annotations.Range;
+
+public final class AlphaColor extends Color {
+
+    public static final AlphaColor WHITE = new AlphaColor(0xFFFFFFFF);
+
+    private final int alpha;
+
+    public AlphaColor(
+            @Range(from = 0L, to = 255L) int red,
+            @Range(from = 0L, to = 255L) int green,
+            @Range(from = 0L, to = 255L) int blue
+    ) {
+        this(255, red, green, blue);
+    }
+
+    public AlphaColor(
+            @Range(from = 0L, to = 255L) int alpha,
+            @Range(from = 0L, to = 255L) int red,
+            @Range(from = 0L, to = 255L) int green,
+            @Range(from = 0L, to = 255L) int blue
+    ) {
+        super(red, green, blue);
+        this.alpha = alpha;
+    }
+
+    public AlphaColor(
+            @Range(from = 0L, to = 1L) float red,
+            @Range(from = 0L, to = 1L) float green,
+            @Range(from = 0L, to = 1L) float blue
+    ) {
+        this(1f, red, green, blue);
+    }
+
+    public AlphaColor(
+            @Range(from = 0L, to = 1L) float alpha,
+            @Range(from = 0L, to = 1L) float red,
+            @Range(from = 0L, to = 1L) float green,
+            @Range(from = 0L, to = 1L) float blue
+    ) {
+        super(red, green, blue);
+        this.alpha = MathUtil.floor(alpha * 255f);
+    }
+
+    public AlphaColor(int rgb) {
+        this((rgb >> 24) & BIT_MASK,
+                (rgb >> 16) & BIT_MASK,
+                (rgb >> 8) & BIT_MASK,
+                rgb & BIT_MASK);
+    }
+
+    public static AlphaColor decode(NBT nbt, ClientVersion version) {
+        if (nbt instanceof NBTNumber) {
+            return new AlphaColor(((NBTNumber) nbt).getAsInt());
+        }
+        NBTList<?> list = (NBTList<?>) nbt;
+        float red = ((NBTNumber) list.getTag(0)).getAsFloat();
+        float green = ((NBTNumber) list.getTag(1)).getAsFloat();
+        float blue = ((NBTNumber) list.getTag(2)).getAsFloat();
+        float alpha = ((NBTNumber) list.getTag(3)).getAsFloat();
+        return new AlphaColor(alpha, red, green, blue);
+    }
+
+    public static NBT encode(AlphaColor color, ClientVersion version) {
+        if (version.isNewerThanOrEquals(ClientVersion.V_1_21_2)) {
+            return new NBTInt(color.asRGB());
+        }
+        NBTList<NBTFloat> list = new NBTList<>(NBTType.FLOAT, 4);
+        list.addTag(new NBTFloat(color.red));
+        list.addTag(new NBTFloat(color.green));
+        list.addTag(new NBTFloat(color.blue));
+        list.addTag(new NBTFloat(color.alpha));
+        return list;
+    }
+
+    public AlphaColor withAlpha(@Range(from = 0L, to = 255L) int alpha) {
+        return new AlphaColor(alpha, this.red, this.green, this.blue);
+    }
+
+    @Override
+    public AlphaColor withRed(@Range(from = 0L, to = 255L) int red) {
+        return new AlphaColor(this.alpha, red, this.green, this.blue);
+    }
+
+    @Override
+    public AlphaColor withGreen(@Range(from = 0L, to = 255L) int green) {
+        return new AlphaColor(this.alpha, this.red, green, this.blue);
+    }
+
+    @Override
+    public AlphaColor withBlue(@Range(from = 0L, to = 255L) int blue) {
+        return new AlphaColor(this.alpha, this.red, this.green, blue);
+    }
+
+    @Override
+    public int asRGB() {
+        return (this.alpha << 24) | (this.red << 16) | (this.green << 8) | this.blue;
+    }
+
+    public @Range(from = 0L, to = 255L) int alpha() {
+        return this.alpha;
+    }
+
+    @Override
+    public @Range(from = 0L, to = 255L) int red() {
+        return this.red;
+    }
+
+    @Override
+    public @Range(from = 0L, to = 255L) int green() {
+        return this.green;
+    }
+
+    @Override
+    public @Range(from = 0L, to = 255L) int blue() {
+        return this.blue;
+    }
+}

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

@@ -18,15 +18,24 @@
 
 package com.github.retrooper.packetevents.protocol.color;
 
+import com.github.retrooper.packetevents.protocol.nbt.NBT;
+import com.github.retrooper.packetevents.protocol.nbt.NBTFloat;
+import com.github.retrooper.packetevents.protocol.nbt.NBTInt;
+import com.github.retrooper.packetevents.protocol.nbt.NBTList;
+import com.github.retrooper.packetevents.protocol.nbt.NBTNumber;
+import com.github.retrooper.packetevents.protocol.nbt.NBTType;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.util.MathUtil;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import net.kyori.adventure.util.RGBLike;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
 
-public final class Color implements RGBLike {
+public class Color implements RGBLike {
 
-    private static final int BIT_MASK = 0xFF;
+    protected static final int BIT_MASK = 0xFF;
 
-    private final int red, green, blue;
+    protected final int red, green, blue;
 
     public Color(@Range(from = 0L, to = 255L) int red, @Range(from = 0L, to = 255L) int green, @Range(from = 0L, to = 255L) int blue) {
         this.red = red;
@@ -34,10 +43,50 @@ public final class Color implements RGBLike {
         this.blue = blue;
     }
 
+    public Color(
+            @Range(from = 0L, to = 1L) float red,
+            @Range(from = 0L, to = 1L) float green,
+            @Range(from = 0L, to = 1L) float blue
+    ) {
+        this(MathUtil.floor(red * 255f),
+                MathUtil.floor(green * 255f),
+                MathUtil.floor(blue * 255f));
+    }
+
     public Color(int rgb) {
         this((rgb >> 16) & BIT_MASK, (rgb >> 8) & BIT_MASK, rgb & BIT_MASK);
     }
 
+    public static Color read(PacketWrapper<?> wrapper) {
+        return new Color(wrapper.readInt());
+    }
+
+    public static void write(PacketWrapper<?> wrapper, Color color) {
+        wrapper.writeInt(color.asRGB());
+    }
+
+    public static Color decode(NBT nbt, ClientVersion version) {
+        if (nbt instanceof NBTNumber) {
+            return new Color(((NBTNumber) nbt).getAsInt());
+        }
+        NBTList<?> list = (NBTList<?>) nbt;
+        float red = ((NBTNumber) list.getTag(0)).getAsFloat();
+        float green = ((NBTNumber) list.getTag(1)).getAsFloat();
+        float blue = ((NBTNumber) list.getTag(2)).getAsFloat();
+        return new Color(red, green, blue);
+    }
+
+    public static NBT encode(Color color, ClientVersion version) {
+        if (version.isNewerThanOrEquals(ClientVersion.V_1_21_2)) {
+            return new NBTInt(color.asRGB());
+        }
+        NBTList<NBTFloat> list = new NBTList<>(NBTType.FLOAT, 3);
+        list.addTag(new NBTFloat(color.red));
+        list.addTag(new NBTFloat(color.green));
+        list.addTag(new NBTFloat(color.blue));
+        return list;
+    }
+
     public @NotNull Color withRed(@Range(from = 0L, to = 255L) int red) {
         return new Color(red, green, blue);
     }
@@ -51,9 +100,7 @@ public final class Color implements RGBLike {
     }
 
     public int asRGB() {
-        int rgb = red;
-        rgb = (rgb << 8) + green;
-        return (rgb << 8) + blue;
+        return (this.red << 16) | (this.green << 8) | this.blue;
     }
 
     @Override
@@ -70,4 +117,4 @@ public final class Color implements RGBLike {
     public @Range(from = 0L, to = 255L) int blue() {
         return blue;
     }
-}
+}

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 enum DyeColor implements RGBLike {
     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;
     }

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

@@ -22,6 +22,9 @@ import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
 import com.github.retrooper.packetevents.protocol.nbt.NBT;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Function;
 
 public interface ComponentType<T> extends MappedEntity {
 
@@ -33,6 +36,9 @@ public interface ComponentType<T> extends MappedEntity {
 
     NBT encode(T value, ClientVersion version);
 
+    @ApiStatus.Internal
+    <Z> ComponentType<Z> legacyMap(Function<T, Z> mapper, Function<Z, T> unmapper);
+
     interface Decoder<T> {
 
         T decode(NBT nbt, ClientVersion version);

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

@@ -19,6 +19,30 @@
 package com.github.retrooper.packetevents.protocol.component;
 
 import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.protocol.component.builtin.AxolotlVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.CatCollarComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.CatVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.ChickenVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.CowVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.FoxVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.FrogVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.HorseVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.LlamaVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.MooshroomVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.PaintingVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.ParrotVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.PigVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.RabbitVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.SalmonSizeComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.SheepColorComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.ShulkerColorComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.TropicalFishBaseColorComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.TropicalFishPatternColorComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.TropicalFishPatternComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.VillagerVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.WolfCollarComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.WolfSoundVariantComponent;
+import com.github.retrooper.packetevents.protocol.component.builtin.WolfVariantComponent;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ArmorTrim;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.BannerLayers;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.BundleContents;
@@ -31,27 +55,48 @@ import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAdv
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAttributeModifiers;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBees;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlockStateProperties;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlocksAttacks;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBreakSound;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemConsumable;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemContainerContents;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemContainerLoot;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemCustomModelData;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDamageResistant;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDeathProtection;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemDyeColor;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantable;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantments;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEquippable;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemFireworks;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemInstrument;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemJukeboxPlayable;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLock;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLore;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemMapDecorations;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemMapPostProcessingState;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemModel;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemPotionContents;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemPotionDurationScale;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemProfile;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemProvidesBannerPatterns;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemProvidesTrimMaterial;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRarity;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRecipes;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRepairable;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemTool;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemTooltipDisplay;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemTooltipStyle;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemUnbreakable;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemUseCooldown;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemUseRemainder;
+import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemWeapon;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.LodestoneTracker;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.PotDecorations;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.SuspiciousStewEffects;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.WritableBookContent;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.WrittenBookContent;
 import com.github.retrooper.packetevents.protocol.item.instrument.Instrument;
+import com.github.retrooper.packetevents.protocol.mapper.MaybeMappedEntity;
 import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
@@ -73,8 +118,7 @@ import java.util.Collection;
  */
 public final class ComponentTypes {
 
-    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>(
-            "data_component_type", "item/item_component_mappings");
+    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>("data_component_type");
 
     private ComponentTypes() {
     }
@@ -111,8 +155,14 @@ public final class ComponentTypes {
             PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
     public static final ComponentType<Integer> DAMAGE = define("damage",
             PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
-    public static final ComponentType<Boolean> UNBREAKABLE = define("unbreakable",
-            PacketWrapper::readBoolean, PacketWrapper::writeBoolean);
+    public static final ComponentType<ItemUnbreakable> UNBREAKABLE_MODERN = define("unbreakable",
+            ItemUnbreakable::read, ItemUnbreakable::write);
+    /**
+     * Changed in 1.21.5
+     */
+    @Deprecated
+    public static final ComponentType<Boolean> UNBREAKABLE = UNBREAKABLE_MODERN.legacyMap(
+            ItemUnbreakable::isShowInTooltip, ItemUnbreakable::new);
     public static final ComponentType<Component> CUSTOM_NAME = define("custom_name",
             PacketWrapper::readComponent, PacketWrapper::writeComponent);
     public static final ComponentType<Component> ITEM_NAME = define("item_name",
@@ -129,10 +179,24 @@ public final class ComponentTypes {
             ItemAdventurePredicate::read, ItemAdventurePredicate::write);
     public static final ComponentType<ItemAttributeModifiers> ATTRIBUTE_MODIFIERS = define("attribute_modifiers",
             ItemAttributeModifiers::read, ItemAttributeModifiers::write);
-    public static final ComponentType<Integer> CUSTOM_MODEL_DATA = define("custom_model_data",
-            PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
+    public static final ComponentType<ItemCustomModelData> CUSTOM_MODEL_DATA_LISTS = define("custom_model_data",
+            ItemCustomModelData::read, ItemCustomModelData::write);
+    /**
+     * Rewritten in 1.21.4
+     */
+    @Deprecated
+    public static final ComponentType<Integer> CUSTOM_MODEL_DATA = CUSTOM_MODEL_DATA_LISTS.legacyMap(
+            ItemCustomModelData::getLegacyId, ItemCustomModelData::new);
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
     public static final ComponentType<Dummy> HIDE_ADDITIONAL_TOOLTIP = define("hide_additional_tooltip",
             Dummy::dummyRead, Dummy::dummyWrite);
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
     public static final ComponentType<Dummy> HIDE_TOOLTIP = define("hide_tooltip",
             Dummy::dummyRead, Dummy::dummyWrite);
     public static final ComponentType<Integer> REPAIR_COST = define("repair_cost",
@@ -145,6 +209,10 @@ public final class ComponentTypes {
             Dummy::dummyReadNbt, Dummy::dummyWriteNbt);
     public static final ComponentType<FoodProperties> FOOD = define("food",
             FoodProperties::read, FoodProperties::write);
+    /**
+     * Has been migrated to #DAMAGE_RESISTANT with 1.21.2.
+     */
+    @ApiStatus.Obsolete
     public static final ComponentType<Dummy> FIRE_RESISTANT = define("fire_resistant",
             Dummy::dummyRead, Dummy::dummyWrite);
     public static final ComponentType<ItemTool> TOOL = define("tool",
@@ -183,8 +251,12 @@ public final class ComponentTypes {
             PacketWrapper::readNBT, PacketWrapper::writeNBT);
     public static final ComponentType<NBTCompound> BLOCK_ENTITY_DATA = define("block_entity_data",
             PacketWrapper::readNBT, PacketWrapper::writeNBT);
-    public static final ComponentType<Instrument> INSTRUMENT = define("instrument",
-            Instrument::read, Instrument::write);
+    public static final ComponentType<ItemInstrument> ITEM_INSTRUMENT = define("instrument",
+            ItemInstrument::read, ItemInstrument::write);
+    @Deprecated
+    public static final ComponentType<Instrument> INSTRUMENT = ITEM_INSTRUMENT.legacyMap(
+            inst -> inst.getInstrument().getValue(),
+            inst -> new ItemInstrument(new MaybeMappedEntity<>(inst)));
     public static final ComponentType<Integer> OMINOUS_BOTTLE_AMPLIFIER = define("ominous_bottle_amplifier",
             PacketWrapper::readVarInt, PacketWrapper::writeVarInt);
     public static final ComponentType<ItemRecipes> RECIPES = define("recipes",
@@ -220,6 +292,186 @@ public final class ComponentTypes {
     public static final ComponentType<ItemJukeboxPlayable> JUKEBOX_PLAYABLE = define("jukebox_playable",
             ItemJukeboxPlayable::read, ItemJukeboxPlayable::write);
 
+    // added in 1.21.2
+    public static final ComponentType<ItemConsumable> CONSUMABLE = define("consumable",
+            ItemConsumable::read, ItemConsumable::write);
+    public static final ComponentType<ItemUseRemainder> USE_REMAINDER = define("use_remainder",
+            ItemUseRemainder::read, ItemUseRemainder::write);
+    public static final ComponentType<ItemUseCooldown> USE_COOLDOWN = define("use_cooldown",
+            ItemUseCooldown::read, ItemUseCooldown::write);
+    public static final ComponentType<ItemEnchantable> ENCHANTABLE = define("enchantable",
+            ItemEnchantable::read, ItemEnchantable::write);
+    public static final ComponentType<ItemRepairable> REPAIRABLE = define("repairable",
+            ItemRepairable::read, ItemRepairable::write);
+    public static final ComponentType<ItemModel> ITEM_MODEL = define("item_model",
+            ItemModel::read, ItemModel::write);
+    public static final ComponentType<ItemDamageResistant> DAMAGE_RESISTANT = define("damage_resistant",
+            ItemDamageResistant::read, ItemDamageResistant::write);
+    public static final ComponentType<ItemEquippable> EQUIPPABLE = define("equippable",
+            ItemEquippable::read, ItemEquippable::write);
+    public static final ComponentType<Dummy> GLIDER = define("glider",
+            Dummy::dummyRead, Dummy::dummyWrite);
+    public static final ComponentType<ItemDeathProtection> DEATH_PROTECTION = define("death_protection",
+            ItemDeathProtection::read, ItemDeathProtection::write);
+    public static final ComponentType<ItemTooltipStyle> TOOLTIP_STYLE = define("tooltip_style",
+            ItemTooltipStyle::read, ItemTooltipStyle::write);
+
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemTooltipDisplay> TOOLTIP_DISPLAY = define("tooltip_display",
+            ItemTooltipDisplay::read, ItemTooltipDisplay::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemWeapon> WEAPON = define("weapon",
+            ItemWeapon::read, ItemWeapon::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemBlocksAttacks> BLOCKS_ATTACKS = define("blocks_attacks",
+            ItemBlocksAttacks::read, ItemBlocksAttacks::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemPotionDurationScale> POTION_DURATION_SCALE = define("potion_duration_scale",
+            ItemPotionDurationScale::read, ItemPotionDurationScale::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemProvidesTrimMaterial> PROVIDES_TRIM_MATERIAL = define("provides_trim_material",
+            ItemProvidesTrimMaterial::read, ItemProvidesTrimMaterial::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemProvidesBannerPatterns> PROVIDES_BANNER_PATTERNS = define("provides_banner_patterns",
+            ItemProvidesBannerPatterns::read, ItemProvidesBannerPatterns::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ItemBreakSound> BREAK_SOUND = define("break_sound",
+            ItemBreakSound::read, ItemBreakSound::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<VillagerVariantComponent> VILLAGER_VARIANT = define("villager/variant",
+            VillagerVariantComponent::read, VillagerVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<WolfVariantComponent> WOLF_VARIANT = define("wolf/variant",
+            WolfVariantComponent::read, WolfVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<WolfSoundVariantComponent> WOLF_SOUND_VARIANT = define("wolf/sound_variant",
+            WolfSoundVariantComponent::read, WolfSoundVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<WolfCollarComponent> WOLF_COLLAR = define("wolf/collar",
+            WolfCollarComponent::read, WolfCollarComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<FoxVariantComponent> FOX_VARIANT = define("fox/variant",
+            FoxVariantComponent::read, FoxVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<SalmonSizeComponent> SALMON_SIZE = define("salmon/size",
+            SalmonSizeComponent::read, SalmonSizeComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ParrotVariantComponent> PARROT_VARIANT = define("parrot/variant",
+            ParrotVariantComponent::read, ParrotVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<TropicalFishPatternComponent> TROPICAL_FISH_PATTERN = define("tropical_fish/pattern",
+            TropicalFishPatternComponent::read, TropicalFishPatternComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<TropicalFishBaseColorComponent> TROPICAL_FISH_BASE_COLOR = define("tropical_fish/base_color",
+            TropicalFishBaseColorComponent::read, TropicalFishBaseColorComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<TropicalFishPatternColorComponent> TROPICAL_FISH_PATTERN_COLOR = define("tropical_fish/pattern_color",
+            TropicalFishPatternColorComponent::read, TropicalFishPatternColorComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<MooshroomVariantComponent> MOOSHROOM_VARIANT = define("mooshroom/variant",
+            MooshroomVariantComponent::read, MooshroomVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<RabbitVariantComponent> RABBIT_VARIANT = define("rabbit/variant",
+            RabbitVariantComponent::read, RabbitVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<PigVariantComponent> PIG_VARIANT = define("pig/variant",
+            PigVariantComponent::read, PigVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<CowVariantComponent> COW_VARIANT = define("cow/variant",
+            CowVariantComponent::read, CowVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ChickenVariantComponent> CHICKEN_VARIANT = define("chicken/variant",
+            ChickenVariantComponent::read, ChickenVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<FrogVariantComponent> FROG_VARIANT = define("frog/variant",
+            FrogVariantComponent::read, FrogVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<HorseVariantComponent> HORSE_VARIANT = define("horse/variant",
+            HorseVariantComponent::read, HorseVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<PaintingVariantComponent> PAINTING_VARIANT = define("painting/variant",
+            PaintingVariantComponent::read, PaintingVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<LlamaVariantComponent> LLAMA_VARIANT = define("llama/variant",
+            LlamaVariantComponent::read, LlamaVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<AxolotlVariantComponent> AXOLOTL_VARIANT = define("axolotl/variant",
+            AxolotlVariantComponent::read, AxolotlVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<CatVariantComponent> CAT_VARIANT = define("cat/variant",
+            CatVariantComponent::read, CatVariantComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<CatCollarComponent> CAT_COLLAR = define("cat/collar",
+            CatCollarComponent::read, CatCollarComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<SheepColorComponent> SHEEP_COLOR = define("sheep/color",
+            SheepColorComponent::read, SheepColorComponent::write);
+    /**
+     * Added with 1.21.5
+     */
+    public static final ComponentType<ShulkerColorComponent> SHULKER_COLOR = define("shulker/color",
+            ShulkerColorComponent::read, ShulkerColorComponent::write);
+
     /**
      * Returns an immutable view of the component types.
      *

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

@@ -32,8 +32,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public final class EnchantEffectComponentTypes {
 
-    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>(
-            "enchantment_effect_component_type", "enchantment/effect_component_type");
+    private static final VersionedRegistry<ComponentType<?>> REGISTRY = new VersionedRegistry<>("enchantment_effect_component_type");
 
     private EnchantEffectComponentTypes() {
     }

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

@@ -0,0 +1,57 @@
+/*
+ * 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.component;
+
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public final class HashedComponentPatchMap {
+
+    private final Map<ComponentType<?>, Integer> addedComponents;
+    private final Set<ComponentType<?>> removedComponents;
+
+    public HashedComponentPatchMap(Map<ComponentType<?>, Integer> addedComponents, Set<ComponentType<?>> removedComponents) {
+        this.addedComponents = addedComponents;
+        this.removedComponents = removedComponents;
+    }
+
+    public static HashedComponentPatchMap read(PacketWrapper<?> wrapper) {
+        Map<ComponentType<?>, Integer> addedComponents = wrapper.readMap(ew ->
+                ew.readMappedEntity(ComponentTypes.getRegistry()), PacketWrapper::readInt);
+        Set<ComponentType<?>> removedComponents = wrapper.readCollection(HashSet::new, ew ->
+                ew.readMappedEntity(ComponentTypes.getRegistry()));
+        return new HashedComponentPatchMap(addedComponents, removedComponents);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, HashedComponentPatchMap map) {
+        wrapper.writeMap(map.addedComponents, PacketWrapper::writeMappedEntity, PacketWrapper::writeInt);
+        wrapper.writeCollection(map.removedComponents, PacketWrapper::writeMappedEntity);
+    }
+
+    public Map<ComponentType<?>, Integer> getAddedComponents() {
+        return this.addedComponents;
+    }
+
+    public Set<ComponentType<?>> getRemovedComponents() {
+        return this.removedComponents;
+    }
+}

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

@@ -22,6 +22,7 @@ import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAtt
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemEnchantments;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemLore;
 import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemRarity;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
@@ -33,6 +34,8 @@ import java.util.Optional;
 public class StaticComponentMap implements IComponentMap {
 
     public static final StaticComponentMap EMPTY = new StaticComponentMap(Collections.emptyMap());
+
+    @ApiStatus.Obsolete
     public static final StaticComponentMap SHARED_ITEM_COMPONENTS = builder()
             .set(ComponentTypes.MAX_STACK_SIZE, 64)
             .set(ComponentTypes.LORE, ItemLore.EMPTY)
@@ -98,7 +101,7 @@ public class StaticComponentMap implements IComponentMap {
 
     @Override
     public String toString() {
-        return "StaticComponentMap{empty=" + this.empty + ", delegate=" + this.delegate + '}';
+        return "Components" + this.delegate;
     }
 
     public static class Builder {
@@ -112,6 +115,10 @@ public class StaticComponentMap implements IComponentMap {
             return new StaticComponentMap(this.map);
         }
 
+        public Builder setAll(StaticComponentMap.Builder map) {
+            return this.setAll(map.map);
+        }
+
         public Builder setAll(StaticComponentMap map) {
             return this.setAll(map.getDelegate());
         }

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

@@ -25,8 +25,11 @@ import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper.Reader;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper.Writer;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Function;
+
 public class StaticComponentType<T> extends AbstractMappedEntity implements ComponentType<T> {
 
     private final @Nullable Reader<T> reader;
@@ -34,6 +37,7 @@ public class StaticComponentType<T> extends AbstractMappedEntity implements Comp
     private final @Nullable Decoder<T> decoder;
     private final @Nullable Encoder<T> encoder;
 
+    @ApiStatus.Internal
     public StaticComponentType(
             @Nullable TypesBuilderData data,
             @Nullable Reader<T> reader,
@@ -42,6 +46,7 @@ public class StaticComponentType<T> extends AbstractMappedEntity implements Comp
         this(data, reader, writer, null, null);
     }
 
+    @ApiStatus.Internal
     public StaticComponentType(
             @Nullable TypesBuilderData data,
             @Nullable Decoder<T> decoder,
@@ -50,6 +55,7 @@ public class StaticComponentType<T> extends AbstractMappedEntity implements Comp
         this(data, null, null, decoder, encoder);
     }
 
+    @ApiStatus.Internal
     public StaticComponentType(
             @Nullable TypesBuilderData data,
             @Nullable Reader<T> reader,
@@ -91,4 +97,13 @@ public class StaticComponentType<T> extends AbstractMappedEntity implements Comp
         }
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public <Z> ComponentType<Z> legacyMap(Function<T, Z> mapper, Function<Z, T> unmapper) {
+        Reader<Z> reader = this.reader != null ? wrapper -> mapper.apply(this.reader.apply(wrapper)) : null;
+        Writer<Z> writer = this.writer != null ? (wrapper, value) -> this.writer.accept(wrapper, unmapper.apply(value)) : null;
+        Decoder<Z> decoder = this.decoder != null ? (nbt, version) -> mapper.apply(this.decoder.decode(nbt, version)) : null;
+        Encoder<Z> encoder = this.encoder != null ? (value, version) -> this.encoder.encode(unmapper.apply(value), version) : null;
+        return new StaticComponentType<>(this.data, reader, writer, decoder, encoder);
+    }
 }

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.axolotl.AxolotlVariant;
+import com.github.retrooper.packetevents.protocol.entity.axolotl.AxolotlVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class AxolotlVariantComponent {
+
+    private AxolotlVariant variant;
+
+    public AxolotlVariantComponent(AxolotlVariant variant) {
+        this.variant = variant;
+    }
+
+    public static AxolotlVariantComponent read(PacketWrapper<?> wrapper) {
+        AxolotlVariant type = wrapper.readMappedEntity(AxolotlVariants.getRegistry());
+        return new AxolotlVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, AxolotlVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public AxolotlVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(AxolotlVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof AxolotlVariantComponent)) return false;
+        AxolotlVariantComponent that = (AxolotlVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class CatCollarComponent {
+
+    private DyeColor color;
+
+    public CatCollarComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static CatCollarComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new CatCollarComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, CatCollarComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof CatCollarComponent)) return false;
+        CatCollarComponent that = (CatCollarComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.cat.CatVariant;
+import com.github.retrooper.packetevents.protocol.entity.cat.CatVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class CatVariantComponent {
+
+    private CatVariant variant;
+
+    public CatVariantComponent(CatVariant variant) {
+        this.variant = variant;
+    }
+
+    public static CatVariantComponent read(PacketWrapper<?> wrapper) {
+        CatVariant type = wrapper.readMappedEntity(CatVariants.getRegistry());
+        return new CatVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, CatVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public CatVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(CatVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof CatVariantComponent)) return false;
+        CatVariantComponent that = (CatVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,65 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.chicken.ChickenVariant;
+import com.github.retrooper.packetevents.protocol.entity.chicken.ChickenVariants;
+import com.github.retrooper.packetevents.protocol.mapper.MaybeMappedEntity;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ChickenVariantComponent {
+
+    private MaybeMappedEntity<ChickenVariant> variant;
+
+    public ChickenVariantComponent(MaybeMappedEntity<ChickenVariant> variant) {
+        this.variant = variant;
+    }
+
+    public static ChickenVariantComponent read(PacketWrapper<?> wrapper) {
+        MaybeMappedEntity<ChickenVariant> variant = MaybeMappedEntity.read(wrapper,
+                ChickenVariants.getRegistry(), ChickenVariant::read);
+        return new ChickenVariantComponent(variant);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ChickenVariantComponent component) {
+        MaybeMappedEntity.write(wrapper, component.variant, ChickenVariant::write);
+    }
+
+    public MaybeMappedEntity<ChickenVariant> getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(MaybeMappedEntity<ChickenVariant> variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ChickenVariantComponent)) return false;
+        ChickenVariantComponent that = (ChickenVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.cow.CowVariant;
+import com.github.retrooper.packetevents.protocol.entity.cow.CowVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class CowVariantComponent {
+
+    private CowVariant variant;
+
+    public CowVariantComponent(CowVariant variant) {
+        this.variant = variant;
+    }
+
+    public static CowVariantComponent read(PacketWrapper<?> wrapper) {
+        CowVariant type = wrapper.readMappedEntity(CowVariants.getRegistry());
+        return new CowVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, CowVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public CowVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(CowVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof CowVariantComponent)) return false;
+        CowVariantComponent that = (CowVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.fox.FoxVariant;
+import com.github.retrooper.packetevents.protocol.entity.fox.FoxVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class FoxVariantComponent {
+
+    private FoxVariant variant;
+
+    public FoxVariantComponent(FoxVariant variant) {
+        this.variant = variant;
+    }
+
+    public static FoxVariantComponent read(PacketWrapper<?> wrapper) {
+        FoxVariant type = wrapper.readMappedEntity(FoxVariants.getRegistry());
+        return new FoxVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, FoxVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public FoxVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(FoxVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof FoxVariantComponent)) return false;
+        FoxVariantComponent that = (FoxVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.frog.FrogVariant;
+import com.github.retrooper.packetevents.protocol.entity.frog.FrogVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class FrogVariantComponent {
+
+    private FrogVariant variant;
+
+    public FrogVariantComponent(FrogVariant variant) {
+        this.variant = variant;
+    }
+
+    public static FrogVariantComponent read(PacketWrapper<?> wrapper) {
+        FrogVariant variant = wrapper.readMappedEntity(FrogVariants.getRegistry());
+        return new FrogVariantComponent(variant);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, FrogVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public FrogVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(FrogVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof FrogVariantComponent)) return false;
+        FrogVariantComponent that = (FrogVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.horse.HorseVariant;
+import com.github.retrooper.packetevents.protocol.entity.horse.HorseVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class HorseVariantComponent {
+
+    private HorseVariant variant;
+
+    public HorseVariantComponent(HorseVariant variant) {
+        this.variant = variant;
+    }
+
+    public static HorseVariantComponent read(PacketWrapper<?> wrapper) {
+        HorseVariant variant = wrapper.readMappedEntity(HorseVariants.getRegistry());
+        return new HorseVariantComponent(variant);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, HorseVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public HorseVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(HorseVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof HorseVariantComponent)) return false;
+        HorseVariantComponent that = (HorseVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.llama.LlamaVariant;
+import com.github.retrooper.packetevents.protocol.entity.llama.LlamaVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class LlamaVariantComponent {
+
+    private LlamaVariant variant;
+
+    public LlamaVariantComponent(LlamaVariant variant) {
+        this.variant = variant;
+    }
+
+    public static LlamaVariantComponent read(PacketWrapper<?> wrapper) {
+        LlamaVariant type = wrapper.readMappedEntity(LlamaVariants.getRegistry());
+        return new LlamaVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, LlamaVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public LlamaVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(LlamaVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof LlamaVariantComponent)) return false;
+        LlamaVariantComponent that = (LlamaVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.mooshroom.MooshroomVariant;
+import com.github.retrooper.packetevents.protocol.entity.mooshroom.MooshroomVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class MooshroomVariantComponent {
+
+    private MooshroomVariant variant;
+
+    public MooshroomVariantComponent(MooshroomVariant variant) {
+        this.variant = variant;
+    }
+
+    public static MooshroomVariantComponent read(PacketWrapper<?> wrapper) {
+        MooshroomVariant type = wrapper.readMappedEntity(MooshroomVariants.getRegistry());
+        return new MooshroomVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, MooshroomVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public MooshroomVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(MooshroomVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof MooshroomVariantComponent)) return false;
+        MooshroomVariantComponent that = (MooshroomVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.world.painting.PaintingVariant;
+import com.github.retrooper.packetevents.protocol.world.painting.PaintingVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class PaintingVariantComponent {
+
+    private PaintingVariant variant;
+
+    public PaintingVariantComponent(PaintingVariant variant) {
+        this.variant = variant;
+    }
+
+    public static PaintingVariantComponent read(PacketWrapper<?> wrapper) {
+        PaintingVariant variant = wrapper.readMappedEntity(PaintingVariants.getRegistry());
+        return new PaintingVariantComponent(variant);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, PaintingVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public PaintingVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(PaintingVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof PaintingVariantComponent)) return false;
+        PaintingVariantComponent that = (PaintingVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.parrot.ParrotVariant;
+import com.github.retrooper.packetevents.protocol.entity.parrot.ParrotVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ParrotVariantComponent {
+
+    private ParrotVariant variant;
+
+    public ParrotVariantComponent(ParrotVariant variant) {
+        this.variant = variant;
+    }
+
+    public static ParrotVariantComponent read(PacketWrapper<?> wrapper) {
+        ParrotVariant type = wrapper.readMappedEntity(ParrotVariants.getRegistry());
+        return new ParrotVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ParrotVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public ParrotVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(ParrotVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ParrotVariantComponent)) return false;
+        ParrotVariantComponent that = (ParrotVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.pig.PigVariant;
+import com.github.retrooper.packetevents.protocol.entity.pig.PigVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class PigVariantComponent {
+
+    private PigVariant variant;
+
+    public PigVariantComponent(PigVariant variant) {
+        this.variant = variant;
+    }
+
+    public static PigVariantComponent read(PacketWrapper<?> wrapper) {
+        PigVariant type = wrapper.readMappedEntity(PigVariants.getRegistry());
+        return new PigVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, PigVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public PigVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(PigVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof PigVariantComponent)) return false;
+        PigVariantComponent that = (PigVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.rabbit.RabbitVariant;
+import com.github.retrooper.packetevents.protocol.entity.rabbit.RabbitVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class RabbitVariantComponent {
+
+    private RabbitVariant variant;
+
+    public RabbitVariantComponent(RabbitVariant variant) {
+        this.variant = variant;
+    }
+
+    public static RabbitVariantComponent read(PacketWrapper<?> wrapper) {
+        RabbitVariant type = wrapper.readMappedEntity(RabbitVariants.getRegistry());
+        return new RabbitVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, RabbitVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public RabbitVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(RabbitVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof RabbitVariantComponent)) return false;
+        RabbitVariantComponent that = (RabbitVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.salmon.SalmonVariant;
+import com.github.retrooper.packetevents.protocol.entity.salmon.SalmonVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class SalmonSizeComponent {
+
+    private SalmonVariant variant;
+
+    public SalmonSizeComponent(SalmonVariant variant) {
+        this.variant = variant;
+    }
+
+    public static SalmonSizeComponent read(PacketWrapper<?> wrapper) {
+        SalmonVariant type = wrapper.readMappedEntity(SalmonVariants.getRegistry());
+        return new SalmonSizeComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, SalmonSizeComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public SalmonVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(SalmonVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof SalmonSizeComponent)) return false;
+        SalmonSizeComponent that = (SalmonSizeComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class SheepColorComponent {
+
+    private DyeColor color;
+
+    public SheepColorComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static SheepColorComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new SheepColorComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, SheepColorComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof SheepColorComponent)) return false;
+        SheepColorComponent that = (SheepColorComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ShulkerColorComponent {
+
+    private DyeColor color;
+
+    public ShulkerColorComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static ShulkerColorComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new ShulkerColorComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ShulkerColorComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ShulkerColorComponent)) return false;
+        ShulkerColorComponent that = (ShulkerColorComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class TropicalFishBaseColorComponent {
+
+    private DyeColor color;
+
+    public TropicalFishBaseColorComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static TropicalFishBaseColorComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new TropicalFishBaseColorComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, TropicalFishBaseColorComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof TropicalFishBaseColorComponent)) return false;
+        TropicalFishBaseColorComponent that = (TropicalFishBaseColorComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class TropicalFishPatternColorComponent {
+
+    private DyeColor color;
+
+    public TropicalFishPatternColorComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static TropicalFishPatternColorComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new TropicalFishPatternColorComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, TropicalFishPatternColorComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof TropicalFishPatternColorComponent)) return false;
+        TropicalFishPatternColorComponent that = (TropicalFishPatternColorComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.tropicalfish.TropicalFishPattern;
+import com.github.retrooper.packetevents.protocol.entity.tropicalfish.TropicalFishPatterns;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class TropicalFishPatternComponent {
+
+    private TropicalFishPattern variant;
+
+    public TropicalFishPatternComponent(TropicalFishPattern variant) {
+        this.variant = variant;
+    }
+
+    public static TropicalFishPatternComponent read(PacketWrapper<?> wrapper) {
+        TropicalFishPattern type = wrapper.readMappedEntity(TropicalFishPatterns.getRegistry());
+        return new TropicalFishPatternComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, TropicalFishPatternComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public TropicalFishPattern getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(TropicalFishPattern variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof TropicalFishPatternComponent)) return false;
+        TropicalFishPatternComponent that = (TropicalFishPatternComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.villager.type.VillagerType;
+import com.github.retrooper.packetevents.protocol.entity.villager.type.VillagerTypes;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class VillagerVariantComponent {
+
+    private VillagerType villagerType;
+
+    public VillagerVariantComponent(VillagerType villagerType) {
+        this.villagerType = villagerType;
+    }
+
+    public static VillagerVariantComponent read(PacketWrapper<?> wrapper) {
+        VillagerType type = wrapper.readMappedEntity(VillagerTypes.getRegistry());
+        return new VillagerVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, VillagerVariantComponent component) {
+        wrapper.writeMappedEntity(component.villagerType);
+    }
+
+    public VillagerType getVillagerType() {
+        return this.villagerType;
+    }
+
+    public void setVillagerType(VillagerType villagerType) {
+        this.villagerType = villagerType;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof VillagerVariantComponent)) return false;
+        VillagerVariantComponent that = (VillagerVariantComponent) obj;
+        return this.villagerType.equals(that.villagerType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.villagerType);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.color.DyeColor;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class WolfCollarComponent {
+
+    private DyeColor color;
+
+    public WolfCollarComponent(DyeColor color) {
+        this.color = color;
+    }
+
+    public static WolfCollarComponent read(PacketWrapper<?> wrapper) {
+        DyeColor type = DyeColor.read(wrapper);
+        return new WolfCollarComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, WolfCollarComponent component) {
+        DyeColor.write(wrapper, component.color);
+    }
+
+    public DyeColor getDyeColor() {
+        return this.color;
+    }
+
+    public void setDyeColor(DyeColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WolfCollarComponent)) return false;
+        WolfCollarComponent that = (WolfCollarComponent) obj;
+        return this.color.equals(that.color);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.color);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.wolfvariant.WolfSoundVariant;
+import com.github.retrooper.packetevents.protocol.entity.wolfvariant.WolfSoundVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class WolfSoundVariantComponent {
+
+    private WolfSoundVariant soundVariant;
+
+    public WolfSoundVariantComponent(WolfSoundVariant soundVariant) {
+        this.soundVariant = soundVariant;
+    }
+
+    public static WolfSoundVariantComponent read(PacketWrapper<?> wrapper) {
+        WolfSoundVariant type = wrapper.readMappedEntity(WolfSoundVariants.getRegistry());
+        return new WolfSoundVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, WolfSoundVariantComponent component) {
+        wrapper.writeMappedEntity(component.soundVariant);
+    }
+
+    public WolfSoundVariant getSoundVariant() {
+        return this.soundVariant;
+    }
+
+    public void setSoundVariant(WolfSoundVariant soundVariant) {
+        this.soundVariant = soundVariant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WolfSoundVariantComponent)) return false;
+        WolfSoundVariantComponent that = (WolfSoundVariantComponent) obj;
+        return this.soundVariant.equals(that.soundVariant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.soundVariant);
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.component.builtin;
+
+import com.github.retrooper.packetevents.protocol.entity.wolfvariant.WolfVariant;
+import com.github.retrooper.packetevents.protocol.entity.wolfvariant.WolfVariants;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class WolfVariantComponent {
+
+    private WolfVariant variant;
+
+    public WolfVariantComponent(WolfVariant variant) {
+        this.variant = variant;
+    }
+
+    public static WolfVariantComponent read(PacketWrapper<?> wrapper) {
+        WolfVariant type = wrapper.readMappedEntity(WolfVariants.getRegistry());
+        return new WolfVariantComponent(type);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, WolfVariantComponent component) {
+        wrapper.writeMappedEntity(component.variant);
+    }
+
+    public WolfVariant getVariant() {
+        return this.variant;
+    }
+
+    public void setVariant(WolfVariant variant) {
+        this.variant = variant;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WolfVariantComponent)) return false;
+        WolfVariantComponent that = (WolfVariantComponent) obj;
+        return this.variant.equals(that.variant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.variant);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ArmorTrim.java

@@ -18,9 +18,11 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.item.trimmaterial.TrimMaterial;
 import com.github.retrooper.packetevents.protocol.item.trimpattern.TrimPattern;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Objects;
 
@@ -28,8 +30,20 @@ public class ArmorTrim {
 
     private TrimMaterial material;
     private TrimPattern pattern;
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ArmorTrim(TrimMaterial material, TrimPattern pattern) {
+        this(material, pattern, true);
+    }
+
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ArmorTrim(TrimMaterial material, TrimPattern pattern, boolean showInTooltip) {
         this.material = material;
         this.pattern = pattern;
@@ -39,14 +53,16 @@ public class ArmorTrim {
     public static ArmorTrim read(PacketWrapper<?> wrapper) {
         TrimMaterial material = TrimMaterial.read(wrapper);
         TrimPattern pattern = TrimPattern.read(wrapper);
-        boolean showInTooltip = wrapper.readBoolean();
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
         return new ArmorTrim(material, pattern, showInTooltip);
     }
 
     public static void write(PacketWrapper<?> wrapper, ArmorTrim trim) {
         TrimMaterial.write(wrapper, trim.material);
         TrimPattern.write(wrapper, trim.pattern);
-        wrapper.writeBoolean(trim.showInTooltip);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(trim.showInTooltip);
+        }
     }
 
     public TrimMaterial getMaterial() {
@@ -65,10 +81,18 @@ public class ArmorTrim {
         this.pattern = pattern;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/BannerLayers.java

@@ -81,13 +81,13 @@ public class BannerLayers {
         public static Layer read(PacketWrapper<?> wrapper) {
             BannerPattern pattern = wrapper.readMappedEntityOrDirect(
                     BannerPatterns.getRegistry(), BannerPattern::readDirect);
-            DyeColor color = wrapper.readEnum(DyeColor.values());
+            DyeColor color = DyeColor.read(wrapper);
             return new Layer(pattern, color);
         }
 
         public static void write(PacketWrapper<?> wrapper, Layer layer) {
             wrapper.writeMappedEntityOrDirect(layer.pattern, BannerPattern::writeDirect);
-            wrapper.writeEnum(layer.color);
+            DyeColor.write(wrapper, layer.color);
         }
 
         public BannerPattern getPattern() {

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/FoodProperties.java

@@ -22,8 +22,10 @@ import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.item.ItemStack;
 import com.github.retrooper.packetevents.protocol.potion.PotionEffect;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -36,6 +38,17 @@ public class FoodProperties {
     private List<PossibleEffect> effects;
     private @Nullable ItemStack usingConvertsTo;
 
+    public FoodProperties(
+            int nutrition, float saturation, boolean canAlwaysEat
+    ) {
+        this(nutrition, saturation, canAlwaysEat, 1.6f, Collections.emptyList());
+    }
+
+    /**
+     * <code>eatSeconds</code> and <code>effects</code>
+     * have been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public FoodProperties(
             int nutrition, float saturation, boolean canAlwaysEat,
             float eatSeconds, List<PossibleEffect> effects
@@ -43,6 +56,11 @@ public class FoodProperties {
         this(nutrition, saturation, canAlwaysEat, eatSeconds, effects, null);
     }
 
+    /**
+     * <code>eatSeconds</code>, <code>effects</code> and <code>usingConvertsTo</code>
+     * have been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public FoodProperties(
             int nutrition, float saturation, boolean canAlwaysEat, float eatSeconds,
             List<PossibleEffect> effects, @Nullable ItemStack usingConvertsTo
@@ -59,10 +77,13 @@ public class FoodProperties {
         int nutrition = wrapper.readVarInt();
         float saturation = wrapper.readFloat();
         boolean canAlwaysEat = wrapper.readBoolean();
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)) {
+            return new FoodProperties(nutrition, saturation, canAlwaysEat);
+        }
         float eatSeconds = wrapper.readFloat();
-        List<PossibleEffect> effects = wrapper.readList(PossibleEffect::read);
         ItemStack usingConvertsTo = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)
                 ? wrapper.readOptional(PacketWrapper::readItemStack) : null;
+        List<PossibleEffect> effects = wrapper.readList(PossibleEffect::read);
         return new FoodProperties(nutrition, saturation, canAlwaysEat, eatSeconds, effects, usingConvertsTo);
     }
 
@@ -70,10 +91,12 @@ public class FoodProperties {
         wrapper.writeVarInt(props.nutrition);
         wrapper.writeFloat(props.saturation);
         wrapper.writeBoolean(props.canAlwaysEat);
-        wrapper.writeFloat(props.eatSeconds);
-        wrapper.writeList(props.effects, PossibleEffect::write);
-        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
-            wrapper.writeOptional(props.usingConvertsTo, PacketWrapper::writeItemStack);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_2)) {
+            wrapper.writeFloat(props.eatSeconds);
+            if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
+                wrapper.writeOptional(props.usingConvertsTo, PacketWrapper::writeItemStack);
+            }
+            wrapper.writeList(props.effects, PossibleEffect::write);
         }
     }
 
@@ -101,30 +124,58 @@ public class FoodProperties {
         this.canAlwaysEat = canAlwaysEat;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public float getEatSeconds() {
         return this.eatSeconds;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public void setEatSeconds(float eatSeconds) {
         this.eatSeconds = eatSeconds;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public void addEffect(PossibleEffect effect) {
         this.effects.add(effect);
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public List<PossibleEffect> getEffects() {
         return this.effects;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public void setEffects(List<PossibleEffect> effects) {
         this.effects = effects;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public @Nullable ItemStack getUsingConvertsTo() {
         return this.usingConvertsTo;
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public void setUsingConvertsTo(@Nullable ItemStack usingConvertsTo) {
         this.usingConvertsTo = usingConvertsTo;
     }
@@ -147,6 +198,10 @@ public class FoodProperties {
         return Objects.hash(this.nutrition, this.saturation, this.canAlwaysEat, this.eatSeconds, this.effects, this.usingConvertsTo);
     }
 
+    /**
+     * Has been moved to {@link ItemConsumable} in 1.21.2
+     */
+    @ApiStatus.Obsolete
     public static class PossibleEffect {
 
         private PotionEffect effect;

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemAdventurePredicate.java

@@ -18,23 +18,37 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.component.predicates.ComponentMatchers;
 import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
 import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-// why do I have to implement this mess, I just want to deserialize items
 public class ItemAdventurePredicate {
 
     private List<BlockPredicate> predicates;
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ItemAdventurePredicate(List<BlockPredicate> predicates) {
+        this(predicates, true);
+    }
+
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ItemAdventurePredicate(List<BlockPredicate> predicates, boolean showInTooltip) {
         this.predicates = predicates;
         this.showInTooltip = showInTooltip;
@@ -42,13 +56,15 @@ public class ItemAdventurePredicate {
 
     public static ItemAdventurePredicate read(PacketWrapper<?> wrapper) {
         List<BlockPredicate> predicates = wrapper.readList(BlockPredicate::read);
-        boolean showInTooltip = wrapper.readBoolean();
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
         return new ItemAdventurePredicate(predicates, showInTooltip);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemAdventurePredicate predicate) {
         wrapper.writeList(predicate.predicates, BlockPredicate::write);
-        wrapper.writeBoolean(predicate.showInTooltip);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(predicate.showInTooltip);
+        }
     }
 
     public void addPredicate(BlockPredicate predicate) {
@@ -63,10 +79,18 @@ public class ItemAdventurePredicate {
         this.predicates = predicates;
     }
 
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }
@@ -90,15 +114,29 @@ public class ItemAdventurePredicate {
         private @Nullable MappedEntitySet<StateType.Mapped> blocks;
         private @Nullable List<PropertyMatcher> properties;
         private @Nullable NBTCompound nbt;
+        /**
+         * Added with 1.21.5
+         */
+        private ComponentMatchers matchers;
 
         public BlockPredicate(
                 @Nullable MappedEntitySet<StateType.Mapped> blocks,
                 @Nullable List<PropertyMatcher> properties,
                 @Nullable NBTCompound nbt
+        ) {
+            this(blocks, properties, nbt, new ComponentMatchers());
+        }
+
+        public BlockPredicate(
+                @Nullable MappedEntitySet<StateType.Mapped> blocks,
+                @Nullable List<PropertyMatcher> properties,
+                @Nullable NBTCompound nbt,
+                ComponentMatchers matchers
         ) {
             this.blocks = blocks;
             this.properties = properties;
             this.nbt = nbt;
+            this.matchers = matchers;
         }
 
         public static BlockPredicate read(PacketWrapper<?> wrapper) {
@@ -107,7 +145,9 @@ public class ItemAdventurePredicate {
             List<PropertyMatcher> properties = wrapper.readOptional(
                     ew -> wrapper.readList(PropertyMatcher::read));
             NBTCompound nbt = wrapper.readOptional(PacketWrapper::readNBT);
-            return new BlockPredicate(blocks, properties, nbt);
+            ComponentMatchers matchers = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)
+                    ? ComponentMatchers.read(wrapper) : new ComponentMatchers();
+            return new BlockPredicate(blocks, properties, nbt, matchers);
         }
 
         public static void write(PacketWrapper<?> wrapper, BlockPredicate predicate) {
@@ -115,6 +155,9 @@ public class ItemAdventurePredicate {
             wrapper.writeOptional(predicate.properties,
                     (ew, val) -> ew.writeList(val, PropertyMatcher::write));
             wrapper.writeOptional(predicate.nbt, PacketWrapper::writeNBT);
+            if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+                ComponentMatchers.write(wrapper, predicate.matchers);
+            }
         }
 
         public @Nullable MappedEntitySet<StateType.Mapped> getBlocks() {
@@ -148,6 +191,20 @@ public class ItemAdventurePredicate {
             this.nbt = nbt;
         }
 
+        /**
+         * Added with 1.21.5
+         */
+        public ComponentMatchers getMatchers() {
+            return this.matchers;
+        }
+
+        /**
+         * Added with 1.21.5
+         */
+        public void setMatchers(ComponentMatchers matchers) {
+            this.matchers = matchers;
+        }
+
         @Override
         public boolean equals(Object obj) {
             if (this == obj) return true;
@@ -155,12 +212,13 @@ public class ItemAdventurePredicate {
             BlockPredicate that = (BlockPredicate) obj;
             if (!Objects.equals(this.blocks, that.blocks)) return false;
             if (!Objects.equals(this.properties, that.properties)) return false;
-            return Objects.equals(this.nbt, that.nbt);
+            if (!Objects.equals(this.nbt, that.nbt)) return false;
+            return this.matchers.equals(that.matchers);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(this.blocks, this.properties, this.nbt);
+            return Objects.hash(this.blocks, this.properties, this.nbt, this.matchers);
         }
     }
 

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemAttributeModifiers.java

@@ -37,6 +37,11 @@ public class ItemAttributeModifiers {
 
     public static final ItemAttributeModifiers EMPTY = new ItemAttributeModifiers(
             Collections.emptyList(), true) {
+        @Override
+        public void setModifiers(List<ModifierEntry> modifiers) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void setShowInTooltip(boolean showInTooltip) {
             throw new UnsupportedOperationException();
@@ -44,8 +49,20 @@ public class ItemAttributeModifiers {
     };
 
     private List<ModifierEntry> modifiers;
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ItemAttributeModifiers(List<ModifierEntry> modifiers) {
+        this(modifiers, true);
+    }
+
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ItemAttributeModifiers(List<ModifierEntry> modifiers, boolean showInTooltip) {
         this.modifiers = modifiers;
         this.showInTooltip = showInTooltip;
@@ -53,13 +70,15 @@ public class ItemAttributeModifiers {
 
     public static ItemAttributeModifiers read(PacketWrapper<?> wrapper) {
         List<ModifierEntry> modifiers = wrapper.readList(ModifierEntry::read);
-        boolean showInTooltip = wrapper.readBoolean();
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
         return new ItemAttributeModifiers(modifiers, showInTooltip);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemAttributeModifiers modifiers) {
         wrapper.writeList(modifiers.modifiers, ModifierEntry::write);
-        wrapper.writeBoolean(modifiers.showInTooltip);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(modifiers.showInTooltip);
+        }
     }
 
     public void addModifier(ModifierEntry modifier) {
@@ -74,10 +93,18 @@ public class ItemAttributeModifiers {
         this.modifiers = modifiers;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }
@@ -294,7 +321,12 @@ public class ItemAttributeModifiers {
         CHEST("chest"),
         HEAD("head"),
         ARMOR("armor"),
-        BODY("body");
+        BODY("body"),
+        /**
+         * Added with 1.21.5
+         */
+        SADDLE("saddle"),
+        ;
 
         public static final Index<String, EquipmentSlotGroup> ID_INDEX = Index.create(
                 EquipmentSlotGroup.class, EquipmentSlotGroup::getId);

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemBlocksAttacks.java

@@ -0,0 +1,294 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
+import com.github.retrooper.packetevents.protocol.sound.Sound;
+import com.github.retrooper.packetevents.protocol.world.damagetype.DamageType;
+import com.github.retrooper.packetevents.protocol.world.damagetype.DamageTypes;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Objects;
+
+public class ItemBlocksAttacks {
+
+    private float blockDelaySeconds;
+    private float disableCooldownScale;
+    private List<DamageReduction> damageReductions;
+    private ItemDamageFunction itemDamage;
+    private @Nullable ResourceLocation bypassedBy;
+    private @Nullable Sound blockSound;
+    private @Nullable Sound disableSound;
+
+    public ItemBlocksAttacks(
+            float blockDelaySeconds, float disableCooldownScale, List<DamageReduction> damageReductions,
+            ItemDamageFunction itemDamage, @Nullable ResourceLocation bypassedBy,
+            @Nullable Sound blockSound, @Nullable Sound disableSound
+    ) {
+        this.blockDelaySeconds = blockDelaySeconds;
+        this.disableCooldownScale = disableCooldownScale;
+        this.damageReductions = damageReductions;
+        this.itemDamage = itemDamage;
+        this.bypassedBy = bypassedBy;
+        this.blockSound = blockSound;
+        this.disableSound = disableSound;
+    }
+
+    public static ItemBlocksAttacks read(PacketWrapper<?> wrapper) {
+        float blockDelaySeconds = wrapper.readFloat();
+        float disableCooldownScale = wrapper.readFloat();
+        List<DamageReduction> damageReductions = wrapper.readList(DamageReduction::read);
+        ItemDamageFunction itemDamage = ItemDamageFunction.read(wrapper);
+        ResourceLocation bypassedBy = wrapper.readOptional(PacketWrapper::readIdentifier);
+        Sound blockSound = wrapper.readOptional(Sound::read);
+        Sound disableSound = wrapper.readOptional(Sound::read);
+        return new ItemBlocksAttacks(
+                blockDelaySeconds, disableCooldownScale, damageReductions,
+                itemDamage, bypassedBy, blockSound, disableSound);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemBlocksAttacks attack) {
+        wrapper.writeFloat(attack.blockDelaySeconds);
+        wrapper.writeFloat(attack.disableCooldownScale);
+        wrapper.writeList(attack.damageReductions, DamageReduction::write);
+        ItemDamageFunction.write(wrapper, attack.itemDamage);
+        wrapper.writeOptional(attack.bypassedBy, PacketWrapper::writeIdentifier);
+        wrapper.writeOptional(attack.blockSound, Sound::write);
+        wrapper.writeOptional(attack.disableSound, Sound::write);
+    }
+
+    public float getBlockDelaySeconds() {
+        return this.blockDelaySeconds;
+    }
+
+    public void setBlockDelaySeconds(float blockDelaySeconds) {
+        this.blockDelaySeconds = blockDelaySeconds;
+    }
+
+    public float getDisableCooldownScale() {
+        return this.disableCooldownScale;
+    }
+
+    public void setDisableCooldownScale(float disableCooldownScale) {
+        this.disableCooldownScale = disableCooldownScale;
+    }
+
+    public List<DamageReduction> getDamageReductions() {
+        return this.damageReductions;
+    }
+
+    public void setDamageReductions(List<DamageReduction> damageReductions) {
+        this.damageReductions = damageReductions;
+    }
+
+    public ItemDamageFunction getItemDamage() {
+        return this.itemDamage;
+    }
+
+    public void setItemDamage(ItemDamageFunction itemDamage) {
+        this.itemDamage = itemDamage;
+    }
+
+    public @Nullable ResourceLocation getBypassedBy() {
+        return this.bypassedBy;
+    }
+
+    public void setBypassedBy(@Nullable ResourceLocation bypassedBy) {
+        this.bypassedBy = bypassedBy;
+    }
+
+    public @Nullable Sound getBlockSound() {
+        return this.blockSound;
+    }
+
+    public void setBlockSound(@Nullable Sound blockSound) {
+        this.blockSound = blockSound;
+    }
+
+    public @Nullable Sound getDisableSound() {
+        return this.disableSound;
+    }
+
+    public void setDisableSound(@Nullable Sound disableSound) {
+        this.disableSound = disableSound;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemBlocksAttacks)) return false;
+        ItemBlocksAttacks that = (ItemBlocksAttacks) obj;
+        if (Float.compare(that.blockDelaySeconds, this.blockDelaySeconds) != 0) return false;
+        if (Float.compare(that.disableCooldownScale, this.disableCooldownScale) != 0) return false;
+        if (!this.damageReductions.equals(that.damageReductions)) return false;
+        if (!this.itemDamage.equals(that.itemDamage)) return false;
+        if (!Objects.equals(this.bypassedBy, that.bypassedBy)) return false;
+        if (!Objects.equals(this.blockSound, that.blockSound)) return false;
+        return Objects.equals(this.disableSound, that.disableSound);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.blockDelaySeconds, this.disableCooldownScale, this.damageReductions, this.itemDamage, this.bypassedBy, this.blockSound, this.disableSound);
+    }
+
+    public static final class DamageReduction {
+
+        private float horizontalBlockingAngle;
+        private @Nullable MappedEntitySet<DamageType> type;
+        private float base;
+        private float factor;
+
+        public DamageReduction(float horizontalBlockingAngle, @Nullable MappedEntitySet<DamageType> type, float base, float factor) {
+            this.horizontalBlockingAngle = horizontalBlockingAngle;
+            this.type = type;
+            this.base = base;
+            this.factor = factor;
+        }
+
+        public static DamageReduction read(PacketWrapper<?> wrapper) {
+            float horizontalBlockingAngle = wrapper.readFloat();
+            MappedEntitySet<DamageType> type = wrapper.readOptional(ew ->
+                    MappedEntitySet.read(ew, DamageTypes.getRegistry()));
+            float base = wrapper.readFloat();
+            float factor = wrapper.readFloat();
+            return new DamageReduction(horizontalBlockingAngle, type, base, factor);
+        }
+
+        public static void write(PacketWrapper<?> wrapper, DamageReduction reduction) {
+            wrapper.writeFloat(reduction.horizontalBlockingAngle);
+            wrapper.writeOptional(reduction.type, MappedEntitySet::write);
+            wrapper.writeFloat(reduction.base);
+            wrapper.writeFloat(reduction.factor);
+        }
+
+        public float getHorizontalBlockingAngle() {
+            return this.horizontalBlockingAngle;
+        }
+
+        public void setHorizontalBlockingAngle(float horizontalBlockingAngle) {
+            this.horizontalBlockingAngle = horizontalBlockingAngle;
+        }
+
+        public @Nullable MappedEntitySet<DamageType> getType() {
+            return this.type;
+        }
+
+        public void setType(@Nullable MappedEntitySet<DamageType> type) {
+            this.type = type;
+        }
+
+        public float getBase() {
+            return this.base;
+        }
+
+        public void setBase(float base) {
+            this.base = base;
+        }
+
+        public float getFactor() {
+            return this.factor;
+        }
+
+        public void setFactor(float factor) {
+            this.factor = factor;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof DamageReduction)) return false;
+            DamageReduction that = (DamageReduction) obj;
+            if (Float.compare(that.horizontalBlockingAngle, this.horizontalBlockingAngle) != 0) return false;
+            if (Float.compare(that.base, this.base) != 0) return false;
+            if (Float.compare(that.factor, this.factor) != 0) return false;
+            return Objects.equals(this.type, that.type);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(this.horizontalBlockingAngle, this.type, this.base, this.factor);
+        }
+    }
+
+    public static final class ItemDamageFunction {
+
+        private float threshold;
+        private float base;
+        private float factor;
+
+        public ItemDamageFunction(float threshold, float base, float factor) {
+            this.threshold = threshold;
+            this.base = base;
+            this.factor = factor;
+        }
+
+        public static ItemDamageFunction read(PacketWrapper<?> wrapper) {
+            float threshold = wrapper.readFloat();
+            float base = wrapper.readFloat();
+            float factor = wrapper.readFloat();
+            return new ItemDamageFunction(threshold, base, factor);
+        }
+
+        public static void write(PacketWrapper<?> wrapper, ItemDamageFunction function) {
+            wrapper.writeFloat(function.threshold);
+            wrapper.writeFloat(function.base);
+            wrapper.writeFloat(function.factor);
+        }
+
+        public float getThreshold() {
+            return this.threshold;
+        }
+
+        public void setThreshold(float threshold) {
+            this.threshold = threshold;
+        }
+
+        public float getBase() {
+            return this.base;
+        }
+
+        public void setBase(float base) {
+            this.base = base;
+        }
+
+        public float getFactor() {
+            return this.factor;
+        }
+
+        public void setFactor(float factor) {
+            this.factor = factor;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof ItemDamageFunction)) return false;
+            ItemDamageFunction that = (ItemDamageFunction) obj;
+            if (Float.compare(that.threshold, this.threshold) != 0) return false;
+            if (Float.compare(that.base, this.base) != 0) return false;
+            return Float.compare(that.factor, this.factor) == 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(this.threshold, this.base, this.factor);
+        }
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemBreakSound.java

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.sound.Sound;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemBreakSound {
+
+    private Sound sound;
+
+    public ItemBreakSound(Sound sound) {
+        this.sound = sound;
+    }
+
+    public static ItemBreakSound read(PacketWrapper<?> wrapper) {
+        Sound sound = Sound.read(wrapper);
+        return new ItemBreakSound(sound);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemBreakSound sound) {
+        Sound.write(wrapper, sound.sound);
+    }
+
+    public Sound getSound() {
+        return this.sound;
+    }
+
+    public void setSound(Sound sound) {
+        this.sound = sound;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemBreakSound)) return false;
+        ItemBreakSound that = (ItemBreakSound) obj;
+        return this.sound.equals(that.sound);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.sound);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemConsumable.java

@@ -0,0 +1,144 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.consumables.ConsumeEffect;
+import com.github.retrooper.packetevents.protocol.sound.Sound;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.List;
+import java.util.Objects;
+
+public class ItemConsumable {
+
+    private float consumeSeconds;
+    private Animation animation;
+    private Sound sound;
+    private boolean consumeParticles;
+    private List<ConsumeEffect<?>> effects;
+
+    public ItemConsumable(
+            float consumeSeconds, Animation animation, Sound sound,
+            boolean consumeParticles, List<ConsumeEffect<?>> effects
+    ) {
+        this.consumeSeconds = consumeSeconds;
+        this.animation = animation;
+        this.sound = sound;
+        this.consumeParticles = consumeParticles;
+        this.effects = effects;
+    }
+
+    public static ItemConsumable read(PacketWrapper<?> wrapper) {
+        float consumeSeconds = wrapper.readFloat();
+        Animation animation = wrapper.readEnum(Animation.values());
+        Sound sound = Sound.read(wrapper);
+        boolean consumeParticles = wrapper.readBoolean();
+        List<ConsumeEffect<?>> effects = wrapper.readList(ConsumeEffect::readFull);
+        return new ItemConsumable(consumeSeconds, animation, sound, consumeParticles, effects);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemConsumable consumable) {
+        wrapper.writeFloat(consumable.consumeSeconds);
+        wrapper.writeEnum(consumable.animation);
+        Sound.write(wrapper, consumable.sound);
+        wrapper.writeBoolean(consumable.consumeParticles);
+        wrapper.writeList(consumable.effects, ConsumeEffect::writeFull);
+    }
+
+    public float getConsumeSeconds() {
+        return this.consumeSeconds;
+    }
+
+    public void setConsumeSeconds(float consumeSeconds) {
+        this.consumeSeconds = consumeSeconds;
+    }
+
+    public Animation getAnimation() {
+        return this.animation;
+    }
+
+    public void setAnimation(Animation animation) {
+        this.animation = animation;
+    }
+
+    public Sound getSound() {
+        return this.sound;
+    }
+
+    public void setSound(Sound sound) {
+        this.sound = sound;
+    }
+
+    public boolean isConsumeParticles() {
+        return this.consumeParticles;
+    }
+
+    public void setConsumeParticles(boolean consumeParticles) {
+        this.consumeParticles = consumeParticles;
+    }
+
+    public List<ConsumeEffect<?>> getEffects() {
+        return this.effects;
+    }
+
+    public void setEffects(List<ConsumeEffect<?>> effects) {
+        this.effects = effects;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemConsumable)) return false;
+        ItemConsumable that = (ItemConsumable) obj;
+        if (Float.compare(that.consumeSeconds, this.consumeSeconds) != 0) return false;
+        if (this.consumeParticles != that.consumeParticles) return false;
+        if (this.animation != that.animation) return false;
+        if (!this.sound.equals(that.sound)) return false;
+        return this.effects.equals(that.effects);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.consumeSeconds, this.animation, this.sound, this.consumeParticles, this.effects);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemConsumable{consumeSeconds=" + this.consumeSeconds + ", animation=" + this.animation + ", sound=" + this.sound + ", consumeParticles=" + this.consumeParticles + ", effects=" + this.effects + '}';
+    }
+
+    public enum Animation {
+
+        NONE,
+        EAT,
+        DRINK,
+        BLOCK,
+        BOW,
+        SPEAR,
+        CROSSBOW,
+        SPYGLASS,
+        TOOT_HORN,
+        BRUSH,
+        /**
+         * Added with 1.21.4
+         */
+        BUNDLE,
+        ;
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemCustomModelData.java

@@ -0,0 +1,134 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.color.Color;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Custom model data was completely rewritten with 1.21.4.
+ * <p>
+ * Before 1.21.4, this used to be a single integer.<br/>
+ * With 1.21.4, this is now a holder of many elements.
+ * <p>
+ * If possible, use {@link com.github.retrooper.packetevents.protocol.component.ComponentTypes#ITEM_MODEL}
+ * instead for specifying which model an item should have.
+ * <p>
+ * When working with legacy versions, the first element in the {@link #floats}
+ * will represent the legacy single integer, just like Mojang is handling this.
+ */
+public class ItemCustomModelData {
+
+    private List<Float> floats;
+    private List<Boolean> flags;
+    private List<String> strings;
+    private List<Color> colors;
+
+    public ItemCustomModelData(List<Float> floats, List<Boolean> flags, List<String> strings, List<Color> colors) {
+        this.floats = floats;
+        this.flags = flags;
+        this.strings = strings;
+        this.colors = colors;
+    }
+
+    public ItemCustomModelData(int legacyId) {
+        this.floats = new ArrayList<>(1);
+        this.flags = new ArrayList<>(0);
+        this.strings = new ArrayList<>(0);
+        this.colors = new ArrayList<>(0);
+        this.setLegacyId(legacyId);
+    }
+
+    public static ItemCustomModelData read(PacketWrapper<?> wrapper) {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_4)) {
+            return new ItemCustomModelData(
+                    wrapper.readList(PacketWrapper::readFloat),
+                    wrapper.readList(PacketWrapper::readBoolean),
+                    wrapper.readList(PacketWrapper::readString),
+                    wrapper.readList(Color::read));
+        } else {
+            return new ItemCustomModelData(wrapper.readVarInt());
+        }
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemCustomModelData data) {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_4)) {
+            wrapper.writeList(data.floats, PacketWrapper::writeFloat);
+            wrapper.writeList(data.flags, PacketWrapper::writeBoolean);
+            wrapper.writeList(data.strings, PacketWrapper::writeString);
+            wrapper.writeList(data.colors, Color::write);
+        } else {
+            wrapper.writeVarInt(data.getLegacyId());
+        }
+    }
+
+    public List<Float> getFloats() {
+        return this.floats;
+    }
+
+    public void setFloats(List<Float> floats) {
+        this.floats = floats;
+    }
+
+    public List<Boolean> getFlags() {
+        return this.flags;
+    }
+
+    public void setFlags(List<Boolean> flags) {
+        this.flags = flags;
+    }
+
+    public List<String> getStrings() {
+        return this.strings;
+    }
+
+    public void setStrings(List<String> strings) {
+        this.strings = strings;
+    }
+
+    public List<Color> getColors() {
+        return this.colors;
+    }
+
+    public void setColors(List<Color> colors) {
+        this.colors = colors;
+    }
+
+    @ApiStatus.Obsolete
+    public int getLegacyId() {
+        if (!this.floats.isEmpty()) {
+            return this.floats.get(0).intValue();
+        }
+        return 0;
+    }
+
+    @ApiStatus.Obsolete
+    public void setLegacyId(int legacyId) {
+        if (this.flags.isEmpty()) {
+            this.floats.add((float) legacyId);
+        } else {
+            this.floats.set(0, (float) legacyId);
+        }
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDamageResistant.java

@@ -0,0 +1,67 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemDamageResistant {
+
+    private ResourceLocation typesTagKey;
+
+    public ItemDamageResistant(ResourceLocation typesTagKey) {
+        this.typesTagKey = typesTagKey;
+    }
+
+    public static ItemDamageResistant read(PacketWrapper<?> wrapper) {
+        return new ItemDamageResistant(wrapper.readIdentifier());
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemDamageResistant resistant) {
+        wrapper.writeIdentifier(resistant.typesTagKey);
+    }
+
+    public ResourceLocation getTypesTagKey() {
+        return this.typesTagKey;
+    }
+
+    public void setTypesTagKey(ResourceLocation typesTagKey) {
+        this.typesTagKey = typesTagKey;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemDamageResistant)) return false;
+        ItemDamageResistant that = (ItemDamageResistant) obj;
+        return this.typesTagKey.equals(that.typesTagKey);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.typesTagKey);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemDamageResistant{typesTagKey=" + this.typesTagKey + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDeathProtection.java

@@ -0,0 +1,69 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.consumables.ConsumeEffect;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.List;
+import java.util.Objects;
+
+public class ItemDeathProtection {
+
+    private List<ConsumeEffect<?>> deathEffects;
+
+    public ItemDeathProtection(List<ConsumeEffect<?>> deathEffects) {
+        this.deathEffects = deathEffects;
+    }
+
+    public static ItemDeathProtection read(PacketWrapper<?> wrapper) {
+        List<ConsumeEffect<?>> deathEffects = wrapper.readList(ConsumeEffect::readFull);
+        return new ItemDeathProtection(deathEffects);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemDeathProtection deathProtection) {
+        wrapper.writeList(deathProtection.deathEffects, ConsumeEffect::writeFull);
+    }
+
+    public List<ConsumeEffect<?>> getDeathEffects() {
+        return this.deathEffects;
+    }
+
+    public void setDeathEffects(List<ConsumeEffect<?>> deathEffects) {
+        this.deathEffects = deathEffects;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemDeathProtection)) return false;
+        ItemDeathProtection that = (ItemDeathProtection) obj;
+        return this.deathEffects.equals(that.deathEffects);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.deathEffects);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemDeathProtection{deathEffects=" + this.deathEffects + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemDyeColor.java

@@ -18,15 +18,29 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Objects;
 
 public class ItemDyeColor {
 
     private int rgb;
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ItemDyeColor(int rgb) {
+        this(rgb, true);
+    }
+
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ItemDyeColor(int rgb, boolean showInTooltip) {
         this.rgb = rgb;
         this.showInTooltip = showInTooltip;
@@ -34,13 +48,15 @@ public class ItemDyeColor {
 
     public static ItemDyeColor read(PacketWrapper<?> wrapper) {
         int rgb = wrapper.readInt();
-        boolean showInTooltip = wrapper.readBoolean();
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
         return new ItemDyeColor(rgb, showInTooltip);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemDyeColor color) {
         wrapper.writeInt(color.rgb);
-        wrapper.writeBoolean(color.showInTooltip);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(color.showInTooltip);
+        }
     }
 
     public int getRgb() {
@@ -51,10 +67,18 @@ public class ItemDyeColor {
         this.rgb = rgb;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEnchantable.java

@@ -0,0 +1,67 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemEnchantable {
+
+    private int value;
+
+    public ItemEnchantable(int value) {
+        this.value = value;
+    }
+
+    public static ItemEnchantable read(PacketWrapper<?> wrapper) {
+        int value = wrapper.readVarInt();
+        return new ItemEnchantable(value);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemEnchantable enchantable) {
+        wrapper.writeVarInt(enchantable.value);
+    }
+
+    public int getValue() {
+        return this.value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemEnchantable)) return false;
+        ItemEnchantable that = (ItemEnchantable) obj;
+        return this.value == that.value;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.value);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemEnchantable{value=" + this.value + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEnchantments.java

@@ -18,10 +18,12 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentType;
 import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentTypes;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -32,6 +34,11 @@ public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Int
 
     public static final ItemEnchantments EMPTY = new ItemEnchantments(
             Collections.emptyMap(), true) {
+        @Override
+        public void setEnchantments(Map<EnchantmentType, Integer> enchantments) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void setShowInTooltip(boolean showInTooltip) {
             throw new UnsupportedOperationException();
@@ -39,8 +46,20 @@ public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Int
     };
 
     private Map<EnchantmentType, Integer> enchantments;
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ItemEnchantments(Map<EnchantmentType, Integer> enchantments) {
+        this(enchantments, true);
+    }
+
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ItemEnchantments(Map<EnchantmentType, Integer> enchantments, boolean showInTooltip) {
         this.enchantments = Collections.unmodifiableMap(enchantments);
         this.showInTooltip = showInTooltip;
@@ -51,7 +70,7 @@ public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Int
                 ew -> wrapper.readMappedEntity(EnchantmentTypes.getRegistry()),
                 PacketWrapper::readVarInt
         );
-        boolean showInTooltip = wrapper.readBoolean();
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
         return new ItemEnchantments(enchantments, showInTooltip);
     }
 
@@ -61,7 +80,9 @@ public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Int
                 (ew, enchantment) -> ew.writeVarInt(enchantment.getId(version)),
                 PacketWrapper::writeVarInt
         );
-        wrapper.writeBoolean(enchantments.isShowInTooltip());
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(enchantments.isShowInTooltip());
+        }
     }
 
     public int getEnchantmentLevel(EnchantmentType enchantment) {
@@ -92,10 +113,18 @@ public class ItemEnchantments implements Iterable<Map.Entry<EnchantmentType, Int
         this.enchantments = enchantments;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemEquippable.java

@@ -0,0 +1,225 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
+import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
+import com.github.retrooper.packetevents.protocol.player.EquipmentSlot;
+import com.github.retrooper.packetevents.protocol.sound.Sound;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class ItemEquippable {
+
+    private EquipmentSlot slot;
+    private Sound equipSound;
+    private @Nullable ResourceLocation assetId;
+    private @Nullable ResourceLocation cameraOverlay;
+    private @Nullable MappedEntitySet<EntityType> allowedEntities;
+    private boolean dispensable;
+    private boolean swappable;
+    private boolean damageOnHurt;
+    private boolean equipOnInteract;
+
+    @ApiStatus.Obsolete
+    public ItemEquippable(
+            EquipmentSlot slot,
+            Sound equipSound,
+            @Nullable ResourceLocation assetId,
+            @Nullable ResourceLocation cameraOverlay,
+            @Nullable MappedEntitySet<EntityType> allowedEntities,
+            boolean dispensable,
+            boolean swappable,
+            boolean damageOnHurt
+    ) {
+        this(slot, equipSound, assetId, cameraOverlay, allowedEntities,
+                dispensable, swappable, damageOnHurt, false);
+    }
+
+    public ItemEquippable(
+            EquipmentSlot slot,
+            Sound equipSound,
+            @Nullable ResourceLocation assetId,
+            @Nullable ResourceLocation cameraOverlay,
+            @Nullable MappedEntitySet<EntityType> allowedEntities,
+            boolean dispensable,
+            boolean swappable,
+            boolean damageOnHurt,
+            boolean equipOnInteract
+    ) {
+        this.slot = slot;
+        this.equipSound = equipSound;
+        this.assetId = assetId;
+        this.cameraOverlay = cameraOverlay;
+        this.allowedEntities = allowedEntities;
+        this.dispensable = dispensable;
+        this.swappable = swappable;
+        this.damageOnHurt = damageOnHurt;
+        this.equipOnInteract = equipOnInteract;
+    }
+
+    public static ItemEquippable read(PacketWrapper<?> wrapper) {
+        EquipmentSlot slot = wrapper.readEnum(EquipmentSlot.values());
+        Sound equipSound = Sound.read(wrapper);
+        ResourceLocation assetId = wrapper.readOptional(PacketWrapper::readIdentifier);
+        ResourceLocation cameraOverlay = wrapper.readOptional(PacketWrapper::readIdentifier);
+        MappedEntitySet<EntityType> allowedEntities = wrapper.readOptional(
+                ew -> MappedEntitySet.read(ew, EntityTypes::getById));
+        boolean dispensable = wrapper.readBoolean();
+        boolean swappable = wrapper.readBoolean();
+        boolean damageOnHurt = wrapper.readBoolean();
+        boolean equipOnInteract = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) && wrapper.readBoolean();
+        return new ItemEquippable(slot, equipSound, assetId,
+                cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemEquippable equippable) {
+        wrapper.writeEnum(equippable.slot);
+        Sound.write(wrapper, equippable.equipSound);
+        wrapper.writeOptional(equippable.assetId, PacketWrapper::writeIdentifier);
+        wrapper.writeOptional(equippable.cameraOverlay, PacketWrapper::writeIdentifier);
+        wrapper.writeOptional(equippable.allowedEntities, MappedEntitySet::write);
+        wrapper.writeBoolean(equippable.dispensable);
+        wrapper.writeBoolean(equippable.swappable);
+        wrapper.writeBoolean(equippable.damageOnHurt);
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(equippable.equipOnInteract);
+        }
+    }
+
+    public EquipmentSlot getSlot() {
+        return this.slot;
+    }
+
+    public void setSlot(EquipmentSlot slot) {
+        this.slot = slot;
+    }
+
+    public Sound getEquipSound() {
+        return this.equipSound;
+    }
+
+    public void setEquipSound(Sound equipSound) {
+        this.equipSound = equipSound;
+    }
+
+    public @Nullable ResourceLocation getAssetId() {
+        return this.assetId;
+    }
+
+    public void setAssetId(@Nullable ResourceLocation assetId) {
+        this.assetId = assetId;
+    }
+
+    public @Nullable ResourceLocation getCameraOverlay() {
+        return this.cameraOverlay;
+    }
+
+    public void setCameraOverlay(@Nullable ResourceLocation cameraOverlay) {
+        this.cameraOverlay = cameraOverlay;
+    }
+
+    public @Nullable MappedEntitySet<EntityType> getAllowedEntities() {
+        return this.allowedEntities;
+    }
+
+    public void setAllowedEntities(@Nullable MappedEntitySet<EntityType> allowedEntities) {
+        this.allowedEntities = allowedEntities;
+    }
+
+    public boolean isDispensable() {
+        return this.dispensable;
+    }
+
+    public void setDispensable(boolean dispensable) {
+        this.dispensable = dispensable;
+    }
+
+    public boolean isSwappable() {
+        return this.swappable;
+    }
+
+    public void setSwappable(boolean swappable) {
+        this.swappable = swappable;
+    }
+
+    public boolean isDamageOnHurt() {
+        return this.damageOnHurt;
+    }
+
+    public void setDamageOnHurt(boolean damageOnHurt) {
+        this.damageOnHurt = damageOnHurt;
+    }
+
+    /**
+     * Added with 1.21.5
+     */
+    public boolean isEquipOnInteract() {
+        return this.equipOnInteract;
+    }
+
+    /**
+     * Added with 1.21.5
+     */
+    public void setEquipOnInteract(boolean equipOnInteract) {
+        this.equipOnInteract = equipOnInteract;
+    }
+
+    @Deprecated
+    public @Nullable ResourceLocation getModel() {
+        return this.assetId;
+    }
+
+    @Deprecated
+    public void setModel(@Nullable ResourceLocation assetId) {
+        this.assetId = assetId;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemEquippable)) return false;
+        ItemEquippable that = (ItemEquippable) obj;
+        if (this.dispensable != that.dispensable) return false;
+        if (this.swappable != that.swappable) return false;
+        if (this.damageOnHurt != that.damageOnHurt) return false;
+        if (this.slot != that.slot) return false;
+        if (!Objects.equals(this.equipSound, that.equipSound)) return false;
+        if (!Objects.equals(this.assetId, that.assetId)) return false;
+        if (!Objects.equals(this.cameraOverlay, that.cameraOverlay)) return false;
+        if (!Objects.equals(this.allowedEntities, that.allowedEntities)) return false;
+        return Objects.equals(this.equipOnInteract, that.equipOnInteract);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.slot, this.equipSound, this.assetId, this.cameraOverlay, this.allowedEntities, this.dispensable, this.swappable, this.damageOnHurt, this.equipOnInteract);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemEquippable{slot=" + this.slot + ", equipSound=" + this.equipSound + ", assetId=" + this.assetId + ", cameraOverlay=" + this.cameraOverlay + ", allowedEntities=" + this.allowedEntities + ", dispensable=" + this.dispensable + ", swappable=" + this.swappable + ", damageOnHurt=" + this.damageOnHurt + ", equipOnInteract=" + this.equipOnInteract + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemInstrument.java

@@ -0,0 +1,74 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.item.instrument.Instrument;
+import com.github.retrooper.packetevents.protocol.item.instrument.Instruments;
+import com.github.retrooper.packetevents.protocol.mapper.MaybeMappedEntity;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemInstrument {
+
+    private MaybeMappedEntity<Instrument> instrument;
+
+    public ItemInstrument(MaybeMappedEntity<Instrument> instrument) {
+        this.instrument = instrument;
+    }
+
+    public static ItemInstrument read(PacketWrapper<?> wrapper) {
+        MaybeMappedEntity<Instrument> instrument;
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+            instrument = MaybeMappedEntity.read(wrapper, Instruments.getRegistry(), Instrument::read);
+        } else {
+            instrument = new MaybeMappedEntity<>(Instrument.read(wrapper));
+        }
+        return new ItemInstrument(instrument);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemInstrument instrument) {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+            MaybeMappedEntity.write(wrapper, instrument.instrument, Instrument::write);
+        } else {
+            Instrument.write(wrapper, instrument.instrument.getValueOrThrow());
+        }
+    }
+
+    public MaybeMappedEntity<Instrument> getInstrument() {
+        return this.instrument;
+    }
+
+    public void setInstrument(MaybeMappedEntity<Instrument> instrument) {
+        this.instrument = instrument;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemInstrument)) return false;
+        ItemInstrument that = (ItemInstrument) obj;
+        return this.instrument.equals(that.instrument);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.instrument);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemJukeboxPlayable.java

@@ -18,20 +18,35 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.item.jukebox.IJukeboxSong;
 import com.github.retrooper.packetevents.protocol.item.jukebox.JukeboxSong;
+import com.github.retrooper.packetevents.protocol.item.jukebox.JukeboxSongs;
+import com.github.retrooper.packetevents.protocol.mapper.MaybeMappedEntity;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
 public class ItemJukeboxPlayable {
 
-    private @Nullable IJukeboxSong song;
-    private @Nullable ResourceLocation songKey;
+    private MaybeMappedEntity<IJukeboxSong> song;
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     private boolean showInTooltip;
 
+    public ItemJukeboxPlayable(MaybeMappedEntity<IJukeboxSong> song) {
+        this(song, true);
+    }
+
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public ItemJukeboxPlayable(
             @Nullable JukeboxSong song,
             @Nullable ResourceLocation songKey,
@@ -40,85 +55,99 @@ public class ItemJukeboxPlayable {
         this((IJukeboxSong) song, songKey, showInTooltip);
     }
 
+    /**
+     * use {@link #ItemJukeboxPlayable(MaybeMappedEntity, boolean)}
+     */
+    @Deprecated
     public ItemJukeboxPlayable(
             @Nullable IJukeboxSong song,
             @Nullable ResourceLocation songKey,
             boolean showInTooltip
     ) {
-        if ((song == null) == (songKey == null)) {
-            throw new IllegalStateException("Illegal state of both song and "
-                    + "song key combined: " + song + " / " + songKey);
-        }
+        this(new MaybeMappedEntity<>(song, songKey), showInTooltip);
+    }
 
+    /**
+     * {@link #showInTooltip} has been removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
+    public ItemJukeboxPlayable(
+            MaybeMappedEntity<IJukeboxSong> song,
+            boolean showInTooltip
+    ) {
         this.song = song;
-        this.songKey = songKey;
         this.showInTooltip = showInTooltip;
     }
 
     public static ItemJukeboxPlayable read(PacketWrapper<?> wrapper) {
-        IJukeboxSong song;
-        ResourceLocation songKey;
-        if (wrapper.readBoolean()) {
-            song = IJukeboxSong.read(wrapper);
-            songKey = null;
-        } else {
-            song = null;
-            songKey = wrapper.readIdentifier();
-        }
-        boolean showInTooltip = wrapper.readBoolean();
-        return new ItemJukeboxPlayable(song, songKey, showInTooltip);
+        MaybeMappedEntity<IJukeboxSong> song = MaybeMappedEntity.read(wrapper, JukeboxSongs.getRegistry(), IJukeboxSong::read);
+        boolean showInTooltip = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5) || wrapper.readBoolean();
+        return new ItemJukeboxPlayable(song, showInTooltip);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemJukeboxPlayable jukeboxPlayable) {
-        if (jukeboxPlayable.song != null) {
-            wrapper.writeBoolean(true);
-            IJukeboxSong.write(wrapper, jukeboxPlayable.song);
-        } else {
-            assert jukeboxPlayable.songKey != null;
-            wrapper.writeBoolean(false);
-            wrapper.writeIdentifier(jukeboxPlayable.songKey);
+        MaybeMappedEntity.write(wrapper, jukeboxPlayable.song, IJukeboxSong::write);
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(jukeboxPlayable.showInTooltip);
         }
-        wrapper.writeBoolean(jukeboxPlayable.showInTooltip);
     }
 
-    public @Nullable IJukeboxSong getJukeboxSong() {
+    public MaybeMappedEntity<IJukeboxSong> getSongHolder() {
         return this.song;
     }
 
+    public void setSongHolder(MaybeMappedEntity<IJukeboxSong> songHolder) {
+        this.song = songHolder;
+    }
+
+    public @Nullable IJukeboxSong getJukeboxSong() {
+        return this.song.getValue();
+    }
+
+    public void setJukeboxSong(@Nullable IJukeboxSong song) {
+        this.song = new MaybeMappedEntity<>(song);
+    }
+
     public void setJukeboxSong(@Nullable JukeboxSong song) {
-        this.song = song;
-        this.songKey = null;
+        this.setJukeboxSong((IJukeboxSong) song);
     }
 
     @Deprecated
     public @Nullable JukeboxSong getSong() {
-        if (this.song == null) {
+        IJukeboxSong song = this.getJukeboxSong();
+        if (song == null) {
             return null;
-        } else if (this.song instanceof JukeboxSong) {
-            return (JukeboxSong) this.song;
+        } else if (song instanceof JukeboxSong) {
+            return (JukeboxSong) song;
         }
-        return (JukeboxSong) this.song.copy(null);
+        return (JukeboxSong) song.copy(null);
     }
 
     @Deprecated
     public void setSong(JukeboxSong song) {
-        this.song = song;
-        this.songKey = null;
+        this.setJukeboxSong((IJukeboxSong) song);
     }
 
     public @Nullable ResourceLocation getSongKey() {
-        return this.songKey;
+        return this.song.getName();
     }
 
     public void setSongKey(ResourceLocation songKey) {
-        this.song = null;
-        this.songKey = songKey;
+        this.song = new MaybeMappedEntity<>(songKey);
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public boolean isShowInTooltip() {
         return this.showInTooltip;
     }
 
+    /**
+     * Removed in 1.21.5
+     */
+    @ApiStatus.Obsolete
     public void setShowInTooltip(boolean showInTooltip) {
         this.showInTooltip = showInTooltip;
     }
@@ -130,11 +159,11 @@ public class ItemJukeboxPlayable {
         ItemJukeboxPlayable that = (ItemJukeboxPlayable) obj;
         if (this.showInTooltip != that.showInTooltip) return false;
         if (!Objects.equals(this.song, that.song)) return false;
-        return Objects.equals(this.songKey, that.songKey);
+        return Objects.equals(this.song, that.song);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.song, this.songKey, this.showInTooltip);
+        return Objects.hash(this.song, this.song, this.showInTooltip);
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemModel.java

@@ -0,0 +1,67 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemModel {
+
+    private ResourceLocation modelLocation;
+
+    public ItemModel(ResourceLocation modelLocation) {
+        this.modelLocation = modelLocation;
+    }
+
+    public static ItemModel read(PacketWrapper<?> wrapper) {
+        return new ItemModel(wrapper.readIdentifier());
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemModel model) {
+        wrapper.writeIdentifier(model.modelLocation);
+    }
+
+    public ResourceLocation getModelLocation() {
+        return this.modelLocation;
+    }
+
+    public void setModelLocation(ResourceLocation modelLocation) {
+        this.modelLocation = modelLocation;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemModel)) return false;
+        ItemModel itemModel = (ItemModel) obj;
+        return this.modelLocation.equals(itemModel.modelLocation);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.modelLocation);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemModel{modelLocation=" + this.modelLocation + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemPotionContents.java

@@ -18,6 +18,7 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.potion.Potion;
 import com.github.retrooper.packetevents.protocol.potion.PotionEffect;
 import com.github.retrooper.packetevents.protocol.potion.Potions;
@@ -32,28 +33,44 @@ public class ItemPotionContents {
     private @Nullable Potion potion;
     private @Nullable Integer customColor;
     private List<PotionEffect> customEffects;
+    private @Nullable String customName;
 
     public ItemPotionContents(
             @Nullable Potion potion,
             @Nullable Integer customColor,
             List<PotionEffect> customEffects
+    ) {
+        this(potion, customColor, customEffects, null);
+    }
+
+    public ItemPotionContents(
+            @Nullable Potion potion,
+            @Nullable Integer customColor,
+            List<PotionEffect> customEffects,
+            @Nullable String customName
     ) {
         this.potion = potion;
         this.customColor = customColor;
         this.customEffects = customEffects;
+        this.customName = customName;
     }
 
     public static ItemPotionContents read(PacketWrapper<?> wrapper) {
         Potion potionId = wrapper.readOptional(ew -> ew.readMappedEntity(Potions::getById));
         Integer customColor = wrapper.readOptional(PacketWrapper::readInt);
         List<PotionEffect> customEffects = wrapper.readList(PotionEffect::read);
-        return new ItemPotionContents(potionId, customColor, customEffects);
+        String customName = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)
+                ? wrapper.readOptional(PacketWrapper::readString) : null;
+        return new ItemPotionContents(potionId, customColor, customEffects, customName);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemPotionContents contents) {
         wrapper.writeOptional(contents.potion, PacketWrapper::writeMappedEntity);
         wrapper.writeOptional(contents.customColor, PacketWrapper::writeInt);
         wrapper.writeList(contents.customEffects, PotionEffect::write);
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)) {
+            wrapper.writeOptional(contents.customName, PacketWrapper::writeString);
+        }
     }
 
     public @Nullable Potion getPotion() {
@@ -84,6 +101,14 @@ public class ItemPotionContents {
         this.customEffects = customEffects;
     }
 
+    public @Nullable String getCustomName() {
+        return this.customName;
+    }
+
+    public void setCustomName(@Nullable String customName) {
+        this.customName = customName;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
@@ -91,11 +116,12 @@ public class ItemPotionContents {
         ItemPotionContents that = (ItemPotionContents) obj;
         if (!Objects.equals(this.potion, that.potion)) return false;
         if (!Objects.equals(this.customColor, that.customColor)) return false;
-        return this.customEffects.equals(that.customEffects);
+        if (!this.customEffects.equals(that.customEffects)) return false;
+        return Objects.equals(this.customName, that.customName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.potion, this.customColor, this.customEffects);
+        return Objects.hash(this.potion, this.customColor, this.customEffects, this.customName);
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemPotionDurationScale.java

@@ -0,0 +1,61 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemPotionDurationScale {
+
+    private float scale;
+
+    public ItemPotionDurationScale(float scale) {
+        this.scale = scale;
+    }
+
+    public static ItemPotionDurationScale read(PacketWrapper<?> wrapper) {
+        float scale = wrapper.readFloat();
+        return new ItemPotionDurationScale(scale);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemPotionDurationScale scale) {
+        wrapper.writeFloat(scale.scale);
+    }
+
+    public float getScale() {
+        return this.scale;
+    }
+
+    public void setScale(float scale) {
+        this.scale = scale;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemPotionDurationScale)) return false;
+        ItemPotionDurationScale that = (ItemPotionDurationScale) obj;
+        return Float.compare(that.scale, this.scale) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.scale);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemProvidesBannerPatterns.java

@@ -0,0 +1,62 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemProvidesBannerPatterns {
+
+    private ResourceLocation tagKey;
+
+    public ItemProvidesBannerPatterns(ResourceLocation tagKey) {
+        this.tagKey = tagKey;
+    }
+
+    public static ItemProvidesBannerPatterns read(PacketWrapper<?> wrapper) {
+        ResourceLocation tagKey = wrapper.readIdentifier();
+        return new ItemProvidesBannerPatterns(tagKey);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemProvidesBannerPatterns patterns) {
+        wrapper.writeIdentifier(patterns.tagKey);
+    }
+
+    public ResourceLocation getTagKey() {
+        return this.tagKey;
+    }
+
+    public void setTagKey(ResourceLocation tagKey) {
+        this.tagKey = tagKey;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemProvidesBannerPatterns)) return false;
+        ItemProvidesBannerPatterns that = (ItemProvidesBannerPatterns) obj;
+        return this.tagKey.equals(that.tagKey);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.tagKey);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemProvidesTrimMaterial.java

@@ -0,0 +1,64 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.trimmaterial.TrimMaterial;
+import com.github.retrooper.packetevents.protocol.item.trimmaterial.TrimMaterials;
+import com.github.retrooper.packetevents.protocol.mapper.MaybeMappedEntity;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemProvidesTrimMaterial {
+
+    private MaybeMappedEntity<TrimMaterial> material;
+
+    public ItemProvidesTrimMaterial(MaybeMappedEntity<TrimMaterial> material) {
+        this.material = material;
+    }
+
+    public static ItemProvidesTrimMaterial read(PacketWrapper<?> wrapper) {
+        MaybeMappedEntity<TrimMaterial> material = MaybeMappedEntity.read(wrapper, TrimMaterials.getRegistry(), TrimMaterial::read);
+        return new ItemProvidesTrimMaterial(material);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemProvidesTrimMaterial material) {
+        MaybeMappedEntity.write(wrapper, material.material, TrimMaterial::write);
+    }
+
+    public MaybeMappedEntity<TrimMaterial> getMaterial() {
+        return this.material;
+    }
+
+    public void setMaterial(MaybeMappedEntity<TrimMaterial> material) {
+        this.material = material;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemProvidesTrimMaterial)) return false;
+        ItemProvidesTrimMaterial that = (ItemProvidesTrimMaterial) obj;
+        return this.material.equals(that.material);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.material);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemRecipes.java

@@ -18,9 +18,12 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.protocol.nbt.NBTList;
+import com.github.retrooper.packetevents.protocol.nbt.NBTString;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -33,12 +36,21 @@ public class ItemRecipes {
     }
 
     public static ItemRecipes read(PacketWrapper<?> wrapper) {
-        List<ResourceLocation> recipes = wrapper.readList(PacketWrapper::readIdentifier);
-        return new ItemRecipes(recipes);
+        NBTList<?> recipes = (NBTList<?>) wrapper.readNBTRaw();
+        List<ResourceLocation> recipeKeys = new ArrayList<>(recipes.size());
+        for (int i = 0; i < recipes.size(); i++) {
+            NBTString tag = (NBTString) recipes.getTag(i);
+            recipeKeys.add(new ResourceLocation(tag.getValue()));
+        }
+        return new ItemRecipes(recipeKeys);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemRecipes recipes) {
-        wrapper.writeList(recipes.recipes, PacketWrapper::writeIdentifier);
+        NBTList<NBTString> recipesTag = NBTList.createStringList();
+        for (ResourceLocation recipeKey : recipes.recipes) {
+            recipesTag.addTag(new NBTString(recipeKey.toString()));
+        }
+        wrapper.writeNBTRaw(recipesTag);
     }
 
     public void addRecipe(ResourceLocation recipeKey) {

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemRepairable.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.type.ItemType;
+import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemRepairable {
+
+    private MappedEntitySet<ItemType> items;
+
+    public ItemRepairable(MappedEntitySet<ItemType> items) {
+        this.items = items;
+    }
+
+    public static ItemRepairable read(PacketWrapper<?> wrapper) {
+        MappedEntitySet<ItemType> items = MappedEntitySet.read(wrapper, ItemTypes.getRegistry());
+        return new ItemRepairable(items);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemRepairable repairable) {
+        MappedEntitySet.write(wrapper, repairable.items);
+    }
+
+    public MappedEntitySet<ItemType> getItems() {
+        return this.items;
+    }
+
+    public void setItems(MappedEntitySet<ItemType> items) {
+        this.items = items;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemRepairable)) return false;
+        ItemRepairable that = (ItemRepairable) obj;
+        return this.items.equals(that.items);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.items);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemRepairable{items=" + this.items + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemTool.java

@@ -18,6 +18,7 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
@@ -32,24 +33,37 @@ public class ItemTool {
     private List<Rule> rules;
     private float defaultMiningSpeed;
     private int damagePerBlock;
+    /**
+     * Added with 1.21.5
+     */
+    private boolean canDestroyBlocksInCreative;
 
     public ItemTool(List<Rule> rules, float defaultMiningSpeed, int damagePerBlock) {
+        this(rules, defaultMiningSpeed, damagePerBlock, true);
+    }
+
+    public ItemTool(List<Rule> rules, float defaultMiningSpeed, int damagePerBlock, boolean canDestroyBlocksInCreative) {
         this.rules = rules;
         this.defaultMiningSpeed = defaultMiningSpeed;
         this.damagePerBlock = damagePerBlock;
+        this.canDestroyBlocksInCreative = canDestroyBlocksInCreative;
     }
 
     public static ItemTool read(PacketWrapper<?> wrapper) {
         List<Rule> rules = wrapper.readList(Rule::read);
         float defaultMiningSpeed = wrapper.readFloat();
         int damagePerBlock = wrapper.readVarInt();
-        return new ItemTool(rules, defaultMiningSpeed, damagePerBlock);
+        boolean canDestroyBlocksInCreative = wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5) || wrapper.readBoolean();
+        return new ItemTool(rules, defaultMiningSpeed, damagePerBlock, canDestroyBlocksInCreative);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemTool tool) {
         wrapper.writeList(tool.rules, Rule::write);
         wrapper.writeFloat(tool.defaultMiningSpeed);
         wrapper.writeVarInt(tool.damagePerBlock);
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(tool.canDestroyBlocksInCreative);
+        }
     }
 
     public void addRule(Rule rule) {
@@ -80,6 +94,20 @@ public class ItemTool {
         this.damagePerBlock = damagePerBlock;
     }
 
+    /**
+     * Added with 1.21.5
+     */
+    public boolean isCanDestroyBlocksInCreative() {
+        return this.canDestroyBlocksInCreative;
+    }
+
+    /**
+     * Added with 1.21.5
+     */
+    public void setCanDestroyBlocksInCreative(boolean canDestroyBlocksInCreative) {
+        this.canDestroyBlocksInCreative = canDestroyBlocksInCreative;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
@@ -87,12 +115,13 @@ public class ItemTool {
         ItemTool itemTool = (ItemTool) obj;
         if (Float.compare(itemTool.defaultMiningSpeed, this.defaultMiningSpeed) != 0) return false;
         if (this.damagePerBlock != itemTool.damagePerBlock) return false;
-        return this.rules.equals(itemTool.rules);
+        if (!this.rules.equals(itemTool.rules)) return false;
+        return this.canDestroyBlocksInCreative == itemTool.canDestroyBlocksInCreative;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.rules, this.defaultMiningSpeed, this.damagePerBlock);
+        return Objects.hash(this.rules, this.defaultMiningSpeed, this.damagePerBlock, this.canDestroyBlocksInCreative);
     }
 
     public static class Rule {

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemTooltipDisplay.java

@@ -0,0 +1,79 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.component.ComponentType;
+import com.github.retrooper.packetevents.protocol.component.ComponentTypes;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+
+public class ItemTooltipDisplay {
+
+    private boolean hideTooltip;
+    private Set<ComponentType<?>> hiddenComponents;
+
+    public ItemTooltipDisplay(boolean hideTooltip, Set<ComponentType<?>> hiddenComponents) {
+        this.hideTooltip = hideTooltip;
+        this.hiddenComponents = hiddenComponents;
+    }
+
+    public static ItemTooltipDisplay read(PacketWrapper<?> wrapper) {
+        boolean hideTooltip = wrapper.readBoolean();
+        Set<ComponentType<?>> hiddenComponents = wrapper.readCollection(LinkedHashSet::new,
+                ew -> ew.readMappedEntity(ComponentTypes.getRegistry()));
+        return new ItemTooltipDisplay(hideTooltip, hiddenComponents);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemTooltipDisplay tooltipDisplay) {
+        wrapper.writeBoolean(tooltipDisplay.hideTooltip);
+        wrapper.writeCollection(tooltipDisplay.hiddenComponents, PacketWrapper::writeMappedEntity);
+    }
+
+    public boolean isHideTooltip() {
+        return this.hideTooltip;
+    }
+
+    public void setHideTooltip(boolean hideTooltip) {
+        this.hideTooltip = hideTooltip;
+    }
+
+    public Set<ComponentType<?>> getHiddenComponents() {
+        return this.hiddenComponents;
+    }
+
+    public void setHiddenComponents(Set<ComponentType<?>> hiddenComponents) {
+        this.hiddenComponents = hiddenComponents;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemTooltipDisplay)) return false;
+        ItemTooltipDisplay that = (ItemTooltipDisplay) obj;
+        if (this.hideTooltip != that.hideTooltip) return false;
+        return this.hiddenComponents.equals(that.hiddenComponents);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.hideTooltip, this.hiddenComponents);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemTooltipStyle.java

@@ -0,0 +1,67 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemTooltipStyle {
+
+    private ResourceLocation tooltipLoc;
+
+    public ItemTooltipStyle(ResourceLocation tooltipLoc) {
+        this.tooltipLoc = tooltipLoc;
+    }
+
+    public static ItemTooltipStyle read(PacketWrapper<?> wrapper) {
+        return new ItemTooltipStyle(wrapper.readIdentifier());
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemTooltipStyle style) {
+        wrapper.writeIdentifier(style.tooltipLoc);
+    }
+
+    public ResourceLocation getTooltipLoc() {
+        return this.tooltipLoc;
+    }
+
+    public void setTooltipLoc(ResourceLocation tooltipLoc) {
+        this.tooltipLoc = tooltipLoc;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemTooltipStyle)) return false;
+        ItemTooltipStyle that = (ItemTooltipStyle) obj;
+        return this.tooltipLoc.equals(that.tooltipLoc);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.tooltipLoc);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemTooltipStyle{tooltipLoc=" + this.tooltipLoc + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemUnbreakable.java

@@ -0,0 +1,88 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Objects;
+
+public class ItemUnbreakable {
+
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
+    private boolean showInTooltip;
+
+    public ItemUnbreakable() {
+        this(true);
+    }
+
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
+    public ItemUnbreakable(boolean showInTooltip) {
+        this.showInTooltip = showInTooltip;
+    }
+
+    public static ItemUnbreakable read(PacketWrapper<?> wrapper) {
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_5)) {
+            return new ItemUnbreakable();
+        }
+        boolean showInTooltip = wrapper.readBoolean();
+        return new ItemUnbreakable(showInTooltip);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemUnbreakable value) {
+        if (wrapper.getServerVersion().isOlderThan(ServerVersion.V_1_21_5)) {
+            wrapper.writeBoolean(value.showInTooltip);
+        }
+    }
+
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
+    public boolean isShowInTooltip() {
+        return this.showInTooltip;
+    }
+
+    /**
+     * Removed with 1.21.5
+     */
+    @ApiStatus.Obsolete
+    public void setShowInTooltip(boolean showInTooltip) {
+        this.showInTooltip = showInTooltip;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemUnbreakable)) return false;
+        ItemUnbreakable that = (ItemUnbreakable) obj;
+        return this.showInTooltip == that.showInTooltip;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.showInTooltip);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemUseCooldown.java

@@ -0,0 +1,101 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.protocol.item.type.ItemType;
+import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSetCooldown;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public class ItemUseCooldown {
+
+    private float seconds;
+    private Optional<ResourceLocation> cooldownGroup;
+
+    public ItemUseCooldown(float seconds, @Nullable ResourceLocation cooldownGroup) {
+        this(seconds, Optional.ofNullable(cooldownGroup));
+    }
+
+    public ItemUseCooldown(float seconds, Optional<ResourceLocation> cooldownGroup) {
+        this.seconds = seconds;
+        this.cooldownGroup = cooldownGroup;
+    }
+
+    public static ItemUseCooldown read(PacketWrapper<?> wrapper) {
+        float seconds = wrapper.readFloat();
+        ResourceLocation cooldownGroup = wrapper.readOptional(PacketWrapper::readIdentifier);
+        return new ItemUseCooldown(seconds, cooldownGroup);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemUseCooldown cooldown) {
+        wrapper.writeFloat(cooldown.seconds);
+        wrapper.writeOptional(cooldown.cooldownGroup.orElse(null), PacketWrapper::writeIdentifier);
+    }
+
+    public WrapperPlayServerSetCooldown buildWrapper(ItemStack fallbackStack) {
+        return this.buildWrapper(fallbackStack.getType());
+    }
+
+    public WrapperPlayServerSetCooldown buildWrapper(ItemType fallbackItem) {
+        int ticks = (int) (this.seconds * 20f);
+        return this.cooldownGroup
+                .map(resourceLocation -> new WrapperPlayServerSetCooldown(resourceLocation, ticks))
+                .orElseGet(() -> new WrapperPlayServerSetCooldown(fallbackItem, ticks));
+    }
+
+    public float getSeconds() {
+        return this.seconds;
+    }
+
+    public void setSeconds(float seconds) {
+        this.seconds = seconds;
+    }
+
+    public Optional<ResourceLocation> getCooldownGroup() {
+        return this.cooldownGroup;
+    }
+
+    public void setCooldownGroup(Optional<ResourceLocation> cooldownGroup) {
+        this.cooldownGroup = cooldownGroup;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemUseCooldown)) return false;
+        ItemUseCooldown that = (ItemUseCooldown) obj;
+        if (Float.compare(that.seconds, this.seconds) != 0) return false;
+        return this.cooldownGroup.equals(that.cooldownGroup);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.seconds, this.cooldownGroup);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemUseCooldown{seconds=" + this.seconds + ", cooldownGroup=" + this.cooldownGroup + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemUseRemainder.java

@@ -0,0 +1,68 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemUseRemainder {
+
+    private ItemStack target;
+
+    public ItemUseRemainder(ItemStack target) {
+        this.target = target;
+    }
+
+    public static ItemUseRemainder read(PacketWrapper<?> wrapper) {
+        ItemStack target = wrapper.readItemStack();
+        return new ItemUseRemainder(target);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemUseRemainder remainder) {
+        wrapper.writeItemStack(remainder.target);
+    }
+
+    public ItemStack getTarget() {
+        return this.target;
+    }
+
+    public void setTarget(ItemStack target) {
+        this.target = target;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof ItemUseRemainder)) return false;
+        ItemUseRemainder that = (ItemUseRemainder) obj;
+        return this.target.equals(that.target);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.target);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemUseRemainder{target=" + this.target + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemWeapon.java

@@ -0,0 +1,74 @@
+/*
+ * 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.component.builtin.item;
+
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class ItemWeapon {
+
+    private int itemDamagePerAttack;
+    private float disableBlockingForSeconds;
+
+    public ItemWeapon(int itemDamagePerAttack, float disableBlockingForSeconds) {
+        this.itemDamagePerAttack = itemDamagePerAttack;
+        this.disableBlockingForSeconds = disableBlockingForSeconds;
+    }
+
+    public static ItemWeapon read(PacketWrapper<?> wrapper) {
+        int itemDamagePerAttack = wrapper.readVarInt();
+        float disableBlockingForSeconds = wrapper.readFloat();
+        return new ItemWeapon(itemDamagePerAttack, disableBlockingForSeconds);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ItemWeapon weapon) {
+        wrapper.writeVarInt(weapon.itemDamagePerAttack);
+        wrapper.writeFloat(weapon.disableBlockingForSeconds);
+    }
+
+    public int getItemDamagePerAttack() {
+        return this.itemDamagePerAttack;
+    }
+
+    public void setItemDamagePerAttack(int itemDamagePerAttack) {
+        this.itemDamagePerAttack = itemDamagePerAttack;
+    }
+
+    public float getDisableBlockingForSeconds() {
+        return this.disableBlockingForSeconds;
+    }
+
+    public void setDisableBlockingForSeconds(float disableBlockingForSeconds) {
+        this.disableBlockingForSeconds = disableBlockingForSeconds;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ItemWeapon)) return false;
+        ItemWeapon that = (ItemWeapon) obj;
+        if (this.itemDamagePerAttack != that.itemDamagePerAttack) return false;
+        return Float.compare(that.disableBlockingForSeconds, this.disableBlockingForSeconds) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.itemDamagePerAttack, this.disableBlockingForSeconds);
+    }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.protocol.component.ComponentPredicate;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class ComponentMatchers {
+
+    private ComponentPredicate components;
+    private List<TypedComponentPredicate<?>> predicates;
+
+    public ComponentMatchers() {
+        this(new ComponentPredicate(), new ArrayList<>());
+    }
+
+    public ComponentMatchers(ComponentPredicate components, List<TypedComponentPredicate<?>> predicates) {
+        this.components = components;
+        this.predicates = predicates;
+    }
+
+    public static ComponentMatchers read(PacketWrapper<?> wrapper) {
+        ComponentPredicate components = ComponentPredicate.read(wrapper);
+        List<TypedComponentPredicate<?>> predicates = wrapper.readList(TypedComponentPredicate::read);
+        return new ComponentMatchers(components, predicates);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, ComponentMatchers matchers) {
+        ComponentPredicate.write(wrapper, matchers.components);
+        wrapper.writeList(matchers.predicates, TypedComponentPredicate::write);
+    }
+
+    public ComponentPredicate getComponents() {
+        return this.components;
+    }
+
+    public void setComponents(ComponentPredicate components) {
+        this.components = components;
+    }
+
+    public List<TypedComponentPredicate<?>> getPredicates() {
+        return this.predicates;
+    }
+
+    public void setPredicates(List<TypedComponentPredicate<?>> predicates) {
+        this.predicates = predicates;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ComponentMatchers)) return false;
+        ComponentMatchers that = (ComponentMatchers) obj;
+        if (!this.components.equals(that.components)) return false;
+        return this.predicates.equals(that.predicates);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.components, this.predicates);
+    }
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntity;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+public interface ComponentPredicateType<T extends IComponentPredicate> extends MappedEntity {
+
+    T read(PacketWrapper<?> wrapper);
+
+    void write(PacketWrapper<?> wrapper, T predicate);
+}

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

@@ -0,0 +1,96 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * This implementation is experimental and not done yet. As I don't expect
+ * component predicates to be used in packetevents at all, it is currently not
+ * read from/to NBT; if you want/need this though, feel free to mention it
+ * via GitHub/Discord - or open a PR!
+ */
+public final class ComponentPredicateTypes {
+
+    private static final VersionedRegistry<ComponentPredicateType<?>> REGISTRY =
+            new VersionedRegistry<>("data_component_predicate_type");
+
+    private ComponentPredicateTypes() {
+    }
+
+    @ApiStatus.Internal
+    public static <T extends IComponentPredicate> ComponentPredicateType<T> define(
+            String key, PacketWrapper.Reader<T> reader, PacketWrapper.Writer<T> writer) {
+        return REGISTRY.define(key, data ->
+                new StaticComponentPredicateType<>(data, reader, writer));
+    }
+
+    public static VersionedRegistry<ComponentPredicateType<?>> getRegistry() {
+        return REGISTRY;
+    }
+
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> DAMAGE =
+            define("damage", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> ENCHANTMENTS =
+            define("enchantments", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> STORED_ENCHANTMENTS =
+            define("stored_enchantments", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> POTION_CONTENTS =
+            define("potion_contents", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> CUSTOM_DATA =
+            define("custom_data", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> CONTAINER =
+            define("container", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> BUNDLE_CONTENTS =
+            define("bundle_contents", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> FIREWORK_EXPLOSION =
+            define("firework_explosion", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> FIREWORKS =
+            define("fireworks", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> WRITABLE_BOOK_CONTENT =
+            define("writable_book_content", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> WRITTEN_BOOK_CONTENT =
+            define("written_book_content", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> ATTRIBUTE_MODIFIERS =
+            define("attribute_modifiers", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> TRIM =
+            define("trim", NbtComponentPredicate::read, NbtComponentPredicate::write);
+    @ApiStatus.Experimental
+    public static final ComponentPredicateType<NbtComponentPredicate> JUKEBOX_PLAYABLE =
+            define("jukebox_playable", NbtComponentPredicate::read, NbtComponentPredicate::write);
+
+    static {
+        REGISTRY.unloadMappings();
+    }
+}

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

@@ -0,0 +1,22 @@
+/*
+ * 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.component.predicates;
+
+public interface IComponentPredicate {
+}

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

@@ -0,0 +1,60 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.protocol.nbt.NBT;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Objects;
+
+@ApiStatus.Experimental
+public class NbtComponentPredicate implements IComponentPredicate {
+
+    private final NBT tag;
+
+    public NbtComponentPredicate(NBT tag) {
+        this.tag = tag;
+    }
+
+    public static NbtComponentPredicate read(PacketWrapper<?> wrapper) {
+        NBT tag = wrapper.readNBTRaw();
+        return new NbtComponentPredicate(tag);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, NbtComponentPredicate predicate) {
+        wrapper.writeNBTRaw(predicate.tag);
+    }
+
+    public NBT getTag() {
+        return this.tag;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof NbtComponentPredicate)) return false;
+        NbtComponentPredicate that = (NbtComponentPredicate) obj;
+        return this.tag.equals(that.tag);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(this.tag);
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.protocol.mapper.AbstractMappedEntity;
+import com.github.retrooper.packetevents.util.mappings.TypesBuilderData;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+public class StaticComponentPredicateType<T extends IComponentPredicate> extends AbstractMappedEntity implements ComponentPredicateType<T> {
+
+    private final PacketWrapper.Reader<T> reader;
+    private final PacketWrapper.Writer<T> writer;
+
+    public StaticComponentPredicateType(PacketWrapper.Reader<T> reader, PacketWrapper.Writer<T> writer) {
+        this(null, reader, writer);
+    }
+
+    @ApiStatus.Internal
+    public StaticComponentPredicateType(
+            @Nullable TypesBuilderData data,
+            PacketWrapper.Reader<T> reader,
+            PacketWrapper.Writer<T> writer
+    ) {
+        super(data);
+        this.reader = reader;
+        this.writer = writer;
+    }
+
+    @Override
+    public T read(PacketWrapper<?> wrapper) {
+        return this.reader.apply(wrapper);
+    }
+
+    @Override
+    public void write(PacketWrapper<?> wrapper, T predicate) {
+        this.writer.accept(wrapper, predicate);
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+ * 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.component.predicates;
+
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+
+import java.util.Objects;
+
+public class TypedComponentPredicate<T extends IComponentPredicate> {
+
+    private final ComponentPredicateType<T> type;
+    private final T predicate;
+
+    public TypedComponentPredicate(ComponentPredicateType<T> type, T predicate) {
+        this.type = type;
+        this.predicate = predicate;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static TypedComponentPredicate<?> read(PacketWrapper<?> wrapper) {
+        ComponentPredicateType<?> type = wrapper.readMappedEntity(ComponentPredicateTypes.getRegistry());
+        IComponentPredicate predicate = type.read(wrapper);
+        return new TypedComponentPredicate<>((ComponentPredicateType<IComponentPredicate>) type, predicate);
+    }
+
+    public static <T extends IComponentPredicate> void write(PacketWrapper<?> wrapper, TypedComponentPredicate<T> predicate) {
+        wrapper.writeMappedEntity(predicate.type);
+        predicate.type.write(wrapper, predicate.predicate);
+    }
+
+    public ComponentPredicateType<T> getType() {
+        return this.type;
+    }
+
+    public T getPredicate() {
+        return this.predicate;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof TypedComponentPredicate)) return false;
+        TypedComponentPredicate<?> that = (TypedComponentPredicate<?>) obj;
+        if (!this.type.equals(that.type)) return false;
+        return this.predicate.equals(that.predicate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.type, this.predicate);
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/entity/EntityPositionData.java

@@ -0,0 +1,109 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 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.entity;
+// Created by booky10 in packetevents (02:12 21.10.2024)
+
+import com.github.retrooper.packetevents.util.Vector3d;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityPositionSync;
+
+import java.util.Objects;
+
+public final class EntityPositionData {
+
+    private Vector3d position;
+    private Vector3d deltaMovement;
+    private float yaw;
+    private float pitch;
+
+    public EntityPositionData(Vector3d position, Vector3d deltaMovement, float yaw, float pitch) {
+        this.position = position;
+        this.deltaMovement = deltaMovement;
+        this.yaw = yaw;
+        this.pitch = pitch;
+    }
+
+    public static EntityPositionData read(PacketWrapper<?> wrapper) {
+        Vector3d position = Vector3d.read(wrapper);
+        Vector3d deltaMovement = Vector3d.read(wrapper);
+        float yaw = wrapper.readFloat();
+        float pitch = wrapper.readFloat();
+        return new EntityPositionData(position, deltaMovement, yaw, pitch);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, EntityPositionData positionData) {
+        Vector3d.write(wrapper, positionData.position);
+        Vector3d.write(wrapper, positionData.deltaMovement);
+        wrapper.writeFloat(positionData.yaw);
+        wrapper.writeFloat(positionData.pitch);
+    }
+
+    public Vector3d getPosition() {
+        return this.position;
+    }
+
+    public void setPosition(Vector3d position) {
+        this.position = position;
+    }
+
+    public Vector3d getDeltaMovement() {
+        return this.deltaMovement;
+    }
+
+    public void setDeltaMovement(Vector3d deltaMovement) {
+        this.deltaMovement = deltaMovement;
+    }
+
+    public float getYaw() {
+        return this.yaw;
+    }
+
+    public void setYaw(float yaw) {
+        this.yaw = yaw;
+    }
+
+    public float getPitch() {
+        return this.pitch;
+    }
+
+    public void setPitch(float pitch) {
+        this.pitch = pitch;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof EntityPositionData)) return false;
+        EntityPositionData that = (EntityPositionData) obj;
+        if (Float.compare(that.yaw, this.yaw) != 0) return false;
+        if (Float.compare(that.pitch, this.pitch) != 0) return false;
+        if (!this.position.equals(that.position)) return false;
+        return this.deltaMovement.equals(that.deltaMovement);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.position, this.deltaMovement, this.yaw, this.pitch);
+    }
+
+    @Override
+    public String toString() {
+        return "EntityPositionData{position=" + this.position + ", deltaMovement=" + this.deltaMovement + ", yaw=" + this.yaw + ", pitch=" + this.pitch + '}';
+    }
+}