Update VV usage

2025-11-18 07:44:16 +01:00 · 2025-10-14 17:57:08 +02:00 · 2025-10-14 17:57:08 +02:00 · a37605e920
commit a37605e920
parent 1d4e41f867
17 changed files with 266 additions and 170 deletions
--- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
@ -77,7 +77,7 @@ import java.util.logging.Logger;

 public interface ViaBackwardsPlatform {

-    String MINIMUM_VV_VERSION = "5.5.1";
+    String MINIMUM_VV_VERSION = "5.5.2";

    /**
     * Initialize ViaBackwards.
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/template/EntityPacketRewriter1_99.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/template/EntityPacketRewriter1_99.java
@ -17,16 +17,13 @@
 */
 package com.viaversion.viabackwards.protocol.template;

-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_2;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
-import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;

 // Replace if needed
 //  VersionedTypes
@ -45,9 +42,6 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2
        registerGameEvent(ClientboundPackets1_21_2.GAME_EVENT);
        registerLogin1_20_5(ClientboundPackets1_21_2.LOGIN);
        registerRespawn1_20_5(ClientboundPackets1_21_2.RESPAWN);
-
-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
    }

    @Override
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol1_99To1_98.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol1_99To1_98.java
@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.template;

 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.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viaversion.api.connection.UserConnection;
@ -37,9 +38,9 @@ import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
-import com.viaversion.viaversion.util.SerializerVersion;

 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;

@ -62,6 +63,7 @@ final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2
    private final ParticleRewriter<ClientboundPacket1_21_2> particleRewriter = new ParticleRewriter<>(this);
    private final NBTComponentRewriter<ClientboundPacket1_21_2> translatableRewriter = new ComponentRewriter1_99(this);
    private final TagRewriter<ClientboundPacket1_21_2> tagRewriter = new TagRewriter<>(this);
+    private final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);

    public Protocol1_99To1_98() {
        super(ClientboundPacket1_21_2.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_4.class, ServerboundPacket1_21_4.class);
@ -71,6 +73,8 @@ final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2
    protected void registerPackets() {
        super.registerPackets();

+        registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
+
        tagRewriter.registerGeneric(ClientboundPackets1_21_2.UPDATE_TAGS);
        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);

@ -123,6 +127,11 @@ final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2
        return itemRewriter;
    }

+    @Override
+    public RegistryDataRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
    @Override
    public ParticleRewriter<ClientboundPacket1_21_2> getParticleRewriter() {
        return particleRewriter;
--- 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
@ -17,15 +17,21 @@
 */
 package com.viaversion.viabackwards.protocol.v1_21_5to1_21_4;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
 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.SoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter.BlockItemPacketRewriter1_21_5;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter.ComponentRewriter1_21_5;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter.EntityPacketRewriter1_21_5;
+import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter.RegistryDataRewriter1_21_5;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.storage.HashedItemConverterStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Particle;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_2;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_5;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
@ -52,10 +58,13 @@ import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
+import java.util.ArrayList;
+import java.util.List;

 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;

@ -75,6 +84,7 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
    };
    private final ComponentRewriter1_21_5 translatableRewriter = new ComponentRewriter1_21_5(this);
    private final TagRewriter<ClientboundPacket1_21_5> tagRewriter = new TagRewriter<>(this);
+    private final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter1_21_5(this);

    public Protocol1_21_5To1_21_4() {
        super(ClientboundPacket1_21_5.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_5.class, ServerboundPacket1_21_4.class);
@ -204,6 +214,11 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
        return itemRewriter;
    }

+    @Override
+    public RegistryDataRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
    @Override
    public ParticleRewriter<ClientboundPacket1_21_5> getParticleRewriter() {
        return particleRewriter;
--- 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
@ -17,15 +17,9 @@
 */
 package com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter;

-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.Protocol1_21_5To1_21_4;
-import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.storage.HashedItemConverterStorage;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.storage.HorseDataStorage;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.TrackedEntity;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
@ -42,18 +36,11 @@ import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfi
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPacket1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPackets1_21_5;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.util.Key;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import java.util.UUID;

 public final class EntityPacketRewriter1_21_5 extends EntityRewriter<ClientboundPacket1_21_5, Protocol1_21_5To1_21_4> {

-    private static final Set<String> NEW_REGISTRIES = Set.of("pig_variant", "cow_variant", "frog_variant", "cat_variant",
-        "chicken_variant", "test_environment", "test_instance", "wolf_sound_variant");
-
    public EntityPacketRewriter1_21_5(final Protocol1_21_5To1_21_4 protocol) {
        super(protocol, protocol.mappedTypes().entityDataTypes().optionalComponentType, protocol.mappedTypes().entityDataTypes().booleanType);
    }
@ -112,67 +99,15 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
            }
        });

-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
-            @Override
-            public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
-                final boolean trimPatternRegistry = key.equals("trim_pattern");
-                if (trimPatternRegistry || key.equals("trim_material")) {
-                    updateTrim(entries, trimPatternRegistry ? "template_item" : "ingredient");
-                    return super.handle(connection, key, entries);
-                }
-
-                if (key.equals("enchantment")) {
-                    updateEnchantment(entries);
-                    return super.handle(connection, key, entries);
-                }
-
-                if (!key.equals("wolf_variant")) {
-                    return super.handle(connection, key, entries);
-                }
-
-                for (final RegistryEntry entry : entries) {
-                    if (entry.tag() == null) {
-                        continue;
-                    }
-
-                    final CompoundTag variant = (CompoundTag) entry.tag();
-                    final CompoundTag assets = (CompoundTag) variant.remove("assets");
-                    variant.put("wild_texture", assets.get("wild"));
-                    variant.put("tame_texture", assets.get("tame"));
-                    variant.put("angry_texture", assets.get("angry"));
-                    variant.put("biomes", new ListTag<>(StringTag.class));
-                }
-                return entries;
-            }
-
-            private void updateTrim(final RegistryEntry[] entries, final String itemKey) {
-                for (final RegistryEntry entry : entries) {
-                    if (entry.tag() == null) {
-                        continue;
-                    }
-
-                    final CompoundTag tag = (CompoundTag) entry.tag();
-                    tag.putString(itemKey, "stone"); // dummy ingredient
-                }
-            }
-        };
        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, wrapper -> {
            final String registryKey = Key.stripMinecraftNamespace(wrapper.passthrough(Types.STRING));
-            if (NEW_REGISTRIES.contains(registryKey)) {
+            if (RegistryDataRewriter1_21_5.NEW_REGISTRIES.contains(registryKey)) {
                wrapper.cancel();
                return;
            }

            final RegistryEntry[] entries = wrapper.read(Types.REGISTRY_ENTRY_ARRAY);
-            if (registryKey.equals("enchantment")) {
-                final List<String> identifiers = new ArrayList<>(entries.length);
-                for (final RegistryEntry entry : entries) {
-                    identifiers.add(entry.key());
-                }
-                wrapper.user().get(HashedItemConverterStorage.class).setEnchantments(identifiers);
-            }
-
-            wrapper.write(Types.REGISTRY_ENTRY_ARRAY, registryDataRewriter.handle(wrapper.user(), registryKey, entries));
+            wrapper.write(Types.REGISTRY_ENTRY_ARRAY, protocol.getRegistryDataRewriter().handle(wrapper.user(), registryKey, entries));
        });

        protocol.registerClientbound(ClientboundPackets1_21_5.LOGIN, wrapper -> {
@ -216,20 +151,6 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
        });
    }

-    private void updateEnchantment(final RegistryEntry[] entries) {
-        for (final RegistryEntry entry : entries) {
-            if (entry.tag() == null) {
-                continue;
-            }
-
-            final CompoundTag enchantment = (CompoundTag) entry.tag();
-            final ListTag<StringTag> slots = enchantment.getListTag("slots", StringTag.class);
-            if (slots != null) {
-                slots.getValue().removeIf(tag -> tag.getValue().equals("saddle")); // Remove saddle slot
-            }
-        }
-    }
-
    private String visibility(final int id) {
        return switch (id) {
            case 0 -> "always";
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/RegistryDataRewriter1_21_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/RegistryDataRewriter1_21_5.java
@ -0,0 +1,94 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 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.v1_21_5to1_21_4.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
+import java.util.Set;
+
+public final class RegistryDataRewriter1_21_5 extends BackwardsRegistryRewriter {
+
+    public static final Set<String> NEW_REGISTRIES = Set.of("pig_variant", "cow_variant", "frog_variant", "cat_variant",
+        "chicken_variant", "test_environment", "test_instance", "wolf_sound_variant");
+
+    public RegistryDataRewriter1_21_5(final BackwardsProtocol<?, ?, ?, ?> protocol) {
+        super(protocol);
+    }
+
+    @Override
+    public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
+        final boolean trimPatternRegistry = key.equals("trim_pattern");
+        if (trimPatternRegistry || key.equals("trim_material")) {
+            updateTrim(entries, trimPatternRegistry ? "template_item" : "ingredient");
+            return super.handle(connection, key, entries);
+        }
+
+        if (key.equals("enchantment")) {
+            updateEnchantment(entries);
+            return super.handle(connection, key, entries);
+        }
+
+        if (!key.equals("wolf_variant")) {
+            return super.handle(connection, key, entries);
+        }
+
+        for (final RegistryEntry entry : entries) {
+            if (entry.tag() == null) {
+                continue;
+            }
+
+            final CompoundTag variant = (CompoundTag) entry.tag();
+            final CompoundTag assets = (CompoundTag) variant.remove("assets");
+            variant.put("wild_texture", assets.get("wild"));
+            variant.put("tame_texture", assets.get("tame"));
+            variant.put("angry_texture", assets.get("angry"));
+            variant.put("biomes", new ListTag<>(StringTag.class));
+        }
+        return entries;
+    }
+
+    private void updateTrim(final RegistryEntry[] entries, final String itemKey) {
+        for (final RegistryEntry entry : entries) {
+            if (entry.tag() == null) {
+                continue;
+            }
+
+            final CompoundTag tag = (CompoundTag) entry.tag();
+            tag.putString(itemKey, "stone"); // dummy ingredient
+        }
+    }
+
+    private void updateEnchantment(final RegistryEntry[] entries) {
+        for (final RegistryEntry entry : entries) {
+            if (entry.tag() == null) {
+                continue;
+            }
+
+            final CompoundTag enchantment = (CompoundTag) entry.tag();
+            final ListTag<StringTag> slots = enchantment.getListTag("slots", StringTag.class);
+            if (slots != null) {
+                slots.getValue().removeIf(tag -> tag.getValue().equals("saddle")); // Remove saddle slot
+            }
+        }
+    }
+}
--- 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
@ -25,25 +25,17 @@ import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.codec.CodecRegistryContext;
 import com.viaversion.viaversion.codec.hash.HashFunction;
 import com.viaversion.viaversion.codec.hash.HashOps;
-import java.util.ArrayList;
-import java.util.List;

 public class HashedItemConverterStorage implements StorableObject {

-    private final List<String> enchantments = new ArrayList<>();
    private final Hasher hasher;

    public HashedItemConverterStorage(final Protocol<?, ?, ?, ?> protocol) {
-        final RegistryAccess registryAccess = RegistryAccess.of(this.enchantments, protocol.getMappingData());
+        final RegistryAccess registryAccess = RegistryAccess.of(protocol);
        final CodecContext context = new CodecRegistryContext(protocol, registryAccess, false);
        this.hasher = new HashOps(context, HashFunction.CRC32C);
    }

-    public void setEnchantments(final List<String> enchantments) {
-        this.enchantments.clear();
-        this.enchantments.addAll(enchantments);
-    }
-
    public Hasher hasher() {
        return hasher; // reusable
    }
--- 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
@ -29,6 +29,7 @@ import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.provider.DialogViewP
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.rewriter.BlockItemPacketRewriter1_21_6;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.rewriter.ComponentRewriter1_21_6;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.rewriter.EntityPacketRewriter1_21_6;
+import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.rewriter.RegistryDataRewriter1_21_6;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.ChestDialogStorage;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.ClickEvents;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.RegistryAndTags;
@ -61,6 +62,7 @@ import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.rewriter.AttributeRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.Key;
@ -75,6 +77,7 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
    private final ParticleRewriter<ClientboundPacket1_21_6> particleRewriter = new ParticleRewriter<>(this);
    private final NBTComponentRewriter<ClientboundPacket1_21_6> translatableRewriter = new ComponentRewriter1_21_6(this);
    private final TagRewriter<ClientboundPacket1_21_6> tagRewriter = new TagRewriter<>(this);
+    private final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter1_21_6(this);

    public Protocol1_21_6To1_21_5() {
        super(ClientboundPacket1_21_6.class, ClientboundPacket1_21_5.class, ServerboundPacket1_21_6.class, ServerboundPacket1_21_5.class);
@ -84,6 +87,8 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
    protected void registerPackets() {
        super.registerPackets();

+        registerClientbound(ClientboundConfigurationPackets1_21_6.REGISTRY_DATA, registryDataRewriter::handle);
+
        registerClientbound(ClientboundPackets1_21_6.UPDATE_TAGS, this::updateTags);
        registerClientbound(ClientboundConfigurationPackets1_21_6.UPDATE_TAGS, this::updateTags);

@ -343,6 +348,11 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
        return itemRewriter;
    }

+    @Override
+    public RegistryDataRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
    @Override
    public ParticleRewriter<ClientboundPacket1_21_6> getParticleRewriter() {
        return particleRewriter;
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/EntityPacketRewriter1_21_6.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/EntityPacketRewriter1_21_6.java
@ -17,29 +17,18 @@
 */
 package com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.rewriter;

-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.Protocol1_21_6To1_21_5;
-import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.RegistryAndTags;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_6;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_5;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
-import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectArrayMap;
-import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectMap;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPackets1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPackets1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundConfigurationPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.util.Key;
-import com.viaversion.viaversion.util.KeyMappings;

 public final class EntityPacketRewriter1_21_6 extends EntityRewriter<ClientboundPacket1_21_6, Protocol1_21_6To1_21_5> {

@ -86,31 +75,6 @@ public final class EntityPacketRewriter1_21_6 extends EntityRewriter<Clientbound
            }
        });

-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
-            @Override
-            public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
-                if (Key.stripMinecraftNamespace(key).equals("dialog")) {
-                    final String[] keys = new String[entries.length];
-                    for (int i = 0; i < entries.length; i++) {
-                        keys[i] = Key.stripMinecraftNamespace(entries[i].key());
-                    }
-
-                    final Object2ObjectMap<String, CompoundTag> dialogs = new Object2ObjectArrayMap<>();
-                    for (final RegistryEntry entry : entries) {
-                        if (entry.tag() instanceof final CompoundTag tag) {
-                            dialogs.put(Key.stripMinecraftNamespace(entry.key()), tag);
-                        }
-                    }
-
-                    final RegistryAndTags registryAndTags = connection.get(RegistryAndTags.class);
-                    registryAndTags.storeRegistry(new KeyMappings(keys), dialogs);
-                }
-                return super.handle(connection, key, entries);
-            }
-        };
-        registryDataRewriter.remove("dialog"); // Tracked and now removed
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21_6.REGISTRY_DATA, registryDataRewriter::handle);
-
        protocol.registerServerbound(ServerboundPackets1_21_5.PLAYER_COMMAND, wrapper -> {
            wrapper.passthrough(Types.VAR_INT); // Entity ID

--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/RegistryDataRewriter1_21_6.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/RegistryDataRewriter1_21_6.java
@ -0,0 +1,59 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 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.v1_21_6to1_21_5.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
+import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.RegistryAndTags;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectArrayMap;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectMap;
+import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.KeyMappings;
+
+public final class RegistryDataRewriter1_21_6 extends BackwardsRegistryRewriter {
+
+    public RegistryDataRewriter1_21_6(final BackwardsProtocol<?, ?, ?, ?> protocol) {
+        super(protocol);
+
+        remove("dialog"); // Tracked and now removed
+    }
+
+    @Override
+    public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
+        if (Key.stripMinecraftNamespace(key).equals("dialog")) {
+            final String[] keys = new String[entries.length];
+            for (int i = 0; i < entries.length; i++) {
+                keys[i] = Key.stripMinecraftNamespace(entries[i].key());
+            }
+
+            final Object2ObjectMap<String, CompoundTag> dialogs = new Object2ObjectArrayMap<>();
+            for (final RegistryEntry entry : entries) {
+                if (entry.tag() instanceof final CompoundTag tag) {
+                    dialogs.put(Key.stripMinecraftNamespace(entry.key()), tag);
+                }
+            }
+
+            final RegistryAndTags registryAndTags = connection.get(RegistryAndTags.class);
+            registryAndTags.storeRegistry(new KeyMappings(keys), dialogs);
+        }
+        return super.handle(connection, key, entries);
+    }
+}
--- 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
@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.v1_21_7to1_21_6;

 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.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.TranslatableRewriter;
@ -42,6 +43,7 @@ import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_6to1_21_7.Protocol1_21_6To1_21_7;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;

@ -55,6 +57,7 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
    private final ParticleRewriter<ClientboundPacket1_21_6> particleRewriter = new ParticleRewriter<>(this);
    private final NBTComponentRewriter<ClientboundPacket1_21_6> translatableRewriter = new NBTComponentRewriter<>(this);
    private final TagRewriter<ClientboundPacket1_21_6> tagRewriter = new TagRewriter<>(this);
+    private final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);

    public Protocol1_21_7To1_21_6() {
        super(ClientboundPacket1_21_6.class, ClientboundPacket1_21_6.class, ServerboundPacket1_21_6.class, ServerboundPacket1_21_6.class);
@ -64,6 +67,8 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
    protected void registerPackets() {
        super.registerPackets();

+        registerClientbound(ClientboundConfigurationPackets1_21_6.REGISTRY_DATA, registryDataRewriter::handle);
+
        tagRewriter.registerGeneric(ClientboundPackets1_21_6.UPDATE_TAGS);
        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_6.UPDATE_TAGS);

@ -127,6 +132,11 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
        return itemRewriter;
    }

+    @Override
+    public RegistryDataRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
    @Override
    public ParticleRewriter<ClientboundPacket1_21_6> getParticleRewriter() {
        return particleRewriter;
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/rewriter/EntityPacketRewriter1_21_7.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/rewriter/EntityPacketRewriter1_21_7.java
@ -17,7 +17,6 @@
 */
 package com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.rewriter;

-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.Protocol1_21_7To1_21_6;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
@ -25,10 +24,8 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_6;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
-import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundConfigurationPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;

 public final class EntityPacketRewriter1_21_7 extends EntityRewriter<ClientboundPacket1_21_6, Protocol1_21_7To1_21_6> {

@ -45,9 +42,6 @@ public final class EntityPacketRewriter1_21_7 extends EntityRewriter<Clientbound
        registerGameEvent(ClientboundPackets1_21_6.GAME_EVENT);
        registerLogin1_20_5(ClientboundPackets1_21_6.LOGIN);
        registerRespawn1_20_5(ClientboundPackets1_21_6.RESPAWN);
-
-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21_6.REGISTRY_DATA, registryDataRewriter::handle);
    }

    @Override
--- 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
@ -26,6 +26,7 @@ import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.BlockItemPa
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.ComponentRewriter1_21_9;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.EntityPacketRewriter1_21_9;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.ParticleRewriter1_21_9;
+import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.RegistryDataRewriter1_21_9;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.DimensionScaleStorage;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.PlayerRotationStorage;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.tracker.EntityTracker1_21_9;
@ -55,6 +56,7 @@ import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundConfigurationPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
+import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;

@ -68,6 +70,7 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
    private final ParticleRewriter<ClientboundPacket1_21_9> particleRewriter = new ParticleRewriter1_21_9(this);
    private final NBTComponentRewriter<ClientboundPacket1_21_9> translatableRewriter = new ComponentRewriter1_21_9(this);
    private final TagRewriter<ClientboundPacket1_21_9> tagRewriter = new TagRewriter<>(this);
+    private final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter1_21_9(this);

    public Protocol1_21_9To1_21_7() {
        super(ClientboundPacket1_21_9.class, ClientboundPacket1_21_6.class, ServerboundPacket1_21_9.class, ServerboundPacket1_21_6.class);
@ -77,6 +80,8 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
    protected void registerPackets() {
        super.registerPackets();

+        registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
+
        tagRewriter.registerGeneric(ClientboundPackets1_21_9.UPDATE_TAGS);
        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_9.UPDATE_TAGS);

@ -224,6 +229,11 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
        return itemRewriter;
    }

+    @Override
+    public RegistryDataRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
    @Override
    public ParticleRewriter<ClientboundPacket1_21_9> getParticleRewriter() {
        return particleRewriter;
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java
@ -20,17 +20,14 @@ package com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.Protocol1_21_9To1_21_7;
-import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.DimensionScaleStorage;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.MannequinData;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.PlayerRotationStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.GameProfile;
 import com.viaversion.viaversion.api.minecraft.GlobalBlockPosition;
-import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
 import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
@ -42,10 +39,8 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
-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.ClientboundPacket1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandler;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import java.util.BitSet;
@ -129,29 +124,6 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
            wrapper.read(Types.FLOAT); // Pitch
        });

-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
-            @Override
-            public void trackDimensionAndBiomes(final UserConnection connection, final String registryKey, final RegistryEntry[] entries) {
-                super.trackDimensionAndBiomes(connection, registryKey, entries);
-                if (!registryKey.equals("dimension_type")) {
-                    return;
-                }
-
-                final DimensionScaleStorage dimensionScaleStorage = connection.get(DimensionScaleStorage.class);
-                for (int i = 0; i < entries.length; i++) {
-                    final RegistryEntry entry = entries[i];
-                    final CompoundTag dimension = (CompoundTag) entry.tag();
-                    if (dimension == null) {
-                        continue;
-                    }
-
-                    final double coordinateScale = dimension.getDouble("coordinate_scale", 1);
-                    dimensionScaleStorage.setScale(i, coordinateScale);
-                }
-            }
-        };
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
-
        protocol.registerServerbound(ServerboundPackets1_21_6.MOVE_PLAYER_POS_ROT, wrapper -> {
            wrapper.passthrough(Types.DOUBLE); // X
            wrapper.passthrough(Types.DOUBLE); // Y
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/RegistryDataRewriter1_21_9.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/RegistryDataRewriter1_21_9.java
@ -0,0 +1,52 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 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.v1_21_9to1_21_7.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
+import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.DimensionScaleStorage;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
+
+public final class RegistryDataRewriter1_21_9 extends BackwardsRegistryRewriter {
+
+    public RegistryDataRewriter1_21_9(final BackwardsProtocol<?, ?, ?, ?> protocol) {
+        super(protocol);
+    }
+
+    @Override
+    public void trackDimensionAndBiomes(final UserConnection connection, final String registryKey, final RegistryEntry[] entries) {
+        super.trackDimensionAndBiomes(connection, registryKey, entries);
+        if (!registryKey.equals("dimension_type")) {
+            return;
+        }
+
+        final DimensionScaleStorage dimensionScaleStorage = connection.get(DimensionScaleStorage.class);
+        for (int i = 0; i < entries.length; i++) {
+            final RegistryEntry entry = entries[i];
+            final CompoundTag dimension = (CompoundTag) entry.tag();
+            if (dimension == null) {
+                continue;
+            }
+
+            final double coordinateScale = dimension.getDouble("coordinate_scale", 1);
+            dimensionScaleStorage.setScale(i, coordinateScale);
+        }
+    }
+}
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]

 # ViaVersion
-viaver = "5.5.1-SNAPSHOT"
+viaver = "5.5.2-SNAPSHOT"

 # Common provided
 netty = "4.0.20.Final"
--- 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.5.1-SNAPSHOT,)"
+        "version": "[5.5.2-SNAPSHOT,)"
      }
    ]
  },