5.5.0 Release

Minus some dynamic player profile stuff

.github/workflows/build.yml

@@ -11,13 +11,13 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         persist-credentials: false
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: 17

.github/workflows/publish.yml

@@ -12,19 +12,26 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 17
           check-latest: true
-      - name: Publish
+      - name: Build
+        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

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Update Gradle Wrapper

.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/

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

@@ -140,8 +140,6 @@ public interface MappingData {
 
     @Nullable Mappings getBlockMappings();
 
-    @Nullable Mappings getBlockEntityMappings();
-
     @Nullable Mappings getBlockStateMappings();
 
     @Nullable Mappings getSoundMappings();
@@ -154,6 +152,8 @@ public interface MappingData {
 
     @Nullable Mappings getPaintingMappings();
 
+    @Nullable FullMappings getBlockEntityMappings();
+
     @Nullable FullMappings getAttributeMappings();
 
     @Nullable FullMappings getEntityMappings();

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

@@ -44,11 +44,11 @@ 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;
@@ -70,7 +70,6 @@ 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");
@@ -86,6 +85,7 @@ public class MappingDataBase implements MappingData {
             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");
@@ -241,7 +241,7 @@ public class MappingDataBase implements MappingData {
     }
 
     @Override
-    public @Nullable Mappings getBlockEntityMappings() {
+    public @Nullable FullMappings getBlockEntityMappings() {
         return blockEntityMappings;
     }
 

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.

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

@@ -45,6 +45,10 @@ public interface CodecContext {
 
         Key dataComponentType(int id);
 
+        Key entity(int id);
+
+        Key blockEntity(int id);
+
         static RegistryAccess of(final List<String> enchantments, final MappingData mappingData) {
             return new RegistryAccessImpl(enchantments, mappingData);
         }

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

@@ -66,6 +66,16 @@ 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);
+    }
+
     private Key key(final FullMappings mappings, final int id) {
         final String identifier = mapped ? mappings.mappedIdentifier(id) : mappings.identifier(id);
         return key(identifier, id);

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

@@ -29,6 +29,7 @@ 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.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_2;
@@ -39,6 +40,7 @@ import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_
 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;
@@ -56,6 +58,7 @@ 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.LodestoneTracker;
 import com.viaversion.viaversion.api.minecraft.item.data.PotDecorations;
@@ -65,6 +68,7 @@ import com.viaversion.viaversion.api.minecraft.item.data.SuspiciousStewEffect;
 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.EntityData;
 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.Weapon;
@@ -97,7 +101,7 @@ public record StructuredDataKey<T>(String identifier, Type<T> 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<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);
@@ -156,9 +160,11 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     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<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,13 +177,15 @@ 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<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.RESOURCE_LOCATION);
     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<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> LOCK = new StructuredDataKey<>("lock", Types.TAG);
     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);
@@ -214,6 +222,7 @@ 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();
 
     @Override
     public String toString() {

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_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/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 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 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/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"};

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,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.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.RESOURCE_LOCATION, 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);
+        return new BlockEntityData(mappedType, tag);
+    }
+}

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/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.RESOURCE_LOCATION, 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 = protocol.getMappingData().getEntityMappings().getNewId(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/Equippable.java

@@ -139,6 +139,8 @@ public record Equippable(int equipmentSlot, Holder<SoundEvent> soundEvent, @Null
     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/ItemModel.java

@@ -0,0 +1,61 @@
+/*
+ * 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.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.Key;
+import com.viaversion.viaversion.util.Rewritable;
+import io.netty.buffer.ByteBuf;
+
+public record ItemModel(Key key) implements Rewritable {
+
+    public static final Type<ItemModel> TYPE = new Type<>(ItemModel.class) {
+        @Override
+        public ItemModel read(final ByteBuf buffer) {
+            final Key key = Types.RESOURCE_LOCATION.read(buffer);
+            return new ItemModel(key);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final ItemModel value) {
+            Types.RESOURCE_LOCATION.write(buffer, value.key());
+        }
+
+        @Override
+        public void write(final Ops ops, final ItemModel data) {
+            ops.write(Types.RESOURCE_LOCATION, data.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/protocol/AbstractProtocol.java

@@ -100,9 +100,9 @@ public abstract class AbstractProtocol<CU extends ClientboundPacketType, CM exte
         Preconditions.checkArgument(!initialized, "Protocol has already been initialized");
         initialized = true;
 
-        // Create logger if protocol does not have one
-        if (getLogger() == null) {
-            logger = new ProtocolLogger(getClass());
+        // Create logger if the protocol doesn't have one
+        if (logger == null) {
+            logger = createLogger();
         }
         registerPackets();
         registerConfigurationChangeHandlers();
@@ -128,6 +128,10 @@ public abstract class AbstractProtocol<CU extends ClientboundPacketType, CM exte
         }
     }
 
+    protected ProtocolLogger createLogger() {
+        return new ProtocolLogger(getClass());
+    }
+
     protected void registerConfigurationChangeHandlers() {
         // Register handlers for protocol state switching
         // Assuming ids will change too often, it is cleaner to register them here instead of the base protocols,
@@ -139,7 +143,7 @@ public abstract class AbstractProtocol<CU extends ClientboundPacketType, CM exte
 
         final CU startConfigurationPacket = startConfigurationPacket();
         if (startConfigurationPacket != null) {
-            appendClientbound(startConfigurationPacket, setServerStateHandler(State.CONFIGURATION));
+            appendClientbound(startConfigurationPacket, startConfigurationHandler());
         }
 
         final SU finishConfigurationPacket = serverboundFinishConfigurationPacket();
@@ -476,6 +480,16 @@ public abstract class AbstractProtocol<CU extends ClientboundPacketType, CM exte
         return wrapper -> wrapper.user().getProtocolInfo().setServerState(state);
     }
 
+    private PacketHandler startConfigurationHandler() {
+        return setServerStateHandler(State.CONFIGURATION).then(wrapper -> {
+            // Mimic client behaviour
+            final EntityTracker tracker = wrapper.user().getEntityTracker(getClass());
+            if (tracker != null) {
+                tracker.clear();
+            }
+        });
+    }
+
     @Override
     public final PacketTypesProvider<CU, CM, SM, SU> getPacketTypesProvider() {
         return packetTypesProvider;

api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java

@@ -24,11 +24,15 @@ package com.viaversion.viaversion.api.protocol;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.exception.CancelException;
+import com.viaversion.viaversion.exception.InformativeException;
 import java.util.Collection;
 import java.util.List;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public interface ProtocolPipeline extends SimpleProtocol {
+public interface ProtocolPipeline {
 
     /**
      * Adds a protocol to the current pipeline.
@@ -67,6 +71,15 @@ public interface ProtocolPipeline extends SimpleProtocol {
     @Deprecated
     @Nullable <P extends Protocol> P getProtocol(Class<P> pipeClass);
 
+    /**
+     * Transform a packet using the protocols in this pipeline.
+     *
+     * @param direction     The direction the packet is going in
+     * @param state         The current protocol state
+     * @param packetWrapper The packet wrapper to transform
+     */
+    void transform(Direction direction, State state, PacketWrapper packetWrapper) throws InformativeException, CancelException;
+
     List<Protocol> pipes(@Nullable Class<? extends Protocol> protocolClass, boolean skipCurrentPipeline, Direction direction);
 
     /**

api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java

@@ -23,152 +23,219 @@
 package com.viaversion.viaversion.api.protocol.packet;
 
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.configuration.RateLimitConfig;
 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import java.util.Arrays;
 
 public class PacketTracker {
-    private final UserConnection connection;
+    private static final long SECOND_NANOS = 1_000_000_000L;
+
+    private final RateTracker packetTracker = new RateTracker(5);
+    private final RateTracker packetSizeTracker = new RateTracker(3);
+    private long startTime = System.nanoTime();
     private boolean packetLimiterEnabled = true;
-    private long sentPackets;
-    private long receivedPackets;
-    // Used for tracking pps
-    private long startTime;
-    private long intervalPackets;
-    private long packetsPerSecond = -1L;
-    // Used for handling warnings (over time)
-    private int secondsObserved;
-    private int warnings;
+    private final UserConnection connection;
+    private long sentPacketsTotal;
+    private long receivedPacketsTotal;
 
     public PacketTracker(UserConnection connection) {
         this.connection = connection;
     }
 
     /**
-     * Used for incrementing the number of packets sent to the client.
+     * Increments the number of packets sent to the client.
      */
     public void incrementSent() {
-        this.sentPackets++;
+        this.sentPacketsTotal++;
     }
 
-    /**
-     * Used for incrementing the number of packets received from the client.
-     *
-     * @return true if the interval has reset and can now be checked for the packets sent
-     */
+    @Deprecated(forRemoval = true)
     public boolean incrementReceived() {
-        // handle stats
-        long diff = System.currentTimeMillis() - startTime;
-        if (diff >= 1000) {
-            packetsPerSecond = intervalPackets;
-            startTime = System.currentTimeMillis();
-            intervalPackets = 1;
-            return true;
-        } else {
-            intervalPackets++;
-        }
-        // increase total
-        this.receivedPackets++;
-        return false;
+        return incrementReceived(0);
     }
 
     /**
-     * Checks for packet flood with the packets sent in the last second.
-     * ALWAYS check for {@link #incrementReceived()} before using this method.
+     * Increments the number of packets received from the client.
      *
-     * @return true if the packet should be cancelled
-     * @see #incrementReceived()
+     * @return true if the interval has reset
      */
-    public boolean exceedsMaxPPS() {
-        if (connection.isClientSide()) return false; // Don't apply PPS limiting for client-side
-        ViaVersionConfig conf = Via.getConfig();
-        // Max PPS Checker
-        if (conf.getMaxPPS() > 0 && packetsPerSecond >= conf.getMaxPPS()) {
-            connection.disconnect(conf.getMaxPPSKickMessage().replace("%pps", Long.toString(packetsPerSecond)));
-            return true; // don't send current packet
-        }
+    public boolean incrementReceived(int packetSize) {
+        receivedPacketsTotal++;
 
-        // Tracking PPS Checker
-        if (conf.getMaxWarnings() > 0 && conf.getTrackingPeriod() > 0) {
-            if (secondsObserved > conf.getTrackingPeriod()) {
-                // Reset
-                warnings = 0;
-                secondsObserved = 1;
-            } else {
-                secondsObserved++;
-                if (packetsPerSecond >= conf.getWarningPPS()) {
-                    warnings++;
-                }
-
-                if (warnings >= conf.getMaxWarnings()) {
-                    connection.disconnect(conf.getMaxWarningsKickMessage().replace("%pps", Long.toString(packetsPerSecond)));
-                    return true; // don't send current packet
-                }
+        ViaVersionConfig config = Via.getConfig();
+        long currentTime = System.nanoTime();
+        long elapsed = currentTime - startTime;
+        if (elapsed < SECOND_NANOS) {
+            // Add to current interval
+            if (config.getPacketTrackerConfig().enabled()) {
+                packetTracker.addIntervalValue(1);
             }
+            if (config.getPacketSizeTrackerConfig().enabled()) {
+                packetSizeTracker.addIntervalValue(packetSize);
+            }
+            return false;
         }
-        return false;
+
+        // Reset interval tracking
+        if (config.getPacketTrackerConfig().enabled()) {
+            packetTracker.updateRate(elapsed);
+            packetTracker.addIntervalValue(1);
+        }
+        if (config.getPacketSizeTrackerConfig().enabled()) {
+            packetSizeTracker.updateRate(elapsed);
+            packetSizeTracker.addIntervalValue(packetSize);
+        }
+        startTime = currentTime;
+        return true;
+    }
+
+    public boolean exceedsLimits() {
+        if (connection.isClientSide()) {
+            return false;
+        }
+
+        ViaVersionConfig config = Via.getConfig();
+        return packetTracker.exceedsLimit(connection, config.getPacketTrackerConfig())
+            || packetSizeTracker.exceedsLimit(connection, config.getPacketSizeTrackerConfig());
     }
 
     public long getSentPackets() {
-        return sentPackets;
+        return sentPacketsTotal;
     }
 
+    @Deprecated(forRemoval = true)
     public void setSentPackets(long sentPackets) {
-        this.sentPackets = sentPackets;
+        this.sentPacketsTotal = sentPackets;
     }
 
     public long getReceivedPackets() {
-        return receivedPackets;
+        return receivedPacketsTotal;
     }
 
+    @Deprecated(forRemoval = true)
     public void setReceivedPackets(long receivedPackets) {
-        this.receivedPackets = receivedPackets;
-    }
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
+        this.receivedPacketsTotal = receivedPackets;
     }
 
+    @Deprecated(forRemoval = true)
     public long getIntervalPackets() {
-        return intervalPackets;
+        return this.packetTracker.intervalValue;
     }
 
+    @Deprecated(forRemoval = true)
     public void setIntervalPackets(long intervalPackets) {
-        this.intervalPackets = intervalPackets;
+        this.packetTracker.intervalValue = Math.toIntExact(intervalPackets);
     }
 
-    public long getPacketsPerSecond() {
-        return packetsPerSecond;
-    }
-
-    public void setPacketsPerSecond(long packetsPerSecond) {
-        this.packetsPerSecond = packetsPerSecond;
-    }
-
-    public int getSecondsObserved() {
-        return secondsObserved;
-    }
-
-    public void setSecondsObserved(int secondsObserved) {
-        this.secondsObserved = secondsObserved;
-    }
-
-    public int getWarnings() {
-        return warnings;
-    }
-
-    public void setWarnings(int warnings) {
-        this.warnings = warnings;
+    public int getPacketsPerSecond() {
+        return packetTracker.currentRate;
     }
 
     public boolean isPacketLimiterEnabled() {
-        return packetLimiterEnabled;
+        ViaVersionConfig config = Via.getConfig();
+        return packetLimiterEnabled && config.getPacketTrackerConfig().enabled() && config.getPacketSizeTrackerConfig().enabled();
     }
 
     public void setPacketLimiterEnabled(boolean packetLimiterEnabled) {
         this.packetLimiterEnabled = packetLimiterEnabled;
     }
+
+    @Deprecated(forRemoval = true)
+    public void setWarnings(int warnings) {
+        this.packetTracker.warnings = warnings;
+    }
+
+    private static final class RateTracker {
+        private final int[] history;
+        private int historyIndex;
+        private int historyCount;
+        private int currentRate = -1;
+
+        // Interval tracking
+        int intervalValue;
+
+        // Warning system
+        private long warningPeriodStart = System.nanoTime();
+        private int warnings;
+
+        public RateTracker(int windowSize) {
+            this.history = new int[windowSize];
+        }
+
+        public void addIntervalValue(int value) {
+            intervalValue += value;
+        }
+
+        public void updateRate(long elapsedNanos) {
+            // Update sliding window
+            history[historyIndex] = (int) ((intervalValue * SECOND_NANOS) / elapsedNanos);
+            historyIndex = (historyIndex + 1) % history.length;
+            if (historyCount < history.length) {
+                historyCount++;
+            }
+
+            // Calculate smoothed average
+            int sum = 0;
+            for (int i = 0; i < historyCount; i++) {
+                sum += history[i];
+            }
+
+            currentRate = sum / historyCount;
+            intervalValue = 0; // Reset
+        }
+
+        public boolean exceedsLimit(UserConnection connection, RateLimitConfig limitConfig) {
+            if (!limitConfig.enabled() || currentRate < 0) {
+                return false;
+            }
+
+            // Immediate limit check
+            if (limitConfig.maxRate() > 0 && currentRate >= limitConfig.maxRate()) {
+                connection.disconnect(limitConfig.maxRateKickMessage().replace(limitConfig.ratePlaceholder(), Integer.toString(currentRate)));
+                return true;
+            }
+
+            // Interval warnings
+            if (limitConfig.maxWarnings() > 0 && limitConfig.trackingPeriodNanos() > 0 && limitConfig.warningRate() > 0) {
+                return checkTrackedInterval(connection, limitConfig);
+            }
+
+            return false;
+        }
+
+        private boolean checkTrackedInterval(UserConnection connection, RateLimitConfig config) {
+            long currentTime = System.nanoTime();
+            if (currentTime - warningPeriodStart >= config.trackingPeriodNanos()) {
+                // Reset
+                warnings = 0;
+                warningPeriodStart = currentTime;
+                return false;
+            }
+
+            if (currentRate >= config.warningRate() && ++warnings >= config.maxWarnings()) {
+                connection.disconnect(config.warningKickMessage().replace(config.ratePlaceholder(), Integer.toString(currentRate)));
+                return true;
+            }
+            return false;
+        }
+
+        public void reset() {
+            intervalValue = 0;
+            currentRate = -1;
+            warnings = 0;
+            warningPeriodStart = System.nanoTime();
+            historyIndex = 0;
+            historyCount = 0;
+            Arrays.fill(history, 0);
+        }
+    }
+
+    public void reset() {
+        sentPacketsTotal = 0;
+        receivedPacketsTotal = 0;
+        startTime = System.nanoTime();
+        packetTracker.reset();
+        packetSizeTracker.reset();
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java

@@ -90,7 +90,8 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
     public static final ProtocolVersion v1_21_4 = register(769, "1.21.4");
     public static final ProtocolVersion v1_21_5 = register(770, "1.21.5");
     public static final ProtocolVersion v1_21_6 = register(771, "1.21.6");
-    public static final ProtocolVersion v1_21_7 = register(772, "1.21.7");
+    public static final ProtocolVersion v1_21_7 = register(772, "1.21.7-1.21.8", new SubVersionRange("1.21", 7, 8));
+    public static final ProtocolVersion v1_21_9 = register(773, "1.21.9");
     public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
 
     static {

api/src/main/java/com/viaversion/viaversion/api/type/Types.java

@@ -36,8 +36,10 @@ import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
 import com.viaversion.viaversion.api.minecraft.ProfileKey;
 import com.viaversion.viaversion.api.minecraft.Quaternion;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
+import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
 import com.viaversion.viaversion.api.minecraft.Vector;
+import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.Vector3f;
 import com.viaversion.viaversion.api.minecraft.VillagerData;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
@@ -70,6 +72,7 @@ import com.viaversion.viaversion.api.type.types.ShortType;
 import com.viaversion.viaversion.api.type.types.StringType;
 import com.viaversion.viaversion.api.type.types.UUIDType;
 import com.viaversion.viaversion.api.type.types.UnsignedByteType;
+import com.viaversion.viaversion.api.type.types.UnsignedIntType;
 import com.viaversion.viaversion.api.type.types.UnsignedShortType;
 import com.viaversion.viaversion.api.type.types.VarIntArrayType;
 import com.viaversion.viaversion.api.type.types.VarIntType;
@@ -100,6 +103,7 @@ import com.viaversion.viaversion.api.type.types.math.BlockPositionType1_8;
 import com.viaversion.viaversion.api.type.types.math.ChunkPositionType;
 import com.viaversion.viaversion.api.type.types.math.EulerAngleType;
 import com.viaversion.viaversion.api.type.types.math.GlobalBlockPositionType;
+import com.viaversion.viaversion.api.type.types.math.MovementVectorType;
 import com.viaversion.viaversion.api.type.types.math.QuaternionType;
 import com.viaversion.viaversion.api.type.types.math.Vector3fType;
 import com.viaversion.viaversion.api.type.types.math.VectorType;
@@ -114,6 +118,7 @@ import com.viaversion.viaversion.api.type.types.misc.PlayerMessageSignatureType;
 import com.viaversion.viaversion.api.type.types.misc.ProfileKeyType;
 import com.viaversion.viaversion.api.type.types.misc.ProfilePropertyType;
 import com.viaversion.viaversion.api.type.types.misc.SoundEventType;
+import com.viaversion.viaversion.api.type.types.misc.ResolvableProfileType;
 import com.viaversion.viaversion.api.type.types.misc.TagKeyType;
 import com.viaversion.viaversion.api.type.types.misc.TagType;
 import com.viaversion.viaversion.api.type.types.misc.TextComponentTagType;
@@ -144,6 +149,7 @@ public final class Types {
 
     public static final IntType INT = new IntType();
     public static final Type<int[]> INT_ARRAY_PRIMITIVE = new IntArrayType();
+    public static final UnsignedIntType UNSIGNED_INT = new UnsignedIntType();
 
     public static final FloatType FLOAT = new FloatType();
     public static final FloatType.OptionalFloatType OPTIONAL_FLOAT = new FloatType.OptionalFloatType();
@@ -192,6 +198,7 @@ public final class Types {
     public static final Type<Vector> VECTOR = new VectorType();
     public static final Type<Vector3f> VECTOR3F = new Vector3fType();
     public static final Type<Quaternion> QUATERNION = new QuaternionType();
+    public static final Type<Vector3d> MOVEMENT_VECTOR = new MovementVectorType();
 
     public static final Type<CompoundTag> NAMED_COMPOUND_TAG = new NamedCompoundTagType();
     public static final Type<CompoundTag> OPTIONAL_NAMED_COMPOUND_TAG = new NamedCompoundTagType.OptionalNamedCompoundTagType();
@@ -224,6 +231,7 @@ public final class Types {
     public static final Type<VillagerData> VILLAGER_DATA = new VillagerDataType();
 
     public static final Type<GameProfile> GAME_PROFILE = new GameProfileType();
+    public static final Type<ResolvableProfile> RESOLVABLE_PROFILE = new ResolvableProfileType();
     public static final Type<GameProfile.Property> PROFILE_PROPERTY = new ProfilePropertyType();
     public static final Type<GameProfile.Property[]> PROFILE_PROPERTY_ARRAY = new ArrayType<>(PROFILE_PROPERTY);
     public static final Type<ProfileKey> PROFILE_KEY = new ProfileKeyType();

api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedIntType.java

@@ -0,0 +1,63 @@
+/*
+ * 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.type.types;
+
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
+
+public class UnsignedIntType extends Type<Long> implements TypeConverter<Long> {
+    public static final long MAX_UNSIGNED_INT = 0xFFFFFFFFL;
+
+    public UnsignedIntType() {
+        super(Long.class);
+    }
+
+    @Override
+    public Long read(ByteBuf buffer) {
+        return buffer.readUnsignedInt();
+    }
+
+    public long readPrimitive(ByteBuf buffer) {
+        return buffer.readUnsignedInt();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Long l) {
+        buffer.writeInt(l.intValue());
+    }
+
+    public void writePrimitive(ByteBuf buffer, long l) {
+        buffer.writeInt((int) l);
+    }
+
+    @Override
+    public Long from(Object o) {
+        if (o instanceof Number number) {
+            return number.longValue();
+        } else if (o instanceof Boolean boo) {
+            return boo ? 1L : 0L;
+        }
+        throw new UnsupportedOperationException();
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java

@@ -25,7 +25,6 @@ package com.viaversion.viaversion.api.type.types.chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;
-import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
 import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;

api/src/main/java/com/viaversion/viaversion/api/type/types/item/StructuredDataType.java

@@ -24,7 +24,6 @@ package com.viaversion.viaversion.api.type.types.item;
 
 import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.data.FullMappings;
-import com.viaversion.viaversion.api.data.item.ItemHasher;
 import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/MovementVectorType.java

@@ -0,0 +1,116 @@
+/*
+ * 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.type.types.math;
+
+import com.viaversion.viaversion.api.minecraft.Vector3d;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.UnsignedIntType;
+import com.viaversion.viaversion.util.MathUtil;
+import io.netty.buffer.ByteBuf;
+
+public class MovementVectorType extends Type<Vector3d> {
+    // Using 15 bits, steal short constants for it
+    private static final double MAX_QUANTIZED_VALUE = Short.MAX_VALUE - 1;
+    private static final int SCALE_BITS = 2; // first 2 bits for the scale
+    private static final int SCALE_BITS_MASK = 3;
+    private static final int CONTINUATION_FLAG = 1 << 2; // 3rd bit to indicate more scale data
+    private static final double ABS_MAX_VALUE = (1L << Integer.SIZE + SCALE_BITS) - 1; // Unsigned int + the first two scale bits
+    private static final double ABS_MIN_VALUE = 1 / MAX_QUANTIZED_VALUE;
+
+    public MovementVectorType() {
+        super(Vector3d.class);
+    }
+
+    @Override
+    public Vector3d read(final ByteBuf buffer) {
+        // Pack values back into a single long
+        final int first = Types.UNSIGNED_BYTE.read(buffer);
+        if (first == 0) {
+            return Vector3d.ZERO;
+        }
+
+        final int second = Types.UNSIGNED_BYTE.read(buffer);
+        final long remaining = Types.UNSIGNED_INT.read(buffer);
+        final long packed = remaining << 16 | second << 8 | first;
+
+        long scale = first & SCALE_BITS_MASK;
+        if ((first & CONTINUATION_FLAG) != 0) {
+            // Read the remaining bits and add them to the first two
+            scale |= (Types.VAR_INT.readPrimitive(buffer) & UnsignedIntType.MAX_UNSIGNED_INT) << SCALE_BITS;
+        }
+
+        // 15 bits for each part after removing the scale bits
+        return new Vector3d(
+            unpack(packed >> (0 + SCALE_BITS_MASK)) * scale,
+            unpack(packed >> (15 + SCALE_BITS_MASK)) * scale,
+            unpack(packed >> (30 + SCALE_BITS_MASK)) * scale
+        );
+    }
+
+    @Override
+    public void write(final ByteBuf buffer, final Vector3d vec) {
+        final double x = sanitize(vec.x());
+        final double y = sanitize(vec.y());
+        final double z = sanitize(vec.z());
+
+        final double maxPart = Math.max(Math.abs(x), Math.max(Math.abs(y), Math.abs(z)));
+        if (maxPart < ABS_MIN_VALUE) {
+            buffer.writeByte(0);
+            return;
+        }
+
+        final long scale = MathUtil.ceilLong(maxPart);
+        final boolean scaleTooLargeForBits = (scale & SCALE_BITS_MASK) != scale;
+        final long scaleBits = scaleTooLargeForBits ? (scale & SCALE_BITS_MASK) | CONTINUATION_FLAG : scale;
+        final long packed = scaleBits
+            | (pack(x / scale) << (0 + SCALE_BITS_MASK))
+            | (pack(y / scale) << (15 + SCALE_BITS_MASK))
+            | (pack(z / scale) << (30 + SCALE_BITS_MASK));
+
+        buffer.writeByte((byte) packed);
+        buffer.writeByte((byte) (packed >> 8));
+        buffer.writeInt((int) (packed >> 16));
+
+        if (scaleTooLargeForBits) {
+            // First two bits have already been written
+            Types.VAR_INT.writePrimitive(buffer, (int) (scale >> SCALE_BITS));
+        }
+    }
+
+    private double sanitize(final double value) {
+        return Double.isNaN(value) ? 0 : MathUtil.clamp(value, -ABS_MAX_VALUE, ABS_MAX_VALUE);
+    }
+
+    private long pack(final double value) {
+        // Shift to [0, 1] and quantize to 15 bits
+        final double shifted = (value * 0.5) + 0.5;
+        return Math.round(shifted * MAX_QUANTIZED_VALUE);
+    }
+
+    private double unpack(final long value) {
+        // Normalize to [-1, 1]
+        final double clamped = Math.min(value & Short.MAX_VALUE, MAX_QUANTIZED_VALUE);
+        return (clamped * 2) / MAX_QUANTIZED_VALUE - 1;
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java

@@ -160,6 +160,13 @@ public class ParticleType extends DynamicType<Particle> {
             particle.add(Types.INT, Types.INT.readPrimitive(buf)); // Color
             particle.add(Types.VAR_INT, Types.VAR_INT.readPrimitive(buf)); // Duration
         };
+        public static final DataReader<Particle> POWER = (buf, particle) -> {
+            particle.add(Types.FLOAT, Types.FLOAT.readPrimitive(buf));
+        };
+        public static final DataReader<Particle> SPELL = (buf, particle) -> {
+            particle.add(Types.INT, Types.INT.readPrimitive(buf)); // Color
+            particle.add(Types.FLOAT, Types.FLOAT.readPrimitive(buf)); // Power
+        };
 
         public static DataReader<Particle> item(Type<Item> item) {
             return (buf, particle) -> particle.add(item, item.read(buf));

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ResolvableProfileType.java

@@ -0,0 +1,90 @@
+/*
+ * 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.type.types.misc;
+
+import com.viaversion.viaversion.api.minecraft.GameProfile;
+import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
+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.util.Key;
+import io.netty.buffer.ByteBuf;
+import java.util.UUID;
+
+public final class ResolvableProfileType extends Type<ResolvableProfile> {
+
+    public ResolvableProfileType() {
+        super(ResolvableProfile.class);
+    }
+
+    @Override
+    public ResolvableProfile read(final ByteBuf buffer) {
+        final GameProfile profile;
+        if (buffer.readBoolean()) {
+            final UUID id = Types.UUID.read(buffer);
+            final String name = Types.STRING.read(buffer);
+            final GameProfile.Property[] properties = Types.PROFILE_PROPERTY_ARRAY.read(buffer);
+            profile = new GameProfile(name, id, properties, false);
+        } else {
+            profile = Types.GAME_PROFILE.read(buffer);
+        }
+
+        final String texture = Types.OPTIONAL_STRING.read(buffer);
+        final String capeTexture = Types.OPTIONAL_STRING.read(buffer);
+        final String elytraTexture = Types.OPTIONAL_STRING.read(buffer);
+        final Boolean encodedModelType = Types.OPTIONAL_BOOLEAN.read(buffer); // ...
+        final Integer modelType = encodedModelType != null ? (encodedModelType ? 0 : 1) : null;
+        return new ResolvableProfile(profile, texture, capeTexture, elytraTexture, modelType);
+    }
+
+    @Override
+    public void write(final ByteBuf buffer, final ResolvableProfile value) {
+        final GameProfile profile = value.profile();
+        if (!profile.dynamic()) {
+            buffer.writeBoolean(true);
+            Types.UUID.write(buffer, profile.id());
+            Types.STRING.write(buffer, profile.name());
+            Types.PROFILE_PROPERTY_ARRAY.write(buffer, profile.properties());
+        } else {
+            buffer.writeBoolean(false);
+            Types.GAME_PROFILE.write(buffer, profile);
+        }
+
+        Types.OPTIONAL_STRING.write(buffer, value.bodyTexture());
+        Types.OPTIONAL_STRING.write(buffer, value.capeTexture());
+        Types.OPTIONAL_STRING.write(buffer, value.elytraTexture());
+        Types.OPTIONAL_BOOLEAN.write(buffer, value.modelType() != null ? value.modelType() == 0 : null);
+    }
+
+    @Override
+    public void write(final Ops ops, final ResolvableProfile value) {
+        final String modelType = value.modelType() != null ? (value.modelType() == 0 ? "slim" : "wide") : null;
+        ops.writeMap(map -> map
+            .writeInlinedMap(Types.GAME_PROFILE, value.profile())
+            .writeOptional("texture", Types.RESOURCE_LOCATION, value.bodyTexture() != null ? Key.of(value.bodyTexture()) : null)
+            .writeOptional("cape", Types.RESOURCE_LOCATION, value.capeTexture() != null ? Key.of(value.capeTexture()) : null)
+            .writeOptional("elytra", Types.RESOURCE_LOCATION, value.elytraTexture() != null ? Key.of(value.elytraTexture()) : null)
+            .writeOptional("model", Types.OPTIONAL_STRING, modelType)
+        );
+    }
+};

api/src/main/java/com/viaversion/viaversion/api/type/types/version/VersionedTypes.java

@@ -29,6 +29,7 @@ import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_2;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_5;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_9;
 
 /**
  * Holds versioned accessors for highly volatile types, specifically around items and data components.
@@ -44,4 +45,5 @@ public final class VersionedTypes {
     public static final Types1_20_5<StructuredDataKeys1_21_2, EntityDataTypes1_21_2> V1_21_4 = new Types1_20_5<>(StructuredDataKeys1_21_2::new, EntityDataTypes1_21_2::new);
     public static final Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> V1_21_5 = new Types1_20_5<>(StructuredDataKeys1_21_5::new, EntityDataTypes1_21_5::new);
     public static final Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> V1_21_6 = new Types1_20_5<>(StructuredDataKeys1_21_5::new, EntityDataTypes1_21_5::new);
+    public static final Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_9> V1_21_9 = new Types1_20_5<>(StructuredDataKeys1_21_5::new, EntityDataTypes1_21_9::new);
 }

api/src/main/java/com/viaversion/viaversion/util/ArrayUtil.java

@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.util;
 
+import java.lang.reflect.Array;
 import java.util.Arrays;
 
 /**
@@ -76,4 +77,21 @@ public final class ArrayUtil {
         }
         return boxedArray;
     }
+
+    public static String toString(final Object o) {
+        if (o == null || !o.getClass().isArray()) {
+            return String.valueOf(o);
+        }
+
+        final int length = Array.getLength(o);
+        final StringBuilder builder = new StringBuilder("[");
+        for (int i = 0; i < length; i++) {
+            if (i > 0) {
+                builder.append(", ");
+            }
+            builder.append(Array.get(o, i));
+        }
+        builder.append("]");
+        return builder.toString();
+    }
 }

api/src/main/java/com/viaversion/viaversion/util/MathUtil.java

@@ -24,6 +24,11 @@ package com.viaversion.viaversion.util;
 
 public final class MathUtil {
 
+    /**
+     * Miniscule value below which positive floats are considered zero
+     */
+    public static final float EPSILON = 1.0E-5F;
+
     /**
      * Returns the ceiled integer value of the given float.
      *
@@ -45,6 +50,11 @@ public final class MathUtil {
         return i > 0 ? 32 - Integer.numberOfLeadingZeros(i - 1) : 0;
     }
 
+    public static long ceilLong(final double d) {
+        final long l = (long) d;
+        return d > l ? l + 1 : l;
+    }
+
     /**
      * Returns the clamped number within the given range.
      *
@@ -59,4 +69,11 @@ public final class MathUtil {
         }
         return i > max ? max : i;
     }
+
+    public static double clamp(final double d, final double min, final double max) {
+        if (d < min) {
+            return min;
+        }
+        return d > max ? max : d;
+    }
 }

api/src/main/java/com/viaversion/viaversion/util/Rewritable.java

@@ -70,6 +70,11 @@ public interface Rewritable {
             : (clientbound ? protocol.getMappingData().getSoundMappings()::getNewId : protocol.getMappingData()::getOldSoundId);
     }
 
+    static Int2IntFunction entityRewriteFunction(final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        return protocol.getMappingData().getEntityMappings() == null ? Int2IntFunction.identity()
+            : (clientbound ? protocol.getMappingData().getEntityMappings()::getNewId : protocol.getMappingData().getEntityMappings().inverse()::getNewId);
+    }
+
     static @Nullable String mappedIdentifier(final FullMappings mappings, final String identifier) {
         // Check if the original exists before mapping
         if (mappings.id(identifier) == -1) {

build-logic/build.gradle.kts

@@ -8,5 +8,7 @@ repositories {
 
 dependencies {
     // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
+
+    // A nice no-conflict comment for patching in downgrading
 }

build-logic/src/main/kotlin/via.base-conventions.gradle.kts

@@ -9,7 +9,7 @@ tasks {
         val ver = project.version.toString()
         val desc = project.description
         filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
-            expand("version" to ver, "description" to desc)
+            expand(mapOf("version" to ver, "description" to desc))
         }
     }
     javadoc {
@@ -19,6 +19,7 @@ tasks {
     compileJava {
         options.encoding = Charsets.UTF_8.name()
         options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
+        options.isFork = true
     }
     test {
         useJUnitPlatform()

build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts

@@ -13,6 +13,7 @@ tasks {
         from(project.rootProject.file("LICENSE"))
     }
     val shadowJar = named<ShadowJar>("shadowJar") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         archiveClassifier.set("")
         configureRelocations()
         configureExcludes()

bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/util/LegacyBlockToItem.java

@@ -18,13 +18,13 @@
 package com.viaversion.viaversion.bukkit.util;
 
 import com.viaversion.viaversion.api.Via;
+import java.lang.reflect.Method;
+import java.util.Random;
+import java.util.logging.Level;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import java.lang.reflect.Method;
-import java.util.Random;
-import java.util.logging.Level;
 
 public class LegacyBlockToItem {
     private static final LegacyBlockToItem INSTANCE;

bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java

@@ -61,7 +61,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
     private static ViaVersionPlugin instance;
     private final BukkitCommandHandler commandHandler = new BukkitCommandHandler();
     private final BukkitViaConfig conf;
-    private final ViaAPI<Player> api = new BukkitViaAPI(this);
+    private final ViaAPI<Player> api = new BukkitViaAPI();
     private boolean lateBind;
 
     public ViaVersionPlugin() {

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java

@@ -18,7 +18,6 @@
 package com.viaversion.viaversion.bukkit.handlers;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.bukkit.platform.PaperViaInjector;
 import com.viaversion.viaversion.connection.UserConnectionImpl;
 import com.viaversion.viaversion.platform.WrappedChannelInitializer;
 import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
@@ -74,10 +73,6 @@ public final class BukkitChannelInitializer extends ChannelInitializer<Channel>
         final UserConnection connection = new UserConnectionImpl(channel);
         new ProtocolPipelineImpl(connection);
 
-        if (PaperViaInjector.PAPER_PACKET_LIMITER) {
-            connection.getPacketTracker().setPacketLimiterEnabled(false);
-        }
-
         // Add our transformers
         final ChannelPipeline pipeline = channel.pipeline();
         final String encoderName = pipeline.get(MINECRAFT_OUTBOUND_CONFIG) != null ? MINECRAFT_OUTBOUND_CONFIG : MINECRAFT_ENCODER;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java

@@ -41,7 +41,7 @@ public final class BukkitDecodeHandler extends MessageToMessageDecoder<ByteBuf>
 
     @Override
     protected void decode(final ChannelHandlerContext ctx, final ByteBuf bytebuf, final List<Object> out) {
-        if (!connection.checkServerboundPacket()) {
+        if (!connection.checkServerboundPacket(bytebuf.readableBytes())) {
             throw CancelDecoderException.generate(null);
         }
         if (!connection.shouldTransformPacket()) {

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java

@@ -18,35 +18,17 @@
 package com.viaversion.viaversion.bukkit.platform;
 
 import com.viaversion.viaversion.ViaAPIBase;
-import com.viaversion.viaversion.ViaVersionPlugin;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.buffer.ByteBuf;
-import java.util.UUID;
 import org.bukkit.entity.Player;
 
 public class BukkitViaAPI extends ViaAPIBase<Player> {
-    private final ViaVersionPlugin plugin;
-
-    public BukkitViaAPI(ViaVersionPlugin plugin) {
-        this.plugin = plugin;
-    }
 
     @Override
     public ProtocolVersion getPlayerProtocolVersion(Player player) {
         return getPlayerProtocolVersion(player.getUniqueId());
     }
 
-    @Override
-    public ProtocolVersion getPlayerProtocolVersion(UUID uuid) {
-        UserConnection connection = Via.getManager().getConnectionManager().getServerConnection(uuid);
-        if (connection != null) {
-            return connection.getProtocolInfo().protocolVersion();
-        }
-        return ProtocolVersion.unknown;
-    }
-
     @Override
     public void sendRawPacket(Player player, ByteBuf packet) throws IllegalArgumentException {
         sendRawPacket(player.getUniqueId(), packet);

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/PaperViaInjector.java

@@ -27,7 +27,6 @@ import org.bukkit.Bukkit;
 public final class PaperViaInjector {
     public static final boolean PAPER_INJECTION_METHOD = hasPaperInjectionMethod();
     public static final boolean PAPER_PROTOCOL_METHOD = hasServerProtocolMethod();
-    public static final boolean PAPER_PACKET_LIMITER = hasPacketLimiter();
     public static final boolean PAPER_IS_STOPPING_METHOD = hasIsStoppingMethod();
 
     private PaperViaInjector() {
@@ -76,10 +75,6 @@ public final class PaperViaInjector {
         return hasMethod(Bukkit.class, "isStopping");
     }
 
-    private static boolean hasPacketLimiter() {
-        return hasClass("com.destroystokyo.paper.PaperConfig$PacketLimit") || hasClass("io.papermc.paper.configuration.GlobalConfiguration$PacketLimiter");
-    }
-
     public static boolean hasClass(final String className) {
         try {
             Class.forName(className);
@@ -106,4 +101,12 @@ public final class PaperViaInjector {
             return false;
         }
     }
+
+    public static boolean hasMethod(final Class<?> clazz, final Class<?> returnType, final String method, final Class<?>... params) {
+        try {
+            return clazz.getDeclaredMethod(method, params).getReturnType().equals(returnType);
+        } catch (final NoSuchMethodException e) {
+            return false;
+        }
+    }
 }

bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitPickItemProvider.java

@@ -25,6 +25,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bukkit.platform.PaperViaInjector;
 import com.viaversion.viaversion.bukkit.util.LegacyBlockToItem;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.provider.PickItemProvider;
+import java.lang.reflect.Method;
 import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -45,12 +46,26 @@ public class BukkitPickItemProvider extends PickItemProvider {
     private static final GetStorageContents GET_STORAGE_CONTENT = GetStorageContents.build();
     private static final SetInHand SET_IN_HAND = SetInHand.build();
 
-    private static final boolean HAS_SPAWN_EGG_METHOD = PaperViaInjector.hasMethod(ItemFactory.class, "getSpawnEgg", EntityType.class);
+    private static final boolean HAS_SPAWN_EGG_METHOD = PaperViaInjector.hasMethod(ItemFactory.class, Material.class, "getSpawnEgg", EntityType.class);
+    private static final Method GET_SPAWN_EGG_ITEMSTACK_METHOD;
+
     private static final double BLOCK_RANGE = 4.5 + 1;
     private static final double BLOCK_RANGE_SQUARED = BLOCK_RANGE * BLOCK_RANGE;
     private static final double ENTITY_RANGE = 3 + 3;
     private final ViaVersionPlugin plugin;
 
+    static {
+        if (PaperViaInjector.hasMethod(ItemFactory.class, ItemStack.class, "getSpawnEgg", EntityType.class)) {
+            try {
+                GET_SPAWN_EGG_ITEMSTACK_METHOD = ItemFactory.class.getDeclaredMethod("getSpawnEgg", EntityType.class);
+            } catch (final ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            GET_SPAWN_EGG_ITEMSTACK_METHOD = null;
+        }
+    }
+
     public BukkitPickItemProvider(final ViaVersionPlugin plugin) {
         this.plugin = plugin;
     }
@@ -83,7 +98,7 @@ public class BukkitPickItemProvider extends PickItemProvider {
 
     @Override
     public void pickItemFromEntity(final UserConnection connection, final int entityId, final boolean includeData) {
-        if (!HAS_SPAWN_EGG_METHOD) {
+        if (!HAS_SPAWN_EGG_METHOD && GET_SPAWN_EGG_ITEMSTACK_METHOD == null) {
             return;
         }
 
@@ -102,9 +117,21 @@ public class BukkitPickItemProvider extends PickItemProvider {
                 return;
             }
 
-            final Material spawnEggType = Bukkit.getItemFactory().getSpawnEgg(entity.getType());
-            if (spawnEggType != null) {
-                pickItem(player, new ItemStack(spawnEggType, 1));
+            if (GET_SPAWN_EGG_ITEMSTACK_METHOD == null) {
+                final Material spawnEggType = Bukkit.getItemFactory().getSpawnEgg(entity.getType());
+                if (spawnEggType != null) {
+                    pickItem(player, new ItemStack(spawnEggType, 1));
+                }
+                return;
+            }
+
+            try {
+                final ItemStack spawnEggItem = (ItemStack) GET_SPAWN_EGG_ITEMSTACK_METHOD.invoke(Bukkit.getItemFactory(), entity.getType());
+                if (spawnEggItem != null) {
+                    pickItem(player, spawnEggItem);
+                }
+            } catch (final ReflectiveOperationException e) {
+                throw new RuntimeException(e);
             }
         }, player);
     }

bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java

@@ -114,14 +114,23 @@ public class BukkitViaMovementTransmitter extends MovementTransmitterProvider {
             }
         } else {
             ChannelHandlerContext context = PipelineUtil.getContextBefore("decoder", info.getChannel().pipeline());
-            if (context != null) {
-                if (info.get(MovementTracker.class).isGround()) {
+            if (context == null) {
+                return;
+            }
+
+            info.getChannel().eventLoop().execute(() -> {
+                MovementTracker movementTracker = info.get(MovementTracker.class);
+                if (movementTracker == null) {
+                    return;
+                }
+
+                if (movementTracker.isGround()) {
                     context.fireChannelRead(getGroundPacket());
                 } else {
                     context.fireChannelRead(getFlyingPacket());
                 }
-                info.get(MovementTracker.class).incrementIdlePacket();
-            }
+                movementTracker.incrementIdlePacket();
+            });
         }
     }
 }

common/build.gradle.kts

@@ -26,7 +26,7 @@ tasks.named<Jar>("sourcesJar") {
 val prepareViaProxyFiles by tasks.registering(Copy::class) {
     dependsOn(project.tasks.shadowJar)
 
-    from(project.tasks.shadowJar.get().archiveFile.get().asFile)
+    from(project.tasks.shadowJar.map { it.archiveFile.get().asFile })
     into(layout.projectDirectory.dir("run/jars"))
 
     val projectName = project.name

common/src/main/java/com/viaversion/viaversion/codec/CodecRegistryContext.java

@@ -21,13 +21,11 @@ import com.viaversion.viaversion.api.minecraft.codec.CodecContext;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
-import com.viaversion.viaversion.util.SerializerVersion;
 import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 import java.util.List;
 import java.util.Set;
 
-public record CodecRegistryContext(Protocol<?, ?, ?, ?> protocol, SerializerVersion serializerVersion,
-                                   SerializerVersion mappedSerializerVersion, RegistryAccess registryAccess,
+public record CodecRegistryContext(Protocol<?, ?, ?, ?> protocol, RegistryAccess registryAccess,
                                    boolean mapped) implements CodecContext {
 
     // Generally from hardcoded, but highly variable client data
@@ -42,10 +40,8 @@ public record CodecRegistryContext(Protocol<?, ?, ?, ?> protocol, SerializerVers
         StructuredDataKey.PAINTING_VARIANT, StructuredDataKey.CAT_VARIANT, StructuredDataKey.EQUIPPABLE1_21_6
     ));
 
-    public CodecRegistryContext(final Protocol<?, ?, ?, ?> protocol, final SerializerVersion serializerVersion, final SerializerVersion mappedSerializerVersion, final RegistryAccess registryAccess, final boolean mapped) {
+    public CodecRegistryContext(final Protocol<?, ?, ?, ?> protocol, final RegistryAccess registryAccess, final boolean mapped) {
         this.protocol = protocol;
-        this.serializerVersion = serializerVersion;
-        this.mappedSerializerVersion = mappedSerializerVersion;
         this.registryAccess = registryAccess.withMapped(mapped);
         this.mapped = mapped;
     }

common/src/main/java/com/viaversion/viaversion/codec/OpsBase.java

@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.codec;
 
-import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.minecraft.codec.CodecContext;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 
 public abstract class OpsBase implements Ops {
 

common/src/main/java/com/viaversion/viaversion/codec/hash/HashBuilder.java

@@ -74,8 +74,9 @@ public final class HashBuilder {
     }
 
     public HashBuilder writeString(final CharSequence sequence) {
-        this.ensureSize(sequence.length());
-        for (int i = 0; i < sequence.length(); i++) {
+        final int length = sequence.length();
+        this.ensureSize(length);
+        for (int i = 0; i < length; i++) {
             this.writeChar(sequence.charAt(i));
         }
         return this;

common/src/main/java/com/viaversion/viaversion/codec/hash/HashOps.java

@@ -182,7 +182,7 @@ public class HashOps extends OpsBase implements Hasher {
             final ListHashBuilder listHasher = hasher.new ListHashBuilder();
             consumer.accept(listHasher);
             listHasher.applyHashToParent();
-            return HashOps.this.hash();
+            return hasher.hash();
         }
 
         protected int mapHash(final Consumer<MapSerializer> consumer) {
@@ -190,7 +190,7 @@ public class HashOps extends OpsBase implements Hasher {
             final MapHashBuilder mapHasher = hasher.new MapHashBuilder();
             consumer.accept(mapHasher);
             mapHasher.applyHashToParent();
-            return HashOps.this.hash();
+            return hasher.hash();
         }
 
         protected <V> int hash(final Type<V> type, final V value) {

common/src/main/java/com/viaversion/viaversion/commands/ViaCommandHandler.java

@@ -29,8 +29,8 @@ import com.viaversion.viaversion.commands.defaultsubs.DontBugMeSubCmd;
 import com.viaversion.viaversion.commands.defaultsubs.DumpSubCmd;
 import com.viaversion.viaversion.commands.defaultsubs.ListSubCmd;
 import com.viaversion.viaversion.commands.defaultsubs.PPSSubCmd;
-import com.viaversion.viaversion.commands.defaultsubs.ReloadSubCmd;
 import com.viaversion.viaversion.commands.defaultsubs.PlayerSubCmd;
+import com.viaversion.viaversion.commands.defaultsubs.ReloadSubCmd;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java

@@ -22,7 +22,6 @@ import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java

@@ -19,12 +19,14 @@ package com.viaversion.viaversion.configuration;
 
 import com.google.gson.JsonElement;
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.configuration.RateLimitConfig;
 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.minecraft.WorldIdentifiers;
 import com.viaversion.viaversion.api.protocol.version.BlockedProtocolVersions;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocol.BlockedProtocolVersionsImpl;
 import com.viaversion.viaversion.util.Config;
+import com.viaversion.viaversion.util.ConfigSection;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import java.io.File;
@@ -32,6 +34,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -54,12 +57,8 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     private boolean bossbarPatch;
     private boolean bossbarAntiFlicker;
     private double hologramOffset;
-    private int maxPPS;
-    private String maxPPSKickMessage;
-    private int trackingPeriod;
-    private int warningPPS;
-    private int maxPPSWarnings;
-    private String maxPPSWarningsKickMessage;
+    private RateLimitConfig packetTrackerConfig;
+    private RateLimitConfig packetSizeTrackerConfig;
     private boolean sendSupportedVersions;
     private boolean simulatePlayerTick;
     private boolean replacePistons;
@@ -68,6 +67,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     private boolean autoTeam;
     private BlockedProtocolVersions blockedProtocolVersions;
     private String blockedDisconnectMessage;
+    private boolean logBlockedJoins;
     private String reloadDisconnectMessage;
     private boolean suppressConversionWarnings;
     private boolean suppressTextComponentConversionWarnings;
@@ -96,6 +96,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     private boolean cancelBlockSounds;
     private boolean hideScoreboardNumbers;
     private boolean fix1_21PlacementRotation;
+    private boolean cancelSwingInInventory;
 
     protected AbstractViaConfig(final File configFile, final Logger logger) {
         super(configFile, logger);
@@ -104,6 +105,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     @Override
     public void reload() {
         super.reload();
+        updateConfig();
         loadFields();
     }
 
@@ -120,12 +122,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         bossbarPatch = getBoolean("bossbar-patch", true);
         bossbarAntiFlicker = getBoolean("bossbar-anti-flicker", false);
         hologramOffset = getDouble("hologram-y", -0.96D);
-        maxPPS = getInt("max-pps", 800);
-        maxPPSKickMessage = getString("max-pps-kick-msg", "Sending packets too fast? lag?");
-        trackingPeriod = getInt("tracking-period", 6);
-        warningPPS = getInt("tracking-warning-pps", 120);
-        maxPPSWarnings = getInt("tracking-max-warnings", 3);
-        maxPPSWarningsKickMessage = getString("tracking-max-kick-msg", "You are sending too many packets, :(");
         sendSupportedVersions = getBoolean("send-supported-versions", false);
         simulatePlayerTick = getBoolean("simulate-pt", true);
         replacePistons = getBoolean("replace-pistons", false);
@@ -134,6 +130,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         autoTeam = getBoolean("auto-team", true);
         blockedProtocolVersions = loadBlockedProtocolVersions();
         blockedDisconnectMessage = getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
+        logBlockedJoins = getBoolean("log-blocked-joins", false);
         reloadDisconnectMessage = getString("reload-disconnect-msg", "Server reload, please rejoin!");
         teamColourFix = getBoolean("team-colour-fix", true);
         suppressConversionWarnings = getBoolean("suppress-conversion-warnings", false);
@@ -165,6 +162,24 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         cancelBlockSounds = getBoolean("cancel-block-sounds", true);
         hideScoreboardNumbers = getBoolean("hide-scoreboard-numbers", false);
         fix1_21PlacementRotation = getBoolean("fix-1_21-placement-rotation", true);
+        cancelSwingInInventory = getBoolean("cancel-swing-in-inventory", true);
+        packetTrackerConfig = loadRateLimitConfig(getSection("packet-limiter"), "%pps", 1);
+        packetSizeTrackerConfig = loadRateLimitConfig(getSection("packet-size-limiter"), "%bps", 1024);
+    }
+
+    protected void updateConfig() {
+        ConfigSection original = originalRootSection();
+        if (original != null && original.contains("max-pps")) {
+            // 5.5.0 pps changes
+            ConfigSection section = getSection("packet-limiter");
+            section.set("max-per-second", original.getInt("max-pps", -1));
+            section.set("max-per-second-kick-message", original.getString("max-pps-kick-msg", "You are sending too many packets!"));
+            section.set("sustained-max-per-second", original.getInt("tracking-warning-pps", -1));
+            section.set("sustained-threshold", original.getInt("tracking-max-warnings", 3));
+            section.set("sustained-period-seconds", original.getInt("tracking-period", 6));
+            section.set("sustained-kick-message", original.getString("tracking-max-kick-msg", "You are sending too many packets, :("));
+            save();
+        }
     }
 
     private BlockedProtocolVersions loadBlockedProtocolVersions() {
@@ -226,6 +241,21 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         return new BlockedProtocolVersionsImpl(blockedProtocols, lowerBound, upperBound);
     }
 
+    private RateLimitConfig loadRateLimitConfig(ConfigSection section, String placeholder, int countMultiplier) {
+        final int maxPerSecond = section.getInt("max-per-second", -1);
+        final int sustainedMaxPerSecond = section.getInt("sustained-max-per-second", -1);
+        return new RateLimitConfig(
+            section.getBoolean("enabled", true),
+            maxPerSecond != -1 ? maxPerSecond * countMultiplier : -1,
+            section.getString("max-per-second-kick-message", "You are sending too many packets!"),
+            sustainedMaxPerSecond != -1 ? sustainedMaxPerSecond * countMultiplier : -1,
+            section.getInt("sustained-threshold", 3),
+            TimeUnit.SECONDS.toNanos(section.getInt("sustained-period-seconds", 6)),
+            section.getString("sustained-kick-message", "You are sending too many packets, :("),
+            placeholder
+        );
+    }
+
     private @Nullable ProtocolVersion protocolVersion(String s) {
         ProtocolVersion protocolVersion = ProtocolVersion.getClosest(s);
         if (protocolVersion == null) {
@@ -308,32 +338,42 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
 
     @Override
     public int getMaxPPS() {
-        return maxPPS;
+        return packetTrackerConfig.maxRate();
     }
 
     @Override
     public String getMaxPPSKickMessage() {
-        return maxPPSKickMessage;
+        return packetTrackerConfig.maxRateKickMessage();
     }
 
     @Override
     public int getTrackingPeriod() {
-        return trackingPeriod;
+        return (int) TimeUnit.NANOSECONDS.toSeconds(packetTrackerConfig.trackingPeriodNanos());
     }
 
     @Override
     public int getWarningPPS() {
-        return warningPPS;
+        return packetTrackerConfig.warningRate();
     }
 
     @Override
     public int getMaxWarnings() {
-        return maxPPSWarnings;
+        return packetTrackerConfig.maxWarnings();
     }
 
     @Override
     public String getMaxWarningsKickMessage() {
-        return maxPPSWarningsKickMessage;
+        return packetTrackerConfig.warningKickMessage();
+    }
+
+    @Override
+    public RateLimitConfig getPacketTrackerConfig() {
+        return packetTrackerConfig;
+    }
+
+    @Override
+    public RateLimitConfig getPacketSizeTrackerConfig() {
+        return packetSizeTrackerConfig;
     }
 
     @Override
@@ -397,6 +437,11 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         return blockedDisconnectMessage;
     }
 
+    @Override
+    public boolean logBlockedJoins() {
+        return logBlockedJoins;
+    }
+
     @Override
     public String getReloadDisconnectMsg() {
         return reloadDisconnectMessage;
@@ -556,4 +601,9 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     public boolean fix1_21PlacementRotation() {
         return fix1_21PlacementRotation;
     }
+
+    @Override
+    public boolean cancelSwingInInventory() {
+        return cancelSwingInInventory;
+    }
 }

common/src/main/java/com/viaversion/viaversion/connection/ConnectionManagerImpl.java

@@ -72,16 +72,20 @@ public class ConnectionManagerImpl implements ConnectionManager {
     @Override
     public void onDisconnect(UserConnection connection) {
         Objects.requireNonNull(connection, "connection is null!");
+        connection.setActive(false);
+
         connections.remove(connection);
 
         UUID id = connection.getProtocolInfo().getUuid();
         if (connection.isServerSide()) {
-            serverConnections.remove(id);
+            serverConnections.remove(id, connection);
         } else {
-            clientConnections.remove(id);
+            clientConnections.remove(id, connection);
         }
 
-        connection.clearStoredObjects();
+        // There might be a packet still going through the handlers after we set the connection as inactive
+        // Make sure that we remove stored objects after those have been handled, otherwise this might introduce NPEs
+        connection.getChannel().eventLoop().execute(connection::clearStoredObjects);
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/connection/StorableObjectTask.java

@@ -15,35 +15,38 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.protocol;
+package com.viaversion.viaversion.connection;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 
 /**
- * Instance of {@link Runnable} that will run {@link #run(UserConnection)} for all active user connections.
+ * Instance of {@link Runnable} that will run {@link #run(UserConnection, StorableObject)} for all active user connections.
  */
-public abstract class ProtocolRunnable implements Runnable {
+public abstract class StorableObjectTask<T extends StorableObject> implements Runnable {
 
-    private final Class<? extends AbstractProtocol<?, ?, ?, ?>> protocolClass;
+    private final Class<T> storableObject;
 
-    public ProtocolRunnable(final Class<? extends AbstractProtocol<?, ?, ?, ?>> protocolClass) {
-        this.protocolClass = protocolClass;
+    protected StorableObjectTask(final Class<T> storableObject) {
+        this.storableObject = storableObject;
     }
 
-    public abstract void run(final UserConnection connection);
+    public abstract void run(final UserConnection connection, final T storableObject);
 
     @Override
     public void run() {
         for (final UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
-            final ProtocolInfo protocolInfo = connection.getProtocolInfo();
-            if (!connection.isActive() || !protocolInfo.getPipeline().contains(this.protocolClass)) {
+            if (!connection.isActive() || !connection.has(storableObject)) {
                 continue;
             }
 
-            run(connection);
+            connection.getChannel().eventLoop().execute(() -> {
+                final T object = connection.get(storableObject);
+                if (object != null) {
+                    this.run(connection, object);
+                }
+            });
         }
     }
 }

common/src/main/java/com/viaversion/viaversion/connection/UserConnectionImpl.java

@@ -154,27 +154,14 @@ public class UserConnectionImpl implements UserConnection {
     }
 
     @Override
-    public void clearStoredObjects(boolean isServerSwitch) {
-        if (isServerSwitch) {
-            storedObjects.values().removeIf(storableObject -> {
-                if (storableObject.clearOnServerSwitch()) {
-                    storableObject.onRemove();
-                    return true;
-                }
-                return false;
-            });
-            for (EntityTracker tracker : entityTrackers.values()) {
-                tracker.clearEntities();
-            }
-        } else {
-            for (StorableObject object : storedObjects.values()) {
-                object.onRemove();
-            }
-            storedObjects.clear();
-            entityTrackers.clear();
-            itemHashers.clear();
-            clientWorlds.clear();
+    public void clearStoredObjects() {
+        for (StorableObject object : storedObjects.values()) {
+            object.onRemove();
         }
+        storedObjects.clear();
+        entityTrackers.clear();
+        itemHashers.clear();
+        clientWorlds.clear();
     }
 
     @Override
@@ -192,7 +179,7 @@ public class UserConnectionImpl implements UserConnection {
             sendRawPacketNow(packet);
         } else {
             try {
-                channel.eventLoop().submit(() -> sendRawPacketNow(packet));
+                channel.eventLoop().execute(() -> sendRawPacketNow(packet));
             } catch (Throwable e) {
                 packet.release(); // Couldn't schedule
                 e.printStackTrace();
@@ -282,7 +269,7 @@ public class UserConnectionImpl implements UserConnection {
                 fireChannelRead(context, buf);
             } else {
                 try {
-                    channel.eventLoop().submit(() -> fireChannelRead(context, buf));
+                    channel.eventLoop().execute(() -> fireChannelRead(context, buf));
                 } catch (Throwable t) {
                     // Couldn't schedule
                     buf.release();
@@ -307,7 +294,7 @@ public class UserConnectionImpl implements UserConnection {
             writeAndFlush(packet);
         } else {
             try {
-                getChannel().eventLoop().submit(() -> writeAndFlush(packet));
+                getChannel().eventLoop().execute(() -> writeAndFlush(packet));
             } catch (Throwable e) {
                 e.printStackTrace();
                 packet.release(); // Couldn't schedule
@@ -320,12 +307,16 @@ public class UserConnectionImpl implements UserConnection {
     }
 
     @Override
-    public boolean checkServerboundPacket() {
+    public boolean checkServerboundPacket(final int bytes) {
         if (pendingDisconnect) {
-            return false;
+            return false; // Cancel everything while disconnecting
         }
-        // Increment received + Check PPS
-        return !packetTracker.isPacketLimiterEnabled() || !packetTracker.incrementReceived() || !packetTracker.exceedsMaxPPS();
+        if (!packetTracker.isPacketLimiterEnabled()) {
+            return true;
+        }
+
+        packetTracker.incrementReceived(bytes);
+        return !packetTracker.exceedsLimits();
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/data/entity/EntityTrackerBase.java

@@ -106,6 +106,16 @@ public class EntityTrackerBase implements EntityTracker, ClientEntityIdChangeLis
         }
     }
 
+    @Override
+    public void clear() {
+        // Call wrapper function in case protocols need to do additional removals
+        for (final int id : entities.keySet().toIntArray()) {
+            removeEntity(id);
+        }
+
+        clientEntityId = null;
+    }
+
     @Override
     public boolean hasClientEntityId() {
         return clientEntityId != null;

common/src/main/java/com/viaversion/viaversion/data/item/ItemHasherBase.java

@@ -33,7 +33,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.codec.CodecRegistryContext;
 import com.viaversion.viaversion.codec.hash.HashFunction;
 import com.viaversion.viaversion.codec.hash.HashOps;
-import com.viaversion.viaversion.util.SerializerVersion;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,10 +49,10 @@ public class ItemHasherBase implements ItemHasher {
     private final CodecContext context;
     private final CodecContext mappedContext;
 
-    public ItemHasherBase(final Protocol<?, ?, ?, ?> protocol, final UserConnection connection, final SerializerVersion serializerVersion, final SerializerVersion mappedSerializerVersion) {
+    public ItemHasherBase(final Protocol<?, ?, ?, ?> protocol, final UserConnection connection) {
         final RegistryAccess registryAccess = RegistryAccess.of(this.enchantments, protocol.getMappingData());
-        this.context = new CodecRegistryContext(protocol, serializerVersion, mappedSerializerVersion, registryAccess, false);
-        this.mappedContext = new CodecRegistryContext(protocol, serializerVersion, mappedSerializerVersion, registryAccess, true);
+        this.context = new CodecRegistryContext(protocol, registryAccess, false);
+        this.mappedContext = new CodecRegistryContext(protocol, registryAccess, true);
         this.connection = connection;
     }
 

common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java

@@ -81,6 +81,7 @@ import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.Protocol1_21_2To1_21_
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.Protocol1_21_4To1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.Protocol1_21_5To1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_6to1_21_7.Protocol1_21_6To1_21_7;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.Protocol1_21_7To1_21_9;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.Protocol1_21To1_21_2;
 import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.Protocol1_9_1To1_9_3;
@@ -205,6 +206,7 @@ public class ProtocolManagerImpl implements ProtocolManager {
 
         registerProtocol(new Protocol1_21_5To1_21_6(), ProtocolVersion.v1_21_6, ProtocolVersion.v1_21_5);
         registerProtocol(new Protocol1_21_6To1_21_7(), ProtocolVersion.v1_21_7, ProtocolVersion.v1_21_6);
+        registerProtocol(new Protocol1_21_7To1_21_9(), ProtocolVersion.v1_21_9, ProtocolVersion.v1_21_7);
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPipelineImpl.java

@@ -21,7 +21,6 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.debug.DebugHandler;
-import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
@@ -40,7 +39,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class ProtocolPipelineImpl extends AbstractSimpleProtocol implements ProtocolPipeline {
+public class ProtocolPipelineImpl implements ProtocolPipeline {
     private final List<Protocol> protocolList = new ArrayList<>();
     private final Set<Class<? extends Protocol>> protocolSet = new HashSet<>();
     private final UserConnection userConnection;
@@ -50,20 +49,9 @@ public class ProtocolPipelineImpl extends AbstractSimpleProtocol implements Prot
     public ProtocolPipelineImpl(UserConnection userConnection) {
         this.userConnection = userConnection;
         userConnection.getProtocolInfo().setPipeline(this);
-        registerPackets(); // Not registered as a standard "protocol", so we have to call the method manually
-    }
-
-    @Override
-    protected void registerPackets() {
-        // This is a pipeline so we register basic pipes
         this.add(Via.getManager().getProtocolManager().getBaseProtocol());
     }
 
-    @Override
-    public void init(UserConnection userConnection) {
-        throw new UnsupportedOperationException("ProtocolPipeline can only be initialized once");
-    }
-
     @Override
     public void add(final Protocol protocol) {
         reversedProtocolList.add(baseProtocols, protocol);
@@ -120,7 +108,6 @@ public class ProtocolPipelineImpl extends AbstractSimpleProtocol implements Prot
 
         // Apply protocols
         packetWrapper.apply(direction, state, protocolListFor(direction));
-        super.transform(direction, state, packetWrapper);
 
         if (debug && debugHandler.logPostPacketTransform() && debugHandler.shouldLog(packetWrapper, direction)) {
             logPacket(direction, state, packetWrapper, originalID, true);
@@ -235,7 +222,7 @@ public class ProtocolPipelineImpl extends AbstractSimpleProtocol implements Prot
         protocolSet.clear();
         baseProtocols = 0;
 
-        registerPackets();
+        this.add(Via.getManager().getProtocolManager().getBaseProtocol());
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/protocol/SpecialProtocolVersion.java

@@ -29,39 +29,39 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * Compares equal to the given origin version and allows base protocol determination via {@link #getBaseProtocolVersion()}
  * which can be null for special cases where there is no base protocol.
  */
-public class RedirectProtocolVersion extends ProtocolVersion {
+public class SpecialProtocolVersion extends ProtocolVersion {
 
-    private final ProtocolVersion origin;
+    private final ProtocolVersion delegate;
 
-    public RedirectProtocolVersion(final int version, final String name, final ProtocolVersion origin) {
-        this(version, -1, name, null, origin);
+    public SpecialProtocolVersion(final int version, final String name, final ProtocolVersion delegate) {
+        this(version, -1, name, null, delegate);
     }
 
     /**
      * See {@link ProtocolVersion} for more information.
      */
-    public RedirectProtocolVersion(final int version, final int snapshotVersion, final String name, @Nullable final SubVersionRange versionRange, final ProtocolVersion origin) {
+    public SpecialProtocolVersion(final int version, final int snapshotVersion, final String name, @Nullable final SubVersionRange versionRange, final ProtocolVersion delegate) {
         super(VersionType.SPECIAL, version, snapshotVersion, name, versionRange);
-        this.origin = origin;
+        this.delegate = delegate;
     }
 
     @Override
     protected @Nullable Comparator<ProtocolVersion> customComparator() {
         return (o1, o2) -> {
-            if (o1 == this) o1 = this.origin;
-            if (o2 == this) o2 = this.origin;
+            if (o1 == this) o1 = this.delegate;
+            if (o2 == this) o2 = this.delegate;
             return o1.compareTo(o2);
         };
     }
 
-    public ProtocolVersion getOrigin() {
-        return origin;
+    public ProtocolVersion getDelegate() {
+        return delegate;
     }
 
     /**
      * @return the protocol version used to determine the base protocol, null in case there is no base protocol.
      */
     public @Nullable ProtocolVersion getBaseProtocolVersion() {
-        return origin;
+        return delegate;
     }
 }

common/src/main/java/com/viaversion/viaversion/protocol/packet/PacketWrapperImpl.java

@@ -307,7 +307,7 @@ public class PacketWrapperImpl implements PacketWrapper {
         if (currentThread) {
             sendNow(protocol, skipCurrentPipeline);
         } else {
-            connection.getChannel().eventLoop().submit(() -> sendNow(protocol, skipCurrentPipeline));
+            connection.getChannel().eventLoop().execute(() -> sendNow(protocol, skipCurrentPipeline));
         }
     }
 
@@ -524,7 +524,7 @@ public class PacketWrapperImpl implements PacketWrapper {
             return;
         }
 
-        connection.getChannel().eventLoop().submit(() -> {
+        connection.getChannel().eventLoop().execute(() -> {
             try {
                 final ByteBuf output = constructPacket(protocol, skipCurrentPipeline, Direction.SERVERBOUND);
                 connection.sendRawPacketToServer(output);

common/src/main/java/com/viaversion/viaversion/protocols/base/InitialBaseProtocol.java

@@ -35,7 +35,7 @@ import com.viaversion.viaversion.api.protocol.version.VersionType;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.protocol.RedirectProtocolVersion;
+import com.viaversion.viaversion.protocol.SpecialProtocolVersion;
 import com.viaversion.viaversion.protocol.version.BaseVersionProvider;
 import com.viaversion.viaversion.protocols.base.packet.BaseClientboundPacket;
 import com.viaversion.viaversion.protocols.base.packet.BasePacketTypesProvider;
@@ -101,11 +101,11 @@ public class InitialBaseProtocol extends AbstractProtocol<BaseClientboundPacket,
             List<Protocol> alreadyAdded = new ArrayList<>(pipeline.pipes());
 
             // Special versions might compare equal to normal versions and would the normal lookup,
-            // platforms can use the RedirectProtocolVersion API or need to manually handle their base protocols.
+            // platforms can use a SpecialProtocolVersion or need to manually handle their base protocols.
             ProtocolVersion clientboundBaseProtocolVersion = null;
             if (serverProtocol.getVersionType() != VersionType.SPECIAL) {
                 clientboundBaseProtocolVersion = serverProtocol;
-            } else if (serverProtocol instanceof RedirectProtocolVersion version) {
+            } else if (serverProtocol instanceof SpecialProtocolVersion version) {
                 clientboundBaseProtocolVersion = version.getBaseProtocolVersion();
             }
             // Add base protocols

common/src/main/java/com/viaversion/viaversion/protocols/base/v1_7/ServerboundBaseProtocol1_7.java

@@ -32,10 +32,10 @@ import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.packet.BaseClientboundPacket;
 import com.viaversion.viaversion.protocols.base.packet.BasePacketTypesProvider;
 import com.viaversion.viaversion.protocols.base.packet.BaseServerboundPacket;
-import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.ComponentUtil;
 import io.netty.channel.ChannelFuture;
+import java.util.logging.Level;
 
 public class ServerboundBaseProtocol1_7 extends AbstractProtocol<BaseClientboundPacket, BaseClientboundPacket, BaseServerboundPacket, BaseServerboundPacket> {
 
@@ -75,6 +75,10 @@ public class ServerboundBaseProtocol1_7 extends AbstractProtocol<BaseClientbound
                 // Send and close
                 final ChannelFuture future = disconnectPacket.sendFutureRaw();
                 future.addListener(f -> user.getChannel().close());
+
+                if (Via.getConfig().logBlockedJoins()) {
+                    Via.getPlatform().getLogger().log(Level.INFO, "Blocked join due to unsupported version from " + user.getChannel().remoteAddress() + " (" + protocol.getName() + ")");
+                }
             }
         });
     }

common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java

@@ -22,11 +22,11 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPacket1_21_4;
-import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
@@ -35,7 +35,7 @@ import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
 //   ChunkType1_21_5
 //   RecipeDisplayRewriter
 //   Types1_21_4, Types1_OLD
-final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<ClientboundPacket1_21_2, ServerboundPacket1_21_4, Protocol1_98To1_99> {
+final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<ClientboundPacket1_21_6, ServerboundPacket1_21_6, Protocol1_98To1_99> {
 
     public BlockItemPacketRewriter1_99(final Protocol1_98To1_99 protocol) {
         super(protocol);
@@ -46,32 +46,32 @@ final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<Clientbou
         // Register block and block state id changes
         // Other places using block state id mappings: Spawn particle, entity data, entity spawn (falling blocks)
         // Tags and statistics use block (!) ids
-        final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_2.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_2.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_2.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_2.BLOCK_ENTITY_DATA);
+        final BlockRewriter<ClientboundPacket1_21_6> blockRewriter = BlockRewriter.for1_20_2(protocol);
+        blockRewriter.registerBlockEvent(ClientboundPackets1_21_6.BLOCK_EVENT);
+        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_6.BLOCK_UPDATE);
+        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_6.SECTION_BLOCKS_UPDATE);
+        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_6.LEVEL_EVENT, 2001);
+        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_6.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
+        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_6.BLOCK_ENTITY_DATA);
 
         // Registers item id changes
         // Other places using item ids are: Entity data, tags, statistics, effect
-        // registerOpenScreen(ClientboundPackets1_21_2.OPEN_SCREEN); If a new container type was added; also remove from the component rewriter registration
-        registerSetCursorItem(ClientboundPackets1_21_2.SET_CURSOR_ITEM);
-        registerSetPlayerInventory(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_2.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_2.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_2.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_2.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_4.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT);
+        // registerOpenScreen(ClientboundPackets1_21_6.OPEN_SCREEN); If a new container type was added; also remove from the component rewriter registration
+        registerSetCursorItem(ClientboundPackets1_21_6.SET_CURSOR_ITEM);
+        registerSetPlayerInventory(ClientboundPackets1_21_6.SET_PLAYER_INVENTORY);
+        registerCooldown1_21_2(ClientboundPackets1_21_6.COOLDOWN);
+        registerSetContent1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_CONTENT);
+        registerSetSlot1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_SLOT);
+        registerAdvancements1_20_3(ClientboundPackets1_21_6.UPDATE_ADVANCEMENTS);
+        registerSetEquipment(ClientboundPackets1_21_6.SET_EQUIPMENT);
+        registerMerchantOffers1_20_5(ClientboundPackets1_21_6.MERCHANT_OFFERS);
+        registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
+        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
 
-        final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_2.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_2.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_2.PLACE_GHOST_RECIPE);
+        final RecipeDisplayRewriter<ClientboundPacket1_21_6> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
+        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_6.UPDATE_RECIPES);
+        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_6.RECIPE_BOOK_ADD);
+        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_6.PLACE_GHOST_RECIPE);
         // OR do this if serialization of recipes changed and override the relevant method
         // Add new serializers to RecipeDisplayRewriter, or extend the last one for changes
     }

common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java

@@ -19,10 +19,10 @@ package com.viaversion.viaversion.protocols.template;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
 import com.viaversion.viaversion.rewriter.text.NBTComponentRewriter;
 
-final class ComponentRewriter1_99 extends NBTComponentRewriter<ClientboundPacket1_21_2> {
+final class ComponentRewriter1_99 extends NBTComponentRewriter<ClientboundPacket1_21_6> {
 
     public ComponentRewriter1_99(final Protocol1_98To1_99 protocol) {
         super(protocol);

common/src/main/java/com/viaversion/viaversion/protocols/template/EntityPacketRewriter1_99.java

@@ -18,19 +18,18 @@
 package com.viaversion.viaversion.protocols.template;
 
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
-import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_5;
-import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_9;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_9;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundConfigurationPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 
 // Replace if needed
-//  Types1_OLD
 //  VersionedTypes
-//  EntityTypes1_21_4
-final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_21_2, Protocol1_98To1_99> {
+//  EntityTypes1_21_9
+final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_21_6, Protocol1_98To1_99> {
 
     public EntityPacketRewriter1_99(final Protocol1_98To1_99 protocol) {
         super(protocol);
@@ -39,21 +38,21 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2
     @Override
     public void registerPackets() {
         // Tracks entities, applies entity data rewrites registered below, untracks entities
-        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets1_21_2.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets1_21_2.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets1_21_2.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets1_21_2.RESPAWN);
+        registerTrackerWithData1_21_9(ClientboundPackets1_21_6.ADD_ENTITY, EntityTypes1_21_9.FALLING_BLOCK);
+        registerSetEntityData(ClientboundPackets1_21_6.SET_ENTITY_DATA);
+        registerRemoveEntities(ClientboundPackets1_21_6.REMOVE_ENTITIES);
+        registerPlayerAbilities(ClientboundPackets1_21_6.PLAYER_ABILITIES);
+        registerGameEvent(ClientboundPackets1_21_6.GAME_EVENT);
+        registerLogin1_20_5(ClientboundPackets1_21_6.LOGIN);
+        registerRespawn1_20_5(ClientboundPackets1_21_6.RESPAWN);
 
         final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter(protocol);
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
+        protocol.registerClientbound(ClientboundConfigurationPackets1_21_6.REGISTRY_DATA, registryDataRewriter::handle);
     }
 
     @Override
     protected void registerRewrites() {
-        final EntityDataTypes1_21_5 entityDataTypes = protocol.types().entityDataTypes();
+        final EntityDataTypes1_21_9 entityDataTypes = protocol.mappedTypes().entityDataTypes();
         /* Uncomment if entity data classes changed
         filter().mapDataType(typeId -> {
             int id = typeId;
@@ -83,6 +82,6 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2
 
     @Override
     public EntityType typeFromId(final int type) {
-        return EntityTypes1_21_4.getTypeFromId(type);
+        return EntityTypes1_21_9.getTypeFromId(type);
     }
 }

common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_98To1_99.java

@@ -21,8 +21,8 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.data.MappingDataBase;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_5;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
-import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_5;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_9;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_9;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
@@ -30,76 +30,74 @@ import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
-import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundConfigurationPackets1_20_5;
-import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
-import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPacket1_21_4;
-import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundConfigurationPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundConfigurationPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.rewriter.AttributeRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.NBTComponentRewriter;
-import com.viaversion.viaversion.util.SerializerVersion;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 
 // Placeholders to replace (in the entire package):
 //   Protocol1_98To1_99, EntityPacketRewriter1_99, BlockItemPacketRewriter1_99 - move the latter two to a rewriter package
-//   ClientboundPacket1_21_2
-//   ServerboundPacket1_21_4
-//   EntityTypes1_21_4 (MAPPED type)
-//   VersionedTypes.V1_21_5
-//   SerializerVersion.V1_21_5
+//   ClientboundPacket1_21_6
+//   ServerboundPacket1_21_6
+//   EntityTypes1_21_9 (MAPPED type)
+//   VersionedTypes.V1_21_9
 //   1.99, 1.98
-final class Protocol1_98To1_99 extends AbstractProtocol<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> {
+final class Protocol1_98To1_99 extends AbstractProtocol<ClientboundPacket1_21_6, ClientboundPacket1_21_6, ServerboundPacket1_21_6, ServerboundPacket1_21_6> {
 
     public static final MappingData MAPPINGS = new MappingDataBase("1.98", "1.99");
     private final EntityPacketRewriter1_99 entityRewriter = new EntityPacketRewriter1_99(this);
     private final BlockItemPacketRewriter1_99 itemRewriter = new BlockItemPacketRewriter1_99(this);
-    private final ParticleRewriter<ClientboundPacket1_21_2> particleRewriter = new ParticleRewriter<>(this);
-    private final TagRewriter<ClientboundPacket1_21_2> tagRewriter = new TagRewriter<>(this);
-    private final NBTComponentRewriter<ClientboundPacket1_21_2> componentRewriter = new ComponentRewriter1_99(this);
+    private final ParticleRewriter<ClientboundPacket1_21_6> particleRewriter = new ParticleRewriter<>(this);
+    private final TagRewriter<ClientboundPacket1_21_6> tagRewriter = new TagRewriter<>(this);
+    private final NBTComponentRewriter<ClientboundPacket1_21_6> componentRewriter = new ComponentRewriter1_99(this);
 
     public Protocol1_98To1_99() {
         // Passing the class types into the super constructor is needed for automatic packet type id remapping, but can otherwise be omitted
-        super(ClientboundPacket1_21_2.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_4.class, ServerboundPacket1_21_4.class);
+        super(ClientboundPacket1_21_6.class, ClientboundPacket1_21_6.class, ServerboundPacket1_21_6.class, ServerboundPacket1_21_6.class);
     }
 
     @Override
     protected void registerPackets() {
         super.registerPackets();
 
-        tagRewriter.registerGeneric(ClientboundPackets1_21_2.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
+        tagRewriter.registerGeneric(ClientboundPackets1_21_6.UPDATE_TAGS);
+        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_6.UPDATE_TAGS);
 
         // If needed for item or component changes
-        componentRewriter.registerOpenScreen1_14(ClientboundPackets1_21_2.OPEN_SCREEN);
-        componentRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_ACTION_BAR_TEXT);
-        componentRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_TITLE_TEXT);
-        componentRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_SUBTITLE_TEXT);
-        componentRewriter.registerBossEvent(ClientboundPackets1_21_2.BOSS_EVENT);
-        componentRewriter.registerComponentPacket(ClientboundPackets1_21_2.DISCONNECT);
-        componentRewriter.registerTabList(ClientboundPackets1_21_2.TAB_LIST);
-        componentRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_2.PLAYER_COMBAT_KILL);
-        componentRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE);
-        componentRewriter.registerComponentPacket(ClientboundPackets1_21_2.SYSTEM_CHAT);
-        componentRewriter.registerDisguisedChat(ClientboundPackets1_21_2.DISGUISED_CHAT);
-        componentRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_2.PLAYER_CHAT);
+        componentRewriter.registerOpenScreen1_14(ClientboundPackets1_21_6.OPEN_SCREEN);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_ACTION_BAR_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_TITLE_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_SUBTITLE_TEXT);
+        componentRewriter.registerBossEvent(ClientboundPackets1_21_6.BOSS_EVENT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21_6.DISCONNECT);
+        componentRewriter.registerTabList(ClientboundPackets1_21_6.TAB_LIST);
+        componentRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_6.PLAYER_COMBAT_KILL);
+        componentRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_6.PLAYER_INFO_UPDATE);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21_6.SYSTEM_CHAT);
+        componentRewriter.registerDisguisedChat(ClientboundPackets1_21_6.DISGUISED_CHAT);
+        componentRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_6.PLAYER_CHAT);
         componentRewriter.registerPing();
 
         // If needed for any particle, item, or block changes. Extend ParticleRewriter for particle serializer changes
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_2.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_2.EXPLODE); // Rewrites the included sound and particles
+        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_6.LEVEL_PARTICLES);
+        particleRewriter.registerExplode1_21_9(ClientboundPackets1_21_6.EXPLODE); // Rewrites the included sound and particles
 
-        final SoundRewriter<ClientboundPacket1_21_2> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND_ENTITY);
+        final SoundRewriter<ClientboundPacket1_21_6> soundRewriter = new SoundRewriter<>(this);
+        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND);
+        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND_ENTITY);
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_2.AWARD_STATS);
-        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_2.UPDATE_ATTRIBUTES);
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_6.AWARD_STATS);
+        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_6.UPDATE_ATTRIBUTES);
 
         // Uncomment if an existing type changed serialization format. Mappings for argument type keys can also be defined in mapping files
         /*new CommandRewriter1_19_4<>(this) {
@@ -112,13 +110,13 @@ final class Protocol1_98To1_99 extends AbstractProtocol<ClientboundPacket1_21_2,
                     super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_21_2.COMMANDS);*/
+        }.registerDeclareCommands1_19(ClientboundPackets1_21_6.COMMANDS);*/
     }
 
     @Override
     protected void onMappingDataLoaded() {
         // Uncomment this if the entity types enum has been newly added specifically for this Protocol
-        // EntityTypes1_21_4.initialize(this);
+        // EntityTypes1_21_9.initialize(this);
 
         // Uncomment if a new particle was added = ids shifted; requires a new Types_ class copied from the last
         /*mappedTypes().particle.filler(this)
@@ -143,8 +141,8 @@ final class Protocol1_98To1_99 extends AbstractProtocol<ClientboundPacket1_21_2,
     @Override
     public void init(final UserConnection connection) {
         // Register the entity tracker - used for entity id/entity data rewriting AND for tracking world data sent to the client (then used for chunk data rewriting)
-        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_4.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_6, SerializerVersion.V1_21_6));
+        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_9.PLAYER));
+        addItemHasher(connection, new ItemHasherBase(this, connection));
     }
 
     // Overriding these methods is important as they are relied on various rewriter classes
@@ -165,37 +163,37 @@ final class Protocol1_98To1_99 extends AbstractProtocol<ClientboundPacket1_21_2,
     }
 
     @Override
-    public ParticleRewriter<ClientboundPacket1_21_2> getParticleRewriter() {
+    public ParticleRewriter<ClientboundPacket1_21_6> getParticleRewriter() {
         return particleRewriter;
     }
 
     @Override
-    public TagRewriter<ClientboundPacket1_21_2> getTagRewriter() {
+    public TagRewriter<ClientboundPacket1_21_6> getTagRewriter() {
         return tagRewriter;
     }
 
     @Override
-    public NBTComponentRewriter<ClientboundPacket1_21_2> getComponentRewriter() {
+    public NBTComponentRewriter<ClientboundPacket1_21_6> getComponentRewriter() {
         return componentRewriter;
     }
 
     @Override
-    public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> types() {
-        return VersionedTypes.V1_21_5;
+    public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_9> types() {
+        return VersionedTypes.V1_21_9;
     }
 
     @Override
-    public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> mappedTypes() {
-        return VersionedTypes.V1_21_5;
+    public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_9> mappedTypes() {
+        return VersionedTypes.V1_21_9;
     }
 
     @Override
-    protected PacketTypesProvider<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> createPacketTypesProvider() {
+    protected PacketTypesProvider<ClientboundPacket1_21_6, ClientboundPacket1_21_6, ServerboundPacket1_21_6, ServerboundPacket1_21_6> createPacketTypesProvider() {
         return new SimplePacketTypesProvider<>(
-            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_21_2.class, ClientboundConfigurationPackets1_21.class),
-            packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_21_2.class, ClientboundConfigurationPackets1_21.class),
-            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_21_4.class, ServerboundConfigurationPackets1_20_5.class),
-            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_4.class, ServerboundConfigurationPackets1_20_5.class)
+            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_21_6.class, ClientboundConfigurationPackets1_21_6.class),
+            packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_21_6.class, ClientboundConfigurationPackets1_21_6.class),
+            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_21_6.class, ServerboundConfigurationPackets1_21_6.class),
+            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_6.class, ServerboundConfigurationPackets1_21_6.class)
         );
     }
 }

common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/Protocol1_10To1_11.java

@@ -38,7 +38,6 @@ import com.viaversion.viaversion.protocols.v1_10to1_11.storage.EntityTracker1_11
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
-import com.viaversion.viaversion.util.Pair;
 
 public class Protocol1_10To1_11 extends AbstractProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
 

common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/WorldPacketRewriter1_13.java

@@ -22,9 +22,9 @@ import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
+import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Particle;
-import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;

common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/TabCompleteTracker.java

@@ -40,7 +40,7 @@ public class TabCompleteTracker implements StorableObject {
         wrapper.write(Types.BOOLEAN, false);
         final BlockPosition playerLookTarget = Via.getManager().getProviders().get(PlayerLookTargetProvider.class).getPlayerLookTarget(connection);
         wrapper.write(Types.OPTIONAL_POSITION1_8, playerLookTarget);
-        wrapper.scheduleSendToServer(Protocol1_12_2To1_13.class);
+        wrapper.sendToServer(Protocol1_12_2To1_13.class);
         lastTabComplete = null;
     }
 

common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/task/TabCompleteTask.java

@@ -18,18 +18,17 @@
 package com.viaversion.viaversion.protocols.v1_12_2to1_13.task;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.protocol.ProtocolRunnable;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
+import com.viaversion.viaversion.connection.StorableObjectTask;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.TabCompleteTracker;
 
-public final class TabCompleteTask extends ProtocolRunnable {
+public final class TabCompleteTask extends StorableObjectTask<TabCompleteTracker> {
 
     public TabCompleteTask() {
-        super(Protocol1_12_2To1_13.class);
+        super(TabCompleteTracker.class);
     }
 
     @Override
-    public void run(final UserConnection connection) {
-        connection.get(TabCompleteTracker.class).sendPacketToServer(connection);
+    public void run(final UserConnection connection, final TabCompleteTracker storableObject) {
+        storableObject.sendPacketToServer(connection);
     }
 }

common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java

@@ -39,11 +39,11 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.PlayerPacketRe
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.WorldPacketRewriter1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
-import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_13, ClientboundPackets1_14, ServerboundPackets1_13, ServerboundPackets1_14> {

common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java

@@ -37,9 +37,9 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14;
-import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
+import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Key;
 import java.util.Set;

common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/EntityPacketRewriter1_16.java

@@ -201,6 +201,10 @@ public class EntityPacketRewriter1_16 extends EntityRewriter<ClientboundPackets1
         });
 
         protocol.registerServerbound(ServerboundPackets1_16.SWING, wrapper -> {
+            if (!Via.getConfig().cancelSwingInInventory()) {
+                return;
+            }
+
             InventoryTracker1_16 inventoryTracker = wrapper.user().get(InventoryTracker1_16.class);
             // Don't send an arm swing if the player has an inventory opened.
             if (inventoryTracker.isInventoryOpen()) {

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_3to1_16_4/Protocol1_16_3To1_16_4.java

@@ -19,7 +19,6 @@ package com.viaversion.viaversion.protocols.v1_16_3to1_16_4;
 
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;