From e651e1cef94d7a6e9b3a0bccce849f50c22b1f32 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 25 May 2026 09:33:25 +0200
Subject: [PATCH] Update VV usage

---
 .../viaversion/viabackwards/api/ViaBackwardsPlatform.java    | 2 +-
 .../viabackwards/protocol/template/Protocol99_1To98_1.java   | 2 +-
 .../protocol/v1_21_11to1_21_9/Protocol1_21_11To1_21_9.java   | 2 +-
 .../rewriter/BlockItemPacketRewriter1_21_2.java              | 5 ++++-
 .../protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java     | 2 +-
 .../v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java | 4 ++--
 .../v1_21_5to1_21_4/storage/HashedItemConverterStorage.java  | 5 +++--
 .../protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java     | 2 +-
 .../protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java     | 2 +-
 .../protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java     | 2 +-
 .../protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java       | 4 ++--
 .../v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java | 2 +-
 gradle/libs.versions.toml                                    | 2 +-
 sponge/src/main/resources/META-INF/sponge_plugins.json       | 2 +-
 14 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
index 046779e2..cfe30cf2 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
@@ -80,7 +80,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()));
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol99_1To98_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol99_1To98_1.java
index 9081093d..c2abb4ae 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol99_1To98_1.java
+++ b/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
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/Protocol1_21_11To1_21_9.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/Protocol1_21_11To1_21_9.java
index 39ac4d63..227d884e 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/Protocol1_21_11To1_21_9.java
+++ b/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());
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java
index f6727eda..11d70671 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java
@@ -675,7 +675,10 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
         if (deathProtection != null) {
             final List<Consumable1_21_2.ConsumeEffect<?>> effects = new ArrayList<>();
             for (int i = 0; i < deathProtection.size(); i++) {
-                effects.add(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.toArray(Consumable1_21_2.ConsumeEffect[]::new)));
         }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java
index ed31409f..e300477d 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java
+++ b/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
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java
index 115f99c0..07ebb0e7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java
@@ -161,7 +161,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
 
         filter().dataType(mappedEntityDataTypes.frogVariantType).handler((event, data) -> {
             final int value = data.value();
-            final String variantKey = protocol.getRegistryDataRewriter().getMappings("frog_variant").idToKey(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;
@@ -172,7 +172,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
         });
         filter().dataType(mappedEntityDataTypes.catVariantType).handler((event, data) -> {
             final int value = data.value();
-            final String variantKey = protocol.getRegistryDataRewriter().getMappings("cat_variant").idToKey(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;
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/storage/HashedItemConverterStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/storage/HashedItemConverterStorage.java
index 6d500f0f..4b86458a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/storage/HashedItemConverterStorage.java
+++ b/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);
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
index 35a694e4..88eb5517 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
@@ -307,7 +307,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());
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java
index 8a031b70..9436a0e4 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java
+++ b/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
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java
index 613648ea..aabd0341 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java
+++ b/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());
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java
index 9a500cb5..4dc81be4 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java
@@ -130,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;
                 }
@@ -169,7 +169,7 @@ 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());
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java
index 34d85aa3..2d3af39e 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java
+++ b/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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f99a8ac3..d3af7334 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.9.1"
+viaver = "5.9.2-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"
diff --git a/sponge/src/main/resources/META-INF/sponge_plugins.json b/sponge/src/main/resources/META-INF/sponge_plugins.json
index fd451ea9..ff9421c1 100644
--- a/sponge/src/main/resources/META-INF/sponge_plugins.json
+++ b/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,)"
       }
     ]
   },