5.6.0 Release

Includes method and local variable names of cross-version code. Key stays unchanged, as it's quite clear what it represents (and is shorter)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -50,21 +50,12 @@ body:
       label: Steps to Reproduce
       description: |
         List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
+        **Please always include the client version(s) with which the issue happens. Ideally also try to find out, from what specific version onward/in what version range the issue happens.**
       placeholder: |
         Example:
         1. Login with a 1.21.3 client
         2. Place a sign
-        3. The sign text is displayed wrong
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: |
-        Describe what exactly you expected to happen.
-      placeholder: |
-        Example: "Placed sign text should not disappear."
+        3. The sign text disappears
     validations:
       required: true
 

.github/dependabot.yml

@@ -1,6 +1,8 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
+    cooldown:
+      default-days: 7
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"

.github/workflows/build.yml

@@ -1,23 +1,22 @@
-name: Java CI with Gradle
-
-on: [push, pull_request, workflow_dispatch]
+name: Build
+on: [pull_request, push, workflow_dispatch]
+permissions:
+  contents: read
 
 jobs:
   build:
     # Only run on PRs if the source branch is on a different repo. We do not need to run everything twice.
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-
     runs-on: ubuntu-24.04
-
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
       with:
         persist-credentials: false
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # 5.0.0
       with:
         distribution: 'temurin'
         java-version: 17
@@ -27,7 +26,7 @@ jobs:
     - name: Upload Artifacts to GitHub
       # Only upload on the preview repository as there is no CI job for it.
       if: ${{ github.repository == 'ViaVersion/ViaVersionDev' && github.ref_name == 'preview' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
       with:
         name: Artifacts
         path: build/libs/

.github/workflows/publish.yml

@@ -6,25 +6,35 @@ on:
       - dev
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   publish:
     if: github.repository_owner == 'ViaVersion'
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # 5.0.0
         with:
           distribution: 'temurin'
           java-version: 17
           check-latest: true
-      - name: Publish
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Publish to Hangar
         env:
           HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
+        run: ./gradlew publishAllPublicationsToHangar --stacktrace
+        continue-on-error: true
+      - name: Publish to Modrinth
+        env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew build modrinth publishAllPublicationsToHangar --stacktrace
+        run: ./gradlew modrinth --stacktrace
+        continue-on-error: true

.github/workflows/update-gradle-wrapper.yml

@@ -4,13 +4,18 @@ on:
   schedule:
     - cron: "0 0 * * 0"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
         with:
+          fetch-depth: 0
           persist-credentials: false
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
+        uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # 2.1.0

.gitignore

@@ -1,115 +1,36 @@
-### Java files ###
-*.class
+# Gradle
 
-# Package Files
-#*.jar
-*.war
-*.ear
+.gradle/
+build/
+out/
+classes/
+.kotlin/
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Eclipse
 
+*.launch
 
+# Idea
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-# Ignore project files
-*.iml
-
-# Ignore IDEA directory
-.idea/*
+.idea/
 !.idea/copyright/*
 !.idea/scopes/*
-
-# Include the project's dictionary
-!.idea/dictionaries/
-!.idea/dictionaries/*
-
-# File-based project format:
+*.iml
 *.ipr
 *.iws
 
-### Plugin-specific files: ###
-# IntelliJ
-/out/
+# VSCode
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-
-
-### Eclipse ###
-*.pydevproject
-.metadata
-.gradle
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
 .settings/
-.loadpath
-
-# Eclipse Core
+.vscode/
+bin/
+.classpath
 .project
 
-# External tool builders
-.externalToolBuilders/
+# macOS
 
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-
-
-
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-.nb-gradle/
-
-### MacOS ###
 .DS_Store
 
-### Run Folder (ViaProxy) ###
-common/run/
+# Misc
+
+run/

README.md

@@ -8,7 +8,7 @@
 it works on any platform you can think of.**
 
 The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
-on Fabric, Forge, Bungee, Sponge, or as a standalone proxy to join from basically any client version on
+on Fabric, Forge, Sponge, or as a standalone proxy to join from basically any client version on
 any server version from the past decade. **See [HERE](https://viaversion.com) for an overview of the different Via\* projects.**
 
 Note that ViaVersion will be able to **run best on either Paper servers or through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
@@ -16,7 +16,7 @@ direct access to client/server state and more extensive API.
 
 Supported Versions:
 
-![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)
+![Table (https://ci.viaversion.com/userContent/images/T.png)](https://ci.viaversion.com/userContent/images/T.png)
 
 **User Docs:** https://docs.viaversion.com
 
@@ -87,12 +87,10 @@ of the `build/libs` directory.
 
 You need JDK 17 or newer to build ViaVersion.
 
-
 Mapping Files
 --------------
 Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings). The generated mapping output is stored [here](./common/src/main/resources/assets/viaversion).
 
-
 Resources
 --------
 

api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java

@@ -123,7 +123,7 @@ public interface ViaAPI<T> {
     boolean isInjected(UUID uuid);
 
     /**
-     * Returns whether Via injected into this player connection. Note that this method may not work on
+     * Returns the injected UserConnection if present. Note that this method may not work on
      * clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
      *
      * @param uuid uuid of the player

api/src/main/java/com/viaversion/viaversion/api/configuration/RateLimitConfig.java

@@ -0,0 +1,27 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.configuration;
+
+public record RateLimitConfig(boolean enabled, int maxRate, String maxRateKickMessage, int warningRate, int maxWarnings,
+                              long trackingPeriodNanos, String warningKickMessage, String ratePlaceholder) {
+}

api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java

@@ -147,6 +147,7 @@ public interface ViaVersionConfig extends Config {
      *
      * @return The number of packets a client can send per second.
      */
+    @Deprecated(forRemoval = true)
     int getMaxPPS();
 
     /**
@@ -154,6 +155,7 @@ public interface ViaVersionConfig extends Config {
      *
      * @return Kick message, with colour codes using '&'
      */
+    @Deprecated(forRemoval = true)
     String getMaxPPSKickMessage();
 
     /**
@@ -161,6 +163,7 @@ public interface ViaVersionConfig extends Config {
      *
      * @return Time in seconds that should be tracked for warnings
      */
+    @Deprecated(forRemoval = true)
     int getTrackingPeriod();
 
     /**
@@ -168,6 +171,7 @@ public interface ViaVersionConfig extends Config {
      *
      * @return The number of packets per second to count as a warning.
      */
+    @Deprecated(forRemoval = true)
     int getWarningPPS();
 
     /**
@@ -175,6 +179,7 @@ public interface ViaVersionConfig extends Config {
      *
      * @return The number of packets a client can send per second.
      */
+    @Deprecated(forRemoval = true)
     int getMaxWarnings();
 
     /**
@@ -182,8 +187,13 @@ public interface ViaVersionConfig extends Config {
      *
      * @return Kick message, with colour codes using '&'
      */
+    @Deprecated(forRemoval = true)
     String getMaxWarningsKickMessage();
 
+    RateLimitConfig getPacketTrackerConfig();
+
+    RateLimitConfig getPacketSizeTrackerConfig();
+
     /**
      * Send supported versions in the status response packet
      *
@@ -263,6 +273,8 @@ public interface ViaVersionConfig extends Config {
      */
     String getBlockedDisconnectMsg();
 
+    boolean logBlockedJoins();
+
     /**
      * Get the message sent to players being kicked on reload.
      * Players are kicked to stop the server crashing
@@ -478,4 +490,12 @@ public interface ViaVersionConfig extends Config {
      * @return true if enabled
      */
     boolean fix1_21PlacementRotation();
+
+    /**
+     * If enabled, cancel swing packets sent while having an inventory opened on 1.15.2 and below servers.
+     * This can cause false positives with anti-cheat plugins.
+     *
+     * @return true if enabled
+     */
+    boolean cancelSwingInInventory();
 }

api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java

@@ -30,15 +30,6 @@ package com.viaversion.viaversion.api.connection;
  */
 public interface StorableObject {
 
-    /**
-     * Returns whether the object should be uncached on a server switch.
-     *
-     * @return whether the object should be uncached on a server switch
-     */
-    default boolean clearOnServerSwitch() {
-        return true;
-    }
-
     default void onRemove() {
     }
 }

api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java

@@ -139,17 +139,7 @@ public interface UserConnection {
     /**
      * Clear stored objects, entity trackers and client worlds.
      */
-    default void clearStoredObjects() {
-        clearStoredObjects(false);
-    }
-
-    /**
-     * Clear stored objects, entity trackers and client worlds.
-     * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
-     *
-     * @param isServerSwitch whether the clear is due to a server switch
-     */
-    void clearStoredObjects(boolean isServerSwitch);
+    void clearStoredObjects();
 
     /**
      * Sends a raw packet to the connection on the current thread.
@@ -204,9 +194,15 @@ public interface UserConnection {
     /**
      * Monitors serverbound packets and returns whether a packet can/should be processed.
      *
+     * @param bytes the number of bytes in the packet
      * @return false if this packet should be cancelled
      */
-    boolean checkServerboundPacket();
+    boolean checkServerboundPacket(int bytes);
+
+    @Deprecated(forRemoval = true)
+    default boolean checkServerboundPacket() {
+        return checkServerboundPacket(0);
+    }
 
     /**
      * Monitors clientbound packets and returns whether a packet can/should be processed.
@@ -219,6 +215,11 @@ public interface UserConnection {
      * @see #checkClientboundPacket()
      * @see #checkServerboundPacket()
      */
+    default boolean checkIncomingPacket(final int bytes) {
+        return isClientSide() ? checkClientboundPacket() : checkServerboundPacket(bytes);
+    }
+
+    @Deprecated(forRemoval = true)
     default boolean checkIncomingPacket() {
         return isClientSide() ? checkClientboundPacket() : checkServerboundPacket();
     }

api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java

@@ -22,9 +22,13 @@
  */
 package com.viaversion.viaversion.api.data;
 
+import com.viaversion.viaversion.api.minecraft.RegistryKey;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
+import com.viaversion.viaversion.util.Key;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.List;
+import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface MappingData {
@@ -140,12 +144,14 @@ public interface MappingData {
 
     @Nullable Mappings getBlockMappings();
 
-    @Nullable Mappings getBlockEntityMappings();
+    @Nullable FullMappings getFullBlockMappings();
 
     @Nullable Mappings getBlockStateMappings();
 
     @Nullable Mappings getSoundMappings();
 
+    @Nullable FullMappings getFullSoundMappings();
+
     @Nullable Mappings getStatisticsMappings();
 
     @Nullable Mappings getMenuMappings();
@@ -154,6 +160,8 @@ public interface MappingData {
 
     @Nullable Mappings getPaintingMappings();
 
+    @Nullable FullMappings getBlockEntityMappings();
+
     @Nullable FullMappings getAttributeMappings();
 
     @Nullable FullMappings getEntityMappings();
@@ -163,4 +171,32 @@ public interface MappingData {
     @Nullable FullMappings getRecipeSerializerMappings();
 
     @Nullable FullMappings getDataComponentSerializerMappings();
+
+    default @Nullable FullMappings getFullMappings(final MappingType mappingType) {
+        return switch (mappingType) {
+            case ITEM -> getFullItemMappings();
+            case BLOCK -> getFullBlockMappings();
+            case SOUND -> getFullSoundMappings();
+            case ENTITY_TYPE -> getEntityMappings();
+        };
+    }
+
+    /**
+     * Set of block (not block state) ids that had their base type or properties changed.
+     *
+     * @return set of changed block ids, or null if not tracked/none are present
+     */
+    @Nullable IntSet changedBlocks();
+
+    /**
+     * Type of mappings. Currently only relevant for ops writing of generic holder classes and expanded when needed.
+     */
+    enum MappingType implements RegistryKey {
+        ITEM, BLOCK, SOUND, ENTITY_TYPE;
+
+        @Override
+        public Key key() {
+            return Key.of(name().toLowerCase(Locale.ROOT));
+        }
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java

@@ -28,6 +28,8 @@ import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
@@ -44,17 +46,21 @@ public class MappingDataBase implements MappingData {
     protected FullMappings recipeSerializerMappings;
     protected FullMappings itemDataSerializerMappings;
     protected FullMappings attributeMappings;
+    protected FullMappings blockEntityMappings;
     protected ParticleMappings particleMappings;
     protected BiMappings itemMappings;
     protected BiMappings blockMappings;
     protected Mappings blockStateMappings;
-    protected Mappings blockEntityMappings;
     protected Mappings soundMappings;
     protected Mappings statisticsMappings;
     protected Mappings enchantmentMappings;
     protected Mappings paintingMappings;
     protected Mappings menuMappings;
     protected Map<RegistryType, List<TagData>> tags;
+    /**
+     * Set of block ids that have had type or property changes.
+     */
+    protected IntSet changedBlocks;
 
     public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
         this.unmappedVersion = unmappedVersion;
@@ -68,10 +74,7 @@ public class MappingDataBase implements MappingData {
         }
 
         final CompoundTag data = readMappingsFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
-        blockMappings = loadBiMappings(data, "blocks");
         blockStateMappings = loadMappings(data, "blockstates");
-        blockEntityMappings = loadMappings(data, "blockentities");
-        soundMappings = loadMappings(data, "sounds");
         statisticsMappings = loadMappings(data, "statistics");
         menuMappings = loadMappings(data, "menus");
         enchantmentMappings = loadMappings(data, "enchantments");
@@ -80,12 +83,16 @@ public class MappingDataBase implements MappingData {
         final CompoundTag unmappedIdentifierData = readUnmappedIdentifiersFile("identifiers-" + unmappedVersion + ".nbt");
         final CompoundTag mappedIdentifierData = readMappedIdentifiersFile("identifiers-" + mappedVersion + ".nbt");
         if (unmappedIdentifierData != null && mappedIdentifierData != null) {
-            itemMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
+            itemMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
+            blockMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "blocks");
+            soundMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "sounds");
+
             entityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "entities");
             argumentTypeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "argumenttypes");
             recipeSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "recipe_serializers");
             itemDataSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "data_component_type");
             attributeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "attributes");
+            blockEntityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "blockentities");
 
             final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
             final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
@@ -99,6 +106,8 @@ public class MappingDataBase implements MappingData {
         } else {
             // Might not have identifiers in older versions
             itemMappings = loadBiMappings(data, "items");
+            blockMappings = loadBiMappings(data, "blocks");
+            soundMappings = loadMappings(data, "sounds");
         }
 
         final CompoundTag tagsTag = data.getCompoundTag("tags");
@@ -109,6 +118,11 @@ public class MappingDataBase implements MappingData {
             loadTags(RegistryType.ENTITY, tagsTag);
         }
 
+        final IntArrayTag changedBlocks = data.getIntArrayTag("changed_blocks");
+        if (changedBlocks != null) {
+            this.changedBlocks = new IntOpenHashSet(changedBlocks.getValue());
+        }
+
         loadExtras(data);
     }
 
@@ -132,6 +146,11 @@ public class MappingDataBase implements MappingData {
         return MappingDataLoader.INSTANCE.loadMappings(data, key);
     }
 
+    protected @Nullable BiMappings loadFullOrBiMappings(final CompoundTag data, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
+        final FullMappings mappings = loadFullMappings(data, unmappedIdentifiersTag, mappedIdentifiersTag, key);
+        return mappings != null ? mappings : loadBiMappings(data, key);
+    }
+
     protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
         if (!unmappedIdentifiersTag.contains(key) || !mappedIdentifiersTag.contains(key)) {
             return null;
@@ -153,7 +172,7 @@ public class MappingDataBase implements MappingData {
     }
 
     private void loadTags(final RegistryType type, final CompoundTag data) {
-        final CompoundTag tag = data.getCompoundTag(type.resourceLocation());
+        final CompoundTag tag = data.getCompoundTag(type.identifier());
         if (tag == null) {
             return;
         }
@@ -224,8 +243,8 @@ public class MappingDataBase implements MappingData {
 
     @Override
     public @Nullable FullMappings getFullItemMappings() {
-        if (itemMappings instanceof FullMappings) {
-            return (FullMappings) itemMappings;
+        if (itemMappings instanceof FullMappings fullItemMappings) {
+            return fullItemMappings;
         }
         return null;
     }
@@ -241,7 +260,15 @@ public class MappingDataBase implements MappingData {
     }
 
     @Override
-    public @Nullable Mappings getBlockEntityMappings() {
+    public @Nullable FullMappings getFullBlockMappings() {
+        if (blockMappings instanceof FullMappings fullBlockMappings) {
+            return fullBlockMappings;
+        }
+        return null;
+    }
+
+    @Override
+    public @Nullable FullMappings getBlockEntityMappings() {
         return blockEntityMappings;
     }
 
@@ -255,6 +282,14 @@ public class MappingDataBase implements MappingData {
         return soundMappings;
     }
 
+    @Override
+    public @Nullable FullMappings getFullSoundMappings() {
+        if (soundMappings instanceof FullMappings fullSoundMappings) {
+            return fullSoundMappings;
+        }
+        return null;
+    }
+
     @Override
     public @Nullable Mappings getStatisticsMappings() {
         return statisticsMappings;
@@ -300,6 +335,11 @@ public class MappingDataBase implements MappingData {
         return recipeSerializerMappings;
     }
 
+    @Override
+    public @Nullable IntSet changedBlocks() {
+        return changedBlocks;
+    }
+
     protected Logger getLogger() {
         return Via.getPlatform().getLogger();
     }

api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java

@@ -210,7 +210,7 @@ public class MappingDataLoader {
             return null;
         }
 
-        final int mappedSize = tag.getIntTag("mappedSize").asInt();
+        final int mappedSize = tag.getInt("mappedSize", -1);
         final byte strategy = tag.getByteTag("id").asByte();
         final V mappings;
         if (strategy == DIRECT_ID) {

api/src/main/java/com/viaversion/viaversion/api/data/entity/EntityTracker.java

@@ -82,6 +82,11 @@ public interface EntityTracker {
      */
     void clearEntities();
 
+    /**
+     * Clears all stored data, including entity types, entity data and client entity id.
+     */
+    void clear();
+
     /**
      * Returns the stored entity data if an entity with the id is tracked, else null.
      * If no data has been initialized yet, it will be done and returned by this method.
@@ -180,6 +185,20 @@ public interface EntityTracker {
      */
     void setCurrentWorld(String currentWorld);
 
+    /**
+     * Returns the id of the current dimension, or -1 if unset (i.e. before 1.20.5).
+     *
+     * @return id of the current dimension, or -1 if unset
+     */
+    int currentDimensionId();
+
+    /**
+     * Sets the id of the current dimension.
+     *
+     * @param currentDimensionId id of the current dimension
+     */
+    void setCurrentDimensionId(int currentDimensionId);
+
     int biomesSent();
 
     void setBiomesSent(int biomesSent);

api/src/main/java/com/viaversion/viaversion/api/data/item/ItemHasher.java

@@ -22,8 +22,6 @@
  */
 package com.viaversion.viaversion.api.data.item;
 
-import java.util.List;
-
 /**
  * Used for converting items to hashed items and caching them for later use during serverbound packets.
  * <p>
@@ -41,11 +39,4 @@ public interface ItemHasher {
     boolean isProcessingClientboundInventoryPacket();
 
     void setProcessingClientboundInventoryPacket(boolean processingClientboundInventoryPacket);
-
-    /**
-     * Sets the enchantment registry for this connection.
-     *
-     * @param enchantments list of enchantment identifiers
-     */
-    void setEnchantments(List<String> enchantments);
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockFace.java

@@ -33,7 +33,6 @@ public enum BlockFace {
     TOP((byte) 0, (byte) 1, (byte) 0, EnumAxis.Y),
     BOTTOM((byte) 0, (byte) -1, (byte) 0, EnumAxis.Y);
 
-    public static final BlockFace[] HORIZONTAL = {NORTH, SOUTH, EAST, WEST};
     private static final Map<BlockFace, BlockFace> opposites = new EnumMap<>(BlockFace.class);
 
     static {

api/src/main/java/com/viaversion/viaversion/api/minecraft/GameProfile.java

@@ -29,7 +29,11 @@ import java.util.Map;
 import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties) {
+public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties, boolean dynamic) {
+
+    public GameProfile(@Nullable final String name, @Nullable final UUID id, final Property[] properties) {
+        this(name, id, properties, true);
+    }
 
     public GameProfile(@Nullable final String name, @Nullable final UUID id) {
         this(name, id, new Property[0]);

api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderSet.java

@@ -22,7 +22,11 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
 
 /**
  * Set of ids that either holds a string tag key or an array of ids.
@@ -32,7 +36,7 @@ public interface HolderSet {
     /**
      * Creates a new holder set for the given tag.
      *
-     * @param tagKey the tag key
+     * @param tagKey the tag key, not including '#'
      * @return a new holder set
      */
     static HolderSet of(final String tagKey) {
@@ -49,10 +53,29 @@ public interface HolderSet {
         return new HolderSetImpl.Ids(ids);
     }
 
+    static HolderSet fromTag(final Tag tag, final Function<String, Integer> mappingFunction) {
+        if (tag instanceof StringTag stringTag) {
+            if (stringTag.getValue().startsWith("#")) {
+                return HolderSet.of(stringTag.getValue().substring(1));
+            }
+
+            final int id = mappingFunction.apply(stringTag.getValue());
+            return HolderSet.of(new int[]{id});
+        } else if (tag instanceof ListTag<?> listTag) {
+            final int[] ids = new int[listTag.size()];
+            for (int i = 0; i < listTag.size(); i++) {
+                final String value = ((StringTag) listTag.get(i)).getValue();
+                ids[i] = mappingFunction.apply(value);
+            }
+            return HolderSet.of(ids);
+        }
+        throw new IllegalArgumentException();
+    }
+
     /**
-     * Gets the tag key.
+     * Gets the tag key, not including '#'.
      *
-     * @return the tag key
+     * @return the tag key without a '#'
      * @see #hasTagKey()
      */
     String tagKey();

api/src/main/java/com/viaversion/viaversion/api/minecraft/PaintingVariant.java

@@ -23,8 +23,10 @@
 package com.viaversion.viaversion.api.minecraft;
 
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import com.viaversion.viaversion.util.Key;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -69,5 +71,21 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
             Types.OPTIONAL_TAG.write(buffer, variant.title());
             Types.OPTIONAL_TAG.write(buffer, variant.author());
         }
+
+        @Override
+        public void writeDirect(final Ops ops, final PaintingVariant value) {
+            // Unused, cannot be direct despite having a direct network codec
+            ops.writeMap(map -> map
+                .write("width", Types.INT, value.width())
+                .write("height", Types.INT, value.height())
+                .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))
+                .writeOptional("title", Types.TAG, value.title())
+                .writeOptional("author", Types.TAG, value.author()));
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("painting_variant", id);
+        }
     };
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryKey.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.api.data.MappingData.MappingType;
+import com.viaversion.viaversion.util.Key;
+
+/**
+ * Holds a key for a registry.
+ * Depending on the context, the key may be used to get registry entries from either synchronized or hardcoded registries.
+ *
+ * @see MappingType
+ * @see #of(String)
+ */
+public interface RegistryKey {
+
+    Key key();
+
+    static RegistryKey of(final String key) {
+        return new SimpleRegistryKey(Key.of(key));
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryType.java

@@ -22,11 +22,12 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
+import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public enum RegistryType {
+public enum RegistryType implements RegistryKey {
 
     BLOCK("block"),
     ITEM("item"),
@@ -40,7 +41,7 @@ public enum RegistryType {
 
     static {
         for (RegistryType type : getValues()) {
-            MAP.put(type.resourceLocation, type);
+            MAP.put(type.identifier, type);
         }
     }
 
@@ -48,17 +49,22 @@ public enum RegistryType {
         return VALUES;
     }
 
-    public static @Nullable RegistryType getByKey(String resourceKey) {
-        return MAP.get(resourceKey);
+    public static @Nullable RegistryType getByKey(String identifier) {
+        return MAP.get(identifier);
     }
 
-    private final String resourceLocation;
+    private final String identifier;
 
-    RegistryType(final String resourceLocation) {
-        this.resourceLocation = resourceLocation;
+    RegistryType(final String identifier) {
+        this.identifier = identifier;
     }
 
-    public String resourceLocation() {
-        return resourceLocation;
+    public String identifier() {
+        return identifier;
+    }
+
+    @Override
+    public Key key() {
+        return Key.of(identifier);
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/ResolvableProfile.java

@@ -0,0 +1,37 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Profile that can be either dynamically filled by the client or is already static.
+ * The additional fields are optional overrides.
+ */
+public record ResolvableProfile(GameProfile profile, @Nullable String bodyTexture, @Nullable String capeTexture,
+                                @Nullable String elytraTexture, @Nullable Integer modelType) {
+
+    public ResolvableProfile(final GameProfile profile) {
+        this(profile, null, null, null, null);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/SimpleRegistryKey.java

@@ -0,0 +1,33 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.util.Key;
+
+record SimpleRegistryKey(Key key) implements RegistryKey {
+
+    @Override
+    public String toString() {
+        return key.toString();
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/Vector3d.java

@@ -0,0 +1,28 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public record Vector3d(double x, double y, double z) {
+
+    public static final Vector3d ZERO = new Vector3d(0, 0, 0);
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/codec/CodecContext.java

@@ -24,8 +24,8 @@ package com.viaversion.viaversion.api.minecraft.codec;
 
 import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.Key;
-import java.util.List;
 
 public interface CodecContext {
 
@@ -39,16 +39,47 @@ public interface CodecContext {
 
         Key item(int id);
 
-        Key enchantment(int id);
-
         Key attributeModifier(int id);
 
         Key dataComponentType(int id);
 
-        static RegistryAccess of(final List<String> enchantments, final MappingData mappingData) {
-            return new RegistryAccessImpl(enchantments, mappingData);
+        Key entity(int id);
+
+        Key blockEntity(int id);
+
+        Key sound(int id);
+
+        /**
+         * Returns the key for a stored mapping type and its numeric id.
+         *
+         * @param mappingType mapping type
+         * @param id numeric id
+         * @return the key
+         */
+        Key key(MappingData.MappingType mappingType, int id);
+
+        /**
+         * Returns the numeric id for a stored mapping type and its identifier.
+         *
+         * @param mappingType mapping type
+         * @param identifier identifier
+         * @return the numeric id, or -1 if not found
+         */
+        int id(MappingData.MappingType mappingType, String identifier);
+
+        static RegistryAccess of(final Protocol<?, ?, ?, ?> protocol) {
+            return new RegistryAccessImpl(protocol);
         }
 
+        /**
+         * Returns the key for a client-synchronized registry element.
+         *
+         * @param registry registry key
+         * @param id numeric id
+         * @return the key
+         */
+        Key registryKey(String registry, int id);
+
         RegistryAccess withMapped(boolean mapped);
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/codec/RegistryAccessImpl.java

@@ -22,26 +22,29 @@
  */
 package com.viaversion.viaversion.api.minecraft.codec;
 
+import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.data.MappingData;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.util.Key;
-import java.util.List;
+import com.viaversion.viaversion.util.KeyMappings;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class RegistryAccessImpl implements CodecContext.RegistryAccess {
-    private final List<String> enchantments;
+    private final RegistryDataRewriter registryDataRewriter;
     private final MappingData mappingData;
     private final boolean mapped;
 
-    RegistryAccessImpl(final List<String> enchantments, final MappingData mappingData) {
-        this.enchantments = enchantments;
-        this.mappingData = mappingData;
+    RegistryAccessImpl(final Protocol<?, ?, ?, ?> protocol) {
+        this.mappingData = protocol.getMappingData();
+        this.registryDataRewriter = protocol.getRegistryDataRewriter();
         this.mapped = false;
     }
 
-    private RegistryAccessImpl(final List<String> enchantments, final MappingData mappingData, final boolean mapped) {
-        this.enchantments = enchantments;
+    private RegistryAccessImpl(final MappingData mappingData, final RegistryDataRewriter registryDataRewriter, final boolean mapped) {
         this.mappingData = mappingData;
+        this.registryDataRewriter = registryDataRewriter;
         this.mapped = mapped;
     }
 
@@ -50,12 +53,6 @@ final class RegistryAccessImpl implements CodecContext.RegistryAccess {
         return key(mappingData.getFullItemMappings(), id);
     }
 
-    @Override
-    public Key enchantment(final int id) {
-        final String identifier = id >= 0 && id < this.enchantments.size() ? this.enchantments.get(id) : null;
-        return key(identifier, id);
-    }
-
     @Override
     public Key attributeModifier(final int id) {
         return key(mappingData.getAttributeMappings(), id);
@@ -66,6 +63,40 @@ final class RegistryAccessImpl implements CodecContext.RegistryAccess {
         return key(mappingData.getDataComponentSerializerMappings(), id);
     }
 
+    @Override
+    public Key entity(final int id) {
+        return key(mappingData.getEntityMappings(), id);
+    }
+
+    @Override
+    public Key blockEntity(final int id) {
+        return key(mappingData.getBlockEntityMappings(), id);
+    }
+
+    @Override
+    public Key sound(final int id) {
+        return key(mappingData.getFullSoundMappings(), id);
+    }
+
+    @Override
+    public Key key(final MappingData.MappingType mappingType, final int id) {
+        return key(mappingData.getFullMappings(mappingType), id);
+    }
+
+    @Override
+    public int id(final MappingData.MappingType mappingType, final String identifier) {
+        final FullMappings mappings = mappingData.getFullMappings(mappingType);
+        return mapped ? mappings.mappedId(identifier) : mappings.id(identifier);
+    }
+
+    @Override
+    public Key registryKey(final String registry, final int id) {
+        final KeyMappings mappings = registryDataRewriter.getMappings(registry);
+        Preconditions.checkNotNull(mappings, "No registry mappings for registry: " + registry);
+        final String identifier = id >= 0 && id < mappings.size() ? mappings.idToKey(id) : null;
+        return key(identifier, id);
+    }
+
     private Key key(final FullMappings mappings, final int id) {
         final String identifier = mapped ? mappings.mappedIdentifier(id) : mappings.identifier(id);
         return key(identifier, id);
@@ -77,6 +108,6 @@ final class RegistryAccessImpl implements CodecContext.RegistryAccess {
 
     @Override
     public CodecContext.RegistryAccess withMapped(final boolean mapped) {
-        return this.mapped == mapped ? this : new RegistryAccessImpl(this.enchantments, this.mappingData, mapped);
+        return this.mapped == mapped ? this : new RegistryAccessImpl(this.mappingData, this.registryDataRewriter, mapped);
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/FilledStructuredData.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft.data;
 
 import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.util.ArrayUtil;
 import com.viaversion.viaversion.util.Copyable;
 import io.netty.buffer.ByteBuf;
 import java.util.Objects;
@@ -102,7 +103,7 @@ final class FilledStructuredData<T> implements StructuredData<T> {
     public String toString() {
         return "FilledStructuredData{" +
             "key=" + key +
-            ", value=" + value +
+            ", value=" + ArrayUtil.toString(value) +
             ", id=" + id +
             '}';
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java

@@ -27,27 +27,34 @@ import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.minecraft.EitherHolder;
 import com.viaversion.viaversion.api.minecraft.GameProfile;
 import com.viaversion.viaversion.api.minecraft.Holder;
-import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.PaintingVariant;
+import com.viaversion.viaversion.api.minecraft.RegistryKey;
+import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_20_5;
+import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_11;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_2;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_5;
 import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate;
 import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrim;
+import com.viaversion.viaversion.api.minecraft.item.data.AttackRange;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_5;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_21;
 import com.viaversion.viaversion.api.minecraft.item.data.BannerPatternLayer;
 import com.viaversion.viaversion.api.minecraft.item.data.Bee;
+import com.viaversion.viaversion.api.minecraft.item.data.BlockEntityData;
 import com.viaversion.viaversion.api.minecraft.item.data.BlockStateProperties;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks;
 import com.viaversion.viaversion.api.minecraft.item.data.Consumable1_21_2;
 import com.viaversion.viaversion.api.minecraft.item.data.CustomModelData1_21_4;
 import com.viaversion.viaversion.api.minecraft.item.data.DamageResistant;
+import com.viaversion.viaversion.api.minecraft.item.data.DamageType;
 import com.viaversion.viaversion.api.minecraft.item.data.DeathProtection;
+import com.viaversion.viaversion.api.minecraft.item.data.DebugStickState;
 import com.viaversion.viaversion.api.minecraft.item.data.DyedColor;
 import com.viaversion.viaversion.api.minecraft.item.data.Enchantable;
 import com.viaversion.viaversion.api.minecraft.item.data.Enchantments;
+import com.viaversion.viaversion.api.minecraft.item.data.EntityData;
 import com.viaversion.viaversion.api.minecraft.item.data.EnumTypes;
 import com.viaversion.viaversion.api.minecraft.item.data.Equippable;
 import com.viaversion.viaversion.api.minecraft.item.data.FireworkExplosion;
@@ -56,24 +63,32 @@ import com.viaversion.viaversion.api.minecraft.item.data.FoodProperties1_20_5;
 import com.viaversion.viaversion.api.minecraft.item.data.FoodProperties1_21_2;
 import com.viaversion.viaversion.api.minecraft.item.data.Instrument1_20_5;
 import com.viaversion.viaversion.api.minecraft.item.data.Instrument1_21_2;
+import com.viaversion.viaversion.api.minecraft.item.data.ItemModel;
 import com.viaversion.viaversion.api.minecraft.item.data.JukeboxPlayable;
+import com.viaversion.viaversion.api.minecraft.item.data.KineticWeapon;
+import com.viaversion.viaversion.api.minecraft.item.data.LockCode;
 import com.viaversion.viaversion.api.minecraft.item.data.LodestoneTracker;
+import com.viaversion.viaversion.api.minecraft.item.data.PiercingWeapon;
 import com.viaversion.viaversion.api.minecraft.item.data.PotDecorations;
 import com.viaversion.viaversion.api.minecraft.item.data.PotionContents;
 import com.viaversion.viaversion.api.minecraft.item.data.ProvidesTrimMaterial;
+import com.viaversion.viaversion.api.minecraft.item.data.Repairable;
 import com.viaversion.viaversion.api.minecraft.item.data.SuspiciousStewEffect;
+import com.viaversion.viaversion.api.minecraft.item.data.SwingAnimation;
 import com.viaversion.viaversion.api.minecraft.item.data.ToolProperties;
 import com.viaversion.viaversion.api.minecraft.item.data.TooltipDisplay;
 import com.viaversion.viaversion.api.minecraft.item.data.TropicalFishPattern;
 import com.viaversion.viaversion.api.minecraft.item.data.Unbreakable;
 import com.viaversion.viaversion.api.minecraft.item.data.UseCooldown;
+import com.viaversion.viaversion.api.minecraft.item.data.UseEffects;
 import com.viaversion.viaversion.api.minecraft.item.data.Weapon;
 import com.viaversion.viaversion.api.minecraft.item.data.WritableBook;
 import com.viaversion.viaversion.api.minecraft.item.data.WrittenBook;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
-import com.viaversion.viaversion.api.type.types.EitherType;
+import com.viaversion.viaversion.api.type.types.misc.SynchronizedRegistryEitherType;
+import com.viaversion.viaversion.api.type.types.misc.SynchronizedRegistryValueType;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.util.Either;
 import com.viaversion.viaversion.util.Key;
@@ -94,10 +109,13 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<Integer> MAX_DAMAGE = new StructuredDataKey<>("max_damage", Types.VAR_INT);
     public static final StructuredDataKey<Integer> DAMAGE = new StructuredDataKey<>("damage", Types.VAR_INT);
     public static final StructuredDataKey<Unbreakable> UNBREAKABLE1_20_5 = new StructuredDataKey<>("unbreakable", Unbreakable.TYPE);
+    public static final StructuredDataKey<UseEffects> USE_EFFECTS = new StructuredDataKey<>("use_effects", UseEffects.TYPE);
     public static final StructuredDataKey<Unit> UNBREAKABLE1_21_5 = new StructuredDataKey<>("unbreakable", Types.EMPTY);
     public static final StructuredDataKey<Tag> CUSTOM_NAME = new StructuredDataKey<>("custom_name", Types.TEXT_COMPONENT_TAG);
+    public static final StructuredDataKey<Float> MINIMUM_ATTACK_CHARGE = new StructuredDataKey<>("minimum_attack_charge", Types.FLOAT);
+    public static final StructuredDataKey<DamageType> DAMAGE_TYPE = new StructuredDataKey<>("damage_type", DamageType.TYPE);
     public static final StructuredDataKey<Tag> ITEM_NAME = new StructuredDataKey<>("item_name", Types.TEXT_COMPONENT_TAG);
-    public static final StructuredDataKey<Key> ITEM_MODEL = new StructuredDataKey<>("item_model", Types.RESOURCE_LOCATION);
+    public static final StructuredDataKey<ItemModel> ITEM_MODEL = new StructuredDataKey<>("item_model", ItemModel.TYPE);
     public static final StructuredDataKey<Tag[]> LORE = new StructuredDataKey<>("lore", new ArrayType<>(Types.TEXT_COMPONENT_TAG, 256));
     public static final StructuredDataKey<Integer> RARITY = new StructuredDataKey<>("rarity", EnumTypes.RARITY);
     public static final StructuredDataKey<Enchantments> ENCHANTMENTS1_20_5 = new StructuredDataKey<>("enchantments", Enchantments.TYPE1_20_5);
@@ -128,15 +146,19 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<ToolProperties> TOOL1_20_5 = new StructuredDataKey<>("tool", ToolProperties.TYPE1_20_5);
     public static final StructuredDataKey<ToolProperties> TOOL1_21_5 = new StructuredDataKey<>("tool", ToolProperties.TYPE1_21_5);
     public static final StructuredDataKey<Weapon> WEAPON = new StructuredDataKey<>("weapon", Weapon.TYPE);
+    public static final StructuredDataKey<AttackRange> ATTACK_RANGE = new StructuredDataKey<>("attack_range", AttackRange.TYPE);
     public static final StructuredDataKey<Enchantable> ENCHANTABLE = new StructuredDataKey<>("enchantable", Enchantable.TYPE);
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_2 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_2);
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_5 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_5);
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_6 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_6);
-    public static final StructuredDataKey<HolderSet> REPAIRABLE = new StructuredDataKey<>("repairable", Types.HOLDER_SET);
+    public static final StructuredDataKey<Repairable> REPAIRABLE = new StructuredDataKey<>("repairable", Repairable.TYPE);
     public static final StructuredDataKey<Unit> GLIDER = new StructuredDataKey<>("glider", Types.EMPTY);
-    public static final StructuredDataKey<Key> TOOLTIP_STYLE = new StructuredDataKey<>("tooltip_style", Types.RESOURCE_LOCATION);
+    public static final StructuredDataKey<Key> TOOLTIP_STYLE = new StructuredDataKey<>("tooltip_style", Types.IDENTIFIER);
     public static final StructuredDataKey<DeathProtection> DEATH_PROTECTION = new StructuredDataKey<>("death_protection", DeathProtection.TYPE);
     public static final StructuredDataKey<BlocksAttacks> BLOCKS_ATTACKS = new StructuredDataKey<>("blocks_attacks", BlocksAttacks.TYPE);
+    public static final StructuredDataKey<PiercingWeapon> PIERCING_WEAPON = new StructuredDataKey<>("piercing_weapon", PiercingWeapon.TYPE);
+    public static final StructuredDataKey<KineticWeapon> KINETIC_WEAPON = new StructuredDataKey<>("kinetic_weapon", KineticWeapon.TYPE);
+    public static final StructuredDataKey<SwingAnimation> SWING_ANIMATION = new StructuredDataKey<>("swing_animation", SwingAnimation.TYPE);
     public static final StructuredDataKey<Enchantments> STORED_ENCHANTMENTS1_20_5 = new StructuredDataKey<>("stored_enchantments", Enchantments.TYPE1_20_5);
     public static final StructuredDataKey<Enchantments> STORED_ENCHANTMENTS1_21_5 = new StructuredDataKey<>("stored_enchantments", Enchantments.TYPE1_21_5);
     public static final StructuredDataKey<DyedColor> DYED_COLOR1_20_5 = new StructuredDataKey<>("dyed_color", DyedColor.TYPE1_20_5);
@@ -155,10 +177,12 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<ArmorTrim> TRIM1_21_2 = new StructuredDataKey<>("trim", ArmorTrim.TYPE1_21_2);
     public static final StructuredDataKey<ArmorTrim> TRIM1_21_4 = new StructuredDataKey<>("trim", ArmorTrim.TYPE1_21_4);
     public static final StructuredDataKey<ArmorTrim> TRIM1_21_5 = new StructuredDataKey<>("trim", ArmorTrim.TYPE1_21_5);
-    public static final StructuredDataKey<CompoundTag> DEBUG_STICK_STATE = new StructuredDataKey<>("debug_stick_state", Types.COMPOUND_TAG);
-    public static final StructuredDataKey<CompoundTag> ENTITY_DATA = new StructuredDataKey<>("entity_data", Types.COMPOUND_TAG);
+    public static final StructuredDataKey<DebugStickState> DEBUG_STICK_STATE = new StructuredDataKey<>("debug_stick_state", DebugStickState.TYPE);
+    public static final StructuredDataKey<CompoundTag> ENTITY_DATA1_20_5 = new StructuredDataKey<>("entity_data", Types.COMPOUND_TAG);
+    public static final StructuredDataKey<EntityData> ENTITY_DATA1_21_9 = new StructuredDataKey<>("entity_data", EntityData.TYPE);
     public static final StructuredDataKey<CompoundTag> BUCKET_ENTITY_DATA = new StructuredDataKey<>("bucket_entity_data", Types.COMPOUND_TAG);
-    public static final StructuredDataKey<CompoundTag> BLOCK_ENTITY_DATA = new StructuredDataKey<>("block_entity_data", Types.COMPOUND_TAG);
+    public static final StructuredDataKey<CompoundTag> BLOCK_ENTITY_DATA1_20_5 = new StructuredDataKey<>("block_entity_data", Types.COMPOUND_TAG);
+    public static final StructuredDataKey<BlockEntityData> BLOCK_ENTITY_DATA1_21_9 = new StructuredDataKey<>("block_entity_data", BlockEntityData.TYPE);
     public static final StructuredDataKey<Holder<Instrument1_20_5>> INSTRUMENT1_20_5 = new StructuredDataKey<>("instrument", Instrument1_20_5.TYPE);
     public static final StructuredDataKey<Holder<Instrument1_21_2>> INSTRUMENT1_21_2 = new StructuredDataKey<>("instrument", Instrument1_21_2.TYPE);
     public static final StructuredDataKey<EitherHolder<Instrument1_21_2>> INSTRUMENT1_21_5 = new StructuredDataKey<>("instrument", Instrument1_21_2.EITHER_HOLDER_TYPE);
@@ -171,20 +195,23 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<LodestoneTracker> LODESTONE_TRACKER = new StructuredDataKey<>("lodestone_tracker", LodestoneTracker.TYPE);
     public static final StructuredDataKey<FireworkExplosion> FIREWORK_EXPLOSION = new StructuredDataKey<>("firework_explosion", FireworkExplosion.TYPE);
     public static final StructuredDataKey<Fireworks> FIREWORKS = new StructuredDataKey<>("fireworks", Fireworks.TYPE);
-    public static final StructuredDataKey<GameProfile> PROFILE = new StructuredDataKey<>("profile", Types.GAME_PROFILE);
-    public static final StructuredDataKey<Key> NOTE_BLOCK_SOUND = new StructuredDataKey<>("note_block_sound", Types.RESOURCE_LOCATION);
+    public static final StructuredDataKey<GameProfile> PROFILE1_20_5 = new StructuredDataKey<>("profile", Types.GAME_PROFILE);
+    public static final StructuredDataKey<ResolvableProfile> PROFILE1_21_9 = new StructuredDataKey<>("profile", Types.RESOLVABLE_PROFILE);
+    public static final StructuredDataKey<Key> NOTE_BLOCK_SOUND = new StructuredDataKey<>("note_block_sound", Types.IDENTIFIER);
     public static final StructuredDataKey<BannerPatternLayer[]> BANNER_PATTERNS = new StructuredDataKey<>("banner_patterns", BannerPatternLayer.ARRAY_TYPE);
     public static final StructuredDataKey<Integer> BASE_COLOR = new StructuredDataKey<>("base_color", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<PotDecorations> POT_DECORATIONS = new StructuredDataKey<>("pot_decorations", PotDecorations.TYPE);
     public static final StructuredDataKey<BlockStateProperties> BLOCK_STATE = new StructuredDataKey<>("block_state", BlockStateProperties.TYPE);
-    public static final StructuredDataKey<Bee[]> BEES = new StructuredDataKey<>("bees", Bee.ARRAY_TYPE);
-    public static final StructuredDataKey<Tag> LOCK = new StructuredDataKey<>("lock", Types.TAG);
+    public static final StructuredDataKey<Bee[]> BEES1_20_5 = new StructuredDataKey<>("bees", Bee.ARRAY_TYPE1_20_5);
+    public static final StructuredDataKey<Bee[]> BEES1_21_9 = new StructuredDataKey<>("bees", Bee.ARRAY_TYPE1_21_9);
+    public static final StructuredDataKey<Tag> LOCK1_20_5 = new StructuredDataKey<>("lock", Types.TAG);
+    public static final StructuredDataKey<LockCode> LOCK1_21_2 = new StructuredDataKey<>("lock", LockCode.TYPE);
     public static final StructuredDataKey<CompoundTag> CONTAINER_LOOT = new StructuredDataKey<>("container_loot", Types.COMPOUND_TAG);
     public static final StructuredDataKey<Holder<SoundEvent>> BREAK_SOUND = new StructuredDataKey<>("break_sound", Types.SOUND_EVENT);
 
     public static final StructuredDataKey<Integer> VILLAGER_VARIANT = new StructuredDataKey<>("villager/variant", EnumTypes.VILLAGER_TYPE);
-    public static final StructuredDataKey<Integer> WOLF_VARIANT = new StructuredDataKey<>("wolf/variant", Types.VAR_INT);
-    public static final StructuredDataKey<Integer> WOLF_SOUND_VARIANT = new StructuredDataKey<>("wolf/sound_variant", Types.VAR_INT);
+    public static final StructuredDataKey<Integer> WOLF_VARIANT = new StructuredDataKey<>("wolf/variant", new SynchronizedRegistryValueType(RegistryKey.of("wolf_variant")));
+    public static final StructuredDataKey<Integer> WOLF_SOUND_VARIANT = new StructuredDataKey<>("wolf/sound_variant", new SynchronizedRegistryValueType(RegistryKey.of("wolf_sound_variant")));
     public static final StructuredDataKey<Integer> WOLF_COLLAR = new StructuredDataKey<>("wolf/collar", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<Integer> FOX_VARIANT = new StructuredDataKey<>("fox/variant", EnumTypes.FOX_VARIANT);
     public static final StructuredDataKey<Integer> SALMON_SIZE = new StructuredDataKey<>("salmon/size", EnumTypes.SALMON_VARIANT);
@@ -194,15 +221,16 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<Integer> TROPICAL_FISH_PATTERN_COLOR = new StructuredDataKey<>("tropical_fish/pattern_color", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<Integer> MOOSHROOM_VARIANT = new StructuredDataKey<>("mooshroom/variant", EnumTypes.MUSHROOM_COW_VARIANT);
     public static final StructuredDataKey<Integer> RABBIT_VARIANT = new StructuredDataKey<>("rabbit/variant", EnumTypes.RABBIT_VARIANT);
-    public static final StructuredDataKey<Integer> PIG_VARIANT = new StructuredDataKey<>("pig/variant", Types.VAR_INT);
-    public static final StructuredDataKey<Integer> COW_VARIANT = new StructuredDataKey<>("cow/variant", Types.VAR_INT);
-    public static final StructuredDataKey<Either<Integer, String>> CHICKEN_VARIANT = new StructuredDataKey<>("chicken/variant", new EitherType<>(Types.VAR_INT, Types.STRING)); // ???
-    public static final StructuredDataKey<Integer> FROG_VARIANT = new StructuredDataKey<>("frog/variant", Types.VAR_INT);
+    public static final StructuredDataKey<Integer> PIG_VARIANT = new StructuredDataKey<>("pig/variant", new SynchronizedRegistryValueType(RegistryKey.of("pig_variant")));
+    public static final StructuredDataKey<Integer> COW_VARIANT = new StructuredDataKey<>("cow/variant", new SynchronizedRegistryValueType(RegistryKey.of("cow_variant")));
+    public static final StructuredDataKey<Either<Integer, String>> CHICKEN_VARIANT = new StructuredDataKey<>("chicken/variant", new SynchronizedRegistryEitherType(RegistryKey.of("chicken_variant")));
+    public static final StructuredDataKey<Either<Integer, String>> ZOMBIE_NAUTILUS_VARIANT = new StructuredDataKey<>("zombie_nautilus/variant", new SynchronizedRegistryEitherType(RegistryKey.of("zombie_nautilus_variant"))); // ???
+    public static final StructuredDataKey<Integer> FROG_VARIANT = new StructuredDataKey<>("frog/variant", new SynchronizedRegistryValueType(RegistryKey.of("frog_variant")));
     public static final StructuredDataKey<Integer> HORSE_VARIANT = new StructuredDataKey<>("horse/variant", EnumTypes.HORSE_VARIANT);
     public static final StructuredDataKey<Holder<PaintingVariant>> PAINTING_VARIANT = new StructuredDataKey<>("painting/variant", PaintingVariant.TYPE1_21_2);
     public static final StructuredDataKey<Integer> LLAMA_VARIANT = new StructuredDataKey<>("llama/variant", EnumTypes.LLAMA_VARIANT);
     public static final StructuredDataKey<Integer> AXOLOTL_VARIANT = new StructuredDataKey<>("axolotl/variant", EnumTypes.AXOLOTL_VARIANT);
-    public static final StructuredDataKey<Integer> CAT_VARIANT = new StructuredDataKey<>("cat/variant", Types.VAR_INT);
+    public static final StructuredDataKey<Integer> CAT_VARIANT = new StructuredDataKey<>("cat/variant", new SynchronizedRegistryValueType(RegistryKey.of("cat_variant")));
     public static final StructuredDataKey<Integer> CAT_COLLAR = new StructuredDataKey<>("cat/collar", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<Integer> SHEEP_COLOR = new StructuredDataKey<>("sheep/color", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<Integer> SHULKER_COLOR = new StructuredDataKey<>("shulker/color", EnumTypes.DYE_COLOR);
@@ -214,6 +242,8 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKeys1_21_2 V1_21_4 = VersionedTypes.V1_21_4.structuredDataKeys();
     public static final StructuredDataKeys1_21_5 V1_21_5 = VersionedTypes.V1_21_5.structuredDataKeys();
     public static final StructuredDataKeys1_21_5 V1_21_6 = VersionedTypes.V1_21_6.structuredDataKeys();
+    public static final StructuredDataKeys1_21_5 V1_21_9 = VersionedTypes.V1_21_9.structuredDataKeys();
+    public static final StructuredDataKeys1_21_11 V1_21_11 = VersionedTypes.V1_21_11.structuredDataKeys();
 
     @Override
     public String toString() {

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/predicate/DataComponentMatchers.java

@@ -30,23 +30,25 @@ public record DataComponentMatchers(StructuredData<?>[] exactPredicates, DataCom
 
     public static final class DataComponentMatchersType extends Type<DataComponentMatchers> {
         private final Type<StructuredData<?>[]> dataArrayType;
+        private final Type<DataComponentPredicate[]> predicateArrayType;
 
-        public DataComponentMatchersType(final Type<StructuredData<?>[]> dataArrayType) {
+        public DataComponentMatchersType(final Type<StructuredData<?>[]> dataArrayType, final Type<DataComponentPredicate[]> predicateArrayType) {
             super(DataComponentMatchers.class);
             this.dataArrayType = dataArrayType;
+            this.predicateArrayType = predicateArrayType;
         }
 
         @Override
         public DataComponentMatchers read(final ByteBuf buffer) {
             final StructuredData<?>[] exactPredicates = dataArrayType.read(buffer);
-            final DataComponentPredicate[] partialPredicates = DataComponentPredicate.ARRAY_TYPE.read(buffer);
+            final DataComponentPredicate[] partialPredicates = predicateArrayType.read(buffer);
             return new DataComponentMatchers(exactPredicates, partialPredicates);
         }
 
         @Override
         public void write(final ByteBuf buffer, final DataComponentMatchers value) {
             dataArrayType.write(buffer, value.exactPredicates());
-            DataComponentPredicate.ARRAY_TYPE.write(buffer, value.predicates());
+            predicateArrayType.write(buffer, value.predicates());
         }
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/predicate/DataComponentPredicate.java

@@ -28,9 +28,13 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import io.netty.buffer.ByteBuf;
 
-public record DataComponentPredicate(int id, Tag predicate) {
+public record DataComponentPredicate(PredicateType type, Tag predicate) {
 
-    public static final Type<DataComponentPredicate> TYPE = new Type<>(DataComponentPredicate.class) {
+    public DataComponentPredicate(final int predicateType, final Tag predicate) {
+        this(PredicateType.ofPredicateType(predicateType), predicate);
+    }
+
+    public static final Type<DataComponentPredicate> TYPE1_21_5 = new Type<>(DataComponentPredicate.class) {
         @Override
         public DataComponentPredicate read(final ByteBuf buffer) {
             final int id = Types.VAR_INT.readPrimitive(buffer);
@@ -40,9 +44,38 @@ public record DataComponentPredicate(int id, Tag predicate) {
 
         @Override
         public void write(final ByteBuf buffer, final DataComponentPredicate value) {
-            Types.VAR_INT.writePrimitive(buffer, value.id());
+            Types.VAR_INT.writePrimitive(buffer, value.type().id());
             Types.TAG.write(buffer, value.predicate());
         }
     };
-    public static final Type<DataComponentPredicate[]> ARRAY_TYPE = new ArrayType<>(TYPE, 64);
+    public static final Type<DataComponentPredicate[]> ARRAY_TYPE1_21_5 = new ArrayType<>(TYPE1_21_5, 64);
+
+    public static final Type<DataComponentPredicate> TYPE1_21_11 = new Type<>(DataComponentPredicate.class) {
+        @Override
+        public DataComponentPredicate read(final ByteBuf buffer) {
+            final boolean isPredicateType = Types.BOOLEAN.read(buffer);
+            final PredicateType type = new PredicateType(Types.VAR_INT.readPrimitive(buffer), isPredicateType);
+            final Tag predicate = Types.TAG.read(buffer);
+            return new DataComponentPredicate(type, predicate);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final DataComponentPredicate value) {
+            Types.BOOLEAN.write(buffer, value.type().isPredicateType());
+            Types.VAR_INT.writePrimitive(buffer, value.type().id());
+            Types.TAG.write(buffer, value.predicate());
+        }
+    };
+    public static final Type<DataComponentPredicate[]> ARRAY_TYPE1_21_11 = new ArrayType<>(TYPE1_21_11, 64);
+
+    public record PredicateType(int id, boolean isPredicateType) {
+
+        public static PredicateType ofPredicateType(final int id) {
+            return new PredicateType(id, true);
+        }
+
+        public static PredicateType ofDataComponentType(final int id) {
+            return new PredicateType(id, false);
+        }
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/version/StructuredDataKeys1_21_11.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.data.version;
+
+import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
+import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentPredicate;
+import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate;
+import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate.AdventureModePredicateType1_21_5;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
+
+public class StructuredDataKeys1_21_11 extends StructuredDataKeys1_21_2 {
+
+    public final StructuredDataKey<AdventureModePredicate> canPlaceOn;
+    public final StructuredDataKey<AdventureModePredicate> canBreak;
+
+    public StructuredDataKeys1_21_11(final VersionedTypesHolder types) {
+        super(types);
+        final AdventureModePredicateType1_21_5 adventureModePredicateType = new AdventureModePredicateType1_21_5(types.structuredDataArray(), DataComponentPredicate.ARRAY_TYPE1_21_11);
+        this.canPlaceOn = add("can_place_on", adventureModePredicateType);
+        this.canBreak = add("can_break", adventureModePredicateType);
+        this.unsupportedForOps.add(this.canPlaceOn);
+        this.unsupportedForOps.add(this.canBreak);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/version/StructuredDataKeys1_21_5.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft.data.version;
 
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
+import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentPredicate;
 import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate;
 import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate.AdventureModePredicateType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
@@ -34,7 +35,7 @@ public class StructuredDataKeys1_21_5 extends StructuredDataKeys1_21_2 {
 
     public StructuredDataKeys1_21_5(final VersionedTypesHolder types) {
         super(types);
-        final AdventureModePredicateType1_21_5 adventureModePredicateType = new AdventureModePredicateType1_21_5(types.structuredDataArray());
+        final AdventureModePredicateType1_21_5 adventureModePredicateType = new AdventureModePredicateType1_21_5(types.structuredDataArray(), DataComponentPredicate.ARRAY_TYPE1_21_5);
         this.canPlaceOn = add("can_place_on", adventureModePredicateType);
         this.canBreak = add("can_break", adventureModePredicateType);
         this.unsupportedForOps.add(this.canPlaceOn);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_10.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_10 {
 
@@ -143,7 +143,7 @@ public class EntityTypes1_10 {
         SPIDER(52, ABSTRACT_MONSTER),
         CAVE_SPIDER(59, SPIDER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -184,7 +184,9 @@ public class EntityTypes1_10 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -230,7 +232,7 @@ public class EntityTypes1_10 {
         SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
         DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -238,7 +240,7 @@ public class EntityTypes1_10 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -268,7 +270,7 @@ public class EntityTypes1_10 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_11.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_11 {
 
@@ -168,7 +168,7 @@ public class EntityTypes1_11 {
         EVOKER(34, ABSTRACT_MONSTER),
         VINDICATOR(36, ABSTRACT_MONSTER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -209,7 +209,9 @@ public class EntityTypes1_11 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -257,7 +259,7 @@ public class EntityTypes1_11 {
         SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
         DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -265,7 +267,7 @@ public class EntityTypes1_11 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -295,7 +297,7 @@ public class EntityTypes1_11 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_12.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_12 {
 
@@ -174,7 +174,7 @@ public class EntityTypes1_12 {
         EVOKER(34, SPELLCASTER_ILLAGER),
         ILLUSIONER(37, SPELLCASTER_ILLAGER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -215,7 +215,9 @@ public class EntityTypes1_12 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -263,7 +265,7 @@ public class EntityTypes1_12 {
         SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
         DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -271,7 +273,7 @@ public class EntityTypes1_12 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -301,7 +303,7 @@ public class EntityTypes1_12 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_13.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_13 {
 
@@ -185,7 +185,7 @@ public class EntityTypes1_13 {
         EVOKER(21, SPELLCASTER_ILLAGER),
         ILLUSIONER(31, SPELLCASTER_ILLAGER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -226,7 +226,9 @@ public class EntityTypes1_13 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -275,7 +277,7 @@ public class EntityTypes1_13 {
         DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL),
         TRIDENT(94, EntityType.TRIDENT);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -283,7 +285,7 @@ public class EntityTypes1_13 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -313,7 +315,7 @@ public class EntityTypes1_13 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java

@@ -213,7 +213,7 @@ public enum EntityTypes1_14 implements EntityType {
 
     EntityTypes1_14(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_14(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java

@@ -214,7 +214,7 @@ public enum EntityTypes1_15 implements EntityType {
 
     EntityTypes1_15(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_15(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java

@@ -218,7 +218,7 @@ public enum EntityTypes1_16 implements EntityType {
 
     EntityTypes1_16(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_16(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java

@@ -221,7 +221,7 @@ public enum EntityTypes1_16_2 implements EntityType {
 
     EntityTypes1_16_2(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_16_2(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java

@@ -227,7 +227,7 @@ public enum EntityTypes1_17 implements EntityType {
 
     EntityTypes1_17(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_17(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java

@@ -232,7 +232,7 @@ public enum EntityTypes1_19 implements EntityType {
 
     EntityTypes1_19(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java

@@ -233,7 +233,7 @@ public enum EntityTypes1_19_3 implements EntityType {
 
     EntityTypes1_19_3(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19_3(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java

@@ -240,7 +240,7 @@ public enum EntityTypes1_19_4 implements EntityType {
 
     EntityTypes1_19_4(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19_4(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_3.java

@@ -242,7 +242,7 @@ public enum EntityTypes1_20_3 implements EntityType {
 
     EntityTypes1_20_3(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_20_3(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java

@@ -248,7 +248,7 @@ public enum EntityTypes1_20_5 implements EntityType {
 
     EntityTypes1_20_5(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_20_5(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_21_11.java

@@ -0,0 +1,329 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.entities;
+
+import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.util.EntityTypeUtil;
+import com.viaversion.viaversion.util.Key;
+import java.util.Locale;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public enum EntityTypes1_21_11 implements EntityType {
+
+    ENTITY(null, null),
+
+    AREA_EFFECT_CLOUD(ENTITY),
+    END_CRYSTAL(ENTITY),
+    EVOKER_FANGS(ENTITY),
+    EXPERIENCE_ORB(ENTITY),
+    EYE_OF_ENDER(ENTITY),
+    FALLING_BLOCK(ENTITY),
+    ITEM(ENTITY),
+    TNT(ENTITY),
+    OMINOUS_ITEM_SPAWNER(ENTITY),
+    MARKER(ENTITY),
+    LIGHTNING_BOLT(ENTITY),
+    INTERACTION(ENTITY),
+
+    DISPLAY(ENTITY, null),
+    BLOCK_DISPLAY(DISPLAY),
+    ITEM_DISPLAY(DISPLAY),
+    TEXT_DISPLAY(DISPLAY),
+
+    // Hanging entities
+    HANGING_ENTITY(ENTITY, null),
+    LEASH_KNOT(HANGING_ENTITY),
+    PAINTING(HANGING_ENTITY),
+    ITEM_FRAME(HANGING_ENTITY),
+    GLOW_ITEM_FRAME(ITEM_FRAME),
+
+    // Projectiles
+    PROJECTILE(ENTITY, null),
+    ITEM_PROJECTILE(PROJECTILE, null),
+    SNOWBALL(ITEM_PROJECTILE),
+    ENDER_PEARL(ITEM_PROJECTILE),
+    EGG(ITEM_PROJECTILE),
+    EXPERIENCE_BOTTLE(ITEM_PROJECTILE),
+    FIREWORK_ROCKET(PROJECTILE),
+    LLAMA_SPIT(PROJECTILE),
+    SHULKER_BULLET(PROJECTILE),
+    FISHING_BOBBER(PROJECTILE),
+    WITHER_SKULL(PROJECTILE),
+    DRAGON_FIREBALL(PROJECTILE), // Doesn't actually inherit fireball
+
+    ABSTRACT_THROWN_POTION(ITEM_PROJECTILE, null),
+    SPLASH_POTION(ABSTRACT_THROWN_POTION),
+    LINGERING_POTION(ABSTRACT_THROWN_POTION),
+
+    ABSTRACT_ARROW(PROJECTILE, null),
+    ARROW(ABSTRACT_ARROW),
+    SPECTRAL_ARROW(ABSTRACT_ARROW),
+    TRIDENT(ABSTRACT_ARROW),
+
+    ABSTRACT_FIREBALL(ENTITY, null),
+    FIREBALL(ABSTRACT_FIREBALL),
+    SMALL_FIREBALL(ABSTRACT_FIREBALL),
+
+    ABSTRACT_WIND_CHARGE(PROJECTILE, null),
+    WIND_CHARGE(ABSTRACT_WIND_CHARGE),
+    BREEZE_WIND_CHARGE(ABSTRACT_WIND_CHARGE),
+
+    // Vehicles
+    VEHICLE(ENTITY, null),
+
+    ABSTRACT_MINECART(VEHICLE, null),
+    MINECART(ABSTRACT_MINECART),
+    FURNACE_MINECART(ABSTRACT_MINECART),
+    COMMAND_BLOCK_MINECART(ABSTRACT_MINECART),
+    TNT_MINECART(ABSTRACT_MINECART),
+    SPAWNER_MINECART(ABSTRACT_MINECART),
+
+    ABSTRACT_MINECART_CONTAINER(ABSTRACT_MINECART, null),
+    CHEST_MINECART(ABSTRACT_MINECART_CONTAINER),
+    HOPPER_MINECART(ABSTRACT_MINECART_CONTAINER),
+
+    ABSTRACT_BOAT(VEHICLE, null),
+    ABSTRACT_CHEST_BOAT(ABSTRACT_BOAT, null),
+    ACACIA_BOAT(ABSTRACT_BOAT),
+    ACACIA_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    BAMBOO_CHEST_RAFT(ABSTRACT_CHEST_BOAT),
+    BAMBOO_RAFT(ABSTRACT_BOAT),
+    BIRCH_BOAT(ABSTRACT_BOAT),
+    BIRCH_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    CHERRY_BOAT(ABSTRACT_BOAT),
+    CHERRY_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    DARK_OAK_BOAT(ABSTRACT_BOAT),
+    DARK_OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    JUNGLE_BOAT(ABSTRACT_BOAT),
+    JUNGLE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    MANGROVE_BOAT(ABSTRACT_BOAT),
+    MANGROVE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    OAK_BOAT(ABSTRACT_BOAT),
+    OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    PALE_OAK_BOAT(ABSTRACT_BOAT),
+    PALE_OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    SPRUCE_BOAT(ABSTRACT_BOAT),
+    SPRUCE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+
+    // Living entities as a larger subclass
+    LIVING_ENTITY(ENTITY, null),
+    ARMOR_STAND(LIVING_ENTITY),
+
+    // Players
+    AVATAR(LIVING_ENTITY, null),
+    MANNEQUIN(AVATAR),
+    PLAYER(AVATAR),
+
+    // Mobs as a larger subclass
+    MOB(LIVING_ENTITY, null),
+    ENDER_DRAGON(MOB),
+
+    SLIME(MOB),
+    MAGMA_CUBE(SLIME),
+
+    // Ambient mobs
+    AMBIENT_CREATURE(MOB, null),
+    BAT(AMBIENT_CREATURE),
+
+    // Flying mobs
+    FLYING_MOB(MOB, null),
+    GHAST(FLYING_MOB),
+    PHANTOM(FLYING_MOB),
+
+    // Pathfinder mobs and its subclasses
+    PATHFINDER_MOB(MOB, null),
+    ALLAY(PATHFINDER_MOB),
+
+    ABSTRACT_GOLEM(PATHFINDER_MOB, null),
+    SNOW_GOLEM(ABSTRACT_GOLEM),
+    IRON_GOLEM(ABSTRACT_GOLEM),
+    SHULKER(ABSTRACT_GOLEM),
+    COPPER_GOLEM(ABSTRACT_GOLEM),
+
+    // Ageable mobs and (tamable) animals
+    ABSTRACT_AGEABLE(PATHFINDER_MOB, null),
+    ABSTRACT_VILLAGER(ABSTRACT_AGEABLE, null),
+    VILLAGER(ABSTRACT_VILLAGER),
+    WANDERING_TRADER(ABSTRACT_VILLAGER),
+
+    ABSTRACT_ANIMAL(ABSTRACT_AGEABLE, null),
+    AXOLOTL(ABSTRACT_ANIMAL),
+    CHICKEN(ABSTRACT_ANIMAL),
+    PANDA(ABSTRACT_ANIMAL),
+    PIG(ABSTRACT_ANIMAL),
+    POLAR_BEAR(ABSTRACT_ANIMAL),
+    RABBIT(ABSTRACT_ANIMAL),
+    SHEEP(ABSTRACT_ANIMAL),
+    BEE(ABSTRACT_ANIMAL),
+    TURTLE(ABSTRACT_ANIMAL),
+    FOX(ABSTRACT_ANIMAL),
+    FROG(ABSTRACT_ANIMAL),
+    GOAT(ABSTRACT_ANIMAL),
+    HOGLIN(ABSTRACT_ANIMAL),
+    STRIDER(ABSTRACT_ANIMAL),
+    SNIFFER(ABSTRACT_ANIMAL),
+    ARMADILLO(ABSTRACT_ANIMAL),
+    HAPPY_GHAST(ABSTRACT_ANIMAL),
+
+    ABSTRACT_COW(ABSTRACT_ANIMAL, null),
+    COW(ABSTRACT_COW),
+    MOOSHROOM(ABSTRACT_COW),
+
+    TAMABLE_ANIMAL(ABSTRACT_ANIMAL, null),
+    CAT(TAMABLE_ANIMAL),
+    OCELOT(TAMABLE_ANIMAL),
+    WOLF(TAMABLE_ANIMAL),
+    PARROT(TAMABLE_ANIMAL),
+
+    ABSTRACT_NAUTILUS(TAMABLE_ANIMAL, null),
+    NAUTILUS(ABSTRACT_NAUTILUS),
+    ZOMBIE_NAUTILUS(ABSTRACT_NAUTILUS),
+
+    ABSTRACT_HORSE(ABSTRACT_ANIMAL, null),
+    HORSE(ABSTRACT_HORSE),
+    SKELETON_HORSE(ABSTRACT_HORSE),
+    ZOMBIE_HORSE(ABSTRACT_HORSE),
+    CAMEL(ABSTRACT_HORSE),
+    CAMEL_HUSK(CAMEL),
+
+    ABSTRACT_CHESTED_HORSE(ABSTRACT_HORSE, null),
+    DONKEY(ABSTRACT_CHESTED_HORSE),
+    MULE(ABSTRACT_CHESTED_HORSE),
+    LLAMA(ABSTRACT_CHESTED_HORSE),
+    TRADER_LLAMA(LLAMA),
+
+    // Monsters
+    ABSTRACT_MONSTER(PATHFINDER_MOB, null),
+    BLAZE(ABSTRACT_MONSTER),
+    CREEPER(ABSTRACT_MONSTER),
+    ENDERMITE(ABSTRACT_MONSTER),
+    ENDERMAN(ABSTRACT_MONSTER),
+    GIANT(ABSTRACT_MONSTER),
+    SILVERFISH(ABSTRACT_MONSTER),
+    VEX(ABSTRACT_MONSTER),
+    WITHER(ABSTRACT_MONSTER),
+    BREEZE(ABSTRACT_MONSTER),
+    ZOGLIN(ABSTRACT_MONSTER),
+    WARDEN(ABSTRACT_MONSTER),
+    CREAKING(ABSTRACT_MONSTER),
+
+    ABSTRACT_SKELETON(ABSTRACT_MONSTER, null),
+    SKELETON(ABSTRACT_SKELETON),
+    STRAY(ABSTRACT_SKELETON),
+    WITHER_SKELETON(ABSTRACT_SKELETON),
+    BOGGED(ABSTRACT_SKELETON),
+    PARCHED(ABSTRACT_SKELETON),
+
+    ZOMBIE(ABSTRACT_MONSTER),
+    DROWNED(ZOMBIE),
+    HUSK(ZOMBIE),
+    ZOMBIFIED_PIGLIN(ZOMBIE),
+    ZOMBIE_VILLAGER(ZOMBIE),
+
+    GUARDIAN(ABSTRACT_MONSTER),
+    ELDER_GUARDIAN(GUARDIAN),
+
+    SPIDER(ABSTRACT_MONSTER),
+    CAVE_SPIDER(SPIDER),
+
+    ABSTRACT_PIGLIN(ABSTRACT_MONSTER, null),
+    PIGLIN(ABSTRACT_PIGLIN),
+    PIGLIN_BRUTE(ABSTRACT_PIGLIN),
+
+    // Water mobs
+    AGEABLE_WATER_CREATURE(ABSTRACT_AGEABLE, null),
+    DOLPHIN(AGEABLE_WATER_CREATURE),
+
+    SQUID(AGEABLE_WATER_CREATURE),
+    GLOW_SQUID(SQUID),
+
+    WATER_ANIMAL(PATHFINDER_MOB, null),
+    ABSTRACT_FISH(WATER_ANIMAL, null),
+    PUFFERFISH(ABSTRACT_FISH),
+    TADPOLE(ABSTRACT_FISH),
+
+    ABSTRACT_SCHOOLING_FISH(ABSTRACT_FISH, null),
+    COD(ABSTRACT_SCHOOLING_FISH),
+    SALMON(ABSTRACT_SCHOOLING_FISH),
+    TROPICAL_FISH(ABSTRACT_SCHOOLING_FISH),
+
+    // Raiders
+    ABSTRACT_RAIDER(ABSTRACT_MONSTER, null),
+    WITCH(ABSTRACT_RAIDER),
+    RAVAGER(ABSTRACT_RAIDER),
+
+    ABSTRACT_ILLAGER(ABSTRACT_RAIDER, null),
+    SPELLCASTER_ILLAGER(ABSTRACT_ILLAGER, null),
+    VINDICATOR(ABSTRACT_ILLAGER),
+    PILLAGER(ABSTRACT_ILLAGER),
+    EVOKER(SPELLCASTER_ILLAGER),
+    ILLUSIONER(SPELLCASTER_ILLAGER);
+
+    private static final EntityType[] TYPES = EntityTypeUtil.createSizedArray(values());
+    private final EntityType parent;
+    private final String identifier;
+    private int id = -1;
+
+    EntityTypes1_21_11(final EntityType parent) {
+        this.parent = parent;
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
+    }
+
+    EntityTypes1_21_11(final EntityType parent, @Nullable final String identifier) {
+        this.parent = parent;
+        this.identifier = identifier;
+    }
+
+    @Override
+    public int getId() {
+        if (id == -1) {
+            throw new IllegalStateException("Ids have not been initialized yet (type " + name() + ")");
+        }
+        return id;
+    }
+
+    @Override
+    public String identifier() {
+        Preconditions.checkArgument(identifier != null, "Called identifier method on abstract type");
+        return identifier;
+    }
+
+    @Override
+    public @Nullable EntityType getParent() {
+        return parent;
+    }
+
+    @Override
+    public boolean isAbstractType() {
+        return identifier == null;
+    }
+
+    public static EntityType getTypeFromId(final int typeId) {
+        return EntityTypeUtil.getTypeFromId(TYPES, typeId, PIG);
+    }
+
+    public static void initialize(final Protocol<?, ?, ?, ?> protocol) {
+        EntityTypeUtil.initialize(values(), TYPES, protocol, (type, id) -> type.id = id);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_21_2.java

@@ -272,7 +272,7 @@ public enum EntityTypes1_21_2 implements EntityType {
 
     EntityTypes1_21_2(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_21_2(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_21_4.java

@@ -271,7 +271,7 @@ public enum EntityTypes1_21_4 implements EntityType {
 
     EntityTypes1_21_4(final EntityType parent) {
         this.parent = parent;
-        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_21_4(final EntityType parent, @Nullable final String identifier) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_21_9.java

@@ -0,0 +1,323 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.entities;
+
+import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.util.EntityTypeUtil;
+import com.viaversion.viaversion.util.Key;
+import java.util.Locale;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public enum EntityTypes1_21_9 implements EntityType {
+
+    ENTITY(null, null),
+
+    AREA_EFFECT_CLOUD(ENTITY),
+    END_CRYSTAL(ENTITY),
+    EVOKER_FANGS(ENTITY),
+    EXPERIENCE_ORB(ENTITY),
+    EYE_OF_ENDER(ENTITY),
+    FALLING_BLOCK(ENTITY),
+    ITEM(ENTITY),
+    TNT(ENTITY),
+    OMINOUS_ITEM_SPAWNER(ENTITY),
+    MARKER(ENTITY),
+    LIGHTNING_BOLT(ENTITY),
+    INTERACTION(ENTITY),
+
+    DISPLAY(ENTITY, null),
+    BLOCK_DISPLAY(DISPLAY),
+    ITEM_DISPLAY(DISPLAY),
+    TEXT_DISPLAY(DISPLAY),
+
+    // Hanging entities
+    HANGING_ENTITY(ENTITY, null),
+    LEASH_KNOT(HANGING_ENTITY),
+    PAINTING(HANGING_ENTITY),
+    ITEM_FRAME(HANGING_ENTITY),
+    GLOW_ITEM_FRAME(ITEM_FRAME),
+
+    // Projectiles
+    PROJECTILE(ENTITY, null),
+    ITEM_PROJECTILE(PROJECTILE, null),
+    SNOWBALL(ITEM_PROJECTILE),
+    ENDER_PEARL(ITEM_PROJECTILE),
+    EGG(ITEM_PROJECTILE),
+    EXPERIENCE_BOTTLE(ITEM_PROJECTILE),
+    FIREWORK_ROCKET(PROJECTILE),
+    LLAMA_SPIT(PROJECTILE),
+    SHULKER_BULLET(PROJECTILE),
+    FISHING_BOBBER(PROJECTILE),
+    WITHER_SKULL(PROJECTILE),
+    DRAGON_FIREBALL(PROJECTILE), // Doesn't actually inherit fireball
+
+    ABSTRACT_THROWN_POTION(ITEM_PROJECTILE, null),
+    SPLASH_POTION(ABSTRACT_THROWN_POTION),
+    LINGERING_POTION(ABSTRACT_THROWN_POTION),
+
+    ABSTRACT_ARROW(PROJECTILE, null),
+    ARROW(ABSTRACT_ARROW),
+    SPECTRAL_ARROW(ABSTRACT_ARROW),
+    TRIDENT(ABSTRACT_ARROW),
+
+    ABSTRACT_FIREBALL(ENTITY, null),
+    FIREBALL(ABSTRACT_FIREBALL),
+    SMALL_FIREBALL(ABSTRACT_FIREBALL),
+
+    ABSTRACT_WIND_CHARGE(PROJECTILE, null),
+    WIND_CHARGE(ABSTRACT_WIND_CHARGE),
+    BREEZE_WIND_CHARGE(ABSTRACT_WIND_CHARGE),
+
+    // Vehicles
+    VEHICLE(ENTITY, null),
+
+    ABSTRACT_MINECART(VEHICLE, null),
+    MINECART(ABSTRACT_MINECART),
+    FURNACE_MINECART(ABSTRACT_MINECART),
+    COMMAND_BLOCK_MINECART(ABSTRACT_MINECART),
+    TNT_MINECART(ABSTRACT_MINECART),
+    SPAWNER_MINECART(ABSTRACT_MINECART),
+
+    ABSTRACT_MINECART_CONTAINER(ABSTRACT_MINECART, null),
+    CHEST_MINECART(ABSTRACT_MINECART_CONTAINER),
+    HOPPER_MINECART(ABSTRACT_MINECART_CONTAINER),
+
+    ABSTRACT_BOAT(VEHICLE, null),
+    ABSTRACT_CHEST_BOAT(ABSTRACT_BOAT, null),
+    ACACIA_BOAT(ABSTRACT_BOAT),
+    ACACIA_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    BAMBOO_CHEST_RAFT(ABSTRACT_CHEST_BOAT),
+    BAMBOO_RAFT(ABSTRACT_BOAT),
+    BIRCH_BOAT(ABSTRACT_BOAT),
+    BIRCH_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    CHERRY_BOAT(ABSTRACT_BOAT),
+    CHERRY_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    DARK_OAK_BOAT(ABSTRACT_BOAT),
+    DARK_OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    JUNGLE_BOAT(ABSTRACT_BOAT),
+    JUNGLE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    MANGROVE_BOAT(ABSTRACT_BOAT),
+    MANGROVE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    OAK_BOAT(ABSTRACT_BOAT),
+    OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    PALE_OAK_BOAT(ABSTRACT_BOAT),
+    PALE_OAK_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+    SPRUCE_BOAT(ABSTRACT_BOAT),
+    SPRUCE_CHEST_BOAT(ABSTRACT_CHEST_BOAT),
+
+    // Living entities as a larger subclass
+    LIVING_ENTITY(ENTITY, null),
+    ARMOR_STAND(LIVING_ENTITY),
+
+    // Players
+    AVATAR(LIVING_ENTITY, null),
+    MANNEQUIN(AVATAR),
+    PLAYER(AVATAR),
+
+    // Mobs as a larger subclass
+    MOB(LIVING_ENTITY, null),
+    ENDER_DRAGON(MOB),
+
+    SLIME(MOB),
+    MAGMA_CUBE(SLIME),
+
+    // Ambient mobs
+    AMBIENT_CREATURE(MOB, null),
+    BAT(AMBIENT_CREATURE),
+
+    // Flying mobs
+    FLYING_MOB(MOB, null),
+    GHAST(FLYING_MOB),
+    PHANTOM(FLYING_MOB),
+
+    // Pathfinder mobs and its subclasses
+    PATHFINDER_MOB(MOB, null),
+    ALLAY(PATHFINDER_MOB),
+
+    ABSTRACT_GOLEM(PATHFINDER_MOB, null),
+    SNOW_GOLEM(ABSTRACT_GOLEM),
+    IRON_GOLEM(ABSTRACT_GOLEM),
+    SHULKER(ABSTRACT_GOLEM),
+    COPPER_GOLEM(ABSTRACT_GOLEM),
+
+    // Ageable mobs and (tamable) animals
+    ABSTRACT_AGEABLE(PATHFINDER_MOB, null),
+    ABSTRACT_VILLAGER(ABSTRACT_AGEABLE, null),
+    VILLAGER(ABSTRACT_VILLAGER),
+    WANDERING_TRADER(ABSTRACT_VILLAGER),
+
+    ABSTRACT_ANIMAL(ABSTRACT_AGEABLE, null),
+    AXOLOTL(ABSTRACT_ANIMAL),
+    CHICKEN(ABSTRACT_ANIMAL),
+    PANDA(ABSTRACT_ANIMAL),
+    PIG(ABSTRACT_ANIMAL),
+    POLAR_BEAR(ABSTRACT_ANIMAL),
+    RABBIT(ABSTRACT_ANIMAL),
+    SHEEP(ABSTRACT_ANIMAL),
+    BEE(ABSTRACT_ANIMAL),
+    TURTLE(ABSTRACT_ANIMAL),
+    FOX(ABSTRACT_ANIMAL),
+    FROG(ABSTRACT_ANIMAL),
+    GOAT(ABSTRACT_ANIMAL),
+    HOGLIN(ABSTRACT_ANIMAL),
+    STRIDER(ABSTRACT_ANIMAL),
+    SNIFFER(ABSTRACT_ANIMAL),
+    ARMADILLO(ABSTRACT_ANIMAL),
+    HAPPY_GHAST(ABSTRACT_ANIMAL),
+
+    ABSTRACT_COW(ABSTRACT_ANIMAL, null),
+    COW(ABSTRACT_COW),
+    MOOSHROOM(ABSTRACT_COW),
+
+    TAMABLE_ANIMAL(ABSTRACT_ANIMAL, null),
+    CAT(TAMABLE_ANIMAL),
+    OCELOT(TAMABLE_ANIMAL),
+    WOLF(TAMABLE_ANIMAL),
+    PARROT(TAMABLE_ANIMAL),
+
+    ABSTRACT_HORSE(ABSTRACT_ANIMAL, null),
+    HORSE(ABSTRACT_HORSE),
+    SKELETON_HORSE(ABSTRACT_HORSE),
+    ZOMBIE_HORSE(ABSTRACT_HORSE),
+    CAMEL(ABSTRACT_HORSE),
+
+    ABSTRACT_CHESTED_HORSE(ABSTRACT_HORSE, null),
+    DONKEY(ABSTRACT_CHESTED_HORSE),
+    MULE(ABSTRACT_CHESTED_HORSE),
+    LLAMA(ABSTRACT_CHESTED_HORSE),
+    TRADER_LLAMA(LLAMA),
+
+    // Monsters
+    ABSTRACT_MONSTER(PATHFINDER_MOB, null),
+    BLAZE(ABSTRACT_MONSTER),
+    CREEPER(ABSTRACT_MONSTER),
+    ENDERMITE(ABSTRACT_MONSTER),
+    ENDERMAN(ABSTRACT_MONSTER),
+    GIANT(ABSTRACT_MONSTER),
+    SILVERFISH(ABSTRACT_MONSTER),
+    VEX(ABSTRACT_MONSTER),
+    WITHER(ABSTRACT_MONSTER),
+    BREEZE(ABSTRACT_MONSTER),
+    ZOGLIN(ABSTRACT_MONSTER),
+    WARDEN(ABSTRACT_MONSTER),
+    CREAKING(ABSTRACT_MONSTER),
+
+    ABSTRACT_SKELETON(ABSTRACT_MONSTER, null),
+    SKELETON(ABSTRACT_SKELETON),
+    STRAY(ABSTRACT_SKELETON),
+    WITHER_SKELETON(ABSTRACT_SKELETON),
+    BOGGED(ABSTRACT_SKELETON),
+
+    ZOMBIE(ABSTRACT_MONSTER),
+    DROWNED(ZOMBIE),
+    HUSK(ZOMBIE),
+    ZOMBIFIED_PIGLIN(ZOMBIE),
+    ZOMBIE_VILLAGER(ZOMBIE),
+
+    GUARDIAN(ABSTRACT_MONSTER),
+    ELDER_GUARDIAN(GUARDIAN),
+
+    SPIDER(ABSTRACT_MONSTER),
+    CAVE_SPIDER(SPIDER),
+
+    ABSTRACT_PIGLIN(ABSTRACT_MONSTER, null),
+    PIGLIN(ABSTRACT_PIGLIN),
+    PIGLIN_BRUTE(ABSTRACT_PIGLIN),
+
+    // Water mobs
+    AGEABLE_WATER_CREATURE(ABSTRACT_AGEABLE, null),
+    DOLPHIN(AGEABLE_WATER_CREATURE),
+
+    SQUID(AGEABLE_WATER_CREATURE),
+    GLOW_SQUID(SQUID),
+
+    WATER_ANIMAL(PATHFINDER_MOB, null),
+    ABSTRACT_FISH(WATER_ANIMAL, null),
+    PUFFERFISH(ABSTRACT_FISH),
+    TADPOLE(ABSTRACT_FISH),
+
+    ABSTRACT_SCHOOLING_FISH(ABSTRACT_FISH, null),
+    COD(ABSTRACT_SCHOOLING_FISH),
+    SALMON(ABSTRACT_SCHOOLING_FISH),
+    TROPICAL_FISH(ABSTRACT_SCHOOLING_FISH),
+
+    // Raiders
+    ABSTRACT_RAIDER(ABSTRACT_MONSTER, null),
+    WITCH(ABSTRACT_RAIDER),
+    RAVAGER(ABSTRACT_RAIDER),
+
+    ABSTRACT_ILLAGER(ABSTRACT_RAIDER, null),
+    SPELLCASTER_ILLAGER(ABSTRACT_ILLAGER, null),
+    VINDICATOR(ABSTRACT_ILLAGER),
+    PILLAGER(ABSTRACT_ILLAGER),
+    EVOKER(SPELLCASTER_ILLAGER),
+    ILLUSIONER(SPELLCASTER_ILLAGER);
+
+    private static final EntityType[] TYPES = EntityTypeUtil.createSizedArray(values());
+    private final EntityType parent;
+    private final String identifier;
+    private int id = -1;
+
+    EntityTypes1_21_9(final EntityType parent) {
+        this.parent = parent;
+        this.identifier = Key.namespaced(name().toLowerCase(Locale.ROOT));
+    }
+
+    EntityTypes1_21_9(final EntityType parent, @Nullable final String identifier) {
+        this.parent = parent;
+        this.identifier = identifier;
+    }
+
+    @Override
+    public int getId() {
+        if (id == -1) {
+            throw new IllegalStateException("Ids have not been initialized yet (type " + name() + ")");
+        }
+        return id;
+    }
+
+    @Override
+    public String identifier() {
+        Preconditions.checkArgument(identifier != null, "Called identifier method on abstract type");
+        return identifier;
+    }
+
+    @Override
+    public @Nullable EntityType getParent() {
+        return parent;
+    }
+
+    @Override
+    public boolean isAbstractType() {
+        return identifier == null;
+    }
+
+    public static EntityType getTypeFromId(final int typeId) {
+        return EntityTypeUtil.getTypeFromId(TYPES, typeId, PIG);
+    }
+
+    public static void initialize(final Protocol<?, ?, ?, ?> protocol) {
+        EntityTypeUtil.initialize(values(), TYPES, protocol, (type, id) -> type.id = id);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_8.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_8 {
 
@@ -135,7 +135,7 @@ public class EntityTypes1_8 {
         SPIDER(52, ABSTRACT_MONSTER),
         CAVE_SPIDER(59, SPIDER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -176,7 +176,9 @@ public class EntityTypes1_8 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -218,7 +220,7 @@ public class EntityTypes1_8 {
         ARMOR_STAND(78, EntityType.ARMOR_STAND),
         FISHIHNG_HOOK(90, EntityType.FISHING_HOOK);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -226,7 +228,7 @@ public class EntityTypes1_8 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -256,7 +258,7 @@ public class EntityTypes1_8 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_9.java

@@ -22,8 +22,8 @@
  */
 package com.viaversion.viaversion.api.minecraft.entities;
 
-import java.util.HashMap;
-import java.util.Map;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class EntityTypes1_9 {
 
@@ -142,7 +142,7 @@ public class EntityTypes1_9 {
         SPIDER(52, ABSTRACT_MONSTER),
         CAVE_SPIDER(59, SPIDER);
 
-        private static final Map<Integer, EntityType> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<EntityType> TYPES;
 
         private final int id;
         private final EntityType parent;
@@ -183,7 +183,9 @@ public class EntityTypes1_9 {
         }
 
         static {
-            for (EntityType type : EntityType.values()) {
+            final EntityType[] values = EntityType.values();
+            TYPES = new Int2ObjectOpenHashMap<>(values.length);
+            for (EntityType type : values) {
                 TYPES.put(type.id, type);
             }
         }
@@ -229,7 +231,7 @@ public class EntityTypes1_9 {
         SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
         DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL);
 
-        private static final Map<Integer, Map<Integer, ObjectType>> TYPES = new HashMap<>();
+        private static final Int2ObjectMap<Int2ObjectMap<ObjectType>> TYPES = new Int2ObjectOpenHashMap<>();
 
         private final int id;
         private final int data;
@@ -237,7 +239,7 @@ public class EntityTypes1_9 {
 
         static {
             for (ObjectType type : ObjectType.values()) {
-                TYPES.computeIfAbsent(type.id, k -> new HashMap<>()).put(type.data, type);
+                TYPES.computeIfAbsent(type.id, k -> new Int2ObjectOpenHashMap<>()).put(type.data, type);
             }
         }
 
@@ -267,7 +269,7 @@ public class EntityTypes1_9 {
         }
 
         public static ObjectType findById(final int id, final int data) {
-            final Map<Integer, ObjectType> types = TYPES.get(id);
+            final Int2ObjectMap<ObjectType> types = TYPES.get(id);
             if (types == null) {
                 return null;
             }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/AbstractEntityDataTypes.java

@@ -44,6 +44,10 @@ public abstract class AbstractEntityDataTypes implements EntityDataTypes {
     }
 
     protected EntityDataType add(final int typeId, final Type<?> type) {
+        if (values[typeId] != null) {
+            throw new IllegalArgumentException("Entity data type ID " + typeId + " is already registered as " + values[typeId]);
+        }
+
         final EntityDataType dataType = EntityDataType.create(typeId, type);
         values[typeId] = dataType;
         return dataType;

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_14.java

@@ -44,7 +44,7 @@ public final class EntityDataTypes1_14 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(13, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(14, Types.NAMED_COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(16, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(16, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(17, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(18, Types.VAR_INT);
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_19.java

@@ -44,7 +44,7 @@ public final class EntityDataTypes1_19 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(13, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(14, Types.NAMED_COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(16, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(16, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(17, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(18, Types.VAR_INT);
     public final EntityDataType catVariantType = add(19, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_19_3.java

@@ -45,7 +45,7 @@ public final class EntityDataTypes1_19_3 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(14, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(15, Types.NAMED_COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(17, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(17, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(18, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(19, Types.VAR_INT);
     public final EntityDataType catVariantType = add(20, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_19_4.java

@@ -46,7 +46,7 @@ public final class EntityDataTypes1_19_4 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(15, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(16, Types.NAMED_COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(18, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(18, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(19, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(20, Types.VAR_INT);
     public final EntityDataType catVariantType = add(21, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_20_2.java

@@ -46,7 +46,7 @@ public final class EntityDataTypes1_20_2 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(15, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(18, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(18, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(19, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(20, Types.VAR_INT);
     public final EntityDataType catVariantType = add(21, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_20_3.java

@@ -46,7 +46,7 @@ public final class EntityDataTypes1_20_3 extends AbstractEntityDataTypes {
     public final EntityDataType optionalBlockStateType = add(15, Types.VAR_INT);
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
-    public final EntityDataType villagerDatatType = add(18, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(18, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(19, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(20, Types.VAR_INT);
     public final EntityDataType catVariantType = add(21, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_20_5.java

@@ -47,7 +47,7 @@ public final class EntityDataTypes1_20_5 extends AbstractEntityDataTypes {
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
     public final EntityDataType particlesType;
-    public final EntityDataType villagerDatatType = add(19, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(19, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(20, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(21, Types.VAR_INT);
     public final EntityDataType catVariantType = add(22, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21.java

@@ -49,7 +49,7 @@ public final class EntityDataTypes1_21 extends AbstractEntityDataTypes {
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
     public final EntityDataType particlesType;
-    public final EntityDataType villagerDatatType = add(19, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(19, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(20, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(21, Types.VAR_INT);
     public final EntityDataType catVariantType = add(22, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21_11.java

@@ -0,0 +1,78 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.entitydata.types;
+
+import com.viaversion.viaversion.api.minecraft.PaintingVariant;
+import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
+
+public final class EntityDataTypes1_21_11 extends AbstractEntityDataTypes {
+
+    public final EntityDataType byteType = add(0, Types.BYTE);
+    public final EntityDataType varIntType = add(1, Types.VAR_INT);
+    public final EntityDataType longType = add(2, Types.VAR_LONG);
+    public final EntityDataType floatType = add(3, Types.FLOAT);
+    public final EntityDataType stringType = add(4, Types.STRING);
+    public final EntityDataType componentType = add(5, Types.TAG);
+    public final EntityDataType optionalComponentType = add(6, Types.OPTIONAL_TAG);
+    public final EntityDataType itemType;
+    public final EntityDataType booleanType = add(8, Types.BOOLEAN);
+    public final EntityDataType rotationsType = add(9, Types.ROTATIONS);
+    public final EntityDataType blockPositionType = add(10, Types.BLOCK_POSITION1_14);
+    public final EntityDataType optionalBlockPositionType = add(11, Types.OPTIONAL_POSITION_1_14);
+    public final EntityDataType directionType = add(12, Types.VAR_INT);
+    public final EntityDataType optionalUUIDType = add(13, Types.OPTIONAL_UUID);
+    public final EntityDataType blockStateType = add(14, Types.VAR_INT);
+    public final EntityDataType optionalBlockStateType = add(15, Types.VAR_INT);
+    public final EntityDataType particleType;
+    public final EntityDataType particlesType;
+    public final EntityDataType villagerDatatType = add(18, Types.VILLAGER_DATA);
+    public final EntityDataType optionalVarIntType = add(19, Types.OPTIONAL_VAR_INT);
+    public final EntityDataType poseType = add(20, Types.VAR_INT);
+    public final EntityDataType catVariantType = add(21, Types.VAR_INT);
+    public final EntityDataType cowVariantType = add(22, Types.VAR_INT);
+    public final EntityDataType wolfVariantType = add(23, Types.VAR_INT);
+    public final EntityDataType wolfSoundVariantType = add(24, Types.VAR_INT);
+    public final EntityDataType frogVariantType = add(25, Types.VAR_INT);
+    public final EntityDataType pigVariantType = add(26, Types.VAR_INT);
+    public final EntityDataType chickenVariantType = add(27, Types.VAR_INT);
+    public final EntityDataType zombieNautilusVariantType = add(28, Types.VAR_INT);
+    public final EntityDataType optionalGlobalPosition = add(29, Types.OPTIONAL_GLOBAL_POSITION);
+    public final EntityDataType paintingVariantType = add(30, PaintingVariant.TYPE1_21_2);
+    public final EntityDataType snifferState = add(31, Types.VAR_INT);
+    public final EntityDataType armadilloState = add(32, Types.VAR_INT);
+    public final EntityDataType copperGolemState = add(33, Types.VAR_INT);
+    public final EntityDataType weatheringCopperState = add(34, Types.VAR_INT);
+    public final EntityDataType vector3FType = add(35, Types.VECTOR3F);
+    public final EntityDataType quaternionType = add(36, Types.QUATERNION);
+    public final EntityDataType mannequinProfileType = add(37, Types.RESOLVABLE_PROFILE);
+    public final EntityDataType humanoidArmType = add(38, Types.VAR_INT);
+
+    public EntityDataTypes1_21_11(final VersionedTypesHolder types) {
+        super(39);
+        this.itemType = add(7, types.item());
+        this.particleType = add(16, types.particle());
+        this.particlesType = add(17, types.particles());
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21_2.java

@@ -49,7 +49,7 @@ public final class EntityDataTypes1_21_2 extends AbstractEntityDataTypes {
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
     public final EntityDataType particlesType;
-    public final EntityDataType villagerDatatType = add(19, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(19, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(20, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(21, Types.VAR_INT);
     public final EntityDataType catVariantType = add(22, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21_5.java

@@ -48,7 +48,7 @@ public final class EntityDataTypes1_21_5 extends AbstractEntityDataTypes {
     public final EntityDataType compoundTagType = add(16, Types.COMPOUND_TAG);
     public final EntityDataType particleType;
     public final EntityDataType particlesType;
-    public final EntityDataType villagerDatatType = add(19, Types.VILLAGER_DATA);
+    public final EntityDataType villagerDataType = add(19, Types.VILLAGER_DATA);
     public final EntityDataType optionalVarIntType = add(20, Types.OPTIONAL_VAR_INT);
     public final EntityDataType poseType = add(21, Types.VAR_INT);
     public final EntityDataType catVariantType = add(22, Types.VAR_INT);

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21_9.java

@@ -0,0 +1,76 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.entitydata.types;
+
+import com.viaversion.viaversion.api.minecraft.PaintingVariant;
+import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
+
+public final class EntityDataTypes1_21_9 extends AbstractEntityDataTypes {
+
+    public final EntityDataType byteType = add(0, Types.BYTE);
+    public final EntityDataType varIntType = add(1, Types.VAR_INT);
+    public final EntityDataType longType = add(2, Types.VAR_LONG);
+    public final EntityDataType floatType = add(3, Types.FLOAT);
+    public final EntityDataType stringType = add(4, Types.STRING);
+    public final EntityDataType componentType = add(5, Types.TAG);
+    public final EntityDataType optionalComponentType = add(6, Types.OPTIONAL_TAG);
+    public final EntityDataType itemType;
+    public final EntityDataType booleanType = add(8, Types.BOOLEAN);
+    public final EntityDataType rotationsType = add(9, Types.ROTATIONS);
+    public final EntityDataType blockPositionType = add(10, Types.BLOCK_POSITION1_14);
+    public final EntityDataType optionalBlockPositionType = add(11, Types.OPTIONAL_POSITION_1_14);
+    public final EntityDataType directionType = add(12, Types.VAR_INT);
+    public final EntityDataType optionalUUIDType = add(13, Types.OPTIONAL_UUID);
+    public final EntityDataType blockStateType = add(14, Types.VAR_INT);
+    public final EntityDataType optionalBlockStateType = add(15, Types.VAR_INT);
+    public final EntityDataType particleType;
+    public final EntityDataType particlesType;
+    public final EntityDataType villagerDataType = add(18, Types.VILLAGER_DATA);
+    public final EntityDataType optionalVarIntType = add(19, Types.OPTIONAL_VAR_INT);
+    public final EntityDataType poseType = add(20, Types.VAR_INT);
+    public final EntityDataType catVariantType = add(21, Types.VAR_INT);
+    public final EntityDataType cowVariantType = add(22, Types.VAR_INT);
+    public final EntityDataType wolfVariantType = add(23, Types.VAR_INT);
+    public final EntityDataType wolfSoundVariantType = add(24, Types.VAR_INT);
+    public final EntityDataType frogVariantType = add(25, Types.VAR_INT);
+    public final EntityDataType pigVariantType = add(26, Types.VAR_INT);
+    public final EntityDataType chickenVariantType = add(27, Types.VAR_INT);
+    public final EntityDataType optionalGlobalPosition = add(28, Types.OPTIONAL_GLOBAL_POSITION);
+    public final EntityDataType paintingVariantType = add(29, PaintingVariant.TYPE1_21_2);
+    public final EntityDataType snifferState = add(30, Types.VAR_INT);
+    public final EntityDataType armadilloState = add(31, Types.VAR_INT);
+    public final EntityDataType copperGolemState = add(32, Types.VAR_INT);
+    public final EntityDataType weatheringCopperState = add(33, Types.VAR_INT);
+    public final EntityDataType vector3FType = add(34, Types.VECTOR3F);
+    public final EntityDataType quaternionType = add(35, Types.QUATERNION);
+    public final EntityDataType mannequinProfileType = add(36, Types.RESOLVABLE_PROFILE);
+
+    public EntityDataTypes1_21_9(final VersionedTypesHolder types) {
+        super(37);
+        this.itemType = add(7, types.item());
+        this.particleType = add(16, types.particle());
+        this.particlesType = add(17, types.particles());
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/Item.java

@@ -24,7 +24,6 @@ package com.viaversion.viaversion.api.minecraft.item;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
-import com.viaversion.viaversion.util.Copyable;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface Item extends ItemBase {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AdventureModePredicate.java

@@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
+import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentPredicate;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.ArrayType;
@@ -53,12 +54,13 @@ public record AdventureModePredicate(BlockPredicate[] predicates,
         }
     };
 
+    // Shared with 1.21.11 too using the predicate array param
     public static final class AdventureModePredicateType1_21_5 extends Type<AdventureModePredicate> {
         private final Type<BlockPredicate[]> blockPredicateType;
 
-        public AdventureModePredicateType1_21_5(final Type<StructuredData<?>[]> dataArrayType) {
+        public AdventureModePredicateType1_21_5(final Type<StructuredData<?>[]> dataArrayType, final Type<DataComponentPredicate[]> predicateArrayType) {
             super(AdventureModePredicate.class);
-            this.blockPredicateType = new ArrayType<>(new BlockPredicate.BlockPredicateType1_21_5(dataArrayType));
+            this.blockPredicateType = new ArrayType<>(new BlockPredicate.BlockPredicateType1_21_5(dataArrayType, predicateArrayType));
         }
 
         @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrim.java

@@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.util.Rewritable;
@@ -97,6 +98,13 @@ public record ArmorTrim(Holder<ArmorTrimMaterial> material, Holder<ArmorTrimPatt
             ArmorTrimMaterial.TYPE1_21_5.write(buffer, value.material);
             ArmorTrimPattern.TYPE1_21_5.write(buffer, value.pattern);
         }
+
+        @Override
+        public void write(final Ops ops, final ArmorTrim value) {
+            ops.writeMap(map -> map
+                .write("material", ArmorTrimMaterial.TYPE1_21_5, value.material)
+                .write("pattern", ArmorTrimPattern.TYPE1_21_5, value.pattern));
+        }
     };
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java

@@ -24,10 +24,12 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
@@ -176,6 +178,26 @@ public record ArmorTrimMaterial(String assetName, int itemId, float itemModelInd
 
             Types.TAG.write(buffer, value.description());
         }
+
+        @Override
+        public void writeDirect(final Ops ops, final ArmorTrimMaterial object) {
+            ops.writeMap(map -> {
+                map.write("asset_name", Types.STRING, object.assetName());
+                if (!object.overrideArmorMaterials.isEmpty()) {
+                    map.writeMap("override_armor_assets", materials -> {
+                        for (final Map.Entry<String, String> entry : object.overrideArmorMaterials.entrySet()) {
+                            materials.write(Types.IDENTIFIER, Key.of(entry.getKey()), Types.STRING, entry.getValue());
+                        }
+                    });
+                }
+                map.write("description", Types.TEXT_COMPONENT_TAG, object.description());
+            });
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("trim_material", id);
+        }
     };
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java

@@ -24,10 +24,12 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 
@@ -70,6 +72,19 @@ public record ArmorTrimPattern(String assetName, int itemId, Tag description, bo
             Types.TAG.write(buffer, value.description());
             buffer.writeBoolean(value.decal());
         }
+
+        @Override
+        public void writeDirect(final Ops ops, final ArmorTrimPattern object) {
+            ops.writeMap(map -> map
+                .write("asset_id", Types.IDENTIFIER, Key.of(object.assetName()))
+                .write("description", Types.TEXT_COMPONENT_TAG, object.description())
+                .write("decal", Types.BOOLEAN, object.decal()));
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("trim_pattern", id);
+        }
     };
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttackRange.java

@@ -0,0 +1,67 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import io.netty.buffer.ByteBuf;
+
+public record AttackRange(float minRange, float maxRange,
+                          float minCreativeRange, float maxCreativeRange,
+                          float hitboxMargin, float mobFactor) {
+
+    public static final Type<AttackRange> TYPE = new Type<>(AttackRange.class) {
+        @Override
+        public AttackRange read(final ByteBuf buffer) {
+            final float minRange = Types.FLOAT.readPrimitive(buffer);
+            final float maxRange = Types.FLOAT.readPrimitive(buffer);
+            final float minCreativeRange = Types.FLOAT.readPrimitive(buffer);
+            final float maxCreativeRange = Types.FLOAT.readPrimitive(buffer);
+            final float hitboxMargin = Types.FLOAT.readPrimitive(buffer);
+            final float mobFactor = Types.FLOAT.readPrimitive(buffer);
+            return new AttackRange(minRange, maxRange, minCreativeRange, maxCreativeRange, hitboxMargin, mobFactor);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final AttackRange value) {
+            Types.FLOAT.writePrimitive(buffer, value.minRange);
+            Types.FLOAT.writePrimitive(buffer, value.maxRange);
+            Types.FLOAT.writePrimitive(buffer, value.minCreativeRange);
+            Types.FLOAT.writePrimitive(buffer, value.maxCreativeRange);
+            Types.FLOAT.writePrimitive(buffer, value.hitboxMargin);
+            Types.FLOAT.writePrimitive(buffer, value.mobFactor);
+        }
+
+        @Override
+        public void write(final Ops ops, final AttackRange AttackRange) {
+            ops.writeMap(map -> map
+                .writeOptional("min_range", Types.FLOAT, AttackRange.minRange, 0F)
+                .writeOptional("max_range", Types.FLOAT, AttackRange.maxRange, 3F)
+                .writeOptional("min_creative_reach", Types.FLOAT, AttackRange.minCreativeRange, 0F)
+                .writeOptional("max_creative_reach", Types.FLOAT, AttackRange.maxCreativeRange, 5F)
+                .writeOptional("hitbox_margin", Types.FLOAT, AttackRange.hitboxMargin, 0.3F)
+                .writeOptional("mob_factor", Types.FLOAT, AttackRange.mobFactor, 1F));
+        }
+    };
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_20_5.java

@@ -22,14 +22,21 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.FullMappings;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
-public record AttributeModifiers1_20_5(AttributeModifier[] modifiers, boolean showInTooltip) implements Copyable {
+public record AttributeModifiers1_20_5(AttributeModifier[] modifiers,
+                                       boolean showInTooltip) implements Copyable, Rewritable {
 
     public static final Type<AttributeModifiers1_20_5> TYPE = new Type<>(AttributeModifiers1_20_5.class) {
         @Override
@@ -51,6 +58,23 @@ public record AttributeModifiers1_20_5(AttributeModifier[] modifiers, boolean sh
         return new AttributeModifiers1_20_5(Copyable.copy(modifiers), showInTooltip);
     }
 
+    @Override
+    public AttributeModifiers1_20_5 rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final FullMappings mappings = protocol.getMappingData().getAttributeMappings();
+        if (mappings == null) {
+            return this;
+        }
+
+        final List<AttributeModifier> modifiers = new ArrayList<>(this.modifiers.length);
+        for (final AttributeModifier modifier : this.modifiers) {
+            final int mappedId = clientbound ? mappings.getNewId(modifier.attribute()) : mappings.inverse().getNewId(modifier.attribute());
+            if (mappedId != -1) {
+                modifiers.add(new AttributeModifier(mappedId, modifier.modifier(), modifier.slotType()));
+            }
+        }
+        return new AttributeModifiers1_20_5(modifiers.toArray(AttributeModifier[]::new), this.showInTooltip);
+    }
+
     public record AttributeModifier(int attribute, ModifierData modifier, int slotType) {
 
         public static final Type<AttributeModifier> TYPE = new Type<>(AttributeModifier.class) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_21.java

@@ -23,16 +23,22 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.ArrayList;
+import java.util.List;
 
-public record AttributeModifiers1_21(AttributeModifier[] modifiers, boolean showInTooltip) implements Copyable {
+public record AttributeModifiers1_21(AttributeModifier[] modifiers, boolean showInTooltip) implements Copyable, Rewritable {
 
     public AttributeModifiers1_21(final AttributeModifier[] modifiers) {
         this(modifiers, true);
@@ -101,6 +107,23 @@ public record AttributeModifiers1_21(AttributeModifier[] modifiers, boolean show
         return new AttributeModifiers1_21(Copyable.copy(modifiers), showInTooltip);
     }
 
+    @Override
+    public AttributeModifiers1_21 rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final FullMappings mappings = protocol.getMappingData().getAttributeMappings();
+        if (mappings == null) {
+            return this;
+        }
+
+        final List<AttributeModifier> modifiers = new ArrayList<>(this.modifiers.length);
+        for (final AttributeModifier modifier : this.modifiers) {
+            final int mappedId = clientbound ? mappings.getNewId(modifier.attribute()) : mappings.inverse().getNewId(modifier.attribute());
+            if (mappedId != -1) {
+                modifiers.add(new AttributeModifier(mappedId, modifier.modifier(), modifier.slotType(), modifier.display()));
+            }
+        }
+        return new AttributeModifiers1_21(modifiers.toArray(AttributeModifier[]::new), this.showInTooltip);
+    }
+
     public record AttributeModifier(int attribute, ModifierData modifier, int slotType, Display display) {
         private static final String[] EQUIPMENT_SLOT_GROUPS = {"any", "mainhand", "offhand", "hand", "feet", "legs", "chest", "head", "armor", "body", "saddle"};
         private static final String[] OPERATION = {"add_value", "add_multiplied_base", "add_multiplied_total"};
@@ -129,8 +152,8 @@ public record AttributeModifiers1_21(AttributeModifier[] modifiers, boolean show
             public void write(final Ops ops, final AttributeModifier value) {
                 final Key attribute = ops.context().registryAccess().attributeModifier(value.attribute);
                 ops.writeMap(map -> map
-                    .write("type", Types.RESOURCE_LOCATION, attribute)
-                    .write("id", Types.RESOURCE_LOCATION, Key.of(value.modifier.id()))
+                    .write("type", Types.IDENTIFIER, attribute)
+                    .write("id", Types.IDENTIFIER, Key.of(value.modifier.id()))
                     .write("amount", Types.DOUBLE, value.modifier.amount)
                     .write("operation", Types.STRING, OPERATION[value.modifier.operation()])
                     .writeOptional("slot", Types.STRING, EQUIPMENT_SLOT_GROUPS[value.slotType()], "any"));
@@ -161,8 +184,8 @@ public record AttributeModifiers1_21(AttributeModifier[] modifiers, boolean show
             public void write(final Ops ops, final AttributeModifier value) {
                 final Key attribute = ops.context().registryAccess().attributeModifier(value.attribute);
                 ops.writeMap(map -> {
-                    map.write("type", Types.RESOURCE_LOCATION, attribute)
-                        .write("id", Types.RESOURCE_LOCATION, Key.of(value.modifier.id()))
+                    map.write("type", Types.IDENTIFIER, attribute)
+                        .write("id", Types.IDENTIFIER, Key.of(value.modifier.id()))
                         .write("amount", Types.DOUBLE, value.modifier.amount)
                         .write("operation", Types.STRING, OPERATION[value.modifier.operation()])
                         .writeOptional("slot", Types.STRING, EQUIPMENT_SLOT_GROUPS[value.slotType()], "any");

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BannerPattern.java

@@ -22,8 +22,10 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import com.viaversion.viaversion.util.Key;
 import io.netty.buffer.ByteBuf;
 
 public record BannerPattern(String assetId, String translationKey) {
@@ -41,6 +43,17 @@ public record BannerPattern(String assetId, String translationKey) {
             Types.STRING.write(buffer, value.assetId);
             Types.STRING.write(buffer, value.translationKey);
         }
-    };
 
+        @Override
+        public void writeDirect(final Ops ops, final BannerPattern object) {
+            ops.writeMap(map -> map
+                .write("asset_id", Types.IDENTIFIER, Key.of(object.assetId))
+                .write("translation_key", Types.STRING, object.translationKey));
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("banner_pattern", id);
+        }
+    };
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BannerPatternLayer.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
@@ -43,6 +44,13 @@ public record BannerPatternLayer(Holder<BannerPattern> pattern, int dyeColor) {
             BannerPattern.TYPE.write(buffer, value.pattern);
             Types.VAR_INT.writePrimitive(buffer, value.dyeColor);
         }
+
+        @Override
+        public void write(final Ops ops, final BannerPatternLayer value) {
+            ops.writeMap(map -> map
+                .write("pattern", BannerPattern.TYPE, value.pattern)
+                .write("color", EnumTypes.DYE_COLOR, value.dyeColor));
+        }
     };
     public static final Type<BannerPatternLayer[]> ARRAY_TYPE = new ArrayType<>(TYPE);
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Bee.java

@@ -30,20 +30,24 @@ import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
 import io.netty.buffer.ByteBuf;
 
-public record Bee(CompoundTag entityData, int ticksInHive, int minTicksInHive) implements Copyable {
+public record Bee(EntityData entityData, int ticksInHive, int minTicksInHive) implements Copyable {
 
-    public static final Type<Bee> TYPE = new Type<>(Bee.class) {
+    public Bee(final CompoundTag entityData, final int ticksInHive, final int minTicksInHive) {
+        this(new EntityData(-1, entityData), ticksInHive, minTicksInHive);
+    }
+
+    public static final Type<Bee> TYPE1_20_5 = new Type<>(Bee.class) {
         @Override
         public Bee read(final ByteBuf buffer) {
             final CompoundTag entityData = Types.COMPOUND_TAG.read(buffer);
             final int ticksInHive = Types.VAR_INT.readPrimitive(buffer);
             final int minTicksInHive = Types.VAR_INT.readPrimitive(buffer);
-            return new Bee(entityData, ticksInHive, minTicksInHive);
+            return new Bee(new EntityData(-1, entityData), ticksInHive, minTicksInHive);
         }
 
         @Override
         public void write(final ByteBuf buffer, final Bee value) {
-            Types.COMPOUND_TAG.write(buffer, value.entityData);
+            Types.COMPOUND_TAG.write(buffer, value.entityData.tag());
             Types.VAR_INT.writePrimitive(buffer, value.ticksInHive);
             Types.VAR_INT.writePrimitive(buffer, value.minTicksInHive);
         }
@@ -51,12 +55,38 @@ public record Bee(CompoundTag entityData, int ticksInHive, int minTicksInHive) i
         @Override
         public void write(final Ops ops, final Bee value) {
             ops.writeMap(map -> map
-                .writeOptional("entity_data", Types.COMPOUND_TAG, value.entityData, new CompoundTag())
+                .writeOptional("entity_data", Types.COMPOUND_TAG, value.entityData.tag(), new CompoundTag())
                 .write("ticks_in_hive", Types.INT, value.ticksInHive)
                 .write("min_ticks_in_hive", Types.INT, value.minTicksInHive));
         }
     };
-    public static final Type<Bee[]> ARRAY_TYPE = new ArrayType<>(TYPE);
+    public static final Type<Bee[]> ARRAY_TYPE1_20_5 = new ArrayType<>(TYPE1_20_5);
+
+    public static final Type<Bee> TYPE1_21_9 = new Type<>(Bee.class) {
+        @Override
+        public Bee read(final ByteBuf buffer) {
+            final EntityData entityData = EntityData.TYPE.read(buffer);
+            final int ticksInHive = Types.VAR_INT.readPrimitive(buffer);
+            final int minTicksInHive = Types.VAR_INT.readPrimitive(buffer);
+            return new Bee(entityData, ticksInHive, minTicksInHive);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final Bee value) {
+            EntityData.TYPE.write(buffer, value.entityData);
+            Types.VAR_INT.writePrimitive(buffer, value.ticksInHive);
+            Types.VAR_INT.writePrimitive(buffer, value.minTicksInHive);
+        }
+
+        @Override
+        public void write(final Ops ops, final Bee value) {
+            ops.writeMap(map -> map
+                .write("entity_data", EntityData.TYPE, value.entityData)
+                .write("ticks_in_hive", Types.INT, value.ticksInHive)
+                .write("min_ticks_in_hive", Types.INT, value.minTicksInHive));
+        }
+    };
+    public static final Type<Bee[]> ARRAY_TYPE1_21_9 = new ArrayType<>(TYPE1_21_9);
 
     @Override
     public Bee copy() {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockEntityData.java

@@ -0,0 +1,65 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Rewritable;
+import io.netty.buffer.ByteBuf;
+
+public record BlockEntityData(int type, CompoundTag tag) implements Rewritable {
+
+    public static final Type<BlockEntityData> TYPE = new Type<>(BlockEntityData.class) {
+        @Override
+        public BlockEntityData read(final ByteBuf buffer) {
+            final int type = Types.VAR_INT.readPrimitive(buffer);
+            final CompoundTag tag = Types.COMPOUND_TAG.read(buffer);
+            return new BlockEntityData(type, tag);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final BlockEntityData value) {
+            Types.VAR_INT.writePrimitive(buffer, value.type);
+            Types.COMPOUND_TAG.write(buffer, value.tag);
+        }
+
+        @Override
+        public void write(final Ops ops, final BlockEntityData data) {
+            ops.writeMap(map -> map
+                .write("id", Types.IDENTIFIER, ops.context().registryAccess().blockEntity(data.type))
+                .writeInlinedMap(Types.COMPOUND_TAG, data.tag)
+            );
+        }
+    };
+
+    @Override
+    public BlockEntityData rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final int mappedType = protocol.getMappingData().getBlockEntityMappings().getNewId(type);
+        // Empty mappings might be possible for removed block entities, set a dummy value in that case. Will be handled fine by server and client without losing data
+        return new BlockEntityData(mappedType != -1 ? mappedType : 0, tag);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java

@@ -72,9 +72,9 @@ public record BlockPredicate(@Nullable HolderSet holderSet, StatePropertyMatcher
     public static final class BlockPredicateType1_21_5 extends Type<BlockPredicate> {
         private final Type<DataComponentMatchers> matchersType;
 
-        public BlockPredicateType1_21_5(final Type<StructuredData<?>[]> dataArrayType) {
+        public BlockPredicateType1_21_5(final Type<StructuredData<?>[]> dataArrayType, final Type<DataComponentPredicate[]> predicateArrayType) {
             super(BlockPredicate.class);
-            this.matchersType = new DataComponentMatchersType(dataArrayType);
+            this.matchersType = new DataComponentMatchersType(dataArrayType, predicateArrayType);
         }
 
         @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlocksAttacks.java

@@ -25,11 +25,15 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
+import com.viaversion.viaversion.api.minecraft.RegistryKey;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
+import com.viaversion.viaversion.api.type.types.misc.HolderSetType;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -68,6 +72,20 @@ public record BlocksAttacks(
             Types.OPTIONAL_SOUND_EVENT.write(buffer, value.blockSound());
             Types.OPTIONAL_SOUND_EVENT.write(buffer, value.disableSound());
         }
+
+        @Override
+        public void write(final Ops ops, final BlocksAttacks value) {
+            final DamageReduction[] defaultDamageReductions = {new DamageReduction(90, null, 0, 1)};
+            final ItemDamageFunction defaultItemDamage = new ItemDamageFunction(1, 0, 1);
+            ops.writeMap(map -> map
+                .writeOptional("block_delay_seconds", Types.FLOAT, value.blockDelaySeconds(), 0F)
+                .writeOptional("disable_cooldown_scale", Types.FLOAT, value.disableCooldownScale(), 1F)
+                .writeOptional("damage_reductions", DamageReduction.ARRAY_TYPE, value.damageReductions(), defaultDamageReductions)
+                .writeOptional("item_damage", ItemDamageFunction.TYPE, value.itemDamage(), defaultItemDamage)
+                .writeOptional("bypassed_by", Types.TAG_KEY, value.bypassedByTag() != null ? Key.of(value.bypassedByTag()) : null)
+                .writeOptional("block_sound", Types.SOUND_EVENT, value.blockSound())
+                .writeOptional("disabled_sound", Types.SOUND_EVENT, value.disableSound()));
+        }
     };
 
     @Override
@@ -97,6 +115,15 @@ public record BlocksAttacks(
                 buffer.writeFloat(value.base());
                 buffer.writeFloat(value.factor());
             }
+
+            @Override
+            public void write(final Ops ops, final DamageReduction value) {
+                ops.writeMap(map -> map
+                    .writeOptional("horizontal_blocking_angle", Types.FLOAT, value.horizontalBlockingAngle(), 90F)
+                    .writeOptional("type", new HolderSetType(RegistryKey.of("damage_type")), value.type())
+                    .write("base", Types.FLOAT, value.base())
+                    .write("factor", Types.FLOAT, value.factor()));
+            }
         };
         public static final ArrayType<DamageReduction> ARRAY_TYPE = new ArrayType<>(TYPE);
     }
@@ -119,6 +146,14 @@ public record BlocksAttacks(
                 buffer.writeFloat(value.base());
                 buffer.writeFloat(value.factor());
             }
+
+            @Override
+            public void write(final Ops ops, final ItemDamageFunction value) {
+                ops.writeMap(map -> map
+                    .write("threshold", Types.FLOAT, value.threshold())
+                    .write("base", Types.FLOAT, value.base())
+                    .write("factor", Types.FLOAT, value.factor()));
+            }
         };
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Consumable1_21_2.java

@@ -23,12 +23,17 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
+import com.viaversion.viaversion.api.type.types.misc.HolderSetType;
+import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
@@ -37,12 +42,51 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
                                boolean hasConsumeParticles,
                                ConsumeEffect<?>[] consumeEffects) implements Copyable, Rewritable {
 
+    private static final HolderSetType REMOVE_EFFECTS_TYPE = new HolderSetType() {
+        @Override
+        public void write(final Ops ops, final HolderSet value) {
+            ops.writeMap(map -> map.write("effects", new HolderSetType(EnumTypes.MOB_EFFECT), value));
+        }
+    };
+    private static final Type<Float> TELEPORT_RANDOMLY_TYPE = new Type<>(Float.class) {
+        @Override
+        public void write(final ByteBuf buffer, final Float value) {
+            Types.FLOAT.writePrimitive(buffer, value);
+        }
+
+        @Override
+        public Float read(final ByteBuf buffer) {
+            return Types.FLOAT.readPrimitive(buffer);
+        }
+
+        @Override
+        public void write(final Ops ops, final Float value) {
+            ops.writeMap(map -> map.write("diameter", Types.FLOAT, 16F));
+        }
+    };
+    private static final HolderType<SoundEvent> PLAY_SOUND_TYPE = new HolderType<>(MappingData.MappingType.SOUND) {
+        @Override
+        public SoundEvent readDirect(final ByteBuf buffer) {
+            return Types.SOUND_EVENT.readDirect(buffer);
+        }
+
+        @Override
+        public void writeDirect(final ByteBuf buffer, final SoundEvent value) {
+            Types.SOUND_EVENT.writeDirect(buffer, value);
+        }
+
+        @Override
+        public void write(final Ops ops, final Holder<SoundEvent> value) {
+            ops.writeMap(map -> map.write("sound", Types.SOUND_EVENT, value));
+        }
+    };
+
     public static final Type<?>[] EFFECT_TYPES = {
         ApplyStatusEffects.TYPE,
-        Types.HOLDER_SET, // remove effects
+        REMOVE_EFFECTS_TYPE,
         Types.EMPTY, // clear all effects
-        Types.FLOAT, // teleport randomly
-        Types.SOUND_EVENT // play sound
+        TELEPORT_RANDOMLY_TYPE,
+        PLAY_SOUND_TYPE
     };
 
     public static final Type<Consumable1_21_2> TYPE = new Type<>(Consumable1_21_2.class) {
@@ -64,6 +108,17 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
             buffer.writeBoolean(value.hasConsumeParticles);
             ConsumeEffect.ARRAY_TYPE.write(buffer, value.consumeEffects);
         }
+
+        @Override
+        public void write(final Ops ops, final Consumable1_21_2 value) {
+            final Holder<SoundEvent> defaultSound = Holder.of(ops.context().registryAccess().id(MappingData.MappingType.SOUND, "entity.generic.eat"));
+            ops.writeMap(map -> map
+                .writeOptional("consume_seconds", Types.FLOAT, value.consumeSeconds, 1.6F)
+                .writeOptional("animation", EnumTypes.ITEM_USE_ANIMATION, value.animationType, 1)
+                .writeOptional("sound", Types.SOUND_EVENT, value.sound, defaultSound)
+                .writeOptional("has_consume_particles", Types.BOOLEAN, value.hasConsumeParticles, true)
+                .writeOptional("consume_effects", ConsumeEffect.ARRAY_TYPE, value.consumeEffects, new ConsumeEffect<?>[0]));
+        }
     };
 
     public record ConsumeEffect<T>(int id, Type<T> type, T value) {
@@ -83,6 +138,17 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
                 Types.VAR_INT.writePrimitive(buffer, value.id);
                 value.writeValue(buffer);
             }
+
+            @Override
+            public void write(final Ops ops, final ConsumeEffect<?> value) {
+                writeGeneric(ops, value);
+            }
+
+            private <E> void writeGeneric(final Ops ops, final ConsumeEffect<E> value) {
+                ops.writeMap(map -> map
+                    .write("type", EnumTypes.CONSUME_EFFECT, value.id)
+                    .writeInlinedMap(value.type, value.value));
+            }
         };
         public static final Type<ConsumeEffect<?>[]> ARRAY_TYPE = new ArrayType<>(TYPE);
 
@@ -111,6 +177,13 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
                 PotionEffect.ARRAY_TYPE.write(buffer, value.effects);
                 buffer.writeFloat(value.probability);
             }
+
+            @Override
+            public void write(final Ops ops, final ApplyStatusEffects value) {
+                ops.writeMap(map -> map
+                    .write("effects", PotionEffect.ARRAY_TYPE, value.effects)
+                    .writeOptional("probability", Types.FLOAT, value.probability, 1F));
+            }
         };
     }
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ContainterContents.java

@@ -44,6 +44,10 @@ public final class ContainterContents {
             ops.writeList(list -> {
                 for (int i = 0; i < value.length; i++) {
                     final Item item = value[i];
+                    if (item.isEmpty()) {
+                        continue;
+                    }
+
                     final int slot = i;
                     list.writeMap(map -> map
                         .write("slot", Types.INT, slot)

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DamageResistant.java

@@ -23,24 +23,14 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.type.TransformingType;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.util.Key;
-import io.netty.buffer.ByteBuf;
 
 public record DamageResistant(Key typesTagKey) {
 
-    public static final Type<DamageResistant> TYPE = new Type<>(DamageResistant.class) {
-        @Override
-        public DamageResistant read(final ByteBuf buffer) {
-            final Key typesTagKey = Types.RESOURCE_LOCATION.read(buffer);
-            return new DamageResistant(typesTagKey);
-        }
-
-        @Override
-        public void write(final ByteBuf buffer, final DamageResistant value) {
-            Types.RESOURCE_LOCATION.write(buffer, value.typesTagKey());
-        }
+    public static final Type<DamageResistant> TYPE = new TransformingType<>(Types.IDENTIFIER, DamageResistant.class, DamageResistant::new, DamageResistant::typesTagKey) {
 
         @Override
         public void write(final Ops ops, final DamageResistant value) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DamageType.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.type.TransformingType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.EitherType;
+import com.viaversion.viaversion.util.Either;
+
+public record DamageType(Either<Integer, String> id) {
+
+    public static final Type<DamageType> TYPE = TransformingType.of(new EitherType<>(Types.VAR_INT, Types.STRING), DamageType.class, DamageType::new, DamageType::id);
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DeathProtection.java

@@ -22,23 +22,18 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.minecraft.item.data.Consumable1_21_2.ConsumeEffect;
+import com.viaversion.viaversion.api.type.TransformingType;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.util.Copyable;
-import io.netty.buffer.ByteBuf;
 
 public record DeathProtection(ConsumeEffect<?>[] deathEffects) implements Copyable {
 
-    public static final Type<DeathProtection> TYPE = new Type<>(DeathProtection.class) {
+    public static final Type<DeathProtection> TYPE = new TransformingType<>(ConsumeEffect.ARRAY_TYPE, DeathProtection.class, DeathProtection::new, DeathProtection::deathEffects) {
         @Override
-        public DeathProtection read(final ByteBuf buffer) {
-            final ConsumeEffect<?>[] deathEffects = ConsumeEffect.ARRAY_TYPE.read(buffer);
-            return new DeathProtection(deathEffects);
-        }
-
-        @Override
-        public void write(final ByteBuf buffer, final DeathProtection value) {
-            ConsumeEffect.ARRAY_TYPE.write(buffer, value.deathEffects);
+        public void write(final Ops ops, final DeathProtection value) {
+            ops.writeMap(map -> map.write("death_effects", ConsumeEffect.ARRAY_TYPE, value.deathEffects));
         }
     };
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DebugStickState.java

@@ -0,0 +1,56 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
+
+public record DebugStickState(CompoundTag tag) implements Rewritable, Copyable {
+
+    public static final Type<DebugStickState> TYPE = TransformingType.of(Types.COMPOUND_TAG, DebugStickState.class, DebugStickState::new, DebugStickState::tag);
+
+    @Override
+    public DebugStickState rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        CompoundTag updatedTag = tag;
+        if (clientbound && protocol.getMappingData() != null && protocol.getMappingData().changedBlocks() != null) {
+            updatedTag = tag.copy();
+            // Anything beyond this isn't worth the disk space/handling
+            updatedTag.entrySet().removeIf(entry -> {
+                final int blockId = protocol.getMappingData().getFullBlockMappings().id(entry.getKey());
+                return protocol.getMappingData().changedBlocks().contains(blockId);
+            });
+        }
+        return new DebugStickState(updatedTag);
+    }
+
+    @Override
+    public DebugStickState copy() {
+        return new DebugStickState(tag.copy());
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Enchantments.java

@@ -88,8 +88,8 @@ public record Enchantments(Int2IntMap enchantments, boolean showInTooltip) imple
         public void write(final Ops ops, final Enchantments value) {
             ops.writeMap(map -> {
                 for (final Int2IntMap.Entry entry : value.enchantments.int2IntEntrySet()) {
-                    final Key key = ops.context().registryAccess().enchantment(entry.getIntKey());
-                    map.write(Types.RESOURCE_LOCATION, key, Types.VAR_INT, entry.getIntValue());
+                    final Key key = ops.context().registryAccess().registryKey("enchantment", entry.getIntKey());
+                    map.write(Types.IDENTIFIER, key, Types.VAR_INT, entry.getIntValue());
                 }
             });
         }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EntityData.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
+import io.netty.buffer.ByteBuf;
+
+public record EntityData(int type, CompoundTag tag) implements Rewritable, Copyable {
+
+    public static final Type<EntityData> TYPE = new Type<>(EntityData.class) {
+        @Override
+        public EntityData read(final ByteBuf buffer) {
+            final int type = Types.VAR_INT.readPrimitive(buffer);
+            final CompoundTag tag = Types.COMPOUND_TAG.read(buffer);
+            return new EntityData(type, tag);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final EntityData value) {
+            Types.VAR_INT.writePrimitive(buffer, value.type);
+            Types.COMPOUND_TAG.write(buffer, value.tag);
+        }
+
+        @Override
+        public void write(final Ops ops, final EntityData data) {
+            ops.writeMap(map -> map
+                .write("id", Types.IDENTIFIER, ops.context().registryAccess().entity(data.type))
+                .writeInlinedMap(Types.COMPOUND_TAG, data.tag)
+            );
+        }
+    };
+
+    @Override
+    public EntityData rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final int mappedType = Rewritable.entityRewriteFunction(protocol, clientbound).applyAsInt(type);
+        return new EntityData(mappedType, tag);
+    }
+
+    @Override
+    public EntityData copy() {
+        return new EntityData(type, tag.copy());
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EnumTypes.java

@@ -25,7 +25,8 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 import com.viaversion.viaversion.api.type.types.EnumType;
 import com.viaversion.viaversion.api.type.types.EnumType.Fallback;
 import com.viaversion.viaversion.api.type.types.FakeEnumType;
-import com.viaversion.viaversion.api.type.types.RegistryValueType;
+import com.viaversion.viaversion.api.type.types.misc.RegistryValueType;
+import com.viaversion.viaversion.util.Key;
 import java.util.List;
 
 import static com.viaversion.viaversion.api.type.types.FakeEnumType.Entry.of;
@@ -44,10 +45,14 @@ public final class EnumTypes {
     public static final EnumType HORSE_VARIANT = new EnumType(Fallback.WRAP, "white", "creamy", "chestnut", "brown", "black", "gray", "dark_brown");
     public static final EnumType LLAMA_VARIANT = new EnumType(Fallback.CLAMP, "creamy", "white", "brown", "gray");
     public static final EnumType AXOLOTL_VARIANT = new EnumType("lucy", "wild", "gold", "cyan", "blue");
+    public static final EnumType EQUIPMENT_SLOT = new EnumType("mainhand", "feet", "legs", "chest", "head", "offhand", "body", "saddle");
+    public static final EnumType SWING_ANIMATION = new EnumType("none", "whack", "stab");
+    public static final EnumType ITEM_USE_ANIMATION = new EnumType("none", "eat", "drink", "block", "bow", "trident", "crossbow", "spyglass", "toot_horn", "brush", "bundle", "spear");
     // Enums with non-ordinal ids
     public static final FakeEnumType RABBIT_VARIANT = new FakeEnumType(List.of("brown", "white", "black", "white_splotched", "gold", "salt"), of(99, "evil"));
-    // Pretty much enums, but with a resource location
-    public static final RegistryValueType VILLAGER_TYPE = new RegistryValueType("desert", "jungle", "plains", "savanna", "snow", "swamp", "taiga");
-    public static final RegistryValueType POTION = new RegistryValueType("water", "mundane", "thick", "awkward", "night_vision", "long_night_vision", "invisibility", "long_invisibility", "leaping", "long_leaping", "strong_leaping", "fire_resistance", "long_fire_resistance", "swiftness", "long_swiftness", "strong_swiftness", "slowness", "long_slowness", "strong_slowness", "turtle_master", "long_turtle_master", "strong_turtle_master", "water_breathing", "long_water_breathing", "healing", "strong_healing", "harming", "strong_harming", "poison", "long_poison", "strong_poison", "regeneration", "long_regeneration", "strong_regeneration", "strength", "long_strength", "strong_strength", "weakness", "long_weakness", "luck", "slow_falling", "long_slow_falling", "wind_charged", "weaving", "oozing", "infested");
-    public static final RegistryValueType MOB_EFFECT = new RegistryValueType("speed", "slowness", "haste", "mining_fatigue", "strength", "instant_health", "instant_damage", "jump_boost", "nausea", "regeneration", "resistance", "fire_resistance", "water_breathing", "invisibility", "blindness", "night_vision", "hunger", "weakness", "poison", "wither", "health_boost", "absorption", "saturation", "glowing", "levitation", "luck", "unluck", "slow_falling", "conduit_power", "dolphins_grace", "bad_omen", "hero_of_the_village", "darkness", "trial_omen", "raid_omen", "wind_charged", "weaving", "oozing", "infested");
+    // Hardcoded registries
+    public static final RegistryValueType VILLAGER_TYPE = new RegistryValueType(Key.of("villager_type"), "desert", "jungle", "plains", "savanna", "snow", "swamp", "taiga");
+    public static final RegistryValueType POTION = new RegistryValueType(Key.of("potion"), "water", "mundane", "thick", "awkward", "night_vision", "long_night_vision", "invisibility", "long_invisibility", "leaping", "long_leaping", "strong_leaping", "fire_resistance", "long_fire_resistance", "swiftness", "long_swiftness", "strong_swiftness", "slowness", "long_slowness", "strong_slowness", "turtle_master", "long_turtle_master", "strong_turtle_master", "water_breathing", "long_water_breathing", "healing", "strong_healing", "harming", "strong_harming", "poison", "long_poison", "strong_poison", "regeneration", "long_regeneration", "strong_regeneration", "strength", "long_strength", "strong_strength", "weakness", "long_weakness", "luck", "slow_falling", "long_slow_falling", "wind_charged", "weaving", "oozing", "infested");
+    public static final RegistryValueType MOB_EFFECT = new RegistryValueType(Key.of("mob_effect"), "speed", "slowness", "haste", "mining_fatigue", "strength", "instant_health", "instant_damage", "jump_boost", "nausea", "regeneration", "resistance", "fire_resistance", "water_breathing", "invisibility", "blindness", "night_vision", "hunger", "weakness", "poison", "wither", "health_boost", "absorption", "saturation", "glowing", "levitation", "luck", "unluck", "slow_falling", "conduit_power", "dolphins_grace", "bad_omen", "hero_of_the_village", "darkness", "trial_omen", "raid_omen", "wind_charged", "weaving", "oozing", "infested");
+    public static final RegistryValueType CONSUME_EFFECT = new RegistryValueType(Key.of("consume_effect_type"), "apply_effects", "remove_effects", "clear_all_effects", "teleport_randomly", "play_sound");
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Equippable.java

@@ -23,12 +23,16 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.misc.HolderSetType;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -101,6 +105,21 @@ public record Equippable(int equipmentSlot, Holder<SoundEvent> soundEvent, @Null
             buffer.writeBoolean(value.damageOnHurt());
             buffer.writeBoolean(value.equipOnInteract());
         }
+
+        @Override
+        public void write(final Ops ops, final Equippable value) {
+            final Holder<SoundEvent> defaultEquipSound = Holder.of(ops.context().registryAccess().id(MappingData.MappingType.SOUND, "item.armor.equip_generic"));
+            ops.writeMap(map -> map
+                .write("slot", EnumTypes.EQUIPMENT_SLOT, value.equipmentSlot)
+                .writeOptional("equip_sound", Types.SOUND_EVENT, value.soundEvent, defaultEquipSound)
+                .writeOptional("asset_id", Types.IDENTIFIER, value.model != null ? Key.of(value.model) : null)
+                .writeOptional("camera_overlay", Types.IDENTIFIER, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
+                .writeOptional("allowed_entities", new HolderSetType(MappingData.MappingType.ENTITY_TYPE), value.allowedEntities)
+                .writeOptional("dispensable", Types.BOOLEAN, value.dispensable, true)
+                .writeOptional("swappable", Types.BOOLEAN, value.swappable, true)
+                .writeOptional("damage_on_hurt", Types.BOOLEAN, value.damageOnHurt, true)
+                .writeOptional("equip_on_interact", Types.BOOLEAN, value.equipOnInteract, false));
+        }
     };
     public static final Type<Equippable> TYPE1_21_6 = new Type<>(Equippable.class) {
         @Override
@@ -133,12 +152,32 @@ public record Equippable(int equipmentSlot, Holder<SoundEvent> soundEvent, @Null
             buffer.writeBoolean(value.canBeSheared());
             Types.SOUND_EVENT.write(buffer, value.shearingSound());
         }
+
+        @Override
+        public void write(final Ops ops, final Equippable value) {
+            final Holder<SoundEvent> defaultSound = Holder.of(ops.context().registryAccess().id(MappingData.MappingType.SOUND, "item.armor.equip_generic"));
+            final Holder<SoundEvent> defaultShearingSound = Holder.of(ops.context().registryAccess().id(MappingData.MappingType.SOUND, "item.shears.snip"));
+            ops.writeMap(map -> map
+                .write("slot", EnumTypes.EQUIPMENT_SLOT, value.equipmentSlot)
+                .writeOptional("equip_sound", Types.SOUND_EVENT, value.soundEvent, defaultSound)
+                .writeOptional("asset_id", Types.IDENTIFIER, value.model != null ? Key.of(value.model) : null)
+                .writeOptional("camera_overlay", Types.IDENTIFIER, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
+                .writeOptional("allowed_entities", new HolderSetType(MappingData.MappingType.ENTITY_TYPE), value.allowedEntities)
+                .writeOptional("dispensable", Types.BOOLEAN, value.dispensable, true)
+                .writeOptional("swappable", Types.BOOLEAN, value.swappable, true)
+                .writeOptional("damage_on_hurt", Types.BOOLEAN, value.damageOnHurt, true)
+                .writeOptional("equip_on_interact", Types.BOOLEAN, value.equipOnInteract, false)
+                .writeOptional("can_be_sheared", Types.BOOLEAN, value.canBeSheared, false)
+                .writeOptional("shearing_sound", Types.SOUND_EVENT, value.shearingSound, defaultShearingSound));
+        }
     };
 
     @Override
     public Equippable rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
         final Holder<SoundEvent> soundEvent = SoundEvent.rewriteHolder(this.soundEvent, Rewritable.soundRewriteFunction(protocol, clientbound));
         final Holder<SoundEvent> shearingSound = SoundEvent.rewriteHolder(this.shearingSound, Rewritable.soundRewriteFunction(protocol, clientbound));
-        return soundEvent == this.soundEvent && shearingSound == this.shearingSound ? this : new Equippable(equipmentSlot, soundEvent, model, cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract, canBeSheared, shearingSound);
+        final HolderSet allowedEntities = this.allowedEntities != null ? this.allowedEntities.rewrite(Rewritable.entityRewriteFunction(protocol, clientbound)) : null;
+        return soundEvent == this.soundEvent && shearingSound == this.shearingSound && allowedEntities == this.allowedEntities ? this
+            : new Equippable(equipmentSlot, soundEvent, model, cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract, canBeSheared, shearingSound);
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Instrument1_21_2.java

@@ -26,11 +26,13 @@ import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.EitherHolderType;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 
@@ -54,6 +56,20 @@ public record Instrument1_21_2(Holder<SoundEvent> soundEvent, float useDuration,
             Types.FLOAT.writePrimitive(buffer, value.range());
             Types.TAG.write(buffer, value.description());
         }
+
+        @Override
+        public void writeDirect(final Ops ops, final Instrument1_21_2 value) {
+            ops.writeMap(map -> map
+                .write("sound_event", Types.SOUND_EVENT, value.soundEvent())
+                .write("use_duration", Types.FLOAT, value.useDuration())
+                .write("range", Types.FLOAT, value.range())
+                .write("description", Types.TAG, value.description()));
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("instrument", id);
+        }
     };
     public static final EitherHolderType<Instrument1_21_2> EITHER_HOLDER_TYPE = new EitherHolderType<>(TYPE);
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ItemModel.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.Rewritable;
+
+public record ItemModel(Key key) implements Rewritable {
+
+    public static final Type<ItemModel> TYPE = TransformingType.of(Types.IDENTIFIER, ItemModel.class, ItemModel::new, ItemModel::key);
+
+    @Override
+    public ItemModel rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        // This data specifically will often be used with Vanilla items, so the key should be rewritten
+        final String type = key().toString();
+        final String mappedType = Rewritable.rewriteItem(protocol, clientbound, type);
+        return mappedType == null || type.equals(mappedType) ? this : new ItemModel(Key.of(mappedType));
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/JukeboxPlayable.java

@@ -27,11 +27,14 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.EitherHolder;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.EitherHolderType;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
 
@@ -48,9 +51,9 @@ public record JukeboxPlayable(EitherHolder<JukeboxSong> song, boolean showInTool
     public static final Type<JukeboxPlayable> TYPE1_21 = new Type<>(JukeboxPlayable.class) {
         @Override
         public JukeboxPlayable read(final ByteBuf buffer) {
-            final EitherHolder<JukeboxSong> position = EitherHolderType.read(buffer, JukeboxSong.TYPE);
+            final EitherHolder<JukeboxSong> song = EitherHolderType.read(buffer, JukeboxSong.TYPE);
             final boolean showInTooltip = buffer.readBoolean();
-            return new JukeboxPlayable(position, showInTooltip);
+            return new JukeboxPlayable(song, showInTooltip);
         }
 
         @Override
@@ -59,18 +62,10 @@ public record JukeboxPlayable(EitherHolder<JukeboxSong> song, boolean showInTool
             buffer.writeBoolean(value.showInTooltip);
         }
     };
-    public static final Type<JukeboxPlayable> TYPE1_21_5 = new Type<>(JukeboxPlayable.class) {
-        @Override
-        public JukeboxPlayable read(final ByteBuf buffer) {
-            final EitherHolder<JukeboxSong> position = EitherHolderType.read(buffer, JukeboxSong.TYPE);
-            return new JukeboxPlayable(position, true);
-        }
-
-        @Override
-        public void write(final ByteBuf buffer, final JukeboxPlayable value) {
-            EitherHolderType.write(buffer, value.song, JukeboxSong.TYPE);
-        }
-    };
+    public static final Type<JukeboxPlayable> TYPE1_21_5 = TransformingType.of(
+        new EitherHolderType<>(JukeboxSong.TYPE), JukeboxPlayable.class,
+        song -> new JukeboxPlayable(song, true), JukeboxPlayable::song
+    );
 
     @Override
     public JukeboxPlayable rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
@@ -107,6 +102,21 @@ public record JukeboxPlayable(EitherHolder<JukeboxSong> song, boolean showInTool
                 buffer.writeFloat(value.lengthInSeconds);
                 Types.VAR_INT.writePrimitive(buffer, value.comparatorOutput);
             }
+
+            @Override
+            public void writeDirect(final Ops ops, final JukeboxSong value) {
+                // Unused, cannot be direct despite having a direct network codec
+                ops.writeMap(map -> map
+                    .write("sound_event", Types.SOUND_EVENT, value.soundEvent)
+                    .write("description", Types.TAG, value.description)
+                    .write("length_in_seconds", Types.FLOAT, value.lengthInSeconds)
+                    .write("comparator_output", Types.INT, value.comparatorOutput));
+            }
+
+            @Override
+            protected Key identifier(final Ops ops, final int id) {
+                return ops.context().registryAccess().registryKey("jukebox_song", id);
+            }
         };
 
         @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/KineticWeapon.java

@@ -0,0 +1,113 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.type.OptionalType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record KineticWeapon(int contactCooldownTicks, int delayTicks, @Nullable Condition dismountConditions,
+                            @Nullable Condition knockbackConditions, @Nullable Condition damageConditions,
+                            float forwardMovement, float damageMultiplier,
+                            @Nullable Holder<SoundEvent> sound, @Nullable Holder<SoundEvent> hitSound) {
+
+    public static final Type<KineticWeapon> TYPE = new Type<>(KineticWeapon.class) {
+        @Override
+        public KineticWeapon read(final ByteBuf buffer) {
+            final int contactCooldownTicks = Types.VAR_INT.readPrimitive(buffer);
+            final int delayTicks = Types.VAR_INT.readPrimitive(buffer);
+            final Condition dismountConditions = Condition.OPTIONAL_TYPE.read(buffer);
+            final Condition knockbackConditions = Condition.OPTIONAL_TYPE.read(buffer);
+            final Condition damageConditions = Condition.OPTIONAL_TYPE.read(buffer);
+            final float forwardMovement = Types.FLOAT.readPrimitive(buffer);
+            final float damageMultiplier = Types.FLOAT.readPrimitive(buffer);
+            final Holder<SoundEvent> sound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
+            final Holder<SoundEvent> hitSound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
+            return new KineticWeapon(contactCooldownTicks, delayTicks, dismountConditions, knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final KineticWeapon value) {
+            Types.VAR_INT.writePrimitive(buffer, value.contactCooldownTicks);
+            Types.VAR_INT.writePrimitive(buffer, value.delayTicks);
+            Condition.OPTIONAL_TYPE.write(buffer, value.dismountConditions);
+            Condition.OPTIONAL_TYPE.write(buffer, value.knockbackConditions);
+            Condition.OPTIONAL_TYPE.write(buffer, value.damageConditions);
+            Types.FLOAT.writePrimitive(buffer, value.forwardMovement);
+            Types.FLOAT.writePrimitive(buffer, value.damageMultiplier);
+            Types.OPTIONAL_SOUND_EVENT.write(buffer, value.sound);
+            Types.OPTIONAL_SOUND_EVENT.write(buffer, value.hitSound);
+        }
+
+        @Override
+        public void write(final Ops ops, final KineticWeapon value) {
+            ops.writeMap(map -> map
+                .writeOptional("contact_cooldown_ticks", Types.INT, value.contactCooldownTicks, 10)
+                .writeOptional("delay_ticks", Types.INT, value.delayTicks, 0)
+                .writeOptional("dismount_conditions", Condition.TYPE, value.dismountConditions)
+                .writeOptional("knockback_conditions", Condition.TYPE, value.knockbackConditions)
+                .writeOptional("damage_conditions", Condition.TYPE, value.damageConditions)
+                .writeOptional("forward_movement", Types.FLOAT, value.forwardMovement, 0F)
+                .writeOptional("damage_multiplier", Types.FLOAT, value.damageMultiplier, 1F)
+                .writeOptional("sound", Types.SOUND_EVENT, value.sound)
+                .writeOptional("hit_sound", Types.SOUND_EVENT, value.hitSound)
+            );
+        }
+    };
+
+    public record Condition(int maxDurationTicks, float minSpeed, float minRelativeSpeed) {
+
+        public static final Type<Condition> TYPE = new Type<>(Condition.class) {
+            @Override
+            public Condition read(final ByteBuf buffer) {
+                final int maxDurationTicks = Types.VAR_INT.readPrimitive(buffer);
+                final float minSpeed = Types.FLOAT.readPrimitive(buffer);
+                final float minRelativeSpeed = Types.FLOAT.readPrimitive(buffer);
+                return new Condition(maxDurationTicks, minSpeed, minRelativeSpeed);
+            }
+
+            @Override
+            public void write(final ByteBuf buffer, final Condition value) {
+                Types.VAR_INT.writePrimitive(buffer, value.maxDurationTicks);
+                Types.FLOAT.writePrimitive(buffer, value.minSpeed);
+                Types.FLOAT.writePrimitive(buffer, value.minRelativeSpeed);
+            }
+
+            @Override
+            public void write(final Ops ops, final Condition value) {
+                ops.writeMap(map -> map
+                    .write("max_duration_ticks", Types.INT, value.maxDurationTicks)
+                    .writeOptional("min_speed", Types.FLOAT, value.minSpeed, 0F)
+                    .writeOptional("min_relative_speed", Types.FLOAT, value.minRelativeSpeed, 0F)
+                );
+            }
+        };
+        public static final Type<Condition> OPTIONAL_TYPE = new OptionalType<>(TYPE) {
+        };
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/LockCode.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.FullMappings;
+import com.viaversion.viaversion.api.minecraft.HolderSet;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
+
+public record LockCode(CompoundTag tag) implements Rewritable, Copyable {
+
+    public static final Type<LockCode> TYPE = TransformingType.of(Types.COMPOUND_TAG, LockCode.class, LockCode::new, LockCode::tag);
+
+    @Override
+    public LockCode rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        CompoundTag updatedTag = tag;
+        if (clientbound && protocol.getComponentRewriter() != null) {
+            // Just abuse the component rewriter and keep this one-way
+            updatedTag = tag.copy();
+            updatedTag.putString("id", "air");
+            protocol.getComponentRewriter().handleShowItem(connection, updatedTag);
+            updatedTag.remove("id");
+
+            final FullMappings mappings = protocol.getMappingData().getFullItemMappings();
+            final Tag itemsTag = updatedTag.get("items");
+            if (itemsTag != null) {
+                final HolderSet items = HolderSet.fromTag(itemsTag, key -> mappings.id(key));
+                items.rewrite(mappings::getNewId);
+                updatedTag.put("items", toTag(items, mappings));
+            }
+        }
+        return new LockCode(updatedTag);
+    }
+
+    private Tag toTag(final HolderSet holderSet, final FullMappings mappings) {
+        if (holderSet.hasTagKey()) {
+            return new StringTag("#" + holderSet.tagKey());
+        }
+
+        final int[] ids = holderSet.ids();
+        if (ids.length == 1) {
+            return new StringTag(mappings.mappedIdentifier(ids[0]));
+        }
+
+        final ListTag<StringTag> listTag = new ListTag<>(StringTag.class);
+        for (final int id : ids) {
+            listTag.add(new StringTag(mappings.mappedIdentifier(id)));
+        }
+        return listTag;
+    }
+
+    @Override
+    public LockCode copy() {
+        return new LockCode(tag.copy());
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/PiercingWeapon.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record PiercingWeapon(boolean dealsKnockback, boolean dismounts,
+                             @Nullable Holder<SoundEvent> sound, @Nullable Holder<SoundEvent> hitSound) {
+
+    public static final Type<PiercingWeapon> TYPE = new Type<>(PiercingWeapon.class) {
+        @Override
+        public PiercingWeapon read(final ByteBuf buffer) {
+            final boolean dealsKnockback = Types.BOOLEAN.read(buffer);
+            final boolean dismounts = Types.BOOLEAN.read(buffer);
+            final Holder<SoundEvent> sound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
+            final Holder<SoundEvent> hitSound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
+            return new PiercingWeapon(dealsKnockback, dismounts, sound, hitSound);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final PiercingWeapon value) {
+            Types.BOOLEAN.write(buffer, value.dealsKnockback);
+            Types.BOOLEAN.write(buffer, value.dismounts);
+            Types.OPTIONAL_SOUND_EVENT.write(buffer, value.sound);
+            Types.OPTIONAL_SOUND_EVENT.write(buffer, value.hitSound);
+        }
+
+        @Override
+        public void write(final Ops ops, final PiercingWeapon value) {
+            ops.writeMap(map -> map
+                .writeOptional("deals_knockback", Types.BOOLEAN, value.dealsKnockback, true)
+                .writeOptional("dismounts", Types.BOOLEAN, value.dismounts, false)
+                .writeOptional("sound", Types.SOUND_EVENT, value.sound)
+                .writeOptional("hit_sound", Types.SOUND_EVENT, value.hitSound)
+            );
+        }
+    };
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/PotDecorations.java

@@ -23,39 +23,29 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Rewritable;
-import io.netty.buffer.ByteBuf;
 
-public final class PotDecorations implements Copyable, Rewritable {
+public record PotDecorations(int[] itemIds) implements Copyable, Rewritable {
 
-    public static final Type<PotDecorations> TYPE = new Type<>(PotDecorations.class) {
+    public static final Type<PotDecorations> TYPE = new TransformingType<>(Types.VAR_INT_ARRAY_PRIMITIVE, PotDecorations.class, PotDecorations::new, PotDecorations::itemIds) {
         @Override
-        public PotDecorations read(final ByteBuf buffer) {
-            return new PotDecorations(Types.VAR_INT_ARRAY_PRIMITIVE.read(buffer));
-        }
-
-        @Override
-        public void write(final ByteBuf buffer, final PotDecorations value) {
-            Types.VAR_INT_ARRAY_PRIMITIVE.write(buffer, value.itemIds());
+        public void write(final Ops ops, final PotDecorations value) {
+            ops.writeList(list -> {
+                for (final int itemId : value.itemIds) {
+                    list.write(Types.IDENTIFIER, ops.context().registryAccess().item(itemId));
+                }
+            });
         }
     };
 
-    private final int[] itemIds;
-
-    public PotDecorations(final int[] itemIds) {
-        this.itemIds = itemIds;
-    }
-
     public PotDecorations(final int backItem, final int leftItem, final int rightItem, final int frontItem) {
-        this.itemIds = new int[]{backItem, leftItem, rightItem, frontItem};
-    }
-
-    public int[] itemIds() {
-        return itemIds;
+        this(new int[]{backItem, leftItem, rightItem, frontItem});
     }
 
     public int backItem() {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ProvidesTrimMaterial.java

@@ -25,6 +25,7 @@ package com.viaversion.viaversion.api.minecraft.item.data;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.EitherHolder;
 import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.misc.EitherHolderType;
@@ -45,6 +46,11 @@ public record ProvidesTrimMaterial(EitherHolder<ArmorTrimMaterial> material) imp
         public void write(final ByteBuf buffer, final ProvidesTrimMaterial value) {
             EitherHolderType.write(buffer, value.material, ArmorTrimMaterial.TYPE1_21_5);
         }
+
+        @Override
+        public void write(final Ops ops, final ProvidesTrimMaterial value) {
+            EitherHolderType.write(ops, value.material, ArmorTrimMaterial.TYPE1_21_5);
+        }
     };
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Repairable.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.item.data;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.MappingData.MappingType;
+import com.viaversion.viaversion.api.minecraft.HolderSet;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.TransformingType;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.misc.HolderSetType;
+import com.viaversion.viaversion.util.Rewritable;
+
+public record Repairable(HolderSet items) implements Rewritable {
+
+    public static final Type<Repairable> TYPE = new TransformingType<>(Types.HOLDER_SET, Repairable.class, Repairable::new, Repairable::items) {
+        @Override
+        public void write(final Ops ops, final Repairable value) {
+            ops.writeMap(map -> map.write("items", new HolderSetType(MappingType.ITEM), value.items));
+        }
+    };
+
+    @Override
+    public Repairable rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final HolderSet items = this.items.rewrite(Rewritable.itemRewriteFunction(protocol, clientbound));
+        return this.items == items ? this : new Repairable(items);
+    }
+}