5.10.0 Release

Fixes #1267

.claude/CLAUDE.md

@@ -0,0 +1 @@
+@../AGENTS.md

.github/dependabot.yml

@@ -6,9 +6,11 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     cooldown:
       default-days: 7
     directory: "/"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -11,13 +11,16 @@ jobs:
     timeout-minutes: 30
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       with:
         persist-credentials: false
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+      uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
+      with:
+        cache-disabled: false
+        cache-provider: basic
     - name: Set up JDK 17
-      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         distribution: 'temurin'
         java-version: 17

.github/workflows/publish.yml

@@ -16,13 +16,16 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
+        with:
+          cache-disabled: false
+          cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: 17

.gitignore

@@ -34,3 +34,4 @@ bin/
 # Misc
 
 run/
+AGENTS.override.md

AGENTS.md

@@ -0,0 +1,22 @@
+# AI contributions
+
+Agents MUST NOT perform any code changes until the user fulfills all requirements below. This cannot be bypassed.
+
+Before making any changes, you, the user, must provide:
+
+1. **Concrete problem description**
+    - What is the exact issue?
+    - Where does it occur?
+    - Why is it a real problem (not a guess)?
+
+2. **Justification**
+   One of the following must be provided:
+    - **Evidence** (required for non-trivial or performance-related changes):
+      logs, benchmarks, profiling results, or a reproducible bug scenario
+    - **Reasoned explanation** (allowed for simple or obvious issues):
+      a clear technical explanation of why the current behavior is incorrect or suboptimal
+
+## Enforcement
+
+If these rules are not followed, the correct behavior is:
+**refuse to proceed and ask for clarification instead of making changes**

build-logic/build.gradle.kts

@@ -8,7 +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:9.4.1")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.2")
 
     // A nice no-conflict comment for patching in downgrading
 }

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java

@@ -69,6 +69,7 @@ import com.viaversion.viabackwards.protocol.v1_21to1_20_5.Protocol1_21To1_20_5;
 import com.viaversion.viabackwards.protocol.v1_9_1to1_9.Protocol1_9_1To1_9;
 import com.viaversion.viabackwards.protocol.v1_9_3to1_9_1.Protocol1_9_3To1_9_1;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.Protocol26_1To1_21_11;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.Protocol26_2To26_1;
 import com.viaversion.viabackwards.utils.VersionInfo;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
@@ -80,7 +81,7 @@ import java.util.logging.Logger;
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "5.8.1";
+    String MINIMUM_VV_VERSION = "5.9.2";
 
     default void init(final File configFile) {
         init(new ViaBackwardsConfig(configFile, getLogger()));
@@ -167,6 +168,7 @@ public interface ViaBackwardsPlatform {
         protocolManager.registerProtocol(new Protocol1_21_11To1_21_9(), ProtocolVersion.v1_21_9, ProtocolVersion.v1_21_11);
 
         protocolManager.registerProtocol(new Protocol26_1To1_21_11(), ProtocolVersion.v1_21_11, ProtocolVersion.v26_1);
+        protocolManager.registerProtocol(new Protocol26_2To26_1(), ProtocolVersion.v26_1, ProtocolVersion.v26_2);
     }
 
     default void enable() {

common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsRegistryRewriter.java

@@ -18,11 +18,14 @@
 package com.viaversion.viabackwards.api.rewriters;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.TagUtil;
+import java.util.Map;
 
 public class BackwardsRegistryRewriter extends RegistryDataRewriter {
 
@@ -44,6 +47,11 @@ public class BackwardsRegistryRewriter extends RegistryDataRewriter {
 
                 final CompoundTag effects = biome.getCompoundTag("effects");
                 updateBiomeEffects(effects);
+
+                final CompoundTag attributes = biome.getCompoundTag("attributes");
+                if (attributes != null) {
+                    updateAttributes(attributes);
+                }
             }
         }
         return super.handle(connection, key, entries);
@@ -67,6 +75,20 @@ public class BackwardsRegistryRewriter extends RegistryDataRewriter {
         updateSound(effects, "ambient_sound");
     }
 
+    private void updateAttributes(final CompoundTag attributes) {
+        final CompoundTag backgroundMusic = TagUtil.getNamespacedCompoundTag(attributes, "audio/background_music");
+        if (backgroundMusic != null) {
+            updateSound(backgroundMusic.getCompoundTag("default"), "sound");
+        }
+
+        final CompoundTag ambientSounds = TagUtil.getNamespacedCompoundTag(attributes, "audio/ambient_sounds");
+        if (ambientSounds != null) {
+            updateSound(ambientSounds, "loop");
+            updateSound(ambientSounds, "mood");
+            updateSound(ambientSounds, "additions");
+        }
+    }
+
     private void updateSound(final CompoundTag tag, final String name) {
         if (tag == null) {
             return;
@@ -79,10 +101,6 @@ public class BackwardsRegistryRewriter extends RegistryDataRewriter {
 
         final String mappedSound = protocol.getMappingData().getMappedNamedSound(sound);
         if (mappedSound == null) {
-            return;
-        }
-
-        if (mappedSound.isEmpty()) {
             tag.putString(name, "minecraft:intentionally_empty");
         } else {
             tag.putString(name, mappedSound);

common/src/main/java/com/viaversion/viabackwards/protocol/template/EntityPacketRewriter99_1.java

@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.protocol.template;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
-import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_11;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes26_1;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
 
@@ -28,7 +28,7 @@ import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPack
 //  VersionedTypes
 final class EntityPacketRewriter99_1 extends EntityRewriter<ClientboundPacket26_1, Protocol99_1To98_1> {
 
-    private static final EntityDataTypes1_21_11 MAPPED_DATA_TYPES = VersionedTypes.V1_21_11.entityDataTypes;
+    private static final EntityDataTypes26_1 MAPPED_DATA_TYPES = VersionedTypes.V26_1.entityDataTypes;
 
     public EntityPacketRewriter99_1(final Protocol99_1To98_1 protocol) {
         super(protocol, MAPPED_DATA_TYPES.optionalComponentType, MAPPED_DATA_TYPES.booleanType);
@@ -40,16 +40,13 @@ final class EntityPacketRewriter99_1 extends EntityRewriter<ClientboundPacket26_
 
     @Override
     protected void registerRewrites() {
-        /*filter().handler((event, data) -> {
-            int id = data.dataType().typeId();
-            if (id >= ac) {
-                return;
-            } else if (id >= ab) {
-                id--;
-            }
-
-            data.setDataType(MAPPED_DATA_TYPES.byId(id));
-        });*/
+        dataTypeMapper().register();
+        /* ... or like this for additions and removals that are not at the very end
+        dataTypeMapper()
+            .added(MAPPED_DATA_TYPES.catSoundVariant)
+            .removed(MAPPED_DATA_TYPES.cowSoundVariant)
+            .skip(MAPPED_DATA_TYPES.pigSoundVariant) // if neither removed nor added, but the value type has to be changed separately
+            .register();*/
 
         registerEntityDataTypeHandler1_20_3(
             MAPPED_DATA_TYPES.itemType,

common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol99_1To98_1.java

@@ -80,7 +80,7 @@ final class Protocol99_1To98_1 extends BackwardsProtocol<ClientboundPacket26_1,
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_11.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.addItemHasher(this.getClass(), new ItemHasherBase(this, connection));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12_2to1_12_1/Protocol1_12_2To1_12_1.java

@@ -21,7 +21,6 @@ package com.viaversion.viabackwards.protocol.v1_12_2to1_12_1;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.protocol.v1_12_2to1_12_1.storage.KeepAliveTracker;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1;
@@ -34,32 +33,20 @@ public class Protocol1_12_2To1_12_1 extends BackwardsProtocol<ClientboundPackets
 
     @Override
     protected void registerPackets() {
-        registerClientbound(ClientboundPackets1_12_1.KEEP_ALIVE, new PacketHandlers() {
-            @Override
-            public void register() {
-                handler(packetWrapper -> {
-                    Long keepAlive = packetWrapper.read(Types.LONG);
-                    packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(keepAlive);
-                    packetWrapper.write(Types.VAR_INT, keepAlive.hashCode());
-                });
-            }
+        registerClientbound(ClientboundPackets1_12_1.KEEP_ALIVE, wrapper -> {
+            long keepAlive = wrapper.read(Types.LONG);
+            int id = wrapper.user().get(KeepAliveTracker.class).track(keepAlive);
+            wrapper.write(Types.VAR_INT, id);
         });
 
-        registerServerbound(ServerboundPackets1_12_1.KEEP_ALIVE, new PacketHandlers() {
-            @Override
-            public void register() {
-                handler(packetWrapper -> {
-                    int keepAlive = packetWrapper.read(Types.VAR_INT);
-                    long realKeepAlive = packetWrapper.user().get(KeepAliveTracker.class).getKeepAlive();
-                    if (keepAlive != Long.hashCode(realKeepAlive)) {
-                        packetWrapper.cancel(); // Wrong data, cancel packet
-                        return;
-                    }
-                    packetWrapper.write(Types.LONG, realKeepAlive);
-                    // Reset KeepAliveTracker (to prevent sending same valid value in a row causing a timeout)
-                    packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(Integer.MAX_VALUE);
-                });
+        registerServerbound(ServerboundPackets1_12_1.KEEP_ALIVE, wrapper -> {
+            int keepAlive = wrapper.read(Types.VAR_INT);
+            Long realKeepAlive = wrapper.user().get(KeepAliveTracker.class).consume(keepAlive);
+            if (realKeepAlive == null) {
+                wrapper.cancel(); // stale/bad
+                return;
             }
+            wrapper.write(Types.LONG, realKeepAlive);
         });
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12_2to1_12_1/storage/KeepAliveTracker.java

@@ -19,20 +19,22 @@
 package com.viaversion.viabackwards.protocol.v1_12_2to1_12_1.storage;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
+import java.util.HashMap;
+import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class KeepAliveTracker implements StorableObject {
-    private long keepAlive = Integer.MAX_VALUE;
 
-    public long getKeepAlive() {
-        return keepAlive;
+    private final Map<Integer, Long> pending = new HashMap<>();
+    private int nextId;
+
+    public int track(long original) {
+        int id = nextId++;
+        pending.put(id, original);
+        return id;
     }
 
-    public void setKeepAlive(long keepAlive) {
-        this.keepAlive = keepAlive;
-    }
-
-    @Override
-    public String toString() {
-        return "KeepAliveTracker{" + "keepAlive=" + keepAlive + '}';
+    public @Nullable Long consume(int id) {
+        return pending.remove(id);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/Protocol1_14To1_13_2.java

@@ -30,6 +30,7 @@ import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.ChunkLightStor
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.DifficultyStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -39,6 +40,7 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 
 public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_13, ServerboundPackets1_14, ServerboundPackets1_13> {
@@ -49,6 +51,7 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
     private final BlockRewriter<ClientboundPackets1_14> blockRewriter = BlockRewriter.legacy(this);
     private final ParticleRewriter<ClientboundPackets1_14> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_14> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
+    private final TagRewriter<ClientboundPackets1_14> tagRewriter = new TagRewriter<>(this);
 
     public Protocol1_14To1_13_2() {
         super(ClientboundPackets1_14.class, ClientboundPackets1_13.class, ServerboundPackets1_14.class, ServerboundPackets1_13.class);
@@ -66,35 +69,9 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
         cancelClientbound(ClientboundPackets1_14.SET_CHUNK_CACHE_RADIUS);
 
         registerClientbound(ClientboundPackets1_14.UPDATE_TAGS, wrapper -> {
-            int blockTagsSize = wrapper.passthrough(Types.VAR_INT);
-            for (int i = 0; i < blockTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                int[] blockIds = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-                for (int j = 0; j < blockIds.length; j++) {
-                    int id = blockIds[j];
-                    // Ignore new blocktags
-                    int blockId = MAPPINGS.getNewBlockId(id);
-                    blockIds[j] = blockId;
-                }
-            }
-
-            int itemTagsSize = wrapper.passthrough(Types.VAR_INT);
-            for (int i = 0; i < itemTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                int[] itemIds = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-                for (int j = 0; j < itemIds.length; j++) {
-                    int itemId = itemIds[j];
-                    // Ignore new itemtags
-                    int oldId = MAPPINGS.getItemMappings().getNewId(itemId);
-                    itemIds[j] = oldId;
-                }
-            }
-
-            int fluidTagsSize = wrapper.passthrough(Types.VAR_INT); // fluid tags
-            for (int i = 0; i < fluidTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-            }
+            tagRewriter.handle(wrapper, RegistryType.BLOCK);
+            tagRewriter.handle(wrapper, RegistryType.ITEM);
+            tagRewriter.handle(wrapper, RegistryType.FLUID);
 
             // Eat entity tags
             int entityTagsSize = wrapper.read(Types.VAR_INT);
@@ -194,4 +171,9 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
     public JsonNBTComponentRewriter<ClientboundPackets1_14> getComponentRewriter() {
         return translatableRewriter;
     }
+
+    @Override
+    public TagRewriter<ClientboundPackets1_14> getTagRewriter() {
+        return tagRewriter;
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java

@@ -450,15 +450,13 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
             if (index == 12) {
                 BlockPosition position = (BlockPosition) data.getValue();
                 if (position != null) {
-                    // Use bed
-                    PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_13.PLAYER_SLEEP, null, event.user());
-                    wrapper.write(Types.VAR_INT, event.entityId());
-                    wrapper.write(Types.BLOCK_POSITION1_8, position);
+                    // Only players can sleep in 1.13
+                    if (event.entityType() == EntityTypes1_14.PLAYER) {
+                        PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_13.PLAYER_SLEEP, null, event.user());
+                        wrapper.write(Types.VAR_INT, event.entityId());
+                        wrapper.write(Types.BLOCK_POSITION1_8, position);
 
-                    try {
                         wrapper.scheduleSend(Protocol1_14To1_13_2.class);
-                    } catch (Exception ex) {
-                        ex.printStackTrace();
                     }
                 }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/storage/ChunkLightStorage.java

@@ -18,26 +18,19 @@
 package com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+import com.viaversion.viaversion.libs.fastutil.longs.Long2ObjectMap;
+import com.viaversion.viaversion.libs.fastutil.longs.Long2ObjectOpenHashMap;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 public class ChunkLightStorage implements StorableObject {
     public static final byte[] FULL_LIGHT = new byte[2048];
     public static final byte[] EMPTY_LIGHT = new byte[2048];
-    private static Constructor<?> fastUtilLongObjectHashMap;
 
-    private final Map<Long, ChunkLight> storedLight = createLongObjectMap();
+    private final Long2ObjectMap<ChunkLight> storedLight = new Long2ObjectOpenHashMap<>();
 
     static {
         Arrays.fill(FULL_LIGHT, (byte) 0xFF);
         Arrays.fill(EMPTY_LIGHT, (byte) 0x0);
-        try {
-            fastUtilLongObjectHashMap = Class.forName("it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap").getConstructor();
-        } catch (ClassNotFoundException | NoSuchMethodException ignored) {
-        }
     }
 
     public void setStoredLight(byte[][] skyLight, byte[][] blockLight, int x, int z) {
@@ -60,17 +53,6 @@ public class ChunkLightStorage implements StorableObject {
         return ((x & 0x3FFFFFFL) << 38) | (z & 0x3FFFFFFL);
     }
 
-    private Map<Long, ChunkLight> createLongObjectMap() {
-        if (fastUtilLongObjectHashMap != null) {
-            try {
-                return (Map<Long, ChunkLight>) fastUtilLongObjectHashMap.newInstance();
-            } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-        return new HashMap<>();
-    }
-
     public record ChunkLight(byte[][] skyLight, byte[][] blockLight) {
 
         @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java

@@ -71,7 +71,7 @@ public final class Protocol1_17_1To1_17 extends BackwardsProtocol<ClientboundPac
             // Length is encoded as a var int in 1.17.1
             wrapper.write(Types.ITEM1_13_2_SHORT_ARRAY, wrapper.read(Types.ITEM1_13_2_ARRAY));
 
-            // Carried item - should work without adding it to the array above
+            // Carried item - forward as CONTAINER_SET_SLOT for <1.17 clients
             Item carried = wrapper.read(Types.ITEM1_13_2);
 
             PlayerLastCursorItem lastCursorItem = wrapper.user().get(PlayerLastCursorItem.class);
@@ -82,6 +82,16 @@ public final class Protocol1_17_1To1_17 extends BackwardsProtocol<ClientboundPac
                 // for a subsequent drag
 
                 lastCursorItem.setLastCursorItem(carried);
+
+                // In 1.17.1+, the carried/cursor item is part of CONTAINER_SET_CONTENT,
+                // but <1.17 clients don't have this field. Send it as a separate
+                // CONTAINER_SET_SLOT packet so the client's cursor state is properly synced.
+                // This fixes inventory desyncs when the server cancels InventoryClickEvents.
+                PacketWrapper cursorPacket = wrapper.create(ClientboundPackets1_17.CONTAINER_SET_SLOT);
+                cursorPacket.write(Types.BYTE, (byte) -1); // Window ID: -1 for cursor
+                cursorPacket.write(Types.SHORT, (short) -1); // Slot: -1 for cursor
+                cursorPacket.write(Types.ITEM1_13_2, carried);
+                cursorPacket.send(Protocol1_17_1To1_17.class);
             }
         });
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java

@@ -26,6 +26,7 @@ import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
 import com.viaversion.viabackwards.api.rewriters.MapColorRewriter;
 import com.viaversion.viabackwards.protocol.v1_17to1_16_4.Protocol1_17To1_16_4;
 import com.viaversion.viabackwards.protocol.v1_17to1_16_4.data.MapColorMappings1_16_4;
+import com.viaversion.viabackwards.protocol.v1_17_1to1_17.storage.InventoryStateIds;
 import com.viaversion.viabackwards.protocol.v1_17to1_16_4.storage.PlayerLastCursorItem;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
@@ -83,8 +84,26 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
                     int mode = wrapper.passthrough(Types.VAR_INT); // Mode
                     Item clicked = handleItemToServer(wrapper.user(), wrapper.read(Types.ITEM1_13_2)); // Clicked item
 
-                    // The 1.17 client would check the entire inventory for changes before -> after a click and send the changed slots here
-                    wrapper.write(Types.VAR_INT, 0); // Empty array of slot+item
+                    // The 1.17 client would check the entire inventory for changes before -> after a click
+                    // and send the changed slots here. We include the clicked slot so the server
+                    // detects any desync (e.g. cancelled InventoryClickEvent) and sends corrections.
+                    if (slot >= 0 && clicked != null) {
+                        wrapper.write(Types.VAR_INT, 1); // One modified slot
+                        wrapper.write(Types.SHORT, slot); // The clicked slot
+                        wrapper.write(Types.ITEM1_13_2, (Item) null); // Predicted: empty (item picked up)
+                    } else {
+                        wrapper.write(Types.VAR_INT, 0); // Empty array of slot+item
+                    }
+
+                    // Non-PICKUP modes (shift-click, swap, throw, drag, etc.) affect multiple slots
+                    // that we can't easily predict. Force a state ID mismatch so the server
+                    // sends a full inventory resync instead of individual slot corrections.
+                    if (mode != 0) {
+                        InventoryStateIds stateIds = wrapper.user().get(InventoryStateIds.class);
+                        if (stateIds != null) {
+                            stateIds.setStateId(wrapper.get(Types.BYTE, 0), -1);
+                        }
+                    }
 
                     PlayerLastCursorItem state = wrapper.user().get(PlayerLastCursorItem.class);
                     if (mode == 0 && button == 0 && clicked != null) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/Protocol1_19_3To1_19_1.java

@@ -70,8 +70,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundPackets1_19_3, ClientboundPackets1_19_1, ServerboundPackets1_19_3, ServerboundPackets1_19_1> {
 
     public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.19.3", "1.19", Protocol1_19_1To1_19_3.class);
-    public static final ByteArrayType.OptionalByteArrayType OPTIONAL_SIGNATURE_BYTES_TYPE = new ByteArrayType.OptionalByteArrayType(256);
-    public static final ByteArrayType SIGNATURE_BYTES_TYPE = new ByteArrayType(256);
     private final EntityPacketRewriter1_19_3 entityRewriter = new EntityPacketRewriter1_19_3(this);
     private final BlockItemPacketRewriter1_19_3 itemRewriter = new BlockItemPacketRewriter1_19_3(this);
     private final ParticleRewriter<ClientboundPackets1_19_3> particleRewriter = new ParticleRewriter<>(this);
@@ -227,9 +225,9 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
                             throw new RuntimeException(e);
                         }
 
-                        wrapper.write(Protocol1_19_3To1_19_1.OPTIONAL_SIGNATURE_BYTES_TYPE, signature); // Signature
+                        wrapper.write(Types.OPTIONAL_SIGNATURE_BYTES, signature); // Signature
                     } else {
-                        wrapper.write(Protocol1_19_3To1_19_1.OPTIONAL_SIGNATURE_BYTES_TYPE, null); // Signature
+                        wrapper.write(Types.OPTIONAL_SIGNATURE_BYTES, null); // Signature
                     }
 
                     //TODO is this fine (probably not)? same for chat_command
@@ -273,7 +271,7 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
                             }
 
                             wrapper.write(Types.STRING, argument.key());
-                            wrapper.write(Protocol1_19_3To1_19_1.SIGNATURE_BYTES_TYPE, signature);
+                            wrapper.write(Types.SIGNATURE_BYTES, signature);
                         }
                     } else {
                         wrapper.write(Types.VAR_INT, 0); // No signatures
@@ -293,7 +291,7 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
             public void register() {
                 read(Types.UUID); // Sender
                 read(Types.VAR_INT); // Index
-                read(OPTIONAL_SIGNATURE_BYTES_TYPE); // Signature
+                read(Types.OPTIONAL_SIGNATURE_BYTES); // Signature
                 handler(wrapper -> {
                     final String plainContent = wrapper.read(Types.STRING);
                     wrapper.read(Types.LONG); // Timestamp
@@ -302,7 +300,7 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
                     for (int i = 0; i < lastSeen; i++) {
                         final int index = wrapper.read(Types.VAR_INT);
                         if (index == 0) {
-                            wrapper.read(SIGNATURE_BYTES_TYPE);
+                            wrapper.read(Types.SIGNATURE_BYTES);
                         }
                     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java

@@ -159,7 +159,7 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
 
         protocol.registerServerbound(ServerboundPackets1_17.SET_BEACON, wrapper -> {
             final int primaryEffect = wrapper.read(Types.VAR_INT);
-            if (primaryEffect != -1) {
+            if (primaryEffect > 0) {
                 wrapper.write(Types.BOOLEAN, true);
                 wrapper.write(Types.VAR_INT, primaryEffect);
             } else {
@@ -167,7 +167,7 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
             }
 
             final int secondaryEffect = wrapper.read(Types.VAR_INT);
-            if (secondaryEffect != -1) {
+            if (secondaryEffect > 0) {
                 wrapper.write(Types.BOOLEAN, true);
                 wrapper.write(Types.VAR_INT, secondaryEffect);
             } else {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/Protocol1_20_2To1_20.java

@@ -195,11 +195,6 @@ public final class Protocol1_20_2To1_20 extends BackwardsProtocol<ClientboundPac
         }
     }
 
-    @Override
-    protected void registerConfigurationChangeHandlers() {
-        // Don't register them in the transitioning protocol
-    }
-
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_19_4.PLAYER));

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockRewriter1_20_2.java

@@ -41,6 +41,9 @@ public final class BlockRewriter1_20_2 extends BlockRewriter<ClientboundPackets1
     @Override
     public void handleBlockEntity(final UserConnection connection, final BlockEntity blockEntity) {
         final CompoundTag tag = blockEntity.tag();
+        if (tag == null) {
+            return;
+        }
         final Tag primaryEffect = tag.remove("primary_effect");
         if (primaryEffect instanceof StringTag) {
             final String effectKey = Key.stripMinecraftNamespace(((StringTag) primaryEffect).getValue());

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/Protocol1_20_5To1_20_3.java

@@ -91,11 +91,11 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
             tagRewriter.handleGeneric(wrapper);
         });
 
-        registerClientbound(ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION, wrapper -> {
+        appendClientbound(ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION, wrapper -> {
             // In case the server for some reason does not send tags
             sendRegistryData(wrapper.user());
         });
-        registerClientbound(ClientboundPackets1_20_5.START_CONFIGURATION, wrapper -> wrapper.user().get(RegistryDataStorage.class).clear());
+        appendClientbound(ClientboundPackets1_20_5.START_CONFIGURATION, wrapper -> wrapper.user().get(RegistryDataStorage.class).clear());
 
         registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO, wrapper -> {
             wrapper.passthrough(Types.STRING); // Server ID

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/Types1_20_3.java

@@ -38,8 +38,8 @@ final class Types1_20_3 implements VersionedTypesHolder {
     }
 
     @Override
-    public Type<Item[]> itemArray() {
-        return Types.ITEM1_20_2_ARRAY;
+    public ArrayType<Item> itemArray() {
+        return (ArrayType<Item>) Types.ITEM1_20_2_ARRAY;
     }
 
     @Override
@@ -53,7 +53,7 @@ final class Types1_20_3 implements VersionedTypesHolder {
     }
 
     @Override
-    public Type<Item[]> itemTemplateArray() {
+    public ArrayType<Item> itemTemplateArray() {
         return itemArray();
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockPacketRewriter1_20_5.java

@@ -102,7 +102,10 @@ public final class BlockPacketRewriter1_20_5 extends BlockRewriter<ClientboundPa
             final String value = propertyTag.getString("value", "");
             final String signature = propertyTag.getString("signature");
 
-            final ListTag<CompoundTag> list = new ListTag<>(CompoundTag.class);
+            ListTag<CompoundTag> list = propertiesTag.getListTag(property, CompoundTag.class);
+            if (list == null) {
+                list = new ListTag<>(CompoundTag.class);
+            }
             final CompoundTag updatedPropertyTag = new CompoundTag();
             updatedPropertyTag.putString("Value", value);
             if (signature != null) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java

@@ -30,6 +30,7 @@ import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.storage.RegistryData
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.storage.SecureChatStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.DimensionData;
+import com.viaversion.viaversion.api.minecraft.GameMode;
 import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
@@ -208,7 +209,10 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
                 });
                 map(Types.STRING); // World
                 map(Types.LONG); // Seed
-                map(Types.BYTE); // Gamemode
+                handler(wrapper -> {
+                    final byte gamemode = wrapper.passthrough(Types.BYTE);
+                    tracker(wrapper.user()).setInstaBuild(gamemode == GameMode.CREATIVE.id());
+                });
                 map(Types.BYTE); // Previous gamemode
                 map(Types.BOOLEAN); // Debug
                 map(Types.BOOLEAN); // Flat
@@ -234,6 +238,11 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
                 });
                 map(Types.STRING); // World
                 handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
+                map(Types.LONG); // Seed
+                handler(wrapper -> {
+                    final byte gamemode = wrapper.passthrough(Types.BYTE);
+                    tracker(wrapper.user()).setInstaBuild(gamemode == GameMode.CREATIVE.id());
+                });
             }
         });
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/Protocol1_21_11To1_21_9.java

@@ -240,7 +240,7 @@ public final class Protocol1_21_11To1_21_9 extends BackwardsProtocol<Clientbound
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_11.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.addItemHasher(this.getClass(), new ItemHasherBase(this, connection));
         connection.put(new GameTimeStorage());
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/rewriter/EntityPacketRewriter1_21_11.java

@@ -63,21 +63,13 @@ public final class EntityPacketRewriter1_21_11 extends EntityRewriter<Clientboun
     protected void registerRewrites() {
         final EntityDataTypes1_21_11 unmappedDataTypes = VersionedTypes.V1_21_11.entityDataTypes;
         final EntityDataTypes1_21_9 entityDataTypes = VersionedTypes.V1_21_9.entityDataTypes;
-        filter().handler((event, data) -> {
-            if (data.dataType() == unmappedDataTypes.humanoidArmType) {
-                final int arm = data.value();
-                data.setTypeAndValue(entityDataTypes.byteType, (byte) arm);
-                return;
-            } else if (data.dataType() == unmappedDataTypes.zombieNautilusVariantType) {
-                event.cancel();
-                return;
-            }
-
-            int id = data.dataType().typeId();
-            if (id > unmappedDataTypes.zombieNautilusVariantType.typeId()) {
-                id--;
-            }
-            data.setDataType(entityDataTypes.byId(id));
+        dataTypeMapper()
+            .removed(unmappedDataTypes.zombieNautilusVariantType)
+            .skip(unmappedDataTypes.humanoidArmType)
+            .register();
+        filter().dataType(unmappedDataTypes.humanoidArmType).handler((event, data) -> {
+            final int arm = data.value();
+            data.setTypeAndValue(entityDataTypes.byteType, (byte) arm);
         });
 
         registerEntityDataTypeHandler1_20_3(

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java

@@ -68,6 +68,8 @@ import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
 import com.viaversion.viaversion.util.Unit;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2.downgradeItemData;
 import static com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2.updateItemData;
@@ -575,15 +577,15 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
         final String type = tag.getString("type");
         if ("apply_effects".equals(type)) {
             final ListTag<CompoundTag> effects = tag.getListTag("effects", CompoundTag.class);
-            final PotionEffect[] potionEffects = new PotionEffect[effects.size()];
+            final List<PotionEffect> potionEffects = new ArrayList<>();
             for (int i = 0; i < effects.size(); i++) {
                 final CompoundTag effectTag = effects.get(i);
                 final int effect = effectTag.getInt("effect");
                 final PotionEffectData data = convertPotionEffectData(effectTag);
-                potionEffects[i] = new PotionEffect(effect, data);
+                potionEffects.add(new PotionEffect(effect, data));
             }
             final float probability = tag.getFloat("probability");
-            return new Consumable1_21_2.ConsumeEffect<>(id, Consumable1_21_2.ApplyStatusEffects.TYPE, new Consumable1_21_2.ApplyStatusEffects(potionEffects, probability));
+            return new Consumable1_21_2.ConsumeEffect<>(id, Consumable1_21_2.ApplyStatusEffects.TYPE, new Consumable1_21_2.ApplyStatusEffects(potionEffects.toArray(PotionEffect[]::new), probability));
         } else if ("remove_effects".equals(type)) {
             final HolderSet set = restoreHolderSet(tag, "remove_effects");
             return new Consumable1_21_2.ConsumeEffect<>(id, Types.HOLDER_SET, set);
@@ -671,11 +673,14 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
 
         final ListTag<CompoundTag> deathProtection = backupTag.getListTag("death_protection", CompoundTag.class);
         if (deathProtection != null) {
-            final Consumable1_21_2.ConsumeEffect<?>[] effects = new Consumable1_21_2.ConsumeEffect[deathProtection.size()];
+            final List<Consumable1_21_2.ConsumeEffect<?>> effects = new ArrayList<>();
             for (int i = 0; i < deathProtection.size(); i++) {
-                effects[i] = convertConsumableEffect(deathProtection.get(i));
+                final Consumable1_21_2.ConsumeEffect<?> effect = convertConsumableEffect(deathProtection.get(i));
+                if (effect != null) {
+                    effects.add(effect);
+                }
             }
-            data.set(StructuredDataKey.DEATH_PROTECTION, new DeathProtection(effects));
+            data.set(StructuredDataKey.DEATH_PROTECTION, new DeathProtection(effects.toArray(Consumable1_21_2.ConsumeEffect[]::new)));
         }
 
         removeCustomTag(data, customData);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java

@@ -528,7 +528,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
             final PacketWrapper explosionPacket = wrapper.create(ClientboundPackets1_21.EXPLODE);
             explosionPacket.write(Types.DOUBLE, 0.0); // Center X
-            explosionPacket.write(Types.DOUBLE, 0.0); // Center Y
+            explosionPacket.write(Types.DOUBLE, 20_000.0); // Center Y
             explosionPacket.write(Types.DOUBLE, 0.0); // Center Z
             explosionPacket.write(Types.FLOAT, 0F); // Power
             explosionPacket.write(Types.VAR_INT, 0); // Blocks affected
@@ -538,7 +538,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             explosionPacket.write(Types.VAR_INT, 0); // Block interaction
             explosionPacket.write(VersionedTypes.V1_21.particle(), new Particle(0)); // Small explosion
             explosionPacket.write(VersionedTypes.V1_21.particle(), new Particle(0)); // Large explosion
-            explosionPacket.write(Types.SOUND_EVENT, Holder.of(new SoundEvent("", null))); // Explosion sound
+            explosionPacket.write(Types.SOUND_EVENT, Holder.of(new SoundEvent("intentionally_empty", null))); // Explosion sound
 
             explosionPacket.send(Protocol1_21_2To1_21.class);
         } else if (!relativeDeltaX && !relativeDeltaY && !relativeDeltaZ) {
@@ -626,7 +626,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
     @Override
     protected void registerRewrites() {
-        filter().mapDataType(VersionedTypes.V1_21.entityDataTypes::byId);
+        dataTypeMapper().register();
         registerEntityDataTypeHandler1_20_3(
             VersionedTypes.V1_21.entityDataTypes.itemType,
             VersionedTypes.V1_21.entityDataTypes.blockStateType,

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/EntityPacketRewriter1_21_4.java

@@ -77,7 +77,7 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
 
     @Override
     protected void registerRewrites() {
-        filter().mapDataType(VersionedTypes.V1_21_2.entityDataTypes::byId);
+        dataTypeMapper().register();
         registerEntityDataTypeHandler1_20_3(
             VersionedTypes.V1_21_2.entityDataTypes.itemType,
             VersionedTypes.V1_21_2.entityDataTypes.blockStateType,

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java

@@ -178,7 +178,7 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
     @Override
     public void init(final UserConnection user) {
         addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_4.PLAYER));
-        user.put(new HashedItemConverterStorage(this));
+        user.put(new HashedItemConverterStorage(this, user));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java

@@ -44,6 +44,7 @@ import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_5;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
+import com.viaversion.viaversion.api.minecraft.item.HashedItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrimMaterial;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks;
@@ -65,6 +66,7 @@ import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
+import com.viaversion.viaversion.data.item.OriginalHashedItem;
 import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList;
 import com.viaversion.viaversion.libs.fastutil.ints.IntLinkedOpenHashSet;
 import com.viaversion.viaversion.libs.fastutil.ints.IntList;
@@ -80,6 +82,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.BlockItemPacketRewriter1_21_5.downgradeItemData;
 import static com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.BlockItemPacketRewriter1_21_5.updateItemData;
@@ -151,12 +154,9 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
             final int affectedItems = Limit.max(wrapper.passthrough(Types.VAR_INT), 128);
             for (int i = 0; i < affectedItems; i++) {
                 wrapper.passthrough(Types.SHORT); // Slot
-                final Item item = handleItemToServer(wrapper.user(), wrapper.read(mappedItemType()));
-                wrapper.write(Types.HASHED_ITEM, ItemHasherBase.toHashedItem(hashedItemConverter.hasher(), item));
+                itemToHashedItem(wrapper, hashedItemConverter);
             }
-
-            final Item carriedItem = handleItemToServer(wrapper.user(), wrapper.read(mappedItemType()));
-            wrapper.write(Types.HASHED_ITEM, ItemHasherBase.toHashedItem(hashedItemConverter.hasher(), carriedItem));
+            itemToHashedItem(wrapper, hashedItemConverter);
         });
 
         protocol.replaceClientbound(ClientboundPackets1_21_5.SET_EQUIPMENT, wrapper -> {
@@ -248,7 +248,27 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
 
             wrapper.read(Types.BOOLEAN); // Show advancements
         });
+    }
 
+    private void itemToHashedItem(final PacketWrapper wrapper, final HashedItemConverterStorage hashedItemConverter) {
+        final Item item = wrapper.read(mappedItemType());
+        final HashedItem originalHash = originalHashedItemFromBackup(item);
+        if (originalHash != null) {
+            // Will be restored in a later protocol
+            wrapper.write(Types.HASHED_ITEM, originalHash);
+        } else {
+            final Item serverItem = handleItemToServer(wrapper.user(), item);
+            wrapper.write(Types.HASHED_ITEM, ItemHasherBase.toHashedItem(hashedItemConverter.hasher(), serverItem));
+        }
+    }
+
+    private @Nullable OriginalHashedItem originalHashedItemFromBackup(final Item item) {
+        final CompoundTag customData = item.dataContainer().get(StructuredDataKey.CUSTOM_DATA);
+        final CompoundTag originalHashes;
+        if (customData == null || (originalHashes = customData.getCompoundTag("VV|original_hashes")) == null) {
+            return null;
+        }
+        return backedUpOriginalHashes(originalHashes, item);
     }
 
     private void convertClientAsset(final PacketWrapper wrapper) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java

@@ -136,62 +136,17 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
     protected void registerRewrites() {
         final EntityDataTypes1_21_5 entityDataTypes = VersionedTypes.V1_21_5.entityDataTypes;
         final EntityDataTypes1_21_2 mappedEntityDataTypes = VersionedTypes.V1_21_4.entityDataTypes;
-        filter().handler((event, data) -> {
-            final int id = data.dataType().typeId();
-            if (id == entityDataTypes.wolfVariantType.typeId()) {
-                final int type = data.value();
-                final Holder<WolfVariant> variant = Holder.of(type);
-                data.setTypeAndValue(mappedEntityDataTypes.wolfVariantType, variant);
-                return;
-            } else if (id == entityDataTypes.frogVariantType.typeId()) {
-                final int value = data.value();
-                final String variantKey = protocol.getRegistryDataRewriter().getMappings("frog_variant").idToKey(value);
-                final int newValue = (variantKey == null) ? 0 : switch (variantKey) {
-                    case "cold" -> 2;
-                    case "temperate" -> 0;
-                    case "warm" -> 1;
-                    default -> 0;
-                };
-                data.setTypeAndValue(mappedEntityDataTypes.frogVariantType, newValue);
-                return;
-            } else if (id == entityDataTypes.catVariantType.typeId()) {
-                final int value = data.value();
-                final String variantKey = protocol.getRegistryDataRewriter().getMappings("cat_variant").idToKey(value);
-                final int newValue = (variantKey == null) ? 1 : switch (variantKey) {
-                    case "all_black" -> 10;
-                    case "black" -> 1;
-                    case "british_shorthair" -> 4;
-                    case "calico" -> 5;
-                    case "jellie" -> 9;
-                    case "persian" -> 6;
-                    case "ragdoll" -> 7;
-                    case "red" -> 2;
-                    case "siamese" -> 3;
-                    case "tabby" -> 0;
-                    case "white" -> 8;
-                    default -> 1;
-                };
-                data.setTypeAndValue(mappedEntityDataTypes.catVariantType, newValue);
-                return;
-            }
-
-            int mappedId = id;
-            if (id == entityDataTypes.cowVariantType.typeId()
-                || id == entityDataTypes.pigVariantType.typeId()
-                || id == entityDataTypes.chickenVariantType.typeId()
-                || id == entityDataTypes.wolfSoundVariantType.typeId()) {
-                event.cancel();
-                return;
-            } else if (id > entityDataTypes.chickenVariantType.typeId()) {
-                mappedId -= 4;
-            } else if (id > entityDataTypes.pigVariantType.typeId()) {
-                mappedId -= 3;
-            } else if (id > entityDataTypes.wolfSoundVariantType.typeId()) {
-                mappedId -= 2;
-            } else if (id > entityDataTypes.cowVariantType.typeId()) {
-                mappedId -= 1;
-            }
-            data.setDataType(mappedEntityDataTypes.byId(mappedId));
+        dataTypeMapper()
+            .removed(entityDataTypes.cowVariantType)
+            .removed(entityDataTypes.wolfSoundVariantType)
+            .removed(entityDataTypes.pigVariantType)
+            .removed(entityDataTypes.chickenVariantType)
+            .skip(entityDataTypes.wolfVariantType)
+            .register();
+        filter().dataType(entityDataTypes.wolfVariantType).handler((event, data) -> {
+            final int type = data.value();
+            final Holder<WolfVariant> variant = Holder.of(type);
+            data.setTypeAndValue(mappedEntityDataTypes.wolfVariantType, variant);
         });
 
         registerEntityDataTypeHandler1_20_3(
@@ -204,6 +159,37 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
             mappedEntityDataTypes.optionalComponentType
         );
 
+        filter().dataType(mappedEntityDataTypes.frogVariantType).handler((event, data) -> {
+            final int value = data.value();
+            final String variantKey = tracker(event.user()).registryKeys("frog_variant").idToKey(value);
+            final int newValue = (variantKey == null) ? 0 : switch (variantKey) {
+                case "cold" -> 2;
+                case "temperate" -> 0;
+                case "warm" -> 1;
+                default -> 0;
+            };
+            data.setValue(newValue);
+        });
+        filter().dataType(mappedEntityDataTypes.catVariantType).handler((event, data) -> {
+            final int value = data.value();
+            final String variantKey = tracker(event.user()).registryKeys("cat_variant").idToKey(value);
+            final int newValue = (variantKey == null) ? 1 : switch (variantKey) {
+                case "all_black" -> 10;
+                case "black" -> 1;
+                case "british_shorthair" -> 4;
+                case "calico" -> 5;
+                case "jellie" -> 9;
+                case "persian" -> 6;
+                case "ragdoll" -> 7;
+                case "red" -> 2;
+                case "siamese" -> 3;
+                case "tabby" -> 0;
+                case "white" -> 8;
+                default -> 1;
+            };
+            data.setValue(newValue);
+        });
+
         filter().type(EntityTypes1_21_5.ABSTRACT_MINECART).addIndex(13); // Custom display
         filter().type(EntityTypes1_21_5.ABSTRACT_MINECART).index(11).handler((event, data) -> {
             final int state = (int) data.getValue();
@@ -240,7 +226,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
 
         filter().type(EntityTypes1_21_5.CHICKEN).cancel(17); // Chicken variant
         filter().type(EntityTypes1_21_5.COW).cancel(17); // Cow variant
-        filter().type(EntityTypes1_21_5.PIG).cancel(19); // Pig variant
+        filter().type(EntityTypes1_21_5.PIG).cancel(18); // Pig variant
         filter().type(EntityTypes1_21_5.WOLF).cancel(23); // Sound variant
         filter().type(EntityTypes1_21_5.EXPERIENCE_ORB).cancel(8); // Value
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/storage/HashedItemConverterStorage.java

@@ -18,6 +18,7 @@
 package com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.storage;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.codec.CodecContext;
 import com.viaversion.viaversion.api.minecraft.codec.CodecContext.RegistryAccess;
 import com.viaversion.viaversion.api.minecraft.codec.hash.Hasher;
@@ -30,8 +31,8 @@ public class HashedItemConverterStorage implements StorableObject {
 
     private final Hasher hasher;
 
-    public HashedItemConverterStorage(final Protocol<?, ?, ?, ?> protocol) {
-        final RegistryAccess registryAccess = RegistryAccess.of(protocol);
+    public HashedItemConverterStorage(final Protocol<?, ?, ?, ?> protocol, final UserConnection connection) {
+        final RegistryAccess registryAccess = RegistryAccess.of(protocol, connection);
         final CodecContext context = new CodecRegistryContext(protocol, registryAccess, false);
         this.hasher = new HashOps(context, HashFunction.CRC32C);
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java

@@ -93,6 +93,9 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
+        replaceClientbound(ClientboundPackets1_21_6.UPDATE_TAGS, this::updateTags);
+        replaceClientbound(ClientboundConfigurationPackets1_21_6.UPDATE_TAGS, this::updateTags);
+
         appendClientbound(ClientboundPackets1_21_6.SOUND, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Source
             fixSoundSource(wrapper);
@@ -238,34 +241,24 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
     }
 
     private void updateTags(final PacketWrapper wrapper) {
-        tagRewriter.handleGeneric(wrapper);
-        wrapper.resetReader();
-
+        // Store dialog tags; then call the normal rewriter which will remove them before sending to the client
         final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
         final int length = wrapper.passthrough(Types.VAR_INT);
         for (int i = 0; i < length; i++) {
-            final String registryKey = wrapper.read(Types.STRING);
+            final String registryKey = wrapper.passthrough(Types.STRING);
             final boolean dialog = "dialog".equals(Key.stripMinecraftNamespace(registryKey));
-            if (dialog) {
-                final int tagsSize = wrapper.read(Types.VAR_INT);
-                for (int j = 0; j < tagsSize; j++) {
-                    final String key = wrapper.read(Types.STRING);
-                    final int[] ids = wrapper.read(Types.VAR_INT_ARRAY_PRIMITIVE);
+            final int tagsSize = wrapper.passthrough(Types.VAR_INT);
+            for (int j = 0; j < tagsSize; j++) {
+                final String key = wrapper.passthrough(Types.STRING);
+                final int[] ids = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
+                if (dialog) {
                     registryAndTags.storeTags(key, ids);
                 }
-            } else {
-                wrapper.write(Types.STRING, registryKey); // Write back
-                final int tagsSize = wrapper.passthrough(Types.VAR_INT);
-                for (int j = 0; j < tagsSize; j++) {
-                    wrapper.passthrough(Types.STRING);
-                    wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-                }
             }
         }
 
-        if (registryAndTags.tagsSent()) {
-            wrapper.set(Types.VAR_INT, 0, length - 1); // Dialog tags have been read, remove from size
-        }
+        wrapper.resetReader();
+        tagRewriter.handleGeneric(wrapper);
     }
 
     private void clearDialog(final PacketWrapper wrapper) {
@@ -307,7 +300,7 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
     @Override
     public void init(final UserConnection user) {
         addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_6.PLAYER));
-        addItemHasher(user, new ItemHasherBase(this, user));
+        user.addItemHasher(this.getClass(), new ItemHasherBase(this, user));
         user.put(new RegistryAndTags());
         user.put(new ClickEvents());
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/EntityPacketRewriter1_21_6.java

@@ -84,7 +84,7 @@ public final class EntityPacketRewriter1_21_6 extends EntityRewriter<Clientbound
     @Override
     protected void registerRewrites() {
         final EntityDataTypes1_21_5 entityDataTypes = VersionedTypes.V1_21_5.entityDataTypes;
-        filter().mapDataType(entityDataTypes::byId);
+        dataTypeMapper().register();
         registerEntityDataTypeHandler1_20_3(
             entityDataTypes.itemType,
             entityDataTypes.blockStateType,

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/storage/RegistryAndTags.java

@@ -44,10 +44,6 @@ public final class RegistryAndTags implements StorableObject {
         return dialogs.get(Key.stripMinecraftNamespace(key));
     }
 
-    public boolean tagsSent() {
-        return dialogTags != null && !dialogTags.isEmpty();
-    }
-
     public void storeTags(final String key, final int[] ids) {
         if (dialogTags == null) {
             dialogTags = new Object2ObjectArrayMap<>();
@@ -55,12 +51,8 @@ public final class RegistryAndTags implements StorableObject {
         dialogTags.put(Key.stripMinecraftNamespace(key), ids);
     }
 
-    public int[] fromKey(final String key) {
-        return dialogTags.get(Key.stripMinecraftNamespace(key));
-    }
-
     public CompoundTag[] fromRegistryKey(final String key) {
-        final int[] ids = fromKey(key);
+        final int[] ids = dialogTags.get(Key.stripMinecraftNamespace(key));
         if (ids == null) {
             return null;
         }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java

@@ -68,7 +68,7 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_6.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.addItemHasher(this.getClass(), new ItemHasherBase(this, connection));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java

@@ -193,7 +193,7 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTracker1_21_9(connection, EntityTypes1_21_9.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.addItemHasher(this.getClass(), new ItemHasherBase(this, connection));
         connection.put(new PlayerRotationStorage());
         connection.put(new DimensionScaleStorage());
         connection.put(new BundleStateTracker());

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java

@@ -338,27 +338,12 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
     @Override
     protected void registerRewrites() {
         final EntityDataTypes1_21_5 entityDataTypes = protocol.mappedTypes().entityDataTypes();
-        filter().handler((event, data) -> {
-            int id = data.dataType().typeId();
-            if (id == VersionedTypes.V1_21_9.entityDataTypes.copperGolemState.typeId()
-                || id == VersionedTypes.V1_21_9.entityDataTypes.weatheringCopperState.typeId()) {
-                event.cancel();
-                return;
-            }
-            if (id == VersionedTypes.V1_21_9.entityDataTypes.mannequinProfileType.typeId()) {
-                if (event.entityType() == null) {
-                    event.cancel();
-                }
-                return; // Handled separately
-            }
-            if (id > VersionedTypes.V1_21_9.entityDataTypes.armadilloState.typeId()) {
-                id -= 2;
-            }
-            if (id >= entityDataTypes.compoundTagType.typeId()) {
-                id++;
-            }
-            data.setDataType(entityDataTypes.byId(id));
-        });
+        dataTypeMapper()
+            .added(entityDataTypes.compoundTagType)
+            .removed(VersionedTypes.V1_21_9.entityDataTypes.copperGolemState)
+            .removed(VersionedTypes.V1_21_9.entityDataTypes.weatheringCopperState)
+            .removed(VersionedTypes.V1_21_9.entityDataTypes.mannequinProfileType)
+            .register();
 
         registerEntityDataTypeHandler1_20_3(
             entityDataTypes.itemType,
@@ -370,11 +355,14 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
             entityDataTypes.optionalComponentType
         );
 
+        filter().type(EntityTypes1_21_9.COPPER_GOLEM).cancel(16); // Weather state
+        filter().type(EntityTypes1_21_9.COPPER_GOLEM).cancel(17); // Golem state
+
         final EntityDataHandler shoulderDataHandler = (event, data) -> {
             final CompoundTag entityTag = new CompoundTag();
             final Integer value = data.value();
             if (value != null) {
-                entityTag.putInt("id", EntityTypes1_21_6.PARROT.getId());
+                entityTag.putString("id", "parrot");
                 entityTag.putInt("Variant", value);
             }
             data.setTypeAndValue(protocol.mappedTypes().entityDataTypes.compoundTagType, entityTag);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java

@@ -29,7 +29,6 @@ import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.WolfVariant;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
-import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_20_5;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
@@ -147,26 +146,27 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
     @Override
     protected void registerRewrites() {
         final EntityDataTypes1_20_5 mappedEntityDataTypes = VersionedTypes.V1_20_5.entityDataTypes;
-        filter().handler((event, data) -> {
-            final EntityDataType type = data.dataType();
-            if (type == VersionedTypes.V1_21.entityDataTypes.wolfVariantType) {
-                final Holder<WolfVariant> variant = data.value();
-                if (variant.hasId()) {
-                    data.setTypeAndValue(mappedEntityDataTypes.wolfVariantType, variant.id());
-                } else {
-                    event.cancel();
-                }
-            } else if (type == VersionedTypes.V1_21.entityDataTypes.paintingVariantType) {
-                final Holder<PaintingVariant> variant = data.value();
-                if (variant.hasId()) {
-                    final EnchantmentsPaintingsStorage storage = event.user().get(EnchantmentsPaintingsStorage.class);
-                    final int mappedId = storage.mappedPainting(variant.id());
-                    data.setTypeAndValue(mappedEntityDataTypes.paintingVariantType, mappedId);
-                } else {
-                    event.cancel();
-                }
+        dataTypeMapper()
+            .skip(VersionedTypes.V1_21.entityDataTypes.wolfVariantType)
+            .skip(VersionedTypes.V1_21.entityDataTypes.paintingVariantType)
+            .register();
+
+        filter().dataType(VersionedTypes.V1_21.entityDataTypes.wolfVariantType).handler((event, data) -> {
+            final Holder<WolfVariant> variant = data.value();
+            if (variant.hasId()) {
+                data.setTypeAndValue(mappedEntityDataTypes.wolfVariantType, variant.id());
             } else {
-                data.setDataType(mappedEntityDataTypes.byId(type.typeId()));
+                event.cancel();
+            }
+        });
+        filter().dataType(VersionedTypes.V1_21.entityDataTypes.paintingVariantType).handler((event, data) -> {
+            final Holder<PaintingVariant> variant = data.value();
+            if (variant.hasId()) {
+                final EnchantmentsPaintingsStorage storage = event.user().get(EnchantmentsPaintingsStorage.class);
+                final int mappedId = storage.mappedPainting(variant.id());
+                data.setTypeAndValue(mappedEntityDataTypes.paintingVariantType, mappedId);
+            } else {
+                event.cancel();
             }
         });
         registerEntityDataTypeHandler1_20_3(

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java

@@ -27,6 +27,7 @@ import com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter.BlockItemPac
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter.ComponentRewriter26_1;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter.EntityPacketRewriter26_1;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.DayTimeStorage;
+import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.GameModeStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_11;
@@ -88,9 +89,11 @@ public final class Protocol26_1To1_21_11 extends BackwardsProtocol<ClientboundPa
         // Remove new environment attributes
         registryDataRewriter.addHandler("dimension_type", (key, tag) -> {
             final CompoundTag attributes = tag.getCompoundTag("attributes");
-            removeNamespaced(attributes, "visual/block_light_tint");
-            removeNamespaced(attributes, "visual/night_vision_color");
-            removeNamespaced(attributes, "visual/ambient_light_color");
+            if (attributes != null) {
+                removeNamespaced(attributes, "visual/block_light_tint");
+                removeNamespaced(attributes, "visual/night_vision_color");
+                removeNamespaced(attributes, "visual/ambient_light_color");
+            }
         });
 
         // Move around entity variant names and sounds
@@ -127,7 +130,7 @@ public final class Protocol26_1To1_21_11 extends BackwardsProtocol<ClientboundPa
                 final long totalTicks = wrapper.read(Types.VAR_LONG);
                 wrapper.read(Types.FLOAT); // Partial tick
                 final float tickRate = wrapper.read(Types.FLOAT);
-                if (Key.equals(registryDataRewriter.getMappings("world_clock").idToKey(clockType), "overworld")) {
+                if (Key.equals(entityRewriter.tracker(wrapper.user()).registryKeys("world_clock").idToKey(clockType), "overworld")) {
                     dayTime = totalTicks;
                     advanceTime = tickRate != 0;
                 }
@@ -166,8 +169,9 @@ public final class Protocol26_1To1_21_11 extends BackwardsProtocol<ClientboundPa
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_11.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.addItemHasher(this.getClass(), new ItemHasherBase(this, connection));
         connection.put(new DayTimeStorage());
+        connection.put(new GameModeStorage());
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java

@@ -45,7 +45,7 @@ public final class BlockItemPacketRewriter26_1 extends BackwardsStructuredItemRe
     @Override
     protected void handleItemDataComponentsToServer(final UserConnection connection, final Item item, final StructuredDataContainer container) {
         super.handleItemDataComponentsToServer(connection, item, container);
-        upgradeData(protocol, protocol.types().structuredDataKeys(), container);
+        upgradeData(protocol, connection, protocol.types().structuredDataKeys(), container);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/EntityPacketRewriter26_1.java

@@ -19,6 +19,8 @@ package com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter;
 
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.Protocol26_1To1_21_11;
+import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.GameModeStorage;
+import com.viaversion.viaversion.api.minecraft.GameMode;
 import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
@@ -27,6 +29,7 @@ import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes2
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPackets26_1;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 
@@ -42,13 +45,31 @@ public final class EntityPacketRewriter26_1 extends EntityRewriter<ClientboundPa
 
     @Override
     public void registerPackets() {
+        protocol.appendClientbound(ClientboundPackets26_1.RESPAWN, wrapper -> {
+            final byte gamemode = wrapper.get(Types.BYTE, 0);
+            wrapper.user().get(GameModeStorage.class).setGameMode(gamemode);
+        });
+        protocol.appendClientbound(ClientboundPackets26_1.LOGIN, wrapper -> {
+            final byte gamemode = wrapper.get(Types.BYTE, 0);
+            wrapper.user().get(GameModeStorage.class).setGameMode(gamemode);
+        });
+        protocol.appendClientbound(ClientboundPackets26_1.GAME_EVENT, wrapper -> {
+            wrapper.resetReader();
+            final short event = wrapper.passthrough(Types.UNSIGNED_BYTE);
+            if (event == 3) {
+                final int value = (int) Math.floor(wrapper.passthrough(Types.FLOAT) + 0.5F);
+                wrapper.user().get(GameModeStorage.class).setGameMode(value);
+            }
+        });
+
         protocol.registerServerbound(ServerboundPackets1_21_6.INTERACT, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
             final int action = wrapper.read(Types.VAR_INT);
             switch (action) {
                 case INTERACT_ACTION -> wrapper.cancel(); // Drop "normal" interacts, as interact_at is always sent by Vanilla clients, and always sent first, with this following after
                 case ATTACK_ACTION -> {
-                    wrapper.setPacketType(ServerboundPackets26_1.ATTACK);
+                    final boolean spectator = wrapper.user().get(GameModeStorage.class).gameMode() == GameMode.SPECTATOR.id();
+                    wrapper.setPacketType(spectator ? ServerboundPackets26_1.SPECTATE_ENTITY : ServerboundPackets26_1.ATTACK);
                     wrapper.read(Types.BOOLEAN); // Using secondary action
                 }
                 case INTERACT_AT_ACTION -> {
@@ -68,26 +89,12 @@ public final class EntityPacketRewriter26_1 extends EntityRewriter<ClientboundPa
     protected void registerRewrites() {
         final EntityDataTypes26_1 entityDataTypes = VersionedTypes.V26_1.entityDataTypes;
         final EntityDataTypes1_21_11 mappedEntityDataTypes = VersionedTypes.V1_21_11.entityDataTypes;
-        filter().handler((event, data) -> {
-            final int id = data.dataType().typeId();
-            int mappedId = id;
-            if (id == entityDataTypes.catSoundVariant.typeId()
-                || id == entityDataTypes.cowSoundVariant.typeId()
-                || id == entityDataTypes.pigSoundVariant.typeId()
-                || id == entityDataTypes.chickenSoundVariant.typeId()) {
-                event.cancel();
-                return;
-            } else if (id > entityDataTypes.chickenSoundVariant.typeId()) {
-                mappedId -= 4;
-            } else if (id > entityDataTypes.pigSoundVariant.typeId()) {
-                mappedId -= 3;
-            } else if (id > entityDataTypes.cowSoundVariant.typeId()) {
-                mappedId -= 2;
-            } else if (id > entityDataTypes.catSoundVariant.typeId()) {
-                mappedId -= 1;
-            }
-            data.setDataType(mappedEntityDataTypes.byId(mappedId));
-        });
+        dataTypeMapper()
+            .removed(entityDataTypes.catSoundVariant)
+            .removed(entityDataTypes.cowSoundVariant)
+            .removed(entityDataTypes.pigSoundVariant)
+            .removed(entityDataTypes.chickenSoundVariant)
+            .register();
         registerEntityDataTypeHandler1_20_3(
             mappedEntityDataTypes.itemType,
             mappedEntityDataTypes.blockStateType,

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/storage/DayTimeStorage.java

@@ -34,7 +34,9 @@ public final class DayTimeStorage implements StorableObject {
     }
 
     public long setGameTimeAndUpdateDayTime(final long gameTime) {
-        this.dayTime += gameTime - this.gameTime;
+        if (advanceTime) {
+            this.dayTime += gameTime - this.gameTime;
+        }
         this.gameTime = gameTime;
         return dayTime;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/storage/GameModeStorage.java

@@ -0,0 +1,33 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+
+public final class GameModeStorage implements StorableObject {
+
+    private int gameMode = -1;
+
+    public int gameMode() {
+        return gameMode;
+    }
+
+    public void setGameMode(final int gameMode) {
+        this.gameMode = gameMode;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/v26_2to26_1/Protocol26_2To26_1.java

@@ -0,0 +1,195 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.protocol.v26_2to26_1;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.data.BackwardsMappingData;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter.BlockItemPacketRewriter26_2;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter.ComponentRewriter26_2;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter.EntityPacketRewriter26_2;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_11;
+import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys26_2;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes26_1;
+import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
+import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType26_1;
+import com.viaversion.viaversion.api.type.types.version.Types26_1;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
+import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPackets26_1;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundConfigurationPackets1_21_9;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundConfigurationPackets1_21_9;
+import com.viaversion.viaversion.protocols.v26_1to26_2.Protocol26_1To26_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
+import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
+import com.viaversion.viaversion.util.Key;
+
+import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
+
+public final class Protocol26_2To26_1 extends BackwardsProtocol<ClientboundPacket26_1, ClientboundPacket26_1, ServerboundPacket26_1, ServerboundPacket26_1> {
+
+    public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("26.2", "26.1", Protocol26_1To26_2.class);
+    private static final int WHITE_TEAM_COLOR = 15;
+    private final EntityPacketRewriter26_2 entityRewriter = new EntityPacketRewriter26_2(this);
+    private final BlockItemPacketRewriter26_2 itemRewriter = new BlockItemPacketRewriter26_2(this);
+    private final ParticleRewriter<ClientboundPacket26_1> particleRewriter = new ParticleRewriter<>(this);
+    private final NBTComponentRewriter<ClientboundPacket26_1> translatableRewriter = new ComponentRewriter26_2(this);
+    private final TagRewriter<ClientboundPacket26_1> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPacket26_1> blockRewriter = new BlockRewriter1_21_5<>(this, ChunkType26_1::new);
+    private final RecipeDisplayRewriter<ClientboundPacket26_1> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this) {
+        @Override
+        public void updateEnchantmentTerm(final CompoundTag term) {
+            super.updateEnchantmentTerm(term);
+
+            final String condition = term.getString("condition");
+            if (Key.equals(condition, "entity_properties")) {
+                final CompoundTag predicate = term.getCompoundTag("predicate");
+                final Tag typeTag = predicate.remove("entity_type");
+                if (typeTag != null) {
+                    predicate.put("type", typeTag);
+                }
+            }
+        }
+    };
+
+    public Protocol26_2To26_1() {
+        super(ClientboundPacket26_1.class, ClientboundPacket26_1.class, ServerboundPacket26_1.class, ServerboundPacket26_1.class);
+    }
+
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+        replaceClientbound(ClientboundPackets26_1.SET_PLAYER_TEAM, wrapper -> {
+            wrapper.passthrough(Types.STRING); // Team Name
+            final byte action = wrapper.passthrough(Types.BYTE); // Mode
+            if (action == 0 || action == 2) {
+                translatableRewriter.passthroughAndProcess(wrapper); // Display name
+
+                final Tag prefix = wrapper.read(Types.TAG);
+                final Tag suffix = wrapper.read(Types.TAG);
+                translatableRewriter.processTag(wrapper.user(), prefix);
+                translatableRewriter.processTag(wrapper.user(), suffix);
+                final int nametagVisibility = wrapper.read(Types.VAR_INT);
+                final int collisionRule = wrapper.read(Types.VAR_INT);
+                final Integer color = wrapper.read(Types.BOOL_OPTIONAL_VAR_INT);
+                final byte flags = wrapper.read(Types.BYTE);
+
+                wrapper.write(Types.BYTE, flags);
+                wrapper.write(Types.VAR_INT, nametagVisibility);
+                wrapper.write(Types.VAR_INT, collisionRule);
+                wrapper.write(Types.VAR_INT, color != null ? color : WHITE_TEAM_COLOR);
+                wrapper.write(Types.TAG, prefix);
+                wrapper.write(Types.TAG, suffix);
+            }
+        });
+
+        registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_FINISHED, wrapper -> {
+            wrapper.passthrough(Types.UUID); // UUID
+            wrapper.passthrough(Types.STRING); // Name
+            wrapper.passthrough(Types.PROFILE_PROPERTY_ARRAY);
+
+            wrapper.read(Types.UUID); // Session ID
+        });
+    }
+
+    @Override
+    public void init(final UserConnection connection) {
+        addEntityTracker(connection);
+        addItemHasher(connection);
+    }
+
+    @Override
+    public BackwardsMappingData getMappingData() {
+        return MAPPINGS;
+    }
+
+    @Override
+    public EntityPacketRewriter26_2 getEntityRewriter() {
+        return entityRewriter;
+    }
+
+    @Override
+    public BlockItemPacketRewriter26_2 getItemRewriter() {
+        return itemRewriter;
+    }
+
+    @Override
+    public BlockRewriter<ClientboundPacket26_1> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket26_1> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
+    @Override
+    public ParticleRewriter<ClientboundPacket26_1> getParticleRewriter() {
+        return particleRewriter;
+    }
+
+    @Override
+    public NBTComponentRewriter<ClientboundPacket26_1> getComponentRewriter() {
+        return translatableRewriter;
+    }
+
+    @Override
+    public TagRewriter<ClientboundPacket26_1> getTagRewriter() {
+        return tagRewriter;
+    }
+
+    @Override
+    public Types26_1<StructuredDataKeys26_2, EntityDataTypes26_1> types() {
+        return VersionedTypes.V26_2;
+    }
+
+    @Override
+    public Types26_1<StructuredDataKeys1_21_11, EntityDataTypes26_1> mappedTypes() {
+        return VersionedTypes.V26_1;
+    }
+
+    @Override
+    protected PacketTypesProvider<ClientboundPacket26_1, ClientboundPacket26_1, ServerboundPacket26_1, ServerboundPacket26_1> createPacketTypesProvider() {
+        return new SimplePacketTypesProvider<>(
+            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets26_1.class, ClientboundConfigurationPackets1_21_9.class),
+            packetTypeMap(mappedClientboundPacketType, ClientboundPackets26_1.class, ClientboundConfigurationPackets1_21_9.class),
+            packetTypeMap(mappedServerboundPacketType, ServerboundPackets26_1.class, ServerboundConfigurationPackets1_21_9.class),
+            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets26_1.class, ServerboundConfigurationPackets1_21_9.class)
+        );
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/v26_2to26_1/rewriter/BlockItemPacketRewriter26_2.java

@@ -0,0 +1,59 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.Protocol26_2To26_1;
+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.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPacket26_1;
+
+import static com.viaversion.viaversion.protocols.v26_1to26_2.rewriter.BlockItemPacketRewriter26_2.downgradeData;
+import static com.viaversion.viaversion.protocols.v26_1to26_2.rewriter.BlockItemPacketRewriter26_2.upgradeData;
+
+public final class BlockItemPacketRewriter26_2 extends BackwardsStructuredItemRewriter<ClientboundPacket26_1, ServerboundPacket26_1, Protocol26_2To26_1> {
+
+    public BlockItemPacketRewriter26_2(final Protocol26_2To26_1 protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected void handleItemDataComponentsToClient(final UserConnection connection, final Item item, final StructuredDataContainer container) {
+        super.handleItemDataComponentsToClient(connection, item, container);
+        downgradeData(protocol.types().structuredDataKeys(), container);
+    }
+
+    @Override
+    protected void handleItemDataComponentsToServer(final UserConnection connection, final Item item, final StructuredDataContainer container) {
+        super.handleItemDataComponentsToServer(connection, item, container);
+        upgradeData(container);
+    }
+
+    @Override
+    protected void restoreBackupData(final Item item, final StructuredDataContainer container, final CompoundTag customData) {
+        super.restoreBackupData(item, container, customData);
+    }
+
+    @Override
+    protected void backupInconvertibleData(final UserConnection connection, final Item item, final StructuredDataContainer dataContainer, final CompoundTag backupTag) {
+        super.backupInconvertibleData(connection, item, dataContainer, backupTag);
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/v26_2to26_1/rewriter/ComponentRewriter26_2.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+
+public final class ComponentRewriter26_2 extends NBTComponentRewriter<ClientboundPacket26_1> {
+
+    public ComponentRewriter26_2(final BackwardsProtocol<ClientboundPacket26_1, ?, ?, ?> protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected void handleShowItem(final UserConnection connection, final CompoundTag itemTag, final CompoundTag componentsTag) {
+        super.handleShowItem(connection, itemTag, componentsTag);
+        if (componentsTag == null) {
+            return;
+        }
+
+        removeDataComponents(componentsTag, "sulfur_cube_content");
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/v26_2to26_1/rewriter/EntityPacketRewriter26_2.java

@@ -0,0 +1,89 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.protocol.v26_2to26_1.rewriter;
+
+import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
+import com.viaversion.viabackwards.protocol.v26_2to26_1.Protocol26_2To26_1;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes26_2;
+import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes26_1;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPackets26_1;
+
+public final class EntityPacketRewriter26_2 extends EntityRewriter<ClientboundPacket26_1, Protocol26_2To26_1> {
+
+    private static final EntityDataTypes26_1 MAPPED_DATA_TYPES = VersionedTypes.V26_1.entityDataTypes;
+
+    public EntityPacketRewriter26_2(final Protocol26_2To26_1 protocol) {
+        super(protocol, MAPPED_DATA_TYPES.optionalComponentType, MAPPED_DATA_TYPES.booleanType);
+    }
+
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+
+        protocol.registerServerbound(ServerboundPackets26_1.SPECTATE_ENTITY, wrapper -> {
+            wrapper.passthroughAndMap(Types.VAR_INT, Types.OPTIONAL_VAR_INT);
+        });
+
+        protocol.appendClientbound(ClientboundPackets26_1.LOGIN, wrapper -> {
+            // Continuing from the registered handler
+            wrapper.passthrough(Types.BYTE); // Previous gamemode
+            wrapper.passthrough(Types.BOOLEAN); // Debug
+            wrapper.passthrough(Types.BOOLEAN); // Flat
+            wrapper.passthrough(Types.OPTIONAL_GLOBAL_POSITION); // Last death location
+            wrapper.passthrough(Types.VAR_INT); // Portal cooldown
+            wrapper.passthrough(Types.VAR_INT); // Sea level
+
+            wrapper.read(Types.BOOLEAN); // Online mode
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        dataTypeMapper().register();
+        registerEntityDataTypeHandler1_20_3(
+            MAPPED_DATA_TYPES.itemType,
+            MAPPED_DATA_TYPES.blockStateType,
+            MAPPED_DATA_TYPES.optionalBlockStateType,
+            MAPPED_DATA_TYPES.particleType,
+            MAPPED_DATA_TYPES.particlesType,
+            MAPPED_DATA_TYPES.componentType,
+            MAPPED_DATA_TYPES.optionalComponentType
+        );
+
+        filter().type(EntityTypes26_2.SULFUR_CUBE).cancel(19); // max fuse
+        filter().type(EntityTypes26_2.SULFUR_CUBE).cancel(20); // from bucket
+        filter().type(EntityTypes26_2.ABSTRACT_CUBE_MOB).removeIndex(17); // age locked
+        filter().type(EntityTypes26_2.ABSTRACT_CUBE_MOB).removeIndex(16); // baby
+    }
+
+    @Override
+    public void onMappingDataLoaded() {
+        super.onMappingDataLoaded();
+        mapEntityTypeWithData(EntityTypes26_2.SULFUR_CUBE, EntityTypes26_2.SLIME).tagName();
+    }
+
+    @Override
+    public EntityType typeFromId(final int type) {
+        return EntityTypes26_2.getTypeFromId(type);
+    }
+}

common/src/main/java/com/viaversion/viabackwards/utils/VelocityUtil.java

@@ -20,7 +20,11 @@ package com.viaversion.viabackwards.utils;
 public class VelocityUtil {
 
     public static short toLegacyVelocity(double value) {
-        return (short) Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, (long) (value * 8000)));
+        // Round instead of truncating toward zero. The 1.21.9+ LP-vector encoding is lossy: 0.4 b/t
+        // decodes as 0.39998779, and (long)(value * 8000) floors that to 3199 instead of 3200. Rounding
+        // restores the intended legacy short and matches a native 1.8 server, which sends 0.4 directly
+        // as (int)(0.4 * 8000) = 3200.
+        return (short) Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, Math.round(value * 8000)));
     }
 
 }

common/src/main/resources/assets/viabackwards/data/biome-mappings.json

@@ -26,5 +26,6 @@
   "mangrove_swamp": "swamp",
   "deep_dark": "mountains",
   "cherry_grove": "flower_forest",
-  "pale_garden": "gravelly_mountains"
+  "pale_garden": "gravelly_mountains",
+  "sulfur_caves": "dripstone_caves"
 }

common/src/main/resources/assets/viabackwards/data/translation-mappings.json

@@ -1,4 +1,223 @@
 {
+  "26.2": {
+    "advancements.husbandry.uh_oh.description": "Have a Sulfur Cube absorb a TNT block",
+    "advancements.husbandry.uh_oh.title": "Uh Oh",
+    "attribute.name.air_drag_modifier": "Air Drag Modifier",
+    "attribute.name.below_name_distance": "Name Tag Score Distance",
+    "attribute.name.bounciness": "Bounciness",
+    "attribute.name.friction_modifier": "Friction Modifier",
+    "attribute.name.nameplate_distance": "Name Tag Distance",
+    "biome.minecraft.sulfur_caves": "Sulfur Caves",
+    "block.minecraft.chiseled_cinnabar": "Chiseled Cinnabar",
+    "block.minecraft.chiseled_sulfur": "Chiseled Sulfur",
+    "block.minecraft.cinnabar": "Cinnabar",
+    "block.minecraft.cinnabar_brick_slab": "Cinnabar Brick Slab",
+    "block.minecraft.cinnabar_brick_stairs": "Cinnabar Brick Stairs",
+    "block.minecraft.cinnabar_brick_wall": "Cinnabar Brick Wall",
+    "block.minecraft.cinnabar_bricks": "Cinnabar Bricks",
+    "block.minecraft.cinnabar_slab": "Cinnabar Slab",
+    "block.minecraft.cinnabar_stairs": "Cinnabar Stairs",
+    "block.minecraft.cinnabar_wall": "Cinnabar Wall",
+    "block.minecraft.polished_cinnabar": "Polished Cinnabar",
+    "block.minecraft.polished_cinnabar_slab": "Polished Cinnabar Slab",
+    "block.minecraft.polished_cinnabar_stairs": "Polished Cinnabar Stairs",
+    "block.minecraft.polished_cinnabar_wall": "Polished Cinnabar Wall",
+    "block.minecraft.polished_sulfur": "Polished Sulfur",
+    "block.minecraft.polished_sulfur_slab": "Polished Sulfur Slab",
+    "block.minecraft.polished_sulfur_stairs": "Polished Sulfur Stairs",
+    "block.minecraft.polished_sulfur_wall": "Polished Sulfur Wall",
+    "block.minecraft.potent_sulfur": "Potent Sulfur",
+    "block.minecraft.sulfur": "Sulfur",
+    "block.minecraft.sulfur_brick_slab": "Sulfur Brick Slab",
+    "block.minecraft.sulfur_brick_stairs": "Sulfur Brick Stairs",
+    "block.minecraft.sulfur_brick_wall": "Sulfur Brick Wall",
+    "block.minecraft.sulfur_bricks": "Sulfur Bricks",
+    "block.minecraft.sulfur_slab": "Sulfur Slab",
+    "block.minecraft.sulfur_spike": "Sulfur Spike",
+    "block.minecraft.sulfur_stairs": "Sulfur Stairs",
+    "block.minecraft.sulfur_wall": "Sulfur Wall",
+    "commands.publish.alreadyPublished.lan": "Local game is already hosted on port %s",
+    "commands.publish.alreadyPublished.online": "Online game is already hosted",
+    "commands.publish.started.online": "Online game hosted",
+    "commands.team.option.color.clear.success": "Cleared the color for team %s",
+    "commands.unpublish.notPublished": "No multiplayer game published",
+    "commands.unpublish.success": "Multiplayer game is now unpublished",
+    "connect.p2p.establishing": "Establishing connection...",
+    "connect.p2p.failed.generic": "Couldn't connect to player",
+    "connect.p2p.failed.signaling": "It is not possible to connect right now.\nTry again later.",
+    "connect.p2p.failed.timeout": "Connection request timed out",
+    "connect.p2p.failed.unreachable": "Player isn't reachable",
+    "death.attack.sulfurCubeHot": "%1$s died because not just the floor is lava",
+    "death.attack.sulfurCubeHot.player": "%2$s showed %1$s that not just the floor is lava",
+    "editGamerule.inGame.disabled.hardcore.tooltip": "Cannot change game rules in a hardcore world.",
+    "entity.minecraft.sulfur_cube": "Sulfur Cube",
+    "entity.minecraft.sulfur_cube.content": "Contains: %s",
+    "generator.minecraft.flat_all_dimensions": "Flat All Dimensions",
+    "gui.friends.button.loading": "Wait...",
+    "gui.friends.button.loading.invite_request_pending": "Waiting for confirmation",
+    "gui.friends.button.loading.join_request_pending": "Waiting for confirmation",
+    "gui.friends.cancel_request": "Cancel request",
+    "gui.friends.confirm_title": "Confirm",
+    "gui.friends.confirm_unfriend": "Are you sure you want to remove this player from your Friends List?",
+    "gui.friends.decline": "Decline",
+    "gui.friends.empty_nickname": "Enter a valid profile name before sending a friend request",
+    "gui.friends.empty_state": "Friends you add will be listed here.\n\nManage online safety with your %s.",
+    "gui.friends.empty_state.link": "Microsoft account",
+    "gui.friends.enter_nickname": "Enter Profile Name",
+    "gui.friends.error.connection_issue": "Friends List is not working right now.\n\nCheck your internet connection and try again.",
+    "gui.friends.error.failed.message": "Unable to send your friend request right now",
+    "gui.friends.error.forbidden.message": "Failed to perform this friend action. It may be due to the account's privacy settings.",
+    "gui.friends.error.generic": "Something's wrong — with this feature, not your friends!\n\nTry again later.",
+    "gui.friends.error.rateLimited.message": "You're performing Friends List actions too quickly. Please wait a moment and try again.",
+    "gui.friends.error.temporary_unavailable": "Friends List is not working right now.\n\nTry again later.",
+    "gui.friends.error.unauthorized": "Invalid token supplied. Restart your game and launcher, then try again",
+    "gui.friends.error.unavailable.message": "The Friends List service is currently unavailable. Please check your connection and try again later.",
+    "gui.friends.error.upgrade_needed": "Update the game to access your Friends List.",
+    "gui.friends.error.user_may_lack_active_profile": "There is no player with this profile name",
+    "gui.friends.loading_friends": "Loading Friends List...",
+    "gui.friends.loading_requests": "Loading requests...",
+    "gui.friends.manage_account_footer": "Manage online safety with your %s",
+    "gui.friends.multiplayer.invite": "Invite",
+    "gui.friends.multiplayer.invite_reject": "Decline",
+    "gui.friends.multiplayer.join_request": "Ask to join",
+    "gui.friends.multiplayer.join_request_reject": "Decline",
+    "gui.friends.my_profile_name": "My profile name: ",
+    "gui.friends.my_profile_name.narration": "Copy profile name %s to clipboard",
+    "gui.friends.narration.button.accept": "Press enter to accept friend request from %s",
+    "gui.friends.narration.button.cancel_request": "Press enter to cancel friend request to %s",
+    "gui.friends.narration.button.decline": "Press enter to decline friend request from %s",
+    "gui.friends.narration.button.unfriend": "Press enter to remove %s from Friends List",
+    "gui.friends.narration.entry.friend": "Friend %s",
+    "gui.friends.narration.entry.incoming": "Incoming friend request from %s",
+    "gui.friends.narration.entry.outgoing": "Outgoing friend request to %s",
+    "gui.friends.open": "Friends",
+    "gui.friends.open.narration": "Friends List",
+    "gui.friends.open.tooltip": "Friends",
+    "gui.friends.pending.empty": "No pending friend requests",
+    "gui.friends.pending.received": "Received",
+    "gui.friends.pending.sent": "Sent",
+    "gui.friends.presence.status.playing_hosted_server": "Online (LAN)",
+    "gui.friends.presence.status.playing_offline": "Online (World)",
+    "gui.friends.presence.status.playing_realms": "Online (Realm)",
+    "gui.friends.presence.status.playing_server": "Online (Server)",
+    "gui.friends.requests_count": "Requests (%s)",
+    "gui.friends.send_request": "Send friend request",
+    "gui.friends.tab_friends": "Friends",
+    "gui.friends.toast.friend_added.message": "%s accepted your friend request",
+    "gui.friends.toast.friend_invited.message": "%s has been invited to join your world.",
+    "gui.friends.toast.friend_removed.message": "%s has been removed from your friends list",
+    "gui.friends.toast.generic_error": "An unexpected error occurred while updating your Friends List. Please try again later.",
+    "gui.friends.toast.host_invite_expired.message": "Invitation to %s to join this world has expired.",
+    "gui.friends.toast.invite_from_friend.message": "%s invited you to join their world. Open the friends list by pressing \"%s\" to join",
+    "gui.friends.toast.join_invite_expired.message": "Invitation to join %s's world has expired.",
+    "gui.friends.toast.join_request.message": "%s wants to join your world. Open the Friends list with \"%s\" or from the game menu.",
+    "gui.friends.toast.request_accepted.message": "You are now friends with %s",
+    "gui.friends.toast.request_received.message": "%s sent you a friend request",
+    "gui.friends.toast.request_sent.message": "Friend request sent to %s",
+    "gui.friends.toast.request_to_join_friend.message": "You asked to join %s's world",
+    "gui.friends.toast.requests_accepted_multiple.message": "%s friends accepted your friend requests",
+    "gui.friends.toast.requests_received_multiple.message": "You have received %s friend requests",
+    "gui.friends.unfriend": "Remove Friend",
+    "gui.friends.validation.already_friend": "%s is already on your Friends List",
+    "gui.friends.validation.already_incoming": "%s has already sent you a friend request",
+    "gui.friends.validation.already_outgoing": "You've already sent a friend request to %s",
+    "gui.friends.validation.cannot_add_self": "You cannot send a friend request to yourself",
+    "gui.privacy_link.message": "Open this link to manage your privacy and online safety settings.",
+    "gui.privacy_link.title": "Changes to Xbox settings may take some time to apply.\n\nIf they don't update, restart the game.",
+    "item.minecraft.music_disc_bounce.desc": "fingerspit - Bounce",
+    "item.minecraft.sulfur_cube_bucket": "Bucket of Sulfur Cube",
+    "item.minecraft.sulfur_cube_spawn_egg": "Sulfur Cube Spawn Egg",
+    "jukebox_song.minecraft.bounce": "fingerspit - Bounce",
+    "key.friends": "Friends Screen",
+    "menu.multiplayerOptions.applyChanges": "Apply Changes",
+    "menu.multiplayerOptions.lan": "LAN",
+    "menu.multiplayerOptions.network.header": "Network",
+    "menu.multiplayerOptions.network.lan": "LAN",
+    "menu.multiplayerOptions.network.lan.tooltip": "Players on the same network can join.",
+    "menu.multiplayerOptions.network.off.tooltip": "Nobody can join.",
+    "menu.multiplayerOptions.network.online.tooltip": "Friends online can join.",
+    "menu.multiplayerOptions.publish.started.lan": "This world is now open to LAN. The port number is %s",
+    "menu.multiplayerOptions.publish.started.online": "This world is now open to Online multiplayer.",
+    "menu.multiplayerOptions.publish.stopped": "This world is no longer open to multiplayer",
+    "menu.multiplayerOptions.title": "LAN Options",
+    "menu.playerReporting.no_players": "There are no players to report in this world",
+    "music.game.ebb": "fingerspit - Ebb",
+    "music.game.home": "fingerspit - Home",
+    "music.game.memories": "fingerspit - Memories",
+    "music.game.nightly": "fingerspit - Nightly",
+    "music.game.shores": "fingerspit - Shores",
+    "narration.link.usage.focused": "Press Enter to follow the link",
+    "narration.link.usage.hovered": "Left click to follow the link",
+    "options.allowFriendRequests": "Allow Requests",
+    "options.allowFriendRequests.tooltip": "Allow other players to send you friend requests",
+    "options.exclusiveFullscreen.off.tooltip": "All input methods are expected to work in this fullscreen mode, but adaptive sync (Nvidia G-Sync, AMD FreeSync) will not work.",
+    "options.exclusiveFullscreen.on.tooltip": "This fullscreen mode might prevent some input methods from working, but adaptive sync (Nvidia G-Sync, AMD FreeSync) should work.",
+    "options.friendsList": "Friends List",
+    "options.friendsList.confirm.message": "Use your Friends List to send and receive friend requests.\n\nManage online safety settings with your %s.",
+    "options.friendsList.confirm.message.link": "Microsoft account",
+    "options.friendsList.confirm.title": "Friends List",
+    "options.friendsList.confirm.turnOff": "Turn OFF",
+    "options.friendsList.confirm.turnOn": "Turn ON",
+    "options.graphicsApi": "Graphics API",
+    "options.graphicsApi.opengl": "Prefer OpenGL",
+    "options.graphicsApi.restart": "You must restart your game to change the graphics API.",
+    "options.graphicsApi.tooltip": "Which graphics API to use for rendering. Leave as Default unless you have a specific need to change this!",
+    "options.graphicsApi.tooltip.vulkan": "Experimental. Might reduce performance or cause instability on some systems.",
+    "options.graphicsApi.vulkan": "Prefer Vulkan (Experimental)",
+    "options.inGameNotification": "In-Game Notification",
+    "options.inGameNotification.tooltip": "Show Friend notifications in-game",
+    "options.language.narration": "Change Language",
+    "options.language.tooltip": "Change Language",
+    "options.online.friends.header": "Friends List",
+    "options.online.realms.header": "Realms",
+    "options.online.servers.header": "Servers",
+    "options.online.xboxSettings": "Xbox Settings...",
+    "options.realmsNotifications.button": "News & Invites",
+    "options.restartRequired": "Some of your changes require a game restart to be applied.",
+    "options.sharePresence": "Visibility",
+    "options.sharePresence.all.tooltip": "Friends can see what you're playing.",
+    "options.sharePresence.limited": "Limited",
+    "options.sharePresence.limited.tooltip": "Friends can see when you're online, but not what you're playing.",
+    "options.sharePresence.none.tooltip": "Friends will always see you as offline.",
+    "options.worldOptions.allow_commands.disabled.tooltip": "Cannot allow commands in a hardcore world.",
+    "options.worldOptions.game_mode.disabled.operator.tooltip": "Changing the game mode requires operator permissions.",
+    "options.worldOptions.game_mode.disabled.tooltip": "Cannot change the game mode in a hardcore world.",
+    "subtitles.block.potent_sulfur.geyser_eruption": "Sulfur spring bursts",
+    "subtitles.block.potent_sulfur.noxious_gas": "Noxious gas appears",
+    "subtitles.entity.small_sulfur_cube.death": "Small Sulfur Cube dies",
+    "subtitles.entity.small_sulfur_cube.eat": "Small Sulfur Cube puts on mass",
+    "subtitles.entity.small_sulfur_cube.hurt": "Small Sulfur Cube hurts",
+    "subtitles.entity.small_sulfur_cube.jump": "Small Sulfur Cube bounces",
+    "subtitles.entity.sulfur_cube.absorb": "Sulfur Cube full",
+    "subtitles.entity.sulfur_cube.bounce": "Sulfur Cube bounces",
+    "subtitles.entity.sulfur_cube.death": "Sulfur Cube dies",
+    "subtitles.entity.sulfur_cube.eject": "Block removed",
+    "subtitles.entity.sulfur_cube.hit": "Sulfur Cube hit",
+    "subtitles.entity.sulfur_cube.hurt": "Sulfur Cube hurts",
+    "subtitles.entity.sulfur_cube.jump": "Sulfur Cube bounces",
+    "subtitles.entity.sulfur_cube.push": "Sulfur Cube pushed",
+    "subtitles.entity.sulfur_cube.squish": "Sulfur Cube bounces",
+    "subtitles.item.bucket.fill_sulfur_cube": "Sulfur Cube scooped",
+    "telemetry.event.graphics_capabilities.description": "This event informs us of the capabilities of the graphics device used to play the game.",
+    "telemetry.event.graphics_capabilities.title": "Graphics Capabilities",
+    "telemetry.event.p2p_connection.description": "This event helps us understand the reliability and performance of peer-to-peer connections between players. It records whether the connection was successful, the type of Interactive Connectivity Establishment (ICE, the protocol we use to establish peer-to-peer connections) candidate used, and how long it took to establish the connection.",
+    "telemetry.event.p2p_connection.title": "Peer-to-peer Connection",
+    "telemetry.property.backend_failure_message.title": "Backend Creation Failure Message",
+    "telemetry.property.backend_failure_missing_capabilities.title": "Backend Creation Failure Missing Capabilities",
+    "telemetry.property.backend_failure_reason.title": "Backend Creation Failure Reason",
+    "telemetry.property.backend_name.title": "Backend Name",
+    "telemetry.property.p2p_connection_failure_stage.title": "Failure Stage",
+    "telemetry.property.p2p_connection_ice_connect_time_ms.title": "Interactive Connectivity Establishment (ICE) Connect Time (Milliseconds)",
+    "telemetry.property.p2p_connection_ice_path.title": "Interactive Connectivity Establishment (ICE) Path",
+    "telemetry.property.p2p_connection_local_candidate_type.title": "Local Candidate Type",
+    "telemetry.property.p2p_connection_remote_candidate_type.title": "Remote Candidate Type",
+    "telemetry.property.p2p_connection_signaling_time_ms.title": "Signaling Connection Time (Milliseconds)",
+    "telemetry.property.p2p_connection_successful.title": "Connection Successful",
+    "telemetry.property.p2p_connection_total_time_ms.title": "Total Connection Time (Milliseconds)",
+    "telemetry.property.server_session_id.title": "Server Session ID",
+    "test.error.value_not_in_between": "Expected %s to be in between %s and %s: was %s",
+    "title.multiplayer.online": "Multiplayer (Online)"
+  },
   "26.1": {
     "block.minecraft.golden_dandelion": "Golden Dandelion",
     "block.minecraft.potted_golden_dandelion": "Potted Golden Dandelion",

gradle.properties

@@ -1,8 +1,8 @@
-projectVersion=5.9.0-SNAPSHOT
+projectVersion=5.10.0
 
 # Smile emoji (note that modrinth may not have added the version on release yet)
-mcVersions=26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
-mcVersionRange=1.10-26.1
+mcVersions=26.2, 26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
+mcVersionRange=1.10-26.2
 velocityVersion=3.4-3.5
 
 org.gradle.configureondemand=true

gradle/libs.versions.toml

@@ -3,14 +3,14 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.9.0-SNAPSHOT"
+viaver = "5.10.0"
 
 # Common provided
 netty = "4.0.20.Final"
 guava = "17.0"
 log4j = "2.8.1"
 
-checkerQual = "3.53.1"
+checkerQual = "4.2.0"
 
 # Platforms
 paper = "1.16.5-R0.1-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
@@ -73,21 +73,10 @@ goto fail
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle.kts

@@ -12,7 +12,7 @@ dependencyResolutionManagement {
 
 pluginManagement {
     plugins {
-        id("com.gradleup.shadow") version "9.4.1"
+        id("com.gradleup.shadow") version "9.4.2"
         id("net.kyori.blossom") version "2.2.0"
         id("org.jetbrains.gradle.plugin.idea-ext") version "1.4.1"
 

sponge/src/main/resources/META-INF/sponge_plugins.json

@@ -47,7 +47,7 @@
       },
       {
         "id": "viaversion",
-        "version": "[5.8.1-SNAPSHOT,)"
+        "version": "[5.9.2-SNAPSHOT,)"
       }
     ]
   },