Update VV usage

Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>

common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java

@@ -47,6 +47,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
     private boolean dialogsViaChests;
     private DialogStyleConfig dialogStyleConfig;
     private boolean codeOfConductAsDialog;
+    private boolean passOriginalItemNameToResourcePacks;
 
     public ViaBackwardsConfig(File configFile, Logger logger) {
         super(configFile, logger);
@@ -75,6 +76,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         dialogsViaChests = getBoolean("dialogs-via-chests", true);
         dialogStyleConfig = loadDialogStyleConfig(getSection("dialog-style"));
         codeOfConductAsDialog = getBoolean("code-of-conduct-as-dialog", true);
+        passOriginalItemNameToResourcePacks = getBoolean("pass-original-item-name-to-resource-packs", true);
     }
 
     private DialogStyleConfig loadDialogStyleConfig(final ConfigSection section) {
@@ -179,6 +181,11 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         return codeOfConductAsDialog;
     }
 
+    @Override
+    public boolean passOriginalItemNameToResourcePacks() {
+        return passOriginalItemNameToResourcePacks;
+    }
+
     @Override
     public URL getDefaultConfigURL() {
         return getClass().getClassLoader().getResource("assets/viabackwards/config.yml");

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

@@ -18,9 +18,9 @@
 package com.viaversion.viabackwards.api;
 
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.text.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
+import com.viaversion.viabackwards.protocol.registration.BackwardsRegistrations;
 import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
@@ -31,6 +31,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM extends ClientboundPacketType, SM extends ServerboundPacketType, SU extends ServerboundPacketType>
     extends AbstractProtocol<CU, CM, SM, SU> {
 
+    @Deprecated
     protected BackwardsProtocol() {
     }
 
@@ -39,21 +40,10 @@ public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM ext
         super(oldClientboundPacketEnum, clientboundPacketEnum, oldServerboundPacketEnum, serverboundPacketEnum);
     }
 
-    /**
-     * Waits for the given protocol to be loaded to then asynchronously execute the runnable for this protocol.
-     */
-    protected void executeAsyncAfterLoaded(Class<? extends Protocol> protocolClass, Runnable runnable) {
-        Via.getManager().getProtocolManager().addMappingLoaderFuture(getClass(), protocolClass, runnable);
-    }
-
     @Override
-    protected void registerPackets() {
-        super.registerPackets();
-
-        final BackwardsMappingData mappingData = getMappingData();
-        if (mappingData != null && mappingData.getViaVersionProtocolClass() != null) {
-            executeAsyncAfterLoaded(mappingData.getViaVersionProtocolClass(), this::loadMappingData);
-        }
+    protected void applySharedRegistrations() {
+        super.applySharedRegistrations();
+        BackwardsRegistrations.registrations().applyMatching(this);
     }
 
     @Override
@@ -62,18 +52,17 @@ public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM ext
     }
 
     @Override
-    public boolean hasMappingDataToLoad() {
-        // Manually load them later, since they depend on VV's mappings
-        return false;
+    public @Nullable Class<? extends Protocol<?, ?, ?, ?>> dependsOn() {
+        return getMappingData() != null ? getMappingData().getViaVersionProtocolClass() : null;
     }
 
     @Override
-    public @Nullable BackwardsMappingData getMappingData() { // Change return type to BackwardsMappings
+    public @Nullable BackwardsMappingData getMappingData() {
         return null;
     }
 
     @Override
-    public @Nullable TranslatableRewriter getComponentRewriter() {
+    public @Nullable BackwardsRegistryRewriter getRegistryDataRewriter() {
         return null;
     }
 }

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

@@ -133,4 +133,13 @@ public interface ViaBackwardsConfig extends Config {
      * @return true if enabled
      */
     boolean codeOfConductAsDialog();
+
+    /**
+     * Injects the original vanilla 1.21.4+ item name into custom_model_data strings for resource packs.
+     * Disable if your server creates custom items using modern items as their base.
+     * Tip: For server custom items, base them on items in the game before 1.21.4 (e.g. saddle) to ensure compatibility.
+     *
+     * @return true if enabled
+     */
+    boolean passOriginalItemNameToResourcePacks();
 }

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

@@ -21,6 +21,7 @@ package com.viaversion.viabackwards.api;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.ViaBackwardsConfig;
 import com.viaversion.viabackwards.api.data.TranslatableMappings;
+import com.viaversion.viabackwards.protocol.registration.BackwardsRegistrations;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.Protocol1_10To1_9_3;
 import com.viaversion.viabackwards.protocol.v1_11_1to1_11.Protocol1_11_1To1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.Protocol1_11To1_10;
@@ -105,6 +106,8 @@ public interface ViaBackwardsPlatform {
         TranslatableMappings.loadTranslatables();
 
         getLogger().info("Registering protocols...");
+        BackwardsRegistrations.apply();
+
         final ProtocolManager protocolManager = Via.getManager().getProtocolManager();
         protocolManager.registerProtocol(new Protocol1_9_1To1_9(), ProtocolVersion.v1_9, ProtocolVersion.v1_9_1);
         protocolManager.registerProtocol(new Protocol1_9_3To1_9_1(), Arrays.asList(ProtocolVersion.v1_9_1, ProtocolVersion.v1_9_2), ProtocolVersion.v1_9_3);

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

@@ -24,6 +24,7 @@ import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.data.MappedItem;
@@ -40,6 +41,7 @@ import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
+import com.viaversion.viaversion.util.ArrayUtil;
 import com.viaversion.viaversion.util.Key;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,9 +53,13 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
     T extends BackwardsProtocol<C, ?, ?, S>> extends StructuredItemRewriter<C, S, T> {
 
     private static final int[] EMPTY_INT_ARRAY = new int[0];
+    private static final String GLOBAL_MODEL_DATA_MARKER = "VB|injected_cmd";
+
+    private final String nbtTagName;
 
     public BackwardsStructuredItemRewriter(T protocol) {
         super(protocol);
+        this.nbtTagName = "VB|" + protocol.getClass().getSimpleName();
     }
 
     @Override
@@ -70,17 +76,11 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
         customTag.putInt(nbtTagName("id"), item.identifier()); // Save original id
 
         // Add custom model data
-        if (mappedItem.customModelData() != null) {
+        final boolean addOriginalIdentifier = ViaBackwards.getConfig().passOriginalItemNameToResourcePacks();
+        if (mappedItem.customModelData() != null || addOriginalIdentifier) {
             if (connection.getProtocolInfo().protocolVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_4)) {
-                if (!dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4)) {
-                    dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4, new CustomModelData1_21_4(
-                        new float[]{mappedItem.customModelData().floatValue()},
-                        new boolean[0],
-                        new String[0],
-                        EMPTY_INT_ARRAY
-                    ));
-                }
-            } else if (!dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA1_20_5)) {
+                addCustomModelData(item, addOriginalIdentifier, mappedItem, customTag);
+            } else if (mappedItem.customModelData() != null && !dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA1_20_5)) {
                 dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_20_5, mappedItem.customModelData());
             }
         }
@@ -92,6 +92,33 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
         }
     }
 
+    private void addCustomModelData(final Item item, final boolean addOriginalIdentifier, final MappedItem mappedItem, final CompoundTag customTag) {
+        final StructuredDataContainer dataContainer = item.dataContainer();
+        CustomModelData1_21_4 customModelData = dataContainer.get(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4);
+        if (customModelData == null) {
+            final String[] strings = addOriginalIdentifier
+                ? new String[]{protocol.getMappingData().getFullItemMappings().identifier(item.identifier())}
+                : new String[0];
+            customModelData = new CustomModelData1_21_4(
+                mappedItem.customModelData() != null ? new float[]{mappedItem.customModelData().floatValue()} : new float[0],
+                new boolean[0],
+                strings,
+                EMPTY_INT_ARRAY
+            );
+            dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4, customModelData);
+            // Add one global marker and one for this specific version, so it is removed at the correct protocol
+            customTag.putBoolean(GLOBAL_MODEL_DATA_MARKER, true);
+            customTag.putBoolean(nbtTagName("added_custom_model_data"), true);
+        } else if (addOriginalIdentifier && !customTag.contains(GLOBAL_MODEL_DATA_MARKER)) {
+            final String identifier = protocol.getMappingData().getFullItemMappings().identifier(item.identifier());
+            dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4, new CustomModelData1_21_4(
+                customModelData.floats(), customModelData.booleans(), ArrayUtil.add(customModelData.strings(), identifier), customModelData.colors()
+            ));
+            customTag.putBoolean(GLOBAL_MODEL_DATA_MARKER, true);
+            customTag.putString(nbtTagName("injected_custom_model_data"), identifier);
+        }
+    }
+
     @Override
     protected void restoreBackupData(final Item item, final StructuredDataContainer container, final CompoundTag customData) {
         super.restoreBackupData(item, container, customData);
@@ -99,6 +126,25 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
             item.setIdentifier(originalTag.asInt());
             removeCustomTag(container, customData);
         }
+
+        if (removeBackupTag(customData, "injected_custom_model_data") instanceof StringTag injectedCustomModelData) {
+            customData.remove(GLOBAL_MODEL_DATA_MARKER);
+            container.replace(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4, customModelData -> {
+                final String target = injectedCustomModelData.getValue();
+                final String[] strings = customModelData.strings();
+                for (int i = 0; i < strings.length; i++) {
+                    if (strings[i].equals(target)) {
+                        // Remove the injected string
+                        final String[] filteredStrings = ArrayUtil.remove(strings, i);
+                        return new CustomModelData1_21_4(customModelData.floats(), customModelData.booleans(), filteredStrings, customModelData.colors());
+                    }
+                }
+                return customModelData;
+            });
+        } else if (removeBackupTag(customData, "added_custom_model_data") != null) {
+            customData.remove(GLOBAL_MODEL_DATA_MARKER);
+            container.remove(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4);
+        }
     }
 
     protected void saveListTag(CompoundTag tag, ListTag<?> original, String name) {
@@ -313,6 +359,6 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
 
     @Override
     public String nbtTagName() {
-        return "VB|" + protocol.getClass().getSimpleName();
+        return this.nbtTagName;
     }
 }

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

@@ -38,7 +38,7 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
     }
 
     @Override
-    public void registerTrackerWithData(C packetType, EntityType fallingBlockType) {
+    public void registerTrackerWithData(C packetType) {
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
             wrapper.passthrough(Types.UUID); // Entity UUID
@@ -49,12 +49,12 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
             wrapper.passthrough(Types.BYTE); // Pitch
             wrapper.passthrough(Types.BYTE); // Yaw
             wrapper.passthrough(Types.INT); // Data
-            getSpawnTrackerWithDataHandler(fallingBlockType).handle(wrapper);
+            getSpawnTrackerWithDataHandler().handle(wrapper);
         });
     }
 
     @Override
-    public void registerTrackerWithData1_19(C packetType, EntityType fallingBlockType) {
+    public void registerTrackerWithData1_19(C packetType) {
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity id
             wrapper.passthrough(Types.UUID); // Entity UUID
@@ -66,22 +66,22 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
             wrapper.passthrough(Types.BYTE); // Yaw
             wrapper.passthrough(Types.BYTE); // Head yaw
             wrapper.passthrough(Types.VAR_INT); // Data
-            getSpawnTrackerWithDataHandler1_19(fallingBlockType).handle(wrapper);
+            getSpawnTrackerWithDataHandler1_19().handle(wrapper);
         });
     }
 
-    public PacketHandler getSpawnTrackerWithDataHandler(EntityType fallingBlockType) {
+    public PacketHandler getSpawnTrackerWithDataHandler() {
         return wrapper -> {
             // Check against the UNMAPPED entity type
             EntityType entityType = trackAndMapEntity(wrapper);
-            if (entityType == fallingBlockType) {
+            if (entityType == typeFromId("falling_block")) {
                 int blockState = wrapper.get(Types.INT, 0);
                 wrapper.set(Types.INT, 0, protocol.getMappingData().getNewBlockStateId(blockState));
             }
         };
     }
 
-    public PacketHandler getSpawnTrackerWithDataHandler1_19(EntityType fallingBlockType) {
+    public PacketHandler getSpawnTrackerWithDataHandler1_19() {
         return wrapper -> {
             if (protocol.getMappingData() == null) {
                 return;
@@ -89,14 +89,15 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
 
             // Check against the UNMAPPED entity type
             EntityType entityType = trackAndMapEntity(wrapper);
-            if (entityType == fallingBlockType) {
+            if (entityType == typeFromId("falling_block")) {
                 int blockState = wrapper.get(Types.VAR_INT, 2);
                 wrapper.set(Types.VAR_INT, 2, protocol.getMappingData().getNewBlockStateId(blockState));
             }
         };
     }
 
-    public void registerSpawnTracker(C packetType) {
+    @Override
+    public void registerTracker(C packetType) {
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
             wrapper.passthrough(Types.UUID); // Entity UUID

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

@@ -17,24 +17,22 @@
  */
 package com.viaversion.viabackwards.api.rewriters;
 
-import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viaversion.api.minecraft.Holder;
-import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.data.Mappings;
+import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.type.Types;
 
 public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversion.viaversion.rewriter.SoundRewriter<C> {
 
-    private final BackwardsProtocol<C, ?, ?, ?> protocol;
-
-    public SoundRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol) {
+    public SoundRewriter(final AbstractProtocol<C, ?, ?, ?> protocol) {
         super(protocol);
-        this.protocol = protocol;
     }
 
     public void registerNamedSound(final C packetType) {
+        if (protocol.getMappingData() == null || Mappings.isFullIdentity(protocol.getMappingData().getFullSoundMappings())) {
+            return;
+        }
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.STRING); // Sound identifier
             getNamedSoundHandler().handle(wrapper);
@@ -42,27 +40,10 @@ public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversi
     }
 
     public void registerStopSound(final C packetType) {
-        protocol.registerClientbound(packetType, wrapper -> getStopSoundHandler().handle(wrapper));
-    }
-
-    public PacketHandler getNamedSoundHandler() {
-        return wrapper -> {
-            final String soundId = wrapper.get(Types.STRING, 0);
-            final String mappedId = protocol.getMappingData().getMappedNamedSound(soundId);
-            if (mappedId == null) {
-                return;
-            }
-
-            if (!mappedId.isEmpty()) {
-                wrapper.set(Types.STRING, 0, mappedId);
-            } else {
-                wrapper.cancel();
-            }
-        };
-    }
-
-    public PacketHandler getStopSoundHandler() {
-        return wrapper -> {
+        if (protocol.getMappingData() == null || Mappings.isFullIdentity(protocol.getMappingData().getFullSoundMappings())) {
+            return;
+        }
+        protocol.registerClientbound(packetType, wrapper -> {
             final byte flags = wrapper.passthrough(Types.BYTE);
             if ((flags & 0x01) != 0) {
                 wrapper.passthrough(Types.VAR_INT); // Source
@@ -70,7 +51,7 @@ public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversi
 
             if ((flags & 0x02) == 0) return; // No sound specified
             final String soundId = wrapper.read(Types.STRING);
-            final String mappedId = protocol.getMappingData().getMappedNamedSound(soundId);
+            final String mappedId = protocol.getMappingData().getFullSoundMappings().mappedIdentifier(soundId);
             if (mappedId == null) {
                 // No mapping found
                 wrapper.write(Types.STRING, soundId);
@@ -83,45 +64,22 @@ public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversi
                 // Cancel if set to empty
                 wrapper.cancel();
             }
-        };
+        });
     }
 
-    @Override
-    public void registerSound1_19_3(final C packetType) {
-        protocol.registerClientbound(packetType, getSoundHandler1_19_3());
-    }
-
-    public PacketHandler getSoundHandler1_19_3() {
+    public PacketHandler getNamedSoundHandler() {
         return wrapper -> {
-            Holder<SoundEvent> soundEventHolder = wrapper.read(Types.SOUND_EVENT);
-            if (soundEventHolder.isDirect()) {
-                wrapper.write(Types.SOUND_EVENT, rewriteSoundEvent(wrapper, soundEventHolder));
+            final String soundId = wrapper.get(Types.STRING, 0);
+            final String mappedId = protocol.getMappingData().getFullSoundMappings().mappedIdentifier(soundId);
+            if (mappedId == null) {
                 return;
             }
 
-            final int mappedId = idRewriter.rewrite(soundEventHolder.id());
-            if (mappedId == -1) {
+            if (!mappedId.isEmpty()) {
+                wrapper.set(Types.STRING, 0, mappedId);
+            } else {
                 wrapper.cancel();
-                return;
             }
-
-            if (mappedId != soundEventHolder.id()) {
-                soundEventHolder = Holder.of(mappedId);
-            }
-
-            wrapper.write(Types.SOUND_EVENT, soundEventHolder);
         };
     }
-
-    public Holder<SoundEvent> rewriteSoundEvent(final PacketWrapper wrapper, final Holder<SoundEvent> soundEventHolder) {
-        final SoundEvent soundEvent = soundEventHolder.value();
-        final String mappedIdentifier = protocol.getMappingData().getMappedNamedSound(soundEvent.identifier());
-        if (mappedIdentifier != null) {
-            if (!mappedIdentifier.isEmpty()) {
-                return Holder.of(soundEvent.withIdentifier(mappedIdentifier));
-            }
-            wrapper.cancel();
-        }
-        return soundEventHolder;
-    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/registration/BackwardsRegistrations.java

@@ -0,0 +1,38 @@
+/*
+ * 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.registration;
+
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.protocol.shared_registration.SharedRegistrations;
+
+public final class BackwardsRegistrations {
+
+    private static final SharedRegistrations REGISTRATIONS = SharedRegistrations.create();
+
+    public static void apply() {
+        REGISTRATIONS.registrations()
+            .range(ProtocolVersion.v1_10, ProtocolVersion.v1_19_3, RegistryRegistrations::registerNamedSound1_10)
+            .since(ProtocolVersion.v1_14, RegistryRegistrations::registerStopSound1_14)
+
+            .register();
+    }
+
+    public static SharedRegistrations registrations() {
+        return REGISTRATIONS;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/registration/RegistryRegistrations.java

@@ -0,0 +1,36 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * 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.registration;
+
+import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.protocol.shared_registration.PacketBound;
+import com.viaversion.viaversion.protocol.shared_registration.RegistrationContext;
+import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
+import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
+
+final class RegistryRegistrations {
+
+    static <CU extends ClientboundPacketType> void registerNamedSound1_10(final RegistrationContext<CU, ?> ctx) {
+        ctx.clientbound(ClientboundPackets1_9_3.CUSTOM_SOUND, new SoundRewriter<>(ctx.protocol())::registerNamedSound, PacketBound.REMOVED_AT_MAX);
+    }
+
+    static <CU extends ClientboundPacketType> void registerStopSound1_14(final RegistrationContext<CU, ?> ctx) {
+        ctx.clientbound(ClientboundPackets1_14.STOP_SOUND, new SoundRewriter<>(ctx.protocol())::registerStopSound);
+    }
+}

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

@@ -22,15 +22,8 @@ import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
-import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
-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.ServerboundPacket1_21_9;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
-import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
 
 // To replace if needed:
 //   ChunkType1_21_5
@@ -43,30 +36,6 @@ final class BlockItemPacketRewriter99_1 extends BackwardsStructuredItemRewriter<
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket26_1> blockRewriter = new BlockRewriter1_21_5<>(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets26_1.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets26_1.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets26_1.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets26_1.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets26_1.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets26_1.BLOCK_ENTITY_DATA);
-
-        // registerOpenScreen(ClientboundPackets26_1.OPEN_SCREEN);
-        registerSetCursorItem(ClientboundPackets26_1.SET_CURSOR_ITEM);
-        registerSetPlayerInventory(ClientboundPackets26_1.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets26_1.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets26_1.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets26_1.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets26_1.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets26_1.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets26_1.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
-
-        final RecipeDisplayRewriter<ClientboundPacket26_1> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets26_1.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets26_1.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets26_1.PLACE_GHOST_RECIPE);
     }
 
     @Override

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

@@ -23,7 +23,6 @@ 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.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;
 
 // Replace if needed
 //  VersionedTypes
@@ -37,13 +36,6 @@ final class EntityPacketRewriter99_1 extends EntityRewriter<ClientboundPacket26_
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_21_9(ClientboundPackets26_1.ADD_ENTITY, EntityTypes1_21_11.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets26_1.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets26_1.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets26_1.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets26_1.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets26_1.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets26_1.RESPAWN);
     }
 
     @Override
@@ -75,9 +67,7 @@ final class EntityPacketRewriter99_1 extends EntityRewriter<ClientboundPacket26_
 
     @Override
     public void onMappingDataLoaded() {
-        // If types changed, uncomment to map them
-        // mapTypes();
-
+        super.onMappingDataLoaded();
         // mapEntityTypeWithData(EntityTypes1_21_11.SNIFFER, EntityTypes1_21_11.RAVAGER).tagName();
     }
 

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

@@ -20,12 +20,12 @@ 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;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
 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.chunk.ChunkType26_1;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -33,14 +33,16 @@ import com.viaversion.viaversion.data.item.ItemHasherBase;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.Protocol1_21_11To26_1;
 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_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 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.ServerboundConfigurationPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 
@@ -62,7 +64,9 @@ final class Protocol99_1To98_1 extends BackwardsProtocol<ClientboundPacket26_1,
     private final ParticleRewriter<ClientboundPacket26_1> particleRewriter = new ParticleRewriter<>(this);
     private final NBTComponentRewriter<ClientboundPacket26_1> translatableRewriter = new ComponentRewriter99_1(this);
     private final TagRewriter<ClientboundPacket26_1> tagRewriter = new TagRewriter<>(this);
-    private final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(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);
 
     public Protocol99_1To98_1() {
         super(ClientboundPacket26_1.class, ClientboundPacket26_1.class, ServerboundPacket1_21_9.class, ServerboundPacket1_21_9.class);
@@ -71,42 +75,6 @@ final class Protocol99_1To98_1 extends BackwardsProtocol<ClientboundPacket26_1,
     @Override
     protected void registerPackets() {
         super.registerPackets();
-
-        registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
-
-        tagRewriter.registerGeneric(ClientboundPackets26_1.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_9.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket26_1> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets26_1.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets26_1.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets26_1.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets26_1.AWARD_STATS);
-        //new AttributeRewriter<>(this).register1_21(ClientboundPackets26_1.UPDATE_ATTRIBUTES);
-
-        // Registers translatable mappings (missing a whole bunch still)
-        //translatableRewriter.registerOpenScreen1_14(ClientboundPackets26_1.OPEN_SCREEN); // Handled by registerOpenScreen in item rewriters
-        translatableRewriter.registerComponentPacket(ClientboundPackets26_1.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets26_1.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets26_1.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets26_1.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets26_1.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21_9.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets26_1.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_21_5(ClientboundPackets26_1.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets26_1.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets26_1.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerComponentPacket(ClientboundPackets26_1.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets26_1.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets26_1.PLAYER_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets26_1.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets26_1.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        // If needed for any particle, item, or block changes. Extend ParticleRewriter for particle serializer changes
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets26_1.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_9(ClientboundPackets26_1.EXPLODE);
     }
 
     @Override
@@ -131,7 +99,17 @@ final class Protocol99_1To98_1 extends BackwardsProtocol<ClientboundPacket26_1,
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket26_1> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket26_1> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_10to1_9_3/Protocol1_10To1_9_3.java

@@ -57,7 +57,7 @@ public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9
         itemRewriter.register();
 
         SoundRewriter<ClientboundPackets1_9_3> soundRewriter = new SoundRewriter<>(this);
-        registerClientbound(ClientboundPackets1_9_3.CUSTOM_SOUND, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_9_3.CUSTOM_SOUND, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.STRING); // 0 - Sound name
@@ -70,7 +70,7 @@ public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9
                 handler(soundRewriter.getNamedSoundHandler());
             }
         });
-        registerClientbound(ClientboundPackets1_9_3.SOUND, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_9_3.SOUND, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Sound name
@@ -116,9 +116,4 @@ public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9
     public BlockItemPacketRewriter1_10 getItemRewriter() {
         return itemRewriter;
     }
-
-    @Override
-    public boolean hasMappingDataToLoad() {
-        return true;
-    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/Protocol1_11To1_10.java

@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.v1_11to1_10;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.BlockItemPacketRewriter1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.EntityPacketRewriter1_11;
@@ -51,10 +50,6 @@ public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_
         itemRewriter.register();
         PlayerPacketRewriter1_11.register(this);
 
-        SoundRewriter<ClientboundPackets1_9_3> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerNamedSound(ClientboundPackets1_9_3.CUSTOM_SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_9_3.SOUND);
-
         componentRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
         componentRewriter.registerComponentPacket(ClientboundPackets1_9_3.CHAT);
     }
@@ -84,12 +79,8 @@ public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_
         return itemRewriter;
     }
 
+    @Override
     public JsonNBTComponentRewriter<ClientboundPackets1_9_3> getComponentRewriter() {
         return componentRewriter;
     }
-
-    @Override
-    public boolean hasMappingDataToLoad() {
-        return true;
-    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/Protocol1_12To1_11_1.java

@@ -50,8 +50,8 @@ public class Protocol1_12To1_11_1 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        itemRewriter.register();
-        entityRewriter.register();
+        super.registerPackets();
+
         componentRewriter.registerComponentPacket(ClientboundPackets1_12.CHAT);
         new SoundPacketRewriter1_12(this).register();
 
@@ -92,12 +92,8 @@ public class Protocol1_12To1_11_1 extends BackwardsProtocol<ClientboundPackets1_
         return itemRewriter;
     }
 
+    @Override
     public ComponentRewriter1_12 getComponentRewriter() {
         return componentRewriter;
     }
-
-    @Override
-    public boolean hasMappingDataToLoad() {
-        return true;
-    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/rewriter/SoundPacketRewriter1_12.java

@@ -32,20 +32,7 @@ public class SoundPacketRewriter1_12 extends LegacySoundRewriter<Protocol1_12To1
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.CUSTOM_SOUND, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.STRING); // 0 - Sound name
-                map(Types.VAR_INT); // 1 - Sound Category
-                map(Types.INT); // 2 - x
-                map(Types.INT); // 3 - y
-                map(Types.INT); // 4 - z
-                map(Types.FLOAT); // 5 - Volume
-                map(Types.FLOAT); // 6 - Pitch
-            }
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_12.SOUND, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_12.SOUND, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Sound name

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/Protocol1_13_1To1_13.java

@@ -41,7 +41,6 @@ import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ComponentUtil;
@@ -65,19 +64,8 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
 
         WorldPacketRewriter1_13_1.register(this);
 
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_13.CHAT);
-        translatableRewriter.registerPlayerCombat(ClientboundPackets1_13.PLAYER_COMBAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_13.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_13.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_13.SET_PLAYER_TEAM);
-        translatableRewriter.registerTitle(ClientboundPackets1_13.SET_TITLES);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_13.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
         new CommandRewriter1_13_1(this).registerDeclareCommands(ClientboundPackets1_13.COMMANDS);
 
-        particleRewriter.registerLevelParticles1_13(ClientboundPackets1_13.LEVEL_PARTICLES, Types.FLOAT);
-
         registerServerbound(ServerboundPackets1_13.COMMAND_SUGGESTION, new PacketHandlers() {
             @Override
             public void register() {
@@ -144,7 +132,7 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
             }
         });
 
-        registerClientbound(ClientboundPackets1_13.BOSS_EVENT, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_13.BOSS_EVENT, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.UUID);
@@ -166,41 +154,7 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
             }
         });
 
-        registerClientbound(ClientboundPackets1_13.UPDATE_ADVANCEMENTS, wrapper -> {
-            wrapper.passthrough(Types.BOOLEAN); // Reset/clear
-            int size = wrapper.passthrough(Types.VAR_INT); // Mapping size
-
-            for (int i = 0; i < size; i++) {
-                wrapper.passthrough(Types.STRING); // Identifier
-                wrapper.passthrough(Types.OPTIONAL_STRING); // Parent
-
-                // Display data
-                if (wrapper.passthrough(Types.BOOLEAN)) {
-                    wrapper.passthrough(Types.COMPONENT); // Title
-                    wrapper.passthrough(Types.COMPONENT); // Description
-                    Item icon = itemRewriter.handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_13));
-                    wrapper.write(Types.ITEM1_13, icon);
-                    wrapper.passthrough(Types.VAR_INT); // Frame type
-                    int flags = wrapper.passthrough(Types.INT); // Flags
-                    if ((flags & 1) != 0)
-                        wrapper.passthrough(Types.STRING); // Background texture
-                    wrapper.passthrough(Types.FLOAT); // X
-                    wrapper.passthrough(Types.FLOAT); // Y
-                }
-
-                wrapper.passthrough(Types.STRING_ARRAY); // Criteria
-
-                int arrayLength = wrapper.passthrough(Types.VAR_INT);
-                for (int array = 0; array < arrayLength; array++) {
-                    wrapper.passthrough(Types.STRING_ARRAY); // String array
-                }
-            }
-        });
-
         tagRewriter.register(ClientboundPackets1_13.UPDATE_TAGS, RegistryType.ITEM);
-        new StatisticsRewriter<>(this).
-
-            register(ClientboundPackets1_13.AWARD_STATS);
     }
 
     @Override
@@ -229,6 +183,11 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
         return particleRewriter;
     }
 
+    @Override
+    public JsonNBTComponentRewriter<ClientboundPackets1_13> getComponentRewriter() {
+        return translatableRewriter;
+    }
+
     public JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter() {
         return translatableRewriter;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java

@@ -122,7 +122,6 @@ public class EntityPacketRewriter1_13_1 extends LegacyEntityRewriter<Clientbound
         registerTracker(ClientboundPackets1_13.ADD_PAINTING, EntityTypes1_13.EntityType.PAINTING);
         registerJoinGame(ClientboundPackets1_13.LOGIN, EntityTypes1_13.EntityType.PLAYER);
         registerRespawn(ClientboundPackets1_13.RESPAWN);
-        registerRemoveEntities(ClientboundPackets1_13.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_13.SET_ENTITY_DATA, Types1_13.ENTITY_DATA_LIST);
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/ItemPacketRewriter1_13_1.java

@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards.protocol.v1_13_1to1_13.rewriter;
 
 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.Protocol1_13_1To1_13;
-import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
@@ -32,10 +31,6 @@ public class ItemPacketRewriter1_13_1 extends ItemRewriter<ClientboundPackets1_1
 
     @Override
     public void registerPackets() {
-        registerCooldown(ClientboundPackets1_13.COOLDOWN);
-        registerSetContent(ClientboundPackets1_13.CONTAINER_SET_CONTENT);
-        registerSetSlot(ClientboundPackets1_13.CONTAINER_SET_SLOT);
-
         protocol.registerClientbound(ClientboundPackets1_13.CUSTOM_PAYLOAD, wrapper -> {
             String channel = wrapper.passthrough(Types.STRING);
             if (channel.equals("minecraft:trader_list")) {
@@ -57,9 +52,5 @@ public class ItemPacketRewriter1_13_1 extends ItemRewriter<ClientboundPackets1_1
                 }
             }
         });
-
-        registerSetEquippedItem(ClientboundPackets1_13.SET_EQUIPPED_ITEM);
-        registerContainerClick(ServerboundPackets1_13.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_13.SET_CREATIVE_MODE_SLOT);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/Protocol1_13To1_12_2.java

@@ -37,6 +37,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
@@ -82,13 +83,12 @@ public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_12_2To1_13.class, () -> {
-            MAPPINGS.load();
-            PaintingNames1_13.init();
-            Via.getManager().getProviders().register(BackwardsBlockEntityProvider.class, new BackwardsBlockEntityProvider());
-        });
+        super.registerPackets();
 
-        translatableRewriter.registerPing();
+        PaintingNames1_13.init();
+        Via.getManager().getProviders().register(BackwardsBlockEntityProvider.class, new BackwardsBlockEntityProvider());
+
+        translatableRewriter.registerLoginDisconnect();
         translatableRewriter.registerBossEvent(ClientboundPackets1_13.BOSS_EVENT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_13.CHAT);
         translatableRewriter.registerLegacyOpenWindow(ClientboundPackets1_13.OPEN_SCREEN);
@@ -97,17 +97,15 @@ public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_
         translatableRewriter.registerTitle(ClientboundPackets1_13.SET_TITLES);
         translatableRewriter.registerTabList(ClientboundPackets1_13.TAB_LIST);
 
-        blockItemPackets.register();
-        entityRewriter.register();
         new PlayerPacketRewriter1_13(this).register();
         new SoundPacketRewriter1_13(this).register();
 
         cancelClientbound(ClientboundPackets1_13.TAG_QUERY);
         cancelClientbound(ClientboundPackets1_13.PLACE_GHOST_RECIPE);
         cancelClientbound(ClientboundPackets1_13.RECIPE);
-        cancelClientbound(ClientboundPackets1_13.UPDATE_ADVANCEMENTS);
         cancelClientbound(ClientboundPackets1_13.UPDATE_RECIPES);
         cancelClientbound(ClientboundPackets1_13.UPDATE_TAGS);
+        replaceClientbound(ClientboundPackets1_13.UPDATE_ADVANCEMENTS, PacketWrapper::cancel);
 
         cancelServerbound(ServerboundPackets1_12_1.PLACE_RECIPE);
         cancelServerbound(ServerboundPackets1_12_1.RECIPE_BOOK_UPDATE);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java

@@ -92,7 +92,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_13.COOLDOWN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_13.COOLDOWN, wrapper -> {
             int itemId = wrapper.read(Types.VAR_INT);
             int oldId = protocol.getMappingData().getItemMappings().getNewId(itemId);
             if (oldId == -1) {
@@ -252,30 +252,6 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_CONTENT, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.UNSIGNED_BYTE);
-                map(Types.ITEM1_13_SHORT_ARRAY, Types.ITEM1_8_SHORT_ARRAY);
-
-                handler(wrapper -> {
-                    final Item[] items = wrapper.get(Types.ITEM1_8_SHORT_ARRAY, 0);
-                    for (int i = 0; i < items.length; i++) {
-                        items[i] = handleItemToClient(wrapper.user(), items[i]);
-                    }
-                });
-            }
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_SLOT, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.BYTE);
-                map(Types.SHORT);
-                handler(wrapper -> passthroughClientboundItem(wrapper));
-            }
-        });
-
         protocol.registerClientbound(ClientboundPackets1_13.LEVEL_CHUNK, wrapper -> {
             ClientWorld clientWorld = wrapper.user().getClientWorld(Protocol1_13To1_12_2.class);
 
@@ -419,57 +395,6 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
                 });
             }
         });
-
-        protocol.registerClientbound(ClientboundPackets1_13.SET_EQUIPPED_ITEM, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.VAR_INT);
-                map(Types.VAR_INT);
-                handler(wrapper -> passthroughClientboundItem(wrapper));
-            }
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_DATA, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.UNSIGNED_BYTE); // Window Id
-                map(Types.SHORT); // Property
-                map(Types.SHORT); // Value
-                handler(wrapper -> {
-                    short property = wrapper.get(Types.SHORT, 0);
-                    // Enchantment table
-                    if (property >= 4 && property <= 6) {
-                        short oldId = wrapper.get(Types.SHORT, 1);
-                        wrapper.set(Types.SHORT, 1, (short) protocol.getMappingData().getEnchantmentMappings().getNewId(oldId));
-                    }
-                });
-            }
-        });
-
-
-        protocol.registerServerbound(ServerboundPackets1_12_1.SET_CREATIVE_MODE_SLOT, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.SHORT);
-                map(Types.ITEM1_8, Types.ITEM1_13);
-
-                handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_13, 0)));
-            }
-        });
-
-        protocol.registerServerbound(ServerboundPackets1_12_1.CONTAINER_CLICK, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.BYTE);
-                map(Types.SHORT);
-                map(Types.BYTE);
-                map(Types.SHORT);
-                map(Types.VAR_INT);
-                map(Types.ITEM1_8, Types.ITEM1_13);
-
-                handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_13, 0)));
-            }
-        });
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java

@@ -206,7 +206,6 @@ public class EntityPacketRewriter1_13 extends LegacyEntityRewriter<ClientboundPa
             }
         });
 
-        registerRemoveEntities(ClientboundPackets1_13.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_13.SET_ENTITY_DATA, Types1_13.ENTITY_DATA_LIST, Types.ENTITY_DATA_LIST1_12);
 
         // Face Player (new packet)

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/PlayerPacketRewriter1_13.java

@@ -486,7 +486,7 @@ public class PlayerPacketRewriter1_13 extends RewriterBase<Protocol1_13To1_12_2>
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.AWARD_STATS, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_13.AWARD_STATS, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/SoundPacketRewriter1_13.java

@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_13to1_12_2.rewriter;
 
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.data.NamedSoundMappings1_12_2;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.rewriter.RewriterBase;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
@@ -34,7 +33,7 @@ public class SoundPacketRewriter1_13 extends RewriterBase<Protocol1_13To1_12_2>
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_13.CUSTOM_SOUND, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_13.CUSTOM_SOUND, wrapper -> {
             String sound = wrapper.read(Types.STRING);
             String mappedSound = NamedSoundMappings1_12_2.getOldId(sound);
             if (mappedSound != null || (mappedSound = protocol.getMappingData().getMappedNamedSound(sound)) != null) {
@@ -69,21 +68,5 @@ public class SoundPacketRewriter1_13 extends RewriterBase<Protocol1_13To1_12_2>
             wrapper.write(Types.STRING, source);
             wrapper.write(Types.STRING, sound);
         });
-
-        protocol.registerClientbound(ClientboundPackets1_13.SOUND, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.VAR_INT);
-                handler(wrapper -> {
-                    int newSound = wrapper.get(Types.VAR_INT, 0);
-                    int oldSound = protocol.getMappingData().getSoundMappings().getNewId(newSound);
-                    if (oldSound == -1) {
-                        wrapper.cancel();
-                    } else {
-                        wrapper.set(Types.VAR_INT, 0, oldSound);
-                    }
-                });
-            }
-        });
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_14_1to1_14/rewriter/EntityPacketRewriter1_14_1.java

@@ -42,7 +42,6 @@ public class EntityPacketRewriter1_14_1 extends LegacyEntityRewriter<Clientbound
         registerTracker(ClientboundPackets1_14.ADD_PLAYER, EntityTypes1_14.PLAYER);
         registerJoinGame(ClientboundPackets1_14.LOGIN, EntityTypes1_14.PLAYER);
         registerRespawn(ClientboundPackets1_14.RESPAWN);
-        registerRemoveEntities(ClientboundPackets1_14.REMOVE_ENTITIES);
 
         protocol.registerClientbound(ClientboundPackets1_14.ADD_ENTITY, new PacketHandlers() {
             @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_14_2to1_14_1/Protocol1_14_2To1_14_1.java

@@ -22,4 +22,8 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
 
 public class Protocol1_14_2To1_14_1 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_14, ServerboundPackets1_14, ServerboundPackets1_14> {
+
+    public Protocol1_14_2To1_14_1() {
+        super(ClientboundPackets1_14.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
+    }
 }

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

@@ -37,8 +37,8 @@ import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 
 public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_13, ServerboundPackets1_14, ServerboundPackets1_13> {
@@ -46,6 +46,7 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
     public static final BackwardsMappingData1_14 MAPPINGS = new BackwardsMappingData1_14();
     private final EntityPacketRewriter1_14 entityRewriter = new EntityPacketRewriter1_14(this);
     private final BlockItemPacketRewriter1_14 itemRewriter = new BlockItemPacketRewriter1_14(this);
+    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);
 
@@ -57,24 +58,10 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerBossEvent(ClientboundPackets1_14.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_14.CHAT);
-        translatableRewriter.registerPlayerCombat(ClientboundPackets1_14.PLAYER_COMBAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_14.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_14.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_14.SET_PLAYER_TEAM);
-        translatableRewriter.registerTitle(ClientboundPackets1_14.SET_TITLES);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_14.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_13(ClientboundPackets1_14.LEVEL_PARTICLES, Types.FLOAT);
-
         new CommandRewriter1_14(this).registerDeclareCommands(ClientboundPackets1_14.COMMANDS);
         new PlayerPacketRewriter1_14(this).register();
         new SoundPacketRewriter1_14(this).register();
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_14.AWARD_STATS);
-
         cancelClientbound(ClientboundPackets1_14.SET_CHUNK_CACHE_CENTER);
         cancelClientbound(ClientboundPackets1_14.SET_CHUNK_CACHE_RADIUS);
 
@@ -193,6 +180,11 @@ public class Protocol1_14To1_13_2 extends BackwardsProtocol<ClientboundPackets1_
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_14> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_14> getParticleRewriter() {
         return particleRewriter;

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

@@ -57,7 +57,6 @@ import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Key;
@@ -78,7 +77,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
     protected void registerPackets() {
         protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)));
 
-        protocol.registerClientbound(ClientboundPackets1_14.OPEN_SCREEN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_14.OPEN_SCREEN, wrapper -> {
             int windowId = wrapper.read(Types.VAR_INT);
             wrapper.write(Types.UNSIGNED_BYTE, (short) windowId);
 
@@ -164,13 +163,6 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             wrapper.passthrough(Types.INT); // Entity id
         });
 
-        BlockRewriter<ClientboundPackets1_14> blockRewriter = BlockRewriter.legacy(protocol);
-
-        registerCooldown(ClientboundPackets1_14.COOLDOWN);
-        registerSetContent(ClientboundPackets1_14.CONTAINER_SET_CONTENT);
-        registerSetSlot(ClientboundPackets1_14.CONTAINER_SET_SLOT);
-        registerAdvancements(ClientboundPackets1_14.UPDATE_ADVANCEMENTS);
-
         // Trade List -> Plugin Message
         protocol.registerClientbound(ClientboundPackets1_14.MERCHANT_OFFERS, ClientboundPackets1_13.CUSTOM_PAYLOAD, wrapper -> {
             wrapper.write(Types.STRING, "minecraft:trader_list");
@@ -210,7 +202,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             wrapper.read(Types.VAR_INT);
             wrapper.read(Types.VAR_INT);
             wrapper.read(Types.BOOLEAN);
-        });
+        }, true);
 
         // Open Book -> Plugin Message
         protocol.registerClientbound(ClientboundPackets1_14.OPEN_BOOK, ClientboundPackets1_13.CUSTOM_PAYLOAD, wrapper -> {
@@ -218,7 +210,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             wrapper.passthrough(Types.VAR_INT);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SET_EQUIPPED_ITEM, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_14.SET_EQUIPPED_ITEM, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Entity ID
@@ -286,10 +278,6 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             wrapper.set(Types.VAR_INT, 0, size - deleted);
         });
 
-
-        registerContainerClick(ServerboundPackets1_13.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_13.SET_CREATIVE_MODE_SLOT);
-
         protocol.registerClientbound(ClientboundPackets1_14.BLOCK_DESTRUCTION, new PacketHandlers() {
             @Override
             public void register() {
@@ -306,7 +294,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_EVENT, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_14.BLOCK_EVENT, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.BLOCK_POSITION1_14, Types.BLOCK_POSITION1_8); // Location
@@ -324,7 +312,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_UPDATE, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_14.BLOCK_UPDATE, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.BLOCK_POSITION1_14, Types.BLOCK_POSITION1_8);
@@ -337,8 +325,6 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             }
         });
 
-        blockRewriter.registerChunkBlocksUpdate(ClientboundPackets1_14.CHUNK_BLOCKS_UPDATE);
-
         protocol.registerClientbound(ClientboundPackets1_14.EXPLODE, new PacketHandlers() {
             @Override
             public void register() {
@@ -412,7 +398,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
             wrapper.user().get(ChunkLightStorage.class).unloadChunk(x, z);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.LEVEL_EVENT, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_14.LEVEL_EVENT, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // Effect Id

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

@@ -298,7 +298,6 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
             }
         });
 
-        registerRemoveEntities(ClientboundPackets1_14.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_14.SET_ENTITY_DATA, Types1_14.ENTITY_DATA_LIST, Types1_13_2.ENTITY_DATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_14.LOGIN, new PacketHandlers() {
@@ -521,8 +520,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_14.CAT, EntityTypes1_14.OCELOT).jsonName();
         mapEntityTypeWithData(EntityTypes1_14.TRADER_LLAMA, EntityTypes1_14.LLAMA).jsonName();
         mapEntityTypeWithData(EntityTypes1_14.FOX, EntityTypes1_14.WOLF).jsonName();

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

@@ -17,7 +17,6 @@
  */
 package com.viaversion.viabackwards.protocol.v1_14to1_13_2.rewriter;
 
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.EntityPositionStorage1_14;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
@@ -35,11 +34,6 @@ public class SoundPacketRewriter1_14 extends RewriterBase<Protocol1_14To1_13_2>
 
     @Override
     protected void registerPackets() {
-        SoundRewriter<ClientboundPackets1_14> soundRewriter = new SoundRewriter<>(protocol);
-        soundRewriter.registerSound(ClientboundPackets1_14.SOUND);
-        soundRewriter.registerNamedSound(ClientboundPackets1_14.CUSTOM_SOUND);
-        soundRewriter.registerStopSound(ClientboundPackets1_14.STOP_SOUND);
-
         // Entity Sound Effect
         protocol.registerClientbound(ClientboundPackets1_14.SOUND_ENTITY, null, wrapper -> {
             wrapper.cancel();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_15_1to1_15/Protocol1_15_1To1_15.java

@@ -22,4 +22,8 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
 
 public class Protocol1_15_1To1_15 extends BackwardsProtocol<ClientboundPackets1_15, ClientboundPackets1_15, ServerboundPackets1_14, ServerboundPackets1_14> {
+
+    public Protocol1_15_1To1_15() {
+        super(ClientboundPackets1_15.class, ClientboundPackets1_15.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_15_2to1_15_1/Protocol1_15_2To1_15_1.java

@@ -22,4 +22,8 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
 
 public class Protocol1_15_2To1_15_1 extends BackwardsProtocol<ClientboundPackets1_15, ClientboundPackets1_15, ServerboundPackets1_14, ServerboundPackets1_14> {
+
+    public Protocol1_15_2To1_15_1() {
+        super(ClientboundPackets1_15.class, ClientboundPackets1_15.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_15to1_14_4/Protocol1_15To1_14_4.java

@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_15to1_14_4;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_15to1_14_4.rewriter.BlockItemPacketRewriter1_15;
 import com.viaversion.viabackwards.protocol.v1_15to1_14_4.rewriter.EntityPacketRewriter1_15;
@@ -36,8 +35,8 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 
@@ -46,6 +45,7 @@ public class Protocol1_15To1_14_4 extends BackwardsProtocol<ClientboundPackets1_
     public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.15", "1.14", Protocol1_14_4To1_15.class);
     private final EntityPacketRewriter1_15 entityRewriter = new EntityPacketRewriter1_15(this);
     private final BlockItemPacketRewriter1_15 blockItemPackets = new BlockItemPacketRewriter1_15(this);
+    private final BlockRewriter<ClientboundPackets1_15> blockRewriter = BlockRewriter.for1_14(this);
     private final ParticleRewriter<ClientboundPackets1_15> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_15> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_15> tagRewriter = new TagRewriter<>(this);
@@ -58,23 +58,6 @@ public class Protocol1_15To1_14_4 extends BackwardsProtocol<ClientboundPackets1_
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerBossEvent(ClientboundPackets1_15.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_15.CHAT);
-        translatableRewriter.registerPlayerCombat(ClientboundPackets1_15.PLAYER_COMBAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_15.DISCONNECT);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_15.OPEN_SCREEN);
-        translatableRewriter.registerTabList(ClientboundPackets1_15.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_15.SET_PLAYER_TEAM);
-        translatableRewriter.registerTitle(ClientboundPackets1_15.SET_TITLES);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_15.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        SoundRewriter<ClientboundPackets1_15> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound(ClientboundPackets1_15.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_15.SOUND_ENTITY);
-        soundRewriter.registerNamedSound(ClientboundPackets1_15.CUSTOM_SOUND);
-        soundRewriter.registerStopSound(ClientboundPackets1_15.STOP_SOUND);
-
         // Explosion - manually send an explosion sound
         registerClientbound(ClientboundPackets1_15.EXPLODE, new PacketHandlers() {
             @Override
@@ -101,8 +84,6 @@ public class Protocol1_15To1_14_4 extends BackwardsProtocol<ClientboundPackets1_
         });
 
         tagRewriter.register(ClientboundPackets1_15.UPDATE_TAGS, RegistryType.ENTITY);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_15.AWARD_STATS);
     }
 
     @Override
@@ -128,6 +109,11 @@ public class Protocol1_15To1_14_4 extends BackwardsProtocol<ClientboundPackets1_
         return blockItemPackets;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_15> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_15> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_15to1_14_4/rewriter/BlockItemPacketRewriter1_15.java

@@ -27,7 +27,6 @@ import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_15;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 
 public class BlockItemPacketRewriter1_15 extends BackwardsItemRewriter<ClientboundPackets1_15, ServerboundPackets1_14, Protocol1_15To1_14_4> {
@@ -38,26 +37,10 @@ public class BlockItemPacketRewriter1_15 extends BackwardsItemRewriter<Clientbou
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_15> blockRewriter = BlockRewriter.for1_14(protocol);
-
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_15.UPDATE_RECIPES);
 
         protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)));
 
-        registerCooldown(ClientboundPackets1_15.COOLDOWN);
-        registerSetContent(ClientboundPackets1_15.CONTAINER_SET_CONTENT);
-        registerSetSlot(ClientboundPackets1_15.CONTAINER_SET_SLOT);
-        registerMerchantOffers(ClientboundPackets1_15.MERCHANT_OFFERS);
-        registerSetEquippedItem(ClientboundPackets1_15.SET_EQUIPPED_ITEM);
-        registerAdvancements(ClientboundPackets1_15.UPDATE_ADVANCEMENTS);
-        registerContainerClick(ServerboundPackets1_14.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_14.SET_CREATIVE_MODE_SLOT);
-
-        blockRewriter.registerBlockBreakAck(ClientboundPackets1_15.BLOCK_BREAK_ACK);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_15.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_15.BLOCK_UPDATE);
-        blockRewriter.registerChunkBlocksUpdate(ClientboundPackets1_15.CHUNK_BLOCKS_UPDATE);
-
         protocol.registerClientbound(ClientboundPackets1_15.LEVEL_CHUNK, wrapper -> {
             Chunk chunk = wrapper.read(ChunkType1_15.TYPE);
             wrapper.write(ChunkType1_14.TYPE, chunk);
@@ -85,12 +68,10 @@ public class BlockItemPacketRewriter1_15 extends BackwardsItemRewriter<Clientbou
                 chunk.setBiomeData(newBiomeData);
             }
 
-            blockRewriter.handleChunk(chunk);
+            protocol.getBlockRewriter().handleChunk(chunk);
         });
 
-        blockRewriter.registerLevelEvent(ClientboundPackets1_15.LEVEL_EVENT, 1010, 2001);
-
-        protocol.registerClientbound(ClientboundPackets1_15.LEVEL_PARTICLES, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_15.LEVEL_PARTICLES, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // 0 - Particle ID

common/src/main/java/com/viaversion/viabackwards/protocol/v1_15to1_14_4/rewriter/EntityPacketRewriter1_15.java

@@ -63,9 +63,7 @@ public class EntityPacketRewriter1_15 extends EntityRewriter<ClientboundPackets1
             }
         });
 
-        registerTrackerWithData(ClientboundPackets1_15.ADD_ENTITY, EntityTypes1_15.FALLING_BLOCK);
-
-        protocol.registerClientbound(ClientboundPackets1_15.ADD_MOB, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_15.ADD_MOB, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Entity ID
@@ -144,7 +142,6 @@ public class EntityPacketRewriter1_15 extends EntityRewriter<ClientboundPackets1
             }
         });
 
-        registerRemoveEntities(ClientboundPackets1_15.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_15.SET_ENTITY_DATA, Types1_14.ENTITY_DATA_LIST);
 
         // Attributes (get rid of generic.flyingSpeed for the Bee remap)
@@ -213,8 +210,7 @@ public class EntityPacketRewriter1_15 extends EntityRewriter<ClientboundPackets1
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_15.BEE, EntityTypes1_15.PUFFERFISH).jsonName().spawnEntityData(storage -> {
             storage.add(new EntityData(14, Types1_14.ENTITY_DATA_TYPES.booleanType, false));
             storage.add(new EntityData(15, Types1_14.ENTITY_DATA_TYPES.varIntType, 2));

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_1to1_16/Protocol1_16_1To1_16.java

@@ -22,4 +22,8 @@ import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16;
 
 public class Protocol1_16_1To1_16 extends BackwardsProtocol<ClientboundPackets1_16, ClientboundPackets1_16, ServerboundPackets1_16, ServerboundPackets1_16> {
+
+    public Protocol1_16_1To1_16() {
+        super(ClientboundPackets1_16.class, ClientboundPackets1_16.class, ServerboundPackets1_16.class, ServerboundPackets1_16.class);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/Protocol1_16_2To1_16_1.java

@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_16_2to1_16_1;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.BlockItemPacketRewriter1_16_2;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.CommandRewriter1_16_2;
@@ -38,8 +37,8 @@ import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ProtocolLogger;
@@ -50,6 +49,7 @@ public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets
     public static final ProtocolLogger LOGGER = new BackwardsProtocolLogger(Protocol1_16_2To1_16_1.class);
     private final EntityPacketRewriter1_16_2 entityRewriter = new EntityPacketRewriter1_16_2(this);
     private final BlockItemPacketRewriter1_16_2 blockItemPackets = new BlockItemPacketRewriter1_16_2(this);
+    private final BlockRewriter<ClientboundPackets1_16_2> blockRewriter = BlockRewriter.for1_14(this);
     private final ParticleRewriter<ClientboundPackets1_16_2> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_16_2> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_16_2> tagRewriter = new TagRewriter<>(this);
@@ -62,27 +62,9 @@ public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerBossEvent(ClientboundPackets1_16_2.BOSS_EVENT);
-        translatableRewriter.registerPlayerCombat(ClientboundPackets1_16_2.PLAYER_COMBAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_16_2.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_16_2.TAB_LIST);
-        translatableRewriter.registerTitle(ClientboundPackets1_16_2.SET_TITLES);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_16_2.SET_PLAYER_TEAM);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_16_2.OPEN_SCREEN);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_16_2.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_13(ClientboundPackets1_16_2.LEVEL_PARTICLES, Types.DOUBLE);
-
         new CommandRewriter1_16_2(this).registerDeclareCommands(ClientboundPackets1_16_2.COMMANDS);
 
-        SoundRewriter<ClientboundPackets1_16_2> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND_ENTITY);
-        soundRewriter.registerNamedSound(ClientboundPackets1_16_2.CUSTOM_SOUND);
-        soundRewriter.registerStopSound(ClientboundPackets1_16_2.STOP_SOUND);
-
-        registerClientbound(ClientboundPackets1_16_2.CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_16_2.CHAT, wrapper -> {
             JsonElement message = wrapper.passthrough(Types.COMPONENT);
             translatableRewriter.processText(wrapper.user(), message);
             byte position = wrapper.passthrough(Types.BYTE);
@@ -112,8 +94,6 @@ public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets
         });
 
         tagRewriter.register(ClientboundPackets1_16_2.UPDATE_TAGS, RegistryType.ENTITY);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_16_2.AWARD_STATS);
     }
 
     private static void sendSeenRecipePacket(int recipeType, PacketWrapper wrapper) {
@@ -158,6 +138,11 @@ public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets
         return blockItemPackets;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_16_2> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_16_2> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/BlockItemPacketRewriter1_16_2.java

@@ -33,7 +33,6 @@ import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16_2;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -46,17 +45,8 @@ public class BlockItemPacketRewriter1_16_2 extends BackwardsItemRewriter<Clientb
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_16_2> blockRewriter = BlockRewriter.for1_14(protocol);
-
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_16_2.UPDATE_RECIPES);
 
-        registerCooldown(ClientboundPackets1_16_2.COOLDOWN);
-        registerSetContent(ClientboundPackets1_16_2.CONTAINER_SET_CONTENT);
-        registerSetSlot(ClientboundPackets1_16_2.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_16_2.SET_EQUIPMENT);
-        registerMerchantOffers(ClientboundPackets1_16_2.MERCHANT_OFFERS);
-        registerAdvancements(ClientboundPackets1_16_2.UPDATE_ADVANCEMENTS);
-
         protocol.registerClientbound(ClientboundPackets1_16_2.RECIPE, wrapper -> {
             wrapper.passthrough(Types.VAR_INT);
             wrapper.passthrough(Types.BOOLEAN); // Open
@@ -70,10 +60,7 @@ public class BlockItemPacketRewriter1_16_2 extends BackwardsItemRewriter<Clientb
             wrapper.read(Types.BOOLEAN);
         });
 
-        blockRewriter.registerBlockBreakAck(ClientboundPackets1_16_2.BLOCK_BREAK_ACK);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_16_2.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_16_2.BLOCK_UPDATE);
-        blockRewriter.registerLevelChunk(ClientboundPackets1_16_2.LEVEL_CHUNK, ChunkType1_16_2.TYPE, ChunkType1_16.TYPE, (connection, chunk) -> {
+        protocol.getBlockRewriter().registerLevelChunk(ClientboundPackets1_16_2.LEVEL_CHUNK, ChunkType1_16_2.TYPE, ChunkType1_16.TYPE, (connection, chunk) -> {
             chunk.setIgnoreOldLightData(true);
 
             for (CompoundTag blockEntity : chunk.getBlockEntities()) {
@@ -112,10 +99,6 @@ public class BlockItemPacketRewriter1_16_2 extends BackwardsItemRewriter<Clientb
             }
         });
 
-        blockRewriter.registerLevelEvent(ClientboundPackets1_16_2.LEVEL_EVENT, 1010, 2001);
-
-        registerContainerClick(ServerboundPackets1_16.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_16.SET_CREATIVE_MODE_SLOT);
         protocol.registerServerbound(ServerboundPackets1_16.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)));
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java

@@ -49,12 +49,9 @@ public class EntityPacketRewriter1_16_2 extends EntityRewriter<ClientboundPacket
 
     @Override
     protected void registerPackets() {
-        registerTrackerWithData(ClientboundPackets1_16_2.ADD_ENTITY, EntityTypes1_16_2.FALLING_BLOCK);
-        registerSpawnTracker(ClientboundPackets1_16_2.ADD_MOB);
         registerTracker(ClientboundPackets1_16_2.ADD_EXPERIENCE_ORB, EntityTypes1_16_2.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_16_2.ADD_PAINTING, EntityTypes1_16_2.PAINTING);
         registerTracker(ClientboundPackets1_16_2.ADD_PLAYER, EntityTypes1_16_2.PLAYER);
-        registerRemoveEntities(ClientboundPackets1_16_2.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_16_2.SET_ENTITY_DATA, Types1_16.ENTITY_DATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_16_2.LOGIN, new PacketHandlers() {
@@ -136,8 +133,7 @@ public class EntityPacketRewriter1_16_2 extends EntityRewriter<ClientboundPacket
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_16_2.PIGLIN_BRUTE, EntityTypes1_16_2.PIGLIN).jsonName();
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_3to1_16_2/Protocol1_16_3To1_16_2.java

@@ -22,4 +22,8 @@ import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 
 public class Protocol1_16_3To1_16_2 extends BackwardsProtocol<ClientboundPackets1_16_2, ClientboundPackets1_16_2, ServerboundPackets1_16_2, ServerboundPackets1_16_2> {
+
+    public Protocol1_16_3To1_16_2() {
+        super(ClientboundPackets1_16_2.class, ClientboundPackets1_16_2.class, ServerboundPackets1_16_2.class, ServerboundPackets1_16_2.class);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/Protocol1_16To1_15_2.java

@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards.protocol.v1_16to1_15_2;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_16to1_15_2.data.BackwardsMappingData1_16;
 import com.viaversion.viabackwards.protocol.v1_16to1_15_2.rewriter.BlockItemPacketRewriter1_16;
 import com.viaversion.viabackwards.protocol.v1_16to1_15_2.rewriter.CommandRewriter1_16;
@@ -43,8 +42,8 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.GsonUtil;
 import java.util.UUID;
@@ -57,6 +56,7 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
     private final ParticleRewriter<ClientboundPackets1_16> particleRewriter = new ParticleRewriter<>(this);
     private final TranslatableRewriter1_16 translatableRewriter = new TranslatableRewriter1_16(this);
     private final TagRewriter<ClientboundPackets1_16> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_16> blockRewriter = BlockRewriter.for1_14(this);
 
     public Protocol1_16To1_15_2() {
         super(ClientboundPackets1_16.class, ClientboundPackets1_15.class, ServerboundPackets1_16.class, ServerboundPackets1_14.class);
@@ -66,17 +66,6 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerBossEvent(ClientboundPackets1_16.BOSS_EVENT);
-        translatableRewriter.registerPlayerCombat(ClientboundPackets1_16.PLAYER_COMBAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_16.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_16.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_16.SET_PLAYER_TEAM);
-        translatableRewriter.registerTitle(ClientboundPackets1_16.SET_TITLES);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_16.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_13(ClientboundPackets1_16.LEVEL_PARTICLES, Types.DOUBLE);
-
         new CommandRewriter1_16(this).registerDeclareCommands(ClientboundPackets1_16.COMMANDS);
 
         registerClientbound(State.STATUS, ClientboundStatusPackets.STATUS_RESPONSE, wrapper -> {
@@ -89,7 +78,7 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
             wrapper.set(Types.STRING, 0, object.toString());
         });
 
-        registerClientbound(ClientboundPackets1_16.CHAT, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_16.CHAT, new PacketHandlers() {
             @Override
             public void register() {
                 handler(wrapper -> translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT)));
@@ -98,7 +87,7 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
             }
         });
 
-        registerClientbound(ClientboundPackets1_16.OPEN_SCREEN, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_16.OPEN_SCREEN, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Window Id
@@ -115,12 +104,6 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
             }
         });
 
-        SoundRewriter<ClientboundPackets1_16> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound(ClientboundPackets1_16.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_16.SOUND_ENTITY);
-        soundRewriter.registerNamedSound(ClientboundPackets1_16.CUSTOM_SOUND);
-        soundRewriter.registerStopSound(ClientboundPackets1_16.STOP_SOUND);
-
         // Login success
         registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_FINISHED, wrapper -> {
             // Transform uuid to plain string
@@ -130,8 +113,6 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
 
         tagRewriter.register(ClientboundPackets1_16.UPDATE_TAGS, RegistryType.ENTITY);
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_16.AWARD_STATS);
-
         registerServerbound(ServerboundPackets1_14.PLAYER_COMMAND, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // player id
             int action = wrapper.passthrough(Types.VAR_INT);
@@ -202,6 +183,11 @@ public class Protocol1_16To1_15_2 extends BackwardsProtocol<ClientboundPackets1_
         return blockItemPackets;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_16> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_16> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java

@@ -42,7 +42,6 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter.ItemPacketRewriter1_16;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.CompactArrayUtil;
 import com.viaversion.viaversion.util.Key;
@@ -62,8 +61,6 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_16> blockRewriter = BlockRewriter.for1_14(protocol);
-
         RecipeRewriter<ClientboundPackets1_16> recipeRewriter = new RecipeRewriter<>(protocol);
         // Remove new smithing type, only in this handler
         protocol.registerClientbound(ClientboundPackets1_16.UPDATE_RECIPES, wrapper -> {
@@ -90,17 +87,7 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
             wrapper.set(Types.VAR_INT, 0, newSize);
         });
 
-        registerCooldown(ClientboundPackets1_16.COOLDOWN);
-        registerSetContent(ClientboundPackets1_16.CONTAINER_SET_CONTENT);
-        registerSetSlot(ClientboundPackets1_16.CONTAINER_SET_SLOT);
-        registerMerchantOffers(ClientboundPackets1_16.MERCHANT_OFFERS);
-        registerAdvancements(ClientboundPackets1_16.UPDATE_ADVANCEMENTS);
-
-        blockRewriter.registerBlockBreakAck(ClientboundPackets1_16.BLOCK_BREAK_ACK);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_16.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_16.BLOCK_UPDATE);
-        blockRewriter.registerChunkBlocksUpdate(ClientboundPackets1_16.CHUNK_BLOCKS_UPDATE);
-        blockRewriter.registerLevelChunk(ClientboundPackets1_16.LEVEL_CHUNK, ChunkType1_16.TYPE, ChunkType1_15.TYPE, (connection, chunk) -> {
+        protocol.getBlockRewriter().registerLevelChunk(ClientboundPackets1_16.LEVEL_CHUNK, ChunkType1_16.TYPE, ChunkType1_15.TYPE, (connection, chunk) -> {
             CompoundTag heightMaps = chunk.getHeightMap();
             for (Tag heightMapTag : heightMaps.values()) {
                 if (!(heightMapTag instanceof LongArrayTag heightMap)) {
@@ -177,8 +164,6 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
             }
         });
 
-        blockRewriter.registerLevelEvent(ClientboundPackets1_16.LEVEL_EVENT, 1010, 2001);
-
         protocol.registerClientbound(ClientboundPackets1_16.CONTAINER_SET_DATA, new PacketHandlers() {
             @Override
             public void register() {
@@ -217,9 +202,6 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
             handleBlockEntity(tag);
         });
 
-        registerContainerClick(ServerboundPackets1_14.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_14.SET_CREATIVE_MODE_SLOT);
-
         protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)));
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java

@@ -64,7 +64,7 @@ public class EntityPacketRewriter1_16 extends EntityRewriter<ClientboundPackets1
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_16.ADD_ENTITY, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_16.ADD_ENTITY, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Entity id
@@ -91,12 +91,10 @@ public class EntityPacketRewriter1_16 extends EntityRewriter<ClientboundPackets1
                         spawnLightningPacket.send(Protocol1_16To1_15_2.class);
                     }
                 });
-                handler(getSpawnTrackerWithDataHandler(EntityTypes1_16.FALLING_BLOCK));
+                handler(getSpawnTrackerWithDataHandler());
             }
         });
 
-        registerSpawnTracker(ClientboundPackets1_16.ADD_MOB);
-
         protocol.registerClientbound(ClientboundPackets1_16.RESPAWN, new PacketHandlers() {
             @Override
             public void register() {
@@ -192,7 +190,6 @@ public class EntityPacketRewriter1_16 extends EntityRewriter<ClientboundPackets1
         // F Spawn Global Object, it is no longer with us :(
         registerTracker(ClientboundPackets1_16.ADD_PAINTING, EntityTypes1_16.PAINTING);
         registerTracker(ClientboundPackets1_16.ADD_PLAYER, EntityTypes1_16.PLAYER);
-        registerRemoveEntities(ClientboundPackets1_16.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_16.SET_ENTITY_DATA, Types1_16.ENTITY_DATA_LIST, Types1_14.ENTITY_DATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_16.UPDATE_ATTRIBUTES, wrapper -> {
@@ -316,8 +313,7 @@ public class EntityPacketRewriter1_16 extends EntityRewriter<ClientboundPackets1
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_16.HOGLIN, EntityTypes1_16.COW).jsonName();
         mapEntityTypeWithData(EntityTypes1_16.ZOGLIN, EntityTypes1_16.COW).jsonName();
         mapEntityTypeWithData(EntityTypes1_16.PIGLIN, EntityTypes1_16.ZOMBIFIED_PIGLIN).jsonName();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/Protocol1_17To1_16_4.java

@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.v1_17to1_16_4;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_17to1_16_4.rewriter.BlockItemPacketRewriter1_17;
 import com.viaversion.viabackwards.protocol.v1_17to1_16_4.rewriter.EntityPacketRewriter1_17;
@@ -40,9 +39,9 @@ import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.IdRewriteFunction;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.Key;
@@ -61,6 +60,7 @@ public final class Protocol1_17To1_16_4 extends BackwardsProtocol<ClientboundPac
     private final ParticleRewriter<ClientboundPackets1_17> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_17> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_17> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_17> blockRewriter = BlockRewriter.for1_14(this);
 
     public Protocol1_17To1_16_4() {
         super(ClientboundPackets1_17.class, ClientboundPackets1_16_2.class, ServerboundPackets1_17.class, ServerboundPackets1_16_2.class);
@@ -70,21 +70,6 @@ public final class Protocol1_17To1_16_4 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_17.CHAT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_17.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_17.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_17.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_17.SET_PLAYER_TEAM);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_17.OPEN_SCREEN);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_17.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        SoundRewriter<ClientboundPackets1_17> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound(ClientboundPackets1_17.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_17.SOUND_ENTITY);
-        soundRewriter.registerNamedSound(ClientboundPackets1_17.CUSTOM_SOUND);
-        soundRewriter.registerStopSound(ClientboundPackets1_17.STOP_SOUND);
-
         registerClientbound(ClientboundPackets1_17.UPDATE_TAGS, wrapper -> {
             Map<String, List<TagData>> tags = new HashMap<>();
 
@@ -134,8 +119,6 @@ public final class Protocol1_17To1_16_4 extends BackwardsProtocol<ClientboundPac
             }
         });
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_17.AWARD_STATS);
-
         registerClientbound(ClientboundPackets1_17.RESOURCE_PACK, wrapper -> {
             wrapper.passthrough(Types.STRING);
             wrapper.passthrough(Types.STRING);
@@ -258,6 +241,11 @@ public final class Protocol1_17To1_16_4 extends BackwardsProtocol<ClientboundPac
         return blockItemPackets;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_17> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_17> getParticleRewriter() {
         return particleRewriter;

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

@@ -43,7 +43,6 @@ import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.CompactArrayUtil;
 import com.viaversion.viaversion.util.MathUtil;
@@ -62,22 +61,8 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_17> blockRewriter = BlockRewriter.for1_14(protocol);
-
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_17.UPDATE_RECIPES);
 
-        registerCooldown(ClientboundPackets1_17.COOLDOWN);
-        registerSetContent(ClientboundPackets1_17.CONTAINER_SET_CONTENT);
-        registerSetEquipment(ClientboundPackets1_17.SET_EQUIPMENT);
-        registerMerchantOffers(ClientboundPackets1_17.MERCHANT_OFFERS);
-        registerAdvancements(ClientboundPackets1_17.UPDATE_ADVANCEMENTS);
-
-        blockRewriter.registerBlockBreakAck(ClientboundPackets1_17.BLOCK_BREAK_ACK);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_17.BLOCK_EVENT);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_17.LEVEL_EVENT, 1010, 2001);
-
-
-        registerSetCreativeModeSlot(ServerboundPackets1_16_2.SET_CREATIVE_MODE_SLOT);
         protocol.registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)));
 
         // TODO Since the carried and modified items are typically set incorrectly, the server sends unnecessary
@@ -87,7 +72,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
         // and modified items array as appropriate here. That would be a ton of work and replicated vanilla code,
         // and the hack below mitigates the worst side effects of this issue, which is an incorrect carried item
         // sent to the client when a right/left click drag is started. It works, at least for now...
-        protocol.registerServerbound(ServerboundPackets1_16_2.CONTAINER_CLICK, new PacketHandlers() {
+        protocol.replaceServerbound(ServerboundPackets1_16_2.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.BYTE);
@@ -137,7 +122,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_17.CONTAINER_SET_SLOT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_17.CONTAINER_SET_SLOT, wrapper -> {
             byte windowId = wrapper.passthrough(Types.BYTE);
             short slot = wrapper.passthrough(Types.SHORT);
 
@@ -173,7 +158,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_17.LEVEL_PARTICLES, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_17.LEVEL_PARTICLES, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // Particle id
@@ -292,7 +277,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_17.SECTION_BLOCKS_UPDATE, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_17.SECTION_BLOCKS_UPDATE, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.LONG); // Chunk pos
@@ -318,7 +303,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_17.BLOCK_UPDATE, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_17.BLOCK_UPDATE, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.BLOCK_POSITION1_14);
@@ -369,7 +354,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
                 heightMap.setValue(CompactArrayUtil.createCompactArrayWithPadding(9, heightMapData.length, i -> heightMapData[i]));
             }
 
-            blockRewriter.handleChunk(chunk);
+            protocol.getBlockRewriter().handleChunk(chunk);
 
             if (ViaBackwards.getConfig().bedrockAtY0()) {
                 final ChunkSection lowestSection = chunk.getSections()[0];

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

@@ -47,8 +47,6 @@ public final class EntityPacketRewriter1_17 extends EntityRewriter<ClientboundPa
 
     @Override
     protected void registerPackets() {
-        registerTrackerWithData(ClientboundPackets1_17.ADD_ENTITY, EntityTypes1_17.FALLING_BLOCK);
-        registerSpawnTracker(ClientboundPackets1_17.ADD_MOB);
         registerTracker(ClientboundPackets1_17.ADD_EXPERIENCE_ORB, EntityTypes1_17.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_17.ADD_PAINTING, EntityTypes1_17.PAINTING);
         registerTracker(ClientboundPackets1_17.ADD_PLAYER, EntityTypes1_17.PLAYER);
@@ -221,8 +219,7 @@ public final class EntityPacketRewriter1_17 extends EntityRewriter<ClientboundPa
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_17.AXOLOTL, EntityTypes1_17.TROPICAL_FISH).jsonName();
         mapEntityTypeWithData(EntityTypes1_17.GOAT, EntityTypes1_17.SHEEP).jsonName();
         mapEntityTypeWithData(EntityTypes1_17.GLOW_SQUID, EntityTypes1_17.SQUID).jsonName();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_18to1_17_1/Protocol1_18To1_17_1.java

@@ -54,25 +54,7 @@ public final class Protocol1_18To1_17_1 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_18.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_18.TAB_LIST);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_18.OPEN_SCREEN);
-        translatableRewriter.registerPlayerCombatKill(ClientboundPackets1_18.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPing();
-
-        final SoundRewriter<ClientboundPackets1_18> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound(ClientboundPackets1_18.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_18.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_18.STOP_SOUND);
-        soundRewriter.registerNamedSound(ClientboundPackets1_18.CUSTOM_SOUND);
-
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:lava_pool_stone_replaceables");
-        tagRewriter.registerGeneric(ClientboundPackets1_18.UPDATE_TAGS);
 
         registerServerbound(ServerboundPackets1_17.CLIENT_INFORMATION, new PacketHandlers() {
             @Override
@@ -88,13 +70,7 @@ public final class Protocol1_18To1_17_1 extends BackwardsProtocol<ClientboundPac
             }
         });
 
-        registerClientbound(ClientboundPackets1_18.SET_OBJECTIVE, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.STRING); // Name
-                handler(cutName(0, 16));
-            }
-        });
+        appendClientbound(ClientboundPackets1_18.SET_OBJECTIVE, cutName(0, 16));
         registerClientbound(ClientboundPackets1_18.SET_DISPLAY_OBJECTIVE, new PacketHandlers() {
             @Override
             public void register() {
@@ -103,13 +79,7 @@ public final class Protocol1_18To1_17_1 extends BackwardsProtocol<ClientboundPac
                 handler(cutName(0, 16));
             }
         });
-        registerClientbound(ClientboundPackets1_18.SET_PLAYER_TEAM, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.STRING); // Name
-                handler(cutName(0, 16));
-            }
-        });
+        appendClientbound(ClientboundPackets1_18.SET_PLAYER_TEAM, cutName(0, 16));
         registerClientbound(ClientboundPackets1_18.SET_SCORE, new PacketHandlers() {
             @Override
             public void register() {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_18to1_17_1/rewriter/BlockItemPacketRewriter1_18.java

@@ -55,14 +55,6 @@ public final class BlockItemPacketRewriter1_18 extends BackwardsItemRewriter<Cli
     protected void registerPackets() {
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_18.UPDATE_RECIPES);
 
-        registerCooldown(ClientboundPackets1_18.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_18.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_18.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_18.SET_EQUIPMENT);
-        registerMerchantOffers(ClientboundPackets1_18.MERCHANT_OFFERS);
-        registerAdvancements(ClientboundPackets1_18.UPDATE_ADVANCEMENTS);
-        registerContainerClick1_17_1(ServerboundPackets1_17.CONTAINER_CLICK);
-
         protocol.registerClientbound(ClientboundPackets1_18.LEVEL_EVENT, new PacketHandlers() {
             @Override
             public void register() {
@@ -79,9 +71,7 @@ public final class BlockItemPacketRewriter1_18 extends BackwardsItemRewriter<Cli
             }
         });
 
-        registerSetCreativeModeSlot(ServerboundPackets1_17.SET_CREATIVE_MODE_SLOT);
-
-        protocol.registerClientbound(ClientboundPackets1_18.LEVEL_PARTICLES, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_18.LEVEL_PARTICLES, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // Particle id

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_1to1_19/Protocol1_19_1To1_19.java

@@ -76,19 +76,7 @@ public final class Protocol1_19_1To1_19 extends BackwardsProtocol<ClientboundPac
 
     @Override
     protected void registerPackets() {
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_19_1.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_19_1.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_19_1.SET_PLAYER_TEAM);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_19_1.OPEN_SCREEN);
-        translatableRewriter.registerPlayerCombatKill(ClientboundPackets1_19_1.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_19_1.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        entityRewriter.register();
+        super.registerPackets();
 
         registerClientbound(ClientboundPackets1_19_1.LOGIN, new PacketHandlers() {
             @Override
@@ -180,7 +168,7 @@ public final class Protocol1_19_1To1_19 extends BackwardsProtocol<ClientboundPac
             wrapper.write(Types.VAR_INT, SYSTEM_CHAT_ID);
         });
 
-        registerClientbound(ClientboundPackets1_19_1.SYSTEM_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_1.SYSTEM_CHAT, wrapper -> {
             final JsonElement content = wrapper.passthrough(Types.COMPONENT);
             translatableRewriter.processText(wrapper.user(), content);
 
@@ -287,7 +275,7 @@ public final class Protocol1_19_1To1_19 extends BackwardsProtocol<ClientboundPac
             }
         });
 
-        registerClientbound(ClientboundPackets1_19_1.SERVER_DATA, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_19_1.SERVER_DATA, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.OPTIONAL_COMPONENT); // Motd

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_1to1_19/rewriter/EntityPacketRewriter1_19_1.java

@@ -33,8 +33,6 @@ public final class EntityPacketRewriter1_19_1 extends EntityRewriter<Clientbound
     @Override
     protected void registerPackets() {
         registerSetEntityData(ClientboundPackets1_19_1.SET_ENTITY_DATA, Types1_19.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_19_1.REMOVE_ENTITIES);
-        registerSpawnTracker(ClientboundPackets1_19_1.ADD_ENTITY);
     }
 
     @Override

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

@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.v1_19_3to1_19_1;
 import com.google.common.base.Preconditions;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_19_1to1_19.Protocol1_19_1To1_19;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.rewriter.BlockItemPacketRewriter1_19_3;
@@ -45,6 +44,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.BitSetType;
 import com.viaversion.viaversion.api.type.types.ByteArrayType;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
@@ -54,9 +54,9 @@ import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.CipherUtil;
@@ -77,6 +77,7 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
     private final ParticleRewriter<ClientboundPackets1_19_3> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_19_3> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_19_3> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_19_3> blockRewriter = BlockRewriter.for1_18(this, ChunkType1_18::new);
 
     public Protocol1_19_3To1_19_1() {
         super(ClientboundPackets1_19_3.class, ClientboundPackets1_19_1.class, ServerboundPackets1_19_3.class, ServerboundPackets1_19_1.class);
@@ -86,31 +87,14 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.SYSTEM_CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_19_3.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_19_3.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_19_3.SET_PLAYER_TEAM);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_19_3.OPEN_SCREEN);
-        translatableRewriter.registerPlayerCombatKill(ClientboundPackets1_19_3.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_19_3.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_19(ClientboundPackets1_19_3.LEVEL_PARTICLES);
-
-        final SoundRewriter<ClientboundPackets1_19_3> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerStopSound(ClientboundPackets1_19_3.STOP_SOUND);
-        registerClientbound(ClientboundPackets1_19_3.SOUND, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_3.SOUND, wrapper -> {
             final String mappedIdentifier = rewriteSound(wrapper);
             if (mappedIdentifier != null) {
                 wrapper.write(Types.STRING, mappedIdentifier);
                 wrapper.setPacketType(ClientboundPackets1_19_1.CUSTOM_SOUND);
             }
         });
-        registerClientbound(ClientboundPackets1_19_3.SOUND_ENTITY, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_3.SOUND_ENTITY, wrapper -> {
             final String mappedIdentifier = rewriteSound(wrapper);
             if (mappedIdentifier == null) {
                 return;
@@ -127,12 +111,9 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
 
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:non_flammable_wood");
         tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:overworld_natural_logs");
-        tagRewriter.registerGeneric(ClientboundPackets1_19_3.UPDATE_TAGS);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_19_3.AWARD_STATS);
 
         final CommandRewriter<ClientboundPackets1_19_3> commandRewriter = new CommandRewriter<>(this);
-        registerClientbound(ClientboundPackets1_19_3.COMMANDS, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_3.COMMANDS, wrapper -> {
             final int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
                 final byte flags = wrapper.passthrough(Types.BYTE);
@@ -167,7 +148,7 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
             wrapper.passthrough(Types.VAR_INT); // Root node index
         });
 
-        registerClientbound(ClientboundPackets1_19_3.SERVER_DATA, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_19_3.SERVER_DATA, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.OPTIONAL_COMPONENT); // Motd
@@ -418,6 +399,11 @@ public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundP
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_19_3> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_19_3> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/BlockItemPacketRewriter1_19_3.java

@@ -22,10 +22,8 @@ import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.Protocol1_19_3To1_19
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.Key;
 
@@ -37,24 +35,6 @@ public final class BlockItemPacketRewriter1_19_3 extends BackwardsItemRewriter<C
 
     @Override
     protected void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19_3> blockRewriter = BlockRewriter.for1_14(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_19_3.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_19_3.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate(ClientboundPackets1_19_3.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_19_3.LEVEL_EVENT, 1010, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_19_3.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_18::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_19_3.BLOCK_ENTITY_DATA);
-
-        registerCooldown(ClientboundPackets1_19_3.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_19_3.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_19_3.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_19_3.SET_EQUIPMENT);
-        registerAdvancements(ClientboundPackets1_19_3.UPDATE_ADVANCEMENTS);
-        registerContainerClick1_17_1(ServerboundPackets1_19_1.CONTAINER_CLICK);
-        registerMerchantOffers1_19(ClientboundPackets1_19_3.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_19_1.SET_CREATIVE_MODE_SLOT);
-        registerContainerSetData(ClientboundPackets1_19_3.CONTAINER_SET_DATA);
-
         protocol.registerClientbound(ClientboundPackets1_19_3.EXPLODE, new PacketHandlers() {
             @Override
             public void register() {
@@ -107,9 +87,12 @@ public final class BlockItemPacketRewriter1_19_3 extends BackwardsItemRewriter<C
                         wrapper.passthrough(Types.VAR_INT); // Cooking time
                     }
                     case "crafting_special_armordye", "crafting_special_bookcloning", "crafting_special_mapcloning",
-                         "crafting_special_mapextending", "crafting_special_firework_rocket", "crafting_special_firework_star",
-                         "crafting_special_firework_star_fade", "crafting_special_tippedarrow", "crafting_special_bannerduplicate",
-                         "crafting_special_shielddecoration", "crafting_special_shulkerboxcoloring", "crafting_special_suspiciousstew",
+                         "crafting_special_mapextending", "crafting_special_firework_rocket",
+                         "crafting_special_firework_star",
+                         "crafting_special_firework_star_fade", "crafting_special_tippedarrow",
+                         "crafting_special_bannerduplicate",
+                         "crafting_special_shielddecoration", "crafting_special_shulkerboxcoloring",
+                         "crafting_special_suspiciousstew",
                          "crafting_special_repairitem" -> wrapper.read(Types.VAR_INT); // Crafting book category
                     default -> recipeRewriter.handleRecipeType(wrapper, type);
                 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java

@@ -59,8 +59,6 @@ public final class EntityPacketRewriter1_19_3 extends EntityRewriter<Clientbound
     @Override
     protected void registerPackets() {
         registerSetEntityData(ClientboundPackets1_19_3.SET_ENTITY_DATA, Types1_19_3.ENTITY_DATA_LIST, Types1_19.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_19_3.REMOVE_ENTITIES);
-        registerTrackerWithData1_19(ClientboundPackets1_19_3.ADD_ENTITY, EntityTypes1_19_3.FALLING_BLOCK);
 
         protocol.registerClientbound(ClientboundPackets1_19_3.LOGIN, new PacketHandlers() {
             @Override
@@ -248,7 +246,7 @@ public final class EntityPacketRewriter1_19_3 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_19_3.CAMEL, EntityTypes1_19_3.DONKEY).jsonName();
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/Protocol1_19_4To1_19_3.java

@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_19_4to1_19_3;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_19_4to1_19_3.rewriter.BlockItemPacketRewriter1_19_4;
 import com.viaversion.viabackwards.protocol.v1_19_4to1_19_3.rewriter.EntityPacketRewriter1_19_4;
@@ -27,15 +26,16 @@ import com.viaversion.viabackwards.protocol.v1_19_4to1_19_3.storage.EntityTracke
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import java.nio.charset.StandardCharsets;
@@ -49,6 +49,7 @@ public final class Protocol1_19_4To1_19_3 extends BackwardsProtocol<ClientboundP
     private final ParticleRewriter<ClientboundPackets1_19_4> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_19_4> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_19_4> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = BlockRewriter.for1_18(this, ChunkType1_18::new);
 
     public Protocol1_19_4To1_19_3() {
         super(ClientboundPackets1_19_4.class, ClientboundPackets1_19_3.class, ServerboundPackets1_19_4.class, ServerboundPackets1_19_3.class);
@@ -58,28 +59,7 @@ public final class Protocol1_19_4To1_19_3 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
-        final SoundRewriter<ClientboundPackets1_19_4> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerStopSound(ClientboundPackets1_19_4.STOP_SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND_ENTITY);
-
-        // TODO fallback field in components
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_19_4.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_19_4.TAB_LIST);
-        translatableRewriter.registerPlayerCombatKill(ClientboundPackets1_19_4.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_19_4.SET_PLAYER_TEAM);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SYSTEM_CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISGUISED_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_19_4.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_19(ClientboundPackets1_19_4.LEVEL_PARTICLES);
-
-        new CommandRewriter<>(this) {
+        final CommandRewriter<ClientboundPackets1_19_4> commandRewriter = new CommandRewriter<>(this) {
             @Override
             public void handleArgument(final PacketWrapper wrapper, final String argumentType) {
                 switch (argumentType) {
@@ -93,15 +73,14 @@ public final class Protocol1_19_4To1_19_3 extends BackwardsProtocol<ClientboundP
                     default -> super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_19_4.COMMANDS);
+        };
+        replaceClientbound(ClientboundPackets1_19_4.COMMANDS, commandRewriter::handle1_19);
 
         tagRewriter.removeTags("minecraft:damage_type");
-        tagRewriter.registerGeneric(ClientboundPackets1_19_4.UPDATE_TAGS);
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_19_4.AWARD_STATS);
-
-        registerClientbound(ClientboundPackets1_19_4.SERVER_DATA, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_4.SERVER_DATA, wrapper -> {
             final JsonElement element = wrapper.read(Types.COMPONENT);
+            translatableRewriter.processText(wrapper.user(), element);
             wrapper.write(Types.OPTIONAL_COMPONENT, element);
 
             final byte[] iconBytes = wrapper.read(Types.OPTIONAL_BYTE_ARRAY_PRIMITIVE);
@@ -128,6 +107,11 @@ public final class Protocol1_19_4To1_19_3 extends BackwardsProtocol<ClientboundP
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_19_4> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_19_4> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/BlockItemPacketRewriter1_19_4.java

@@ -22,11 +22,9 @@ import com.viaversion.viabackwards.protocol.v1_19_4to1_19_3.Protocol1_19_4To1_19
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.RecipeRewriter1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.util.Key;
 
 public final class BlockItemPacketRewriter1_19_4 extends BackwardsItemRewriter<ClientboundPackets1_19_4, ServerboundPackets1_19_3, Protocol1_19_4To1_19_3> {
@@ -37,15 +35,7 @@ public final class BlockItemPacketRewriter1_19_4 extends BackwardsItemRewriter<C
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = BlockRewriter.for1_14(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_19_4.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_19_4.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate(ClientboundPackets1_19_4.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_19_4.LEVEL_EVENT, 1010, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_19_4.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_18::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_19_4.BLOCK_ENTITY_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_SCREEN, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19_4.OPEN_SCREEN, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Container id
@@ -64,16 +54,6 @@ public final class BlockItemPacketRewriter1_19_4 extends BackwardsItemRewriter<C
             }
         });
 
-        registerCooldown(ClientboundPackets1_19_4.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_19_4.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_19_4.CONTAINER_SET_SLOT);
-        registerAdvancements(ClientboundPackets1_19_4.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_19_4.SET_EQUIPMENT);
-        registerContainerClick1_17_1(ServerboundPackets1_19_3.CONTAINER_CLICK);
-        registerMerchantOffers1_19(ClientboundPackets1_19_4.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_19_3.SET_CREATIVE_MODE_SLOT);
-        registerContainerSetData(ClientboundPackets1_19_4.CONTAINER_SET_DATA);
-
         final RecipeRewriter1_19_3<ClientboundPackets1_19_4> recipeRewriter = new RecipeRewriter1_19_3<>(protocol) {
             @Override
             public void handleCraftingShaped(final PacketWrapper wrapper) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java

@@ -53,10 +53,9 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerRemoveEntities(ClientboundPackets1_19_4.REMOVE_ENTITIES);
         registerSetEntityData(ClientboundPackets1_19_4.SET_ENTITY_DATA, Types1_19_4.ENTITY_DATA_LIST, Types1_19_3.ENTITY_DATA_LIST);
 
-        protocol.registerClientbound(ClientboundPackets1_19_4.ADD_ENTITY, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19_4.ADD_ENTITY, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Entity id
@@ -86,7 +85,7 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter<Clientbound
                     }
 
                     // First track (and remap) entity, then put storage for block display entity
-                    getSpawnTrackerWithDataHandler1_19(EntityTypes1_19_4.FALLING_BLOCK).handle(wrapper);
+                    getSpawnTrackerWithDataHandler1_19().handle(wrapper);
                     if (entityType != EntityTypes1_19_4.BLOCK_DISPLAY.getId()) {
                         return;
                     }
@@ -308,8 +307,7 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         final EntityReplacement.EntityDataCreator displayDataCreator = storage -> {
             storage.add(new EntityData(0, Types1_19_3.ENTITY_DATA_TYPES.byteType, (byte) 0x20)); // Invisible
             storage.add(new EntityData(5, Types1_19_3.ENTITY_DATA_TYPES.booleanType, true)); // No gravity

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/Protocol1_19To1_18_2.java

@@ -40,6 +40,7 @@ import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
@@ -49,9 +50,9 @@ import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.Protocol1_19To1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.data.ChatDecorationResult;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.Pair;
@@ -71,6 +72,7 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
     private final ParticleRewriter<ClientboundPackets1_19> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPackets1_19> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
     private final TagRewriter<ClientboundPackets1_19> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_19> blockRewriter = BlockRewriter.for1_18(this, ChunkType1_18::new);
 
     public Protocol1_19To1_18_2() {
         super(ClientboundPackets1_19.class, ClientboundPackets1_18.class, ServerboundPackets1_19.class, ServerboundPackets1_17.class);
@@ -80,21 +82,8 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_19.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_19.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_19.SET_PLAYER_TEAM);
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_19.OPEN_SCREEN);
-        translatableRewriter.registerPlayerCombatKill(ClientboundPackets1_19.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_19.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
-
         final SoundRewriter<ClientboundPackets1_19> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerStopSound(ClientboundPackets1_19.STOP_SOUND);
-        registerClientbound(ClientboundPackets1_19.SOUND, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_19.SOUND, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Sound id
@@ -108,7 +97,7 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
                 handler(soundRewriter.getSoundHandler());
             }
         });
-        registerClientbound(ClientboundPackets1_19.SOUND_ENTITY, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_19.SOUND_ENTITY, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Sound id
@@ -120,7 +109,7 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
                 handler(soundRewriter.getSoundHandler());
             }
         });
-        registerClientbound(ClientboundPackets1_19.CUSTOM_SOUND, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_19.CUSTOM_SOUND, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.STRING); // Sound name
@@ -143,12 +132,9 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
         tagRewriter.renameTag(RegistryType.BLOCK, "minecraft:wool_carpets", "minecraft:carpets");
         tagRewriter.renameTag(RegistryType.ITEM, "minecraft:wool_carpets", "minecraft:carpets");
         tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:occludes_vibration_signals");
-        tagRewriter.registerGeneric(ClientboundPackets1_19.UPDATE_TAGS);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_19.AWARD_STATS);
 
         final CommandRewriter<ClientboundPackets1_19> commandRewriter = new CommandRewriter1_19(this);
-        registerClientbound(ClientboundPackets1_19.COMMANDS, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19.COMMANDS, wrapper -> {
             final int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
                 final byte flags = wrapper.passthrough(Types.BYTE);
@@ -227,7 +213,7 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
                 });
                 create(Types.UUID, ZERO_UUID); // Sender
             }
-        });
+        }, true);
 
         registerServerbound(ServerboundPackets1_17.CHAT, new PacketHandlers() {
             @Override
@@ -381,6 +367,11 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
         return blockItemPackets;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_19> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_19> getParticleRewriter() {
         return particleRewriter;

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

@@ -37,7 +37,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.MathUtil;
 
@@ -51,25 +50,9 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
 
     @Override
     protected void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19> blockRewriter = BlockRewriter.for1_14(protocol);
-
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_19.UPDATE_RECIPES);
 
-        registerCooldown(ClientboundPackets1_19.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_19.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_19.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_19.SET_EQUIPMENT);
-        registerAdvancements(ClientboundPackets1_19.UPDATE_ADVANCEMENTS);
-        registerContainerClick1_17_1(ServerboundPackets1_17.CONTAINER_CLICK);
-
-        blockRewriter.registerBlockEvent(ClientboundPackets1_19.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_19.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate(ClientboundPackets1_19.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_19.LEVEL_EVENT, 1010, 2001);
-
-        registerSetCreativeModeSlot(ServerboundPackets1_17.SET_CREATIVE_MODE_SLOT);
-
-        protocol.registerClientbound(ClientboundPackets1_19.MERCHANT_OFFERS, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19.MERCHANT_OFFERS, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Container id
@@ -101,8 +84,6 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
             }
         });
 
-        registerContainerSetData(ClientboundPackets1_19.CONTAINER_SET_DATA);
-
         protocol.registerClientbound(ClientboundPackets1_19.BLOCK_CHANGED_ACK, null, new PacketHandlers() {
             @Override
             public void register() {
@@ -111,7 +92,7 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_19.LEVEL_PARTICLES, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19.LEVEL_PARTICLES, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT, Types.INT); // Particle id
@@ -145,22 +126,6 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
             }
         });
 
-
-        protocol.registerClientbound(ClientboundPackets1_19.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
-            final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
-            final ChunkType1_18 chunkType = new ChunkType1_18(tracker.currentWorldSectionHeight(),
-                MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
-                MathUtil.ceilLog2(tracker.biomesSent()));
-            final Chunk chunk = wrapper.passthrough(chunkType);
-            for (final ChunkSection section : chunk.getSections()) {
-                final DataPalette blockPalette = section.palette(PaletteType.BLOCKS);
-                for (int i = 0; i < blockPalette.size(); i++) {
-                    final int id = blockPalette.idByIndex(i);
-                    blockPalette.setIdByIndex(i, protocol.getMappingData().getNewBlockStateId(id));
-                }
-            }
-        });
-
         // The server does nothing but track the sequence, so we can just set it as 0
         protocol.registerServerbound(ServerboundPackets1_17.PLAYER_ACTION, new PacketHandlers() {
             @Override

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

@@ -64,9 +64,8 @@ public final class EntityPacketRewriter1_19 extends EntityRewriter<ClientboundPa
         registerTracker(ClientboundPackets1_19.ADD_EXPERIENCE_ORB, EntityTypes1_19.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_19.ADD_PLAYER, EntityTypes1_19.PLAYER);
         registerSetEntityData(ClientboundPackets1_19.SET_ENTITY_DATA, Types1_19.ENTITY_DATA_LIST, Types1_18.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_19.REMOVE_ENTITIES);
 
-        protocol.registerClientbound(ClientboundPackets1_19.ADD_ENTITY, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19.ADD_ENTITY, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Entity id
@@ -397,7 +396,7 @@ public final class EntityPacketRewriter1_19 extends EntityRewriter<ClientboundPa
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_19.FROG, EntityTypes1_19.RABBIT).jsonName();
         mapEntityTypeWithData(EntityTypes1_19.TADPOLE, EntityTypes1_19.PUFFERFISH).jsonName();
         mapEntityTypeWithData(EntityTypes1_19.CHEST_BOAT, EntityTypes1_19.BOAT);

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

@@ -20,9 +20,9 @@ package com.viaversion.viabackwards.protocol.v1_20_2to1_20;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.provider.AdvancementCriteriaProvider;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter.BlockItemPacketRewriter1_20_2;
+import com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter.BlockRewriter1_20_2;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter.EntityPacketRewriter1_20_2;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.storage.ConfigurationPacketStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -31,8 +31,6 @@ import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
-import com.viaversion.viaversion.api.rewriter.EntityRewriter;
-import com.viaversion.viaversion.api.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.exception.CancelException;
@@ -46,6 +44,7 @@ import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfi
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import java.util.UUID;
@@ -57,6 +56,7 @@ public final class Protocol1_20_2To1_20 extends BackwardsProtocol<ClientboundPac
     private final BlockItemPacketRewriter1_20_2 itemPacketRewriter = new BlockItemPacketRewriter1_20_2(this);
     private final ParticleRewriter<ClientboundPackets1_20_2> particleRewriter = new ParticleRewriter<>(this);
     private final TagRewriter<ClientboundPackets1_20_2> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_20_2> blockRewriter = new BlockRewriter1_20_2(this);
 
     public Protocol1_20_2To1_20() {
         super(ClientboundPackets1_20_2.class, ClientboundPackets1_19_4.class, ServerboundPackets1_20_2.class, ServerboundPackets1_19_4.class);
@@ -66,15 +66,6 @@ public final class Protocol1_20_2To1_20 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        tagRewriter.registerGeneric(ClientboundPackets1_20_2.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPackets1_20_2> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_2.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_2.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_20_2.STOP_SOUND);
-
-        particleRewriter.registerLevelParticles1_19(ClientboundPackets1_20_2.LEVEL_PARTICLES);
-
         registerClientbound(ClientboundPackets1_20_2.SET_DISPLAY_OBJECTIVE, wrapper -> {
             final int slot = wrapper.read(Types.VAR_INT);
             wrapper.write(Types.BYTE, (byte) slot);
@@ -220,15 +211,20 @@ public final class Protocol1_20_2To1_20 extends BackwardsProtocol<ClientboundPac
     }
 
     @Override
-    public EntityRewriter<Protocol1_20_2To1_20> getEntityRewriter() {
+    public EntityPacketRewriter1_20_2 getEntityRewriter() {
         return entityPacketRewriter;
     }
 
     @Override
-    public ItemRewriter<Protocol1_20_2To1_20> getItemRewriter() {
+    public BlockItemPacketRewriter1_20_2 getItemRewriter() {
         return itemPacketRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_20_2> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_20_2> getParticleRewriter() {
         return particleRewriter;

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

@@ -19,16 +19,16 @@ package com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntArrayTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.Protocol1_20_2To1_20;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.provider.AdvancementCriteriaProvider;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.ChunkPosition;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntityImpl;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
@@ -41,12 +41,9 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
-import com.viaversion.viaversion.protocols.v1_20to1_20_2.data.PotionEffects1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter.RecipeRewriter1_20_2;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
-import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.MathUtil;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -58,18 +55,6 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_20_2> blockRewriter = BlockRewriter.for1_14(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_20_2.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_20_2.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_20_2.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_20_2.LEVEL_EVENT, 1010, 2001);
-
-        registerSetContent1_17_1(ClientboundPackets1_20_2.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_20_2.CONTAINER_SET_SLOT);
-        registerContainerClick1_17_1(ServerboundPackets1_19_4.CONTAINER_CLICK);
-        registerMerchantOffers1_19(ClientboundPackets1_20_2.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_19_4.SET_CREATIVE_MODE_SLOT);
-
         protocol.cancelClientbound(ClientboundPackets1_20_2.CHUNK_BATCH_START);
         protocol.registerClientbound(ClientboundPackets1_20_2.CHUNK_BATCH_FINISHED, null, wrapper -> {
             wrapper.cancel();
@@ -109,35 +94,14 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
             wrapper.write(Types.NAMED_COMPOUND_TAG, wrapper.read(Types.COMPOUND_TAG));
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_2.BLOCK_ENTITY_DATA, wrapper -> {
-            wrapper.passthrough(Types.BLOCK_POSITION1_14); // Position
-            wrapper.passthrough(Types.VAR_INT); // Type
-            wrapper.write(Types.NAMED_COMPOUND_TAG, handleBlockEntity(wrapper.read(Types.TRUSTED_COMPOUND_TAG)));
-        });
+        protocol.replaceClientbound(ClientboundPackets1_20_2.BLOCK_ENTITY_DATA, wrapper -> {
+            final BlockPosition position = wrapper.passthrough(Types.BLOCK_POSITION1_14);
+            final int typeId = wrapper.passthrough(Types.VAR_INT);
 
-        protocol.registerClientbound(ClientboundPackets1_20_2.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
-            final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
-            final Type<Chunk> chunkType = new ChunkType1_20_2(tracker.currentWorldSectionHeight(),
-                MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().size()),
-                MathUtil.ceilLog2(tracker.biomesSent()));
-            final Chunk chunk = wrapper.read(chunkType);
-
-            final Type<Chunk> newChunkType = new ChunkType1_18(tracker.currentWorldSectionHeight(),
-                MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
-                MathUtil.ceilLog2(tracker.biomesSent()));
-            wrapper.write(newChunkType, chunk);
-
-            for (final ChunkSection section : chunk.getSections()) {
-                final DataPalette blockPalette = section.palette(PaletteType.BLOCKS);
-                for (int i = 0; i < blockPalette.size(); i++) {
-                    final int id = blockPalette.idByIndex(i);
-                    blockPalette.setIdByIndex(i, protocol.getMappingData().getNewBlockStateId(id));
-                }
-            }
-
-            for (final BlockEntity blockEntity : chunk.blockEntities()) {
-                handleBlockEntity(blockEntity.tag());
-            }
+            final CompoundTag tag = wrapper.read(Types.TRUSTED_COMPOUND_TAG);
+            final BlockEntity blockEntity = new BlockEntityImpl(BlockEntity.pack(position.x(), position.z()), (short) position.y(), typeId, tag);
+            protocol.getBlockRewriter().handleBlockEntity(wrapper.user(), blockEntity);
+            wrapper.write(Types.NAMED_COMPOUND_TAG, blockEntity.tag());
         });
 
         protocol.registerServerbound(ServerboundPackets1_19_4.SET_BEACON, wrapper -> {
@@ -150,7 +114,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_2.UPDATE_ADVANCEMENTS, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_2.UPDATE_ADVANCEMENTS, wrapper -> {
             wrapper.passthrough(Types.BOOLEAN); // Reset/clear
             final int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
@@ -182,7 +146,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
                 wrapper.passthrough(Types.BOOLEAN); // Send telemetry
             }
         });
-        protocol.registerClientbound(ClientboundPackets1_20_2.SET_EQUIPMENT, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_20_2.SET_EQUIPMENT, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Entity ID
@@ -238,28 +202,4 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
 
         return super.handleItemToServer(connection, item);
     }
-
-    private @Nullable CompoundTag handleBlockEntity(@Nullable final CompoundTag tag) {
-        if (tag == null) {
-            return null;
-        }
-
-        final Tag primaryEffect = tag.remove("primary_effect");
-        if (primaryEffect instanceof StringTag) {
-            final String effectKey = Key.stripMinecraftNamespace(((StringTag) primaryEffect).getValue());
-            tag.putInt("Primary", PotionEffects1_20_2.keyToId(effectKey) + 1); // Empty effect at 0
-        }
-
-        final Tag secondaryEffect = tag.remove("secondary_effect");
-        if (secondaryEffect instanceof StringTag) {
-            final String effectKey = Key.stripMinecraftNamespace(((StringTag) secondaryEffect).getValue());
-            tag.putInt("Secondary", PotionEffects1_20_2.keyToId(effectKey) + 1); // Empty effect at 0
-        }
-
-        final CompoundTag skullOwnerTag = tag.getCompoundTag("SkullOwner");
-        if (skullOwnerTag != null && !skullOwnerTag.contains("Id") && skullOwnerTag.contains("Properties")) {
-            skullOwnerTag.put("Id", new IntArrayTag(new int[]{0, 0, 0, 0}));
-        }
-        return tag;
-    }
 }

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

@@ -0,0 +1,61 @@
+/*
+ * 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.v1_20_2to1_20.rewriter;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
+import com.viaversion.viaversion.protocols.v1_20to1_20_2.data.PotionEffects1_20_2;
+import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
+import com.viaversion.viaversion.util.Key;
+
+public final class BlockRewriter1_20_2 extends BlockRewriter<ClientboundPackets1_20_2> {
+
+    public BlockRewriter1_20_2(final Protocol<ClientboundPackets1_20_2, ?, ?, ?> protocol) {
+        super(protocol, Types.BLOCK_POSITION1_14, Types.NAMED_COMPOUND_TAG, ChunkType1_20_2::new, ChunkType1_18::new);
+    }
+
+    @Override
+    public void handleBlockEntity(final UserConnection connection, final BlockEntity blockEntity) {
+        final CompoundTag tag = blockEntity.tag();
+        final Tag primaryEffect = tag.remove("primary_effect");
+        if (primaryEffect instanceof StringTag) {
+            final String effectKey = Key.stripMinecraftNamespace(((StringTag) primaryEffect).getValue());
+            tag.putInt("Primary", PotionEffects1_20_2.keyToId(effectKey) + 1); // Empty effect at 0
+        }
+
+        final Tag secondaryEffect = tag.remove("secondary_effect");
+        if (secondaryEffect instanceof StringTag) {
+            final String effectKey = Key.stripMinecraftNamespace(((StringTag) secondaryEffect).getValue());
+            tag.putInt("Secondary", PotionEffects1_20_2.keyToId(effectKey) + 1); // Empty effect at 0
+        }
+
+        final CompoundTag skullOwnerTag = tag.getCompoundTag("SkullOwner");
+        if (skullOwnerTag != null && !skullOwnerTag.contains("Id") && skullOwnerTag.contains("Properties")) {
+            skullOwnerTag.put("Id", new IntArrayTag(new int[]{0, 0, 0, 0}));
+        }
+    }
+}

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

@@ -41,9 +41,8 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
     @Override
     public void registerPackets() {
         registerSetEntityData(ClientboundPackets1_20_2.SET_ENTITY_DATA, Types1_20_2.ENTITY_DATA_LIST, Types1_20.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_20_2.REMOVE_ENTITIES);
 
-        protocol.registerClientbound(ClientboundPackets1_20_2.ADD_ENTITY, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_20_2.ADD_ENTITY, new PacketHandlers() {
             @Override
             protected void register() {
                 handler(wrapper -> {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java

@@ -20,9 +20,9 @@ package com.viaversion.viabackwards.protocol.v1_20_3to1_20_2;
 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.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.rewriter.BlockItemPacketRewriter1_20_3;
+import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.rewriter.BlockPacketRewriter1_20_3;
 import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.rewriter.EntityPacketRewriter1_20_3;
 import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.storage.ResourcepackIDStorage;
 import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.storage.SpawnPositionStorage;
@@ -51,8 +51,8 @@ import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPacket1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ComponentUtil;
@@ -69,6 +69,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
     private final ParticleRewriter<ClientboundPacket1_20_3> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPacket1_20_3> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.NBT);
     private final TagRewriter<ClientboundPacket1_20_3> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPacket1_20_3> blockRewriter = new BlockPacketRewriter1_20_3(this);
 
     public Protocol1_20_3To1_20_2() {
         super(ClientboundPacket1_20_3.class, ClientboundPacket1_20_2.class, ServerboundPacket1_20_3.class, ServerboundPacket1_20_2.class);
@@ -78,16 +79,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
-        tagRewriter.registerGeneric(ClientboundPackets1_20_3.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_20_3.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket1_20_3> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_3.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_3.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_20_3.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_20_3.AWARD_STATS);
-        new CommandRewriter1_19_4<>(this) {
+        final CommandRewriter1_19_4<ClientboundPacket1_20_3> commandRewriter = new CommandRewriter1_19_4<>(this) {
             @Override
             public void handleArgument(final PacketWrapper wrapper, final String argumentType) {
                 if (argumentType.equals("minecraft:style")) {
@@ -96,7 +88,8 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
                     super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_20_3.COMMANDS);
+        };
+        replaceClientbound(ClientboundPackets1_20_3.COMMANDS, commandRewriter::handle1_19);
 
         registerClientbound(ClientboundPackets1_20_3.RESET_SCORE, ClientboundPackets1_20_2.SET_SCORE, wrapper -> {
             wrapper.passthrough(Types.STRING); // Owner
@@ -105,7 +98,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
             final String objectiveName = wrapper.read(Types.OPTIONAL_STRING);
             wrapper.write(Types.STRING, objectiveName != null ? objectiveName : ""); // Objective name
         });
-        registerClientbound(ClientboundPackets1_20_3.SET_SCORE, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.SET_SCORE, wrapper -> {
             wrapper.passthrough(Types.STRING); // Owner
             wrapper.write(Types.VAR_INT, 0); // Change score
             wrapper.passthrough(Types.STRING); // Objective name
@@ -114,7 +107,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
             // Remove display and number format
             wrapper.clearInputBuffer();
         });
-        registerClientbound(ClientboundPackets1_20_3.SET_OBJECTIVE, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.SET_OBJECTIVE, wrapper -> {
             wrapper.passthrough(Types.STRING); // Objective Name
             final byte action = wrapper.passthrough(Types.BYTE); // Method
             if (action == 0 || action == 2) {
@@ -141,7 +134,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
         });
 
         // Components are now (mostly) written as nbt instead of json strings
-        registerClientbound(ClientboundPackets1_20_3.UPDATE_ADVANCEMENTS, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.UPDATE_ADVANCEMENTS, wrapper -> {
             wrapper.passthrough(Types.BOOLEAN); // Reset/clear
             final int size = wrapper.passthrough(Types.VAR_INT); // Mapping size
             for (int i = 0; i < size; i++) {
@@ -197,7 +190,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
                 }
             }
         });
-        registerClientbound(ClientboundPackets1_20_3.BOSS_EVENT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.BOSS_EVENT, wrapper -> {
             wrapper.passthrough(Types.UUID); // Id
 
             final int action = wrapper.passthrough(Types.VAR_INT);
@@ -205,7 +198,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
                 convertComponent(wrapper);
             }
         });
-        registerClientbound(ClientboundPackets1_20_3.PLAYER_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.PLAYER_CHAT, wrapper -> {
             wrapper.passthrough(Types.UUID); // Sender
             wrapper.passthrough(Types.VAR_INT); // Index
             wrapper.passthrough(Types.OPTIONAL_SIGNATURE_BYTES); // Signature
@@ -232,7 +225,7 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
             convertComponent(wrapper); // Sender
             convertOptionalComponent(wrapper); // Target
         });
-        registerClientbound(ClientboundPackets1_20_3.SET_PLAYER_TEAM, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.SET_PLAYER_TEAM, wrapper -> {
             wrapper.passthrough(Types.STRING); // Team Name
             final byte action = wrapper.passthrough(Types.BYTE); // Mode
             if (action == 0 || action == 2) {
@@ -246,21 +239,21 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
             }
         });
 
-        registerClientbound(ClientboundConfigurationPackets1_20_3.DISCONNECT, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.DISCONNECT, this::convertComponent);
+        replaceClientbound(ClientboundConfigurationPackets1_20_3.DISCONNECT, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.DISCONNECT, this::convertComponent);
         registerClientbound(ClientboundPackets1_20_3.RESOURCE_PACK_PUSH, ClientboundPackets1_20_2.RESOURCE_PACK, resourcePackHandler());
-        registerClientbound(ClientboundPackets1_20_3.SERVER_DATA, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.SET_ACTION_BAR_TEXT, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.SET_TITLE_TEXT, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.SET_SUBTITLE_TEXT, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.DISGUISED_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.SERVER_DATA, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.SET_ACTION_BAR_TEXT, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.SET_TITLE_TEXT, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.SET_SUBTITLE_TEXT, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.DISGUISED_CHAT, wrapper -> {
             convertComponent(wrapper);
             wrapper.passthrough(Types.VAR_INT); // Chat type
             convertComponent(wrapper); // Name
             convertOptionalComponent(wrapper); // Target name
         });
-        registerClientbound(ClientboundPackets1_20_3.SYSTEM_CHAT, this::convertComponent);
-        registerClientbound(ClientboundPackets1_20_3.OPEN_SCREEN, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.SYSTEM_CHAT, this::convertComponent);
+        replaceClientbound(ClientboundPackets1_20_3.OPEN_SCREEN, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Container id
 
             final int containerTypeId = wrapper.read(Types.VAR_INT);
@@ -274,19 +267,19 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
 
             convertComponent(wrapper);
         });
-        registerClientbound(ClientboundPackets1_20_3.TAB_LIST, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.TAB_LIST, wrapper -> {
             convertComponent(wrapper);
             convertComponent(wrapper);
         });
 
-        registerClientbound(ClientboundPackets1_20_3.PLAYER_COMBAT_KILL, new PacketHandlers() {
+        replaceClientbound(ClientboundPackets1_20_3.PLAYER_COMBAT_KILL, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // Duration
                 handler(wrapper -> convertComponent(wrapper));
             }
         });
-        registerClientbound(ClientboundPackets1_20_3.PLAYER_INFO_UPDATE, wrapper -> {
+        replaceClientbound(ClientboundPackets1_20_3.PLAYER_INFO_UPDATE, wrapper -> {
             final BitSet actions = wrapper.passthrough(Types.PROFILE_ACTIONS_ENUM1_19_3);
             final int entries = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < entries; i++) {
@@ -390,6 +383,11 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPacket1_20_3> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_20_3> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java

@@ -23,14 +23,11 @@ import com.viaversion.viaversion.api.data.ParticleMappings;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPacket1_20_2;
-import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 
 public final class BlockItemPacketRewriter1_20_3 extends BackwardsItemRewriter<ClientboundPacket1_20_3, ServerboundPacket1_20_2, Protocol1_20_3To1_20_2> {
 
@@ -40,24 +37,7 @@ public final class BlockItemPacketRewriter1_20_3 extends BackwardsItemRewriter<C
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_20_3> blockRewriter = new BlockPacketRewriter1_20_3(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_20_3.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_20_3.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_20_3.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_20_3.LEVEL_EVENT, 1010, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_20_3.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_20_3.BLOCK_ENTITY_DATA);
-
-        registerCooldown(ClientboundPackets1_20_3.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_20_3.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_20_3.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_20_3.SET_EQUIPMENT);
-        registerContainerClick1_17_1(ServerboundPackets1_20_2.CONTAINER_CLICK);
-        registerMerchantOffers1_19(ClientboundPackets1_20_3.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_20_2.SET_CREATIVE_MODE_SLOT);
-        registerContainerSetData(ClientboundPackets1_20_3.CONTAINER_SET_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_20_3.LEVEL_PARTICLES, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_20_3.LEVEL_PARTICLES, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.VAR_INT); // 0 - Particle ID

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/BlockPacketRewriter1_20_3.java

@@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
@@ -35,7 +36,7 @@ import java.util.logging.Level;
 public final class BlockPacketRewriter1_20_3 extends BlockRewriter<ClientboundPacket1_20_3> {
 
     public BlockPacketRewriter1_20_3(final Protocol1_20_3To1_20_2 protocol) {
-        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG);
+        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG, ChunkType1_20_2::new, null);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java

@@ -44,8 +44,6 @@ public final class EntityPacketRewriter1_20_3 extends EntityRewriter<Clientbound
     @Override
     public void registerPackets() {
         registerSetEntityData(ClientboundPackets1_20_3.SET_ENTITY_DATA, Types1_20_3.ENTITY_DATA_LIST, Types1_20_2.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_20_3.REMOVE_ENTITIES);
-        registerTrackerWithData1_19(ClientboundPackets1_20_3.ADD_ENTITY, EntityTypes1_20_3.FALLING_BLOCK);
 
         protocol.registerClientbound(ClientboundConfigurationPackets1_20_3.REGISTRY_DATA, new PacketHandlers() {
             @Override
@@ -141,8 +139,7 @@ public final class EntityPacketRewriter1_20_3 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_20_3.BREEZE, EntityTypes1_20_3.BLAZE).jsonName();
         mapEntityTypeWithData(EntityTypes1_20_3.WIND_CHARGE, EntityTypes1_20_3.SHULKER_BULLET).jsonName();
     }

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

@@ -20,10 +20,10 @@ package com.viaversion.viabackwards.protocol.v1_20_5to1_20_3;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.provider.TransferProvider;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.rewriter.BlockItemPacketRewriter1_20_5;
+import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.rewriter.BlockPacketRewriter1_20_5;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.rewriter.ComponentRewriter1_20_5;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.rewriter.EntityPacketRewriter1_20_5;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.storage.CookieStorage;
@@ -62,7 +62,6 @@ import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.ArmorTrimStor
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.BannerPatternStorage;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
@@ -75,6 +74,7 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
     private final ParticleRewriter<ClientboundPacket1_20_5> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPacket1_20_5> translatableRewriter = new ComponentRewriter1_20_5(this);
     private final TagRewriter<ClientboundPacket1_20_5> tagRewriter = new TagRewriter<>(this);
+    private final BlockPacketRewriter1_20_5 blockRewriter = new BlockPacketRewriter1_20_5(this);
 
     public Protocol1_20_5To1_20_3() {
         super(ClientboundPacket1_20_5.class, ClientboundPacket1_20_3.class, ServerboundPacket1_20_5.class, ServerboundPacket1_20_3.class);
@@ -85,8 +85,7 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
         super.registerPackets();
 
         tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:axolotl_tempt_items");
-        tagRewriter.registerGeneric(ClientboundPackets1_20_5.UPDATE_TAGS);
-        registerClientbound(ClientboundConfigurationPackets1_20_5.UPDATE_TAGS, wrapper -> {
+        replaceClientbound(ClientboundConfigurationPackets1_20_5.UPDATE_TAGS, wrapper -> {
             // Send off registry data first, needed for tags
             sendRegistryData(wrapper.user());
             tagRewriter.handleGeneric(wrapper);
@@ -98,30 +97,6 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
         });
         registerClientbound(ClientboundPackets1_20_5.START_CONFIGURATION, wrapper -> wrapper.user().get(RegistryDataStorage.class).clear());
 
-        final SoundRewriter<ClientboundPacket1_20_5> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_5.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_20_5.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_20_5.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_20_5.AWARD_STATS);
-
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_20_5.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_20_5.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_20_5.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_20_5.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_20_5.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.SYSTEM_CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_20_5.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat(ClientboundPackets1_20_5.PLAYER_CHAT, Types.VAR_INT);
-        translatableRewriter.registerPlayerInfoUpdate1_20_3(ClientboundPackets1_20_5.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_20_5.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_20_5.SET_SCORE);
-        translatableRewriter.registerPing();
-
         registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO, wrapper -> {
             wrapper.passthrough(Types.STRING); // Server ID
             wrapper.passthrough(Types.BYTE_ARRAY_PRIMITIVE); // Public key
@@ -129,8 +104,8 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
             wrapper.read(Types.BOOLEAN); // Authenticate
         });
 
-        registerClientbound(ClientboundPackets1_20_5.SERVER_DATA, wrapper -> {
-            wrapper.passthrough(Types.TRUSTED_TAG); // MOTD
+        replaceClientbound(ClientboundPackets1_20_5.SERVER_DATA, wrapper -> {
+            translatableRewriter.passthroughAndProcess(wrapper); // MOTD
             wrapper.passthrough(Types.OPTIONAL_BYTE_ARRAY_PRIMITIVE); // Icon
             wrapper.write(Types.BOOLEAN, wrapper.user().get(SecureChatStorage.class).enforcesSecureChat());
         });
@@ -155,7 +130,7 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
             response.sendToServer(Protocol1_20_5To1_20_3.class);
         });
 
-        new CommandRewriter1_19_4<>(this) {
+        final CommandRewriter1_19_4<ClientboundPacket1_20_5> commandRewriter = new CommandRewriter1_19_4<>(this) {
             @Override
             public void handleArgument(final PacketWrapper wrapper, final String argumentType) {
                 if (argumentType.equals("minecraft:loot_table")
@@ -166,7 +141,8 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
                     super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_20_5.COMMANDS);
+        };
+        replaceClientbound(ClientboundPackets1_20_5.COMMANDS, commandRewriter::handle1_19);
 
         registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_FINISHED, wrapper -> {
             wrapper.passthrough(Types.UUID); // UUID
@@ -252,6 +228,11 @@ public final class Protocol1_20_5To1_20_3 extends BackwardsProtocol<ClientboundP
         return itemRewriter;
     }
 
+    @Override
+    public BlockPacketRewriter1_20_5 getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_20_5> getParticleRewriter() {
         return particleRewriter;

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

@@ -36,7 +36,6 @@ import com.viaversion.viaversion.api.minecraft.item.StructuredItem;
 import com.viaversion.viaversion.api.minecraft.item.data.FireworkExplosion;
 import com.viaversion.viaversion.api.minecraft.item.data.Fireworks;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3;
@@ -62,26 +61,13 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
 
     @Override
     public void registerPackets() {
-        final BlockPacketRewriter1_20_5 blockRewriter = new BlockPacketRewriter1_20_5(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_20_5.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_20_5.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_20_5.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_20_5.LEVEL_EVENT, 1010, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_20_5.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
-        protocol.registerClientbound(ClientboundPackets1_20_5.BLOCK_ENTITY_DATA, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.BLOCK_ENTITY_DATA, wrapper -> {
             wrapper.passthrough(Types.BLOCK_POSITION1_14); // Position
             wrapper.passthrough(Types.VAR_INT); // Block entity type
             final CompoundTag tag = wrapper.passthrough(Types.TRUSTED_COMPOUND_TAG);
-            blockRewriter.updateBlockEntityTag(tag);
+            protocol.getBlockRewriter().updateBlockEntityTag(tag);
         });
 
-        registerCooldown(ClientboundPackets1_20_5.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_20_5.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_20_5.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_20_5.UPDATE_ADVANCEMENTS);
-        registerContainerClick1_17_1(ServerboundPackets1_20_3.CONTAINER_CLICK);
-        registerContainerSetData(ClientboundPackets1_20_5.CONTAINER_SET_DATA);
-        registerSetCreativeModeSlot(ServerboundPackets1_20_3.SET_CREATIVE_MODE_SLOT);
         protocol.registerServerbound(ServerboundPackets1_20_3.CONTAINER_BUTTON_CLICK, wrapper -> {
             final int containerId = wrapper.read(Types.BYTE) & 0xFF;
             final int buttonId = wrapper.read(Types.BYTE) & 0xFF;
@@ -89,7 +75,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
             wrapper.write(Types.VAR_INT, buttonId);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_5.LEVEL_PARTICLES, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.LEVEL_PARTICLES, wrapper -> {
             wrapper.write(Types.VAR_INT, 0); // Write dummy value, set later
 
             wrapper.passthrough(Types.BOOLEAN); // Long Distance
@@ -122,7 +108,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_5.EXPLODE, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.EXPLODE, wrapper -> {
             wrapper.passthrough(Types.DOUBLE); // X
             wrapper.passthrough(Types.DOUBLE); // Y
             wrapper.passthrough(Types.DOUBLE); // Z
@@ -156,7 +142,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_5.MERCHANT_OFFERS, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.MERCHANT_OFFERS, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Container id
             final int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
@@ -280,7 +266,12 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
             data.set(StructuredDataKey.FIREWORKS, new Fireworks(1, new FireworkExplosion[0]));
         }
 
-        final CompoundTag customData = data.get(StructuredDataKey.CUSTOM_DATA);
+        CompoundTag customData = data.get(StructuredDataKey.CUSTOM_DATA);
+        if (customData != null) {
+            // Copy original custom data before changes
+            customData = customData.copy();
+        }
+
         final Item oldItem = vvProtocol.getItemRewriter().toOldItem(connection, item, DATA_CONVERTER);
 
         if (customData != null) {
@@ -289,7 +280,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
             if (oldItem.tag() == null) {
                 oldItem.setTag(new CompoundTag());
             }
-            oldItem.tag().put(nbtTagName(), customData.copy());
+            oldItem.tag().put(nbtTagName(), customData);
         } else if (oldItem.tag() != null && oldItem.tag().isEmpty()) {
             // Improve item equality checks by removing empty tags
             oldItem.setTag(null);

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

@@ -26,6 +26,7 @@ import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.Protocol1_20_5To1_20
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
@@ -35,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public final class BlockPacketRewriter1_20_5 extends BlockRewriter<ClientboundPacket1_20_5> {
 
     public BlockPacketRewriter1_20_5(final Protocol1_20_5To1_20_3 protocol) {
-        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG);
+        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG, ChunkType1_20_2::new, null);
     }
 
     @Override

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

@@ -66,11 +66,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_20_5.ADD_ENTITY, EntityTypes1_20_5.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_20_5.SET_ENTITY_DATA, VersionedTypes.V1_20_5.entityDataList(), Types1_20_3.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_20_5.REMOVE_ENTITIES);
-
-        protocol.registerClientbound(ClientboundPackets1_20_5.SET_EQUIPMENT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.SET_EQUIPMENT, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT); // Entity id
             final EntityType type = tracker(wrapper.user()).entityType(entityId);
             byte slot;
@@ -193,7 +189,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             registryDataStorage.registryData().put(registryKey, registryTag);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_5.LOGIN, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.LOGIN, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // Entity id
@@ -228,7 +224,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_20_5.RESPAWN, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_20_5.RESPAWN, new PacketHandlers() {
             @Override
             public void register() {
                 handler(wrapper -> {
@@ -466,8 +462,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_20_5.ARMADILLO, EntityTypes1_20_5.COW).tagName();
         mapEntityTypeWithData(EntityTypes1_20_5.BOGGED, EntityTypes1_20_5.STRAY).tagName();
         mapEntityTypeWithData(EntityTypes1_20_5.BREEZE_WIND_CHARGE, EntityTypes1_20_5.WIND_CHARGE);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/Protocol1_20To1_19_4.java

@@ -18,10 +18,10 @@
 package com.viaversion.viabackwards.protocol.v1_20to1_19_4;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_20to1_19_4.data.BackwardsMappingData1_20;
 import com.viaversion.viabackwards.protocol.v1_20to1_19_4.rewriter.BlockItemPacketRewriter1_20;
+import com.viaversion.viabackwards.protocol.v1_20to1_19_4.rewriter.BlockPacketRewriter1_20;
 import com.viaversion.viabackwards.protocol.v1_20to1_19_4.rewriter.EntityPacketRewriter1_20;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
@@ -30,8 +30,8 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ArrayUtil;
@@ -44,6 +44,7 @@ public final class Protocol1_20To1_19_4 extends BackwardsProtocol<ClientboundPac
     private final BlockItemPacketRewriter1_20 itemRewriter = new BlockItemPacketRewriter1_20(this);
     private final ParticleRewriter<ClientboundPackets1_19_4> particleRewriter = new ParticleRewriter<>(this);
     private final TagRewriter<ClientboundPackets1_19_4> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = new BlockPacketRewriter1_20(this);
 
     public Protocol1_20To1_19_4() {
         super(ClientboundPackets1_19_4.class, ClientboundPackets1_19_4.class, ServerboundPackets1_19_4.class, ServerboundPackets1_19_4.class);
@@ -54,28 +55,6 @@ public final class Protocol1_20To1_19_4 extends BackwardsProtocol<ClientboundPac
         super.registerPackets();
 
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:replaceable_plants");
-        tagRewriter.registerGeneric(ClientboundPackets1_19_4.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPackets1_19_4> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerStopSound(ClientboundPackets1_19_4.STOP_SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND_ENTITY);
-
-        particleRewriter.registerLevelParticles1_19(ClientboundPackets1_19_4.LEVEL_PARTICLES);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_19_4.AWARD_STATS);
-
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_19_4.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_19_4.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_19_4.SET_PLAYER_TEAM);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SYSTEM_CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISGUISED_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_19_4.SET_OBJECTIVE);
-        translatableRewriter.registerPing();
 
         registerClientbound(ClientboundPackets1_19_4.UPDATE_ENABLED_FEATURES, wrapper -> {
             String[] enabledFeatures = wrapper.read(Types.STRING_ARRAY);
@@ -86,7 +65,7 @@ public final class Protocol1_20To1_19_4 extends BackwardsProtocol<ClientboundPac
             wrapper.passthrough(Types.VAR_INT); // Duration
             wrapper.write(Types.INT, -1); // Killer ID - unused (who knows for how long?)
         });
-        registerClientbound(ClientboundPackets1_19_4.PLAYER_COMBAT_KILL, wrapper -> {
+        replaceClientbound(ClientboundPackets1_19_4.PLAYER_COMBAT_KILL, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Player ID
             wrapper.write(Types.INT, -1); // Killer ID - unused (who knows for how long?)
             translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT));
@@ -113,6 +92,11 @@ public final class Protocol1_20To1_19_4 extends BackwardsProtocol<ClientboundPac
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPackets1_19_4> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPackets1_19_4> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/BlockItemPacketRewriter1_20.java

@@ -30,11 +30,9 @@ import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.RecipeRewriter1_19_4;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.util.Key;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -51,18 +49,12 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = new BlockPacketRewriter1_20(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_19_4.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_19_4.BLOCK_UPDATE);
-        blockRewriter.registerLevelEvent(ClientboundPackets1_19_4.LEVEL_EVENT, 1010, 2001);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_19_4.BLOCK_ENTITY_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_19_4.LEVEL_CHUNK_WITH_LIGHT, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19_4.LEVEL_CHUNK_WITH_LIGHT, new PacketHandlers() {
             @Override
             protected void register() {
                 handler(wrapper -> {
-                    final Chunk chunk = blockRewriter.handleChunk1_19(wrapper, ChunkType1_18::new);
-                    blockRewriter.handleBlockEntities(chunk, wrapper.user());
+                    final Chunk chunk = protocol.getBlockRewriter().handleChunk1_18(wrapper);
+                    protocol.getBlockRewriter().handleBlockEntities(chunk, wrapper.user());
                 });
                 create(Types.BOOLEAN, true); // Trust edges
             }
@@ -74,7 +66,7 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
             wrapper.write(Types.BOOLEAN, true); // Trust edges
         });
 
-        protocol.registerClientbound(ClientboundPackets1_19_4.SECTION_BLOCKS_UPDATE, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_19_4.SECTION_BLOCKS_UPDATE, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.LONG); // Chunk position
@@ -87,23 +79,7 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_SCREEN, wrapper -> {
-            wrapper.passthrough(Types.VAR_INT); // Container id
-
-            handleMenuType(wrapper);
-            protocol.getComponentRewriter().passthroughAndProcess(wrapper);
-        });
-
-        registerCooldown(ClientboundPackets1_19_4.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_19_4.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_19_4.CONTAINER_SET_SLOT);
-        registerSetEquipment(ClientboundPackets1_19_4.SET_EQUIPMENT);
-        registerContainerClick1_17_1(ServerboundPackets1_19_4.CONTAINER_CLICK);
-        registerMerchantOffers1_19(ClientboundPackets1_19_4.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_19_4.SET_CREATIVE_MODE_SLOT);
-        registerContainerSetData(ClientboundPackets1_19_4.CONTAINER_SET_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_19_4.UPDATE_ADVANCEMENTS, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_19_4.UPDATE_ADVANCEMENTS, wrapper -> {
             wrapper.passthrough(Types.BOOLEAN); // Reset/clear
             int size = wrapper.passthrough(Types.VAR_INT); // Mapping size
             for (int i = 0; i < size; i++) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/BlockPacketRewriter1_20.java

@@ -25,13 +25,14 @@ import com.viaversion.viabackwards.protocol.v1_20to1_19_4.Protocol1_20To1_19_4;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 
 public final class BlockPacketRewriter1_20 extends BlockRewriter<ClientboundPackets1_19_4> {
 
     public BlockPacketRewriter1_20(final Protocol1_20To1_19_4 protocol) {
-        super(protocol, Types.BLOCK_POSITION1_14, Types.NAMED_COMPOUND_TAG);
+        super(protocol, Types.BLOCK_POSITION1_14, Types.NAMED_COMPOUND_TAG, ChunkType1_18::new, null);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java

@@ -47,9 +47,7 @@ public final class EntityPacketRewriter1_20 extends EntityRewriter<ClientboundPa
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_19_4.ADD_ENTITY, EntityTypes1_19_4.FALLING_BLOCK);
         registerSetEntityData(ClientboundPackets1_19_4.SET_ENTITY_DATA, Types1_20.ENTITY_DATA_LIST, Types1_19_4.ENTITY_DATA_LIST);
-        registerRemoveEntities(ClientboundPackets1_19_4.REMOVE_ENTITIES);
 
         protocol.registerClientbound(ClientboundPackets1_19_4.LOGIN, new PacketHandlers() {
             @Override

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

@@ -27,7 +27,6 @@ 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.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_11to1_21_9.rewriter.BlockItemPacketRewriter1_21_11;
 import com.viaversion.viabackwards.protocol.v1_21_11to1_21_9.rewriter.ComponentRewriter1_21_11;
@@ -38,11 +37,12 @@ import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
 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.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
-import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.CommandRewriter1_19_4;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 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;
@@ -52,10 +52,9 @@ import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.Protocol1_21_9To1_21_11;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.packet.ClientboundPacket1_21_11;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.packet.ClientboundPackets1_21_11;
-import com.viaversion.viaversion.rewriter.AttributeRewriter;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.TagUtil;
@@ -75,7 +74,9 @@ public final class Protocol1_21_11To1_21_9 extends BackwardsProtocol<Clientbound
     private final ParticleRewriter<ClientboundPacket1_21_11> particleRewriter = new ParticleRewriter<>(this);
     private final NBTComponentRewriter<ClientboundPacket1_21_11> translatableRewriter = new ComponentRewriter1_21_11(this);
     private final TagRewriter<ClientboundPacket1_21_11> tagRewriter = new TagRewriter<>(this);
-    private final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(this) {
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_11> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this);
+    private final BlockRewriter<ClientboundPacket1_21_11> blockRewriter = BlockRewriter.for1_20_2(this, ChunkType1_21_5::new);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this) {
         @Override
         protected void updateType(final CompoundTag tag, final String key, final FullMappings mappings) {
             super.updateType(tag, key, mappings);
@@ -232,41 +233,8 @@ public final class Protocol1_21_11To1_21_9 extends BackwardsProtocol<Clientbound
         });
         registryDataRewriter.remove("zombie_nautilus_variant");
         registryDataRewriter.remove("timeline");
-        registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
 
         tagRewriter.removeTags("timeline");
-        tagRewriter.registerGeneric(ClientboundPackets1_21_11.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_9.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket1_21_11> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_11.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_11.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_11.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_11.AWARD_STATS);
-        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_11.UPDATE_ATTRIBUTES);
-
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_11.OPEN_SCREEN);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_11.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_11.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_11.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_11.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_11.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21_9.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_11.TAB_LIST);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_11.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_11.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_11.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_11.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_11.PLAYER_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_11.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_11.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_11.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_9(ClientboundPackets1_21_11.EXPLODE);
-
-        new CommandRewriter1_19_4<>(this).registerDeclareCommands1_19(ClientboundPackets1_21_11.COMMANDS);
     }
 
     @Override
@@ -292,10 +260,20 @@ public final class Protocol1_21_11To1_21_9 extends BackwardsProtocol<Clientbound
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket1_21_11> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_11> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_21_11> getParticleRewriter() {
         return particleRewriter;

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

@@ -37,15 +37,10 @@ import com.viaversion.viaversion.api.minecraft.item.data.PiercingWeapon;
 import com.viaversion.viaversion.api.minecraft.item.data.SwingAnimation;
 import com.viaversion.viaversion.api.minecraft.item.data.UseEffects;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 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.ServerboundPacket1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.packet.ClientboundPacket1_21_11;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.packet.ClientboundPackets1_21_11;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.util.Either;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -60,32 +55,6 @@ public final class BlockItemPacketRewriter1_21_11 extends BackwardsStructuredIte
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_11> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_11.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_11.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_11.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_11.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_11.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_11.BLOCK_ENTITY_DATA);
-
-        registerSetCursorItem(ClientboundPackets1_21_11.SET_CURSOR_ITEM);
-        registerSetPlayerInventory(ClientboundPackets1_21_11.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_11.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_11.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_11.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_11.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_11.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_11.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
-        registerShowDialog(ClientboundPackets1_21_11.SHOW_DIALOG);
-        registerShowDialogDirect(ClientboundConfigurationPackets1_21_9.SHOW_DIALOG);
-
-        final RecipeDisplayRewriter<ClientboundPacket1_21_11> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_11.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_11.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_11.PLACE_GHOST_RECIPE);
-
         protocol.registerClientbound(ClientboundPackets1_21_11.SET_BORDER_LERP_SIZE, wrapper -> {
             wrapper.passthrough(Types.DOUBLE); // oldSize
             wrapper.passthrough(Types.DOUBLE); // newSize

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

@@ -41,14 +41,6 @@ public final class EntityPacketRewriter1_21_11 extends EntityRewriter<Clientboun
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_21_9(ClientboundPackets1_21_11.ADD_ENTITY, EntityTypes1_21_11.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_21_11.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_11.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets1_21_11.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets1_21_11.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets1_21_11.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets1_21_11.RESPAWN);
-
         protocol.registerClientbound(ClientboundPackets1_21_11.MOUNT_SCREEN_OPEN, ClientboundPackets1_21_9.HORSE_SCREEN_OPEN);
 
         protocol.registerClientbound(ClientboundPackets1_21_11.UPDATE_MOB_EFFECT, wrapper -> {
@@ -116,7 +108,7 @@ public final class EntityPacketRewriter1_21_11 extends EntityRewriter<Clientboun
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_21_11.NAUTILUS, EntityTypes1_21_11.SQUID).tagName();
         mapEntityTypeWithData(EntityTypes1_21_11.ZOMBIE_NAUTILUS, EntityTypes1_21_11.GLOW_SQUID).tagName();
         mapEntityTypeWithData(EntityTypes1_21_11.CAMEL_HUSK, EntityTypes1_21_11.CAMEL).tagName();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java

@@ -19,7 +19,7 @@ package com.viaversion.viabackwards.protocol.v1_21_2to1_21;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter.BlockItemPacketRewriter1_21_2;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter.ComponentRewriter1_21_2;
@@ -32,12 +32,12 @@ import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.RecipeStorage;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.SignStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
-import com.viaversion.viaversion.api.minecraft.item.data.ChatType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 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.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -53,8 +53,7 @@ import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.AttributeRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.ArrayUtil;
 
@@ -68,6 +67,8 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
     private final ParticleRewriter1_21_2 particleRewriter = new ParticleRewriter1_21_2(this);
     private final JsonNBTComponentRewriter<ClientboundPacket1_21_2> translatableRewriter = new ComponentRewriter1_21_2(this);
     private final TagRewriter<ClientboundPacket1_21_2> tagRewriter = new TagRewriter<>(this);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);
+    private final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(this, ChunkType1_20_2::new);
 
     public Protocol1_21_2To1_21() {
         super(ClientboundPacket1_21_2.class, ClientboundPacket1_21.class, ServerboundPacket1_21_2.class, ServerboundPacket1_20_5.class);
@@ -77,34 +78,8 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        registerClientbound(ClientboundPackets1_21_2.UPDATE_TAGS, this::storeTags);
-        registerClientbound(ClientboundConfigurationPackets1_21.UPDATE_TAGS, this::storeTags);
-
-        final SoundRewriter<ClientboundPacket1_21_2> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_2.STOP_SOUND);
-
-        particleRewriter.registerLevelParticles1_20_5(ClientboundPackets1_21_2.LEVEL_PARTICLES);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_2.AWARD_STATS);
-        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_2.UPDATE_ATTRIBUTES);
-
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_2.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_2.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_21_2.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_2.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_2.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat(ClientboundPackets1_21_2.PLAYER_CHAT, ChatType.TYPE);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_2.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_2.SET_SCORE);
-        translatableRewriter.registerPing();
+        replaceClientbound(ClientboundPackets1_21_2.UPDATE_TAGS, this::storeTags);
+        replaceClientbound(ClientboundConfigurationPackets1_21.UPDATE_TAGS, this::storeTags);
 
         registerServerbound(ServerboundPackets1_20_5.CLIENT_INFORMATION, this::clientInformation);
         registerServerbound(ServerboundConfigurationPackets1_20_5.CLIENT_INFORMATION, this::clientInformation);
@@ -182,11 +157,21 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPacket1_21_2> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter1_21_2 getParticleRewriter() {
         return particleRewriter;
     }
 
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
     @Override
     public JsonNBTComponentRewriter<ClientboundPacket1_21_2> getComponentRewriter() {
         return translatableRewriter;

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

@@ -58,14 +58,12 @@ import com.viaversion.viaversion.api.minecraft.item.data.UseCooldown;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_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.BlockRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
@@ -82,19 +80,9 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_2.BLOCK_EVENT);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_2.LEVEL_EVENT, 2001);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_2.BLOCK_ENTITY_DATA);
-
-        registerAdvancements1_20_3(ClientboundPackets1_21_2.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_2.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_2.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT);
-
-        protocol.registerClientbound(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
-            final Chunk chunk = blockRewriter.handleChunk1_19(wrapper, ChunkType1_20_2::new);
-            blockRewriter.handleBlockEntities(chunk, wrapper.user());
+        protocol.replaceClientbound(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
+            final Chunk chunk = protocol.getBlockRewriter().handleChunk1_18(wrapper);
+            protocol.getBlockRewriter().handleBlockEntities(chunk, wrapper.user());
 
             if (!wrapper.user().getProtocolInfo().protocolVersion().equalTo(ProtocolVersion.v1_21)) {
                 return;
@@ -136,7 +124,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.BLOCK_UPDATE, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.BLOCK_UPDATE, wrapper -> {
             final BlockPosition position = wrapper.passthrough(Types.BLOCK_POSITION1_14);
 
             final int blockId = wrapper.read(Types.VAR_INT);
@@ -154,7 +142,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE, wrapper -> {
             final long position = wrapper.passthrough(Types.LONG);
 
             final int chunkX = (int) (position >> 42);
@@ -195,7 +183,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.COOLDOWN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.COOLDOWN, wrapper -> {
             final MappingData mappingData = protocol.getMappingData();
             final String itemIdentifier = wrapper.read(Types.STRING);
             final int id = mappingData.getFullItemMappings().id(itemIdentifier);
@@ -214,7 +202,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             passthroughClientboundItem(wrapper);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.OPEN_SCREEN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.OPEN_SCREEN, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Id
 
             final int containerType = wrapper.passthrough(Types.VAR_INT);
@@ -226,7 +214,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             protocol.getComponentRewriter().passthroughAndProcess(wrapper);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT, wrapper -> {
             varIntToUnsignedByte(wrapper);
 
             final int stateId = wrapper.passthrough(Types.VAR_INT);
@@ -239,7 +227,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             }
             passthroughClientboundItem(wrapper);
         });
-        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_SET_SLOT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.CONTAINER_SET_SLOT, wrapper -> {
             varIntToByte(wrapper);
 
             final int stateId = wrapper.passthrough(Types.VAR_INT);
@@ -266,7 +254,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             byteToVarInt(wrapper);
             wrapper.user().get(InventoryStateIdStorage.class).setSmithingTableOpen(false);
         });
-        protocol.registerServerbound(ServerboundPackets1_20_5.CONTAINER_CLICK, wrapper -> {
+        protocol.replaceServerbound(ServerboundPackets1_20_5.CONTAINER_CLICK, wrapper -> {
             byteToVarInt(wrapper);
             wrapper.passthrough(Types.VAR_INT); // State id
             wrapper.passthrough(Types.SHORT); // Slot
@@ -290,16 +278,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             wrapper.passthrough(Types.BOOLEAN); // Inside
             wrapper.write(Types.BOOLEAN, false); // World border hit
         });
-
-        protocol.registerClientbound(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY, ClientboundPackets1_21.CONTAINER_SET_SLOT, wrapper -> {
-            wrapper.write(Types.BYTE, (byte) -2); // Player inventory
-            wrapper.write(Types.VAR_INT, 0); // 0 state id
-            final int slot = wrapper.read(Types.VAR_INT);
-            wrapper.write(Types.SHORT, (short) slot);
-            passthroughClientboundItem(wrapper);
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_21_2.EXPLODE, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.EXPLODE, wrapper -> {
             wrapper.passthrough(Types.DOUBLE); // Center X
             wrapper.passthrough(Types.DOUBLE); // Center Y
             wrapper.passthrough(Types.DOUBLE); // Center Z
@@ -389,6 +368,14 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             final String recipe = Key.stripMinecraftNamespace(wrapper.read(Types.STRING));
             wrapper.write(Types.VAR_INT, Integer.parseInt(recipe));
         });
+
+        protocol.registerClientbound(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY, ClientboundPackets1_21.CONTAINER_SET_SLOT, wrapper -> {
+            wrapper.write(Types.BYTE, (byte) -2); // Player inventory
+            wrapper.write(Types.VAR_INT, 0); // 0 state id
+            final int slot = wrapper.read(Types.VAR_INT);
+            wrapper.write(Types.SHORT, (short) slot);
+            passthroughClientboundItem(wrapper);
+        });
     }
 
     private void varIntToUnsignedByte(final PacketWrapper wrapper) {

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

@@ -23,7 +23,6 @@ import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.ViaBackwards;
-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.PlayerStorage;
@@ -48,7 +47,6 @@ import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.ClientVehicleStorage;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.util.Key;
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -74,9 +72,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
-        protocol.registerClientbound(ClientboundPackets1_21_2.ADD_ENTITY, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.ADD_ENTITY, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
             wrapper.passthrough(Types.UUID); // Entity UUID
             final int entityTypeId = wrapper.passthrough(Types.VAR_INT);
@@ -87,7 +83,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             wrapper.passthrough(Types.BYTE); // Yaw
             wrapper.passthrough(Types.BYTE); // Head yaw
             wrapper.passthrough(Types.VAR_INT); // Data
-            getSpawnTrackerWithDataHandler1_19(EntityTypes1_21_2.FALLING_BLOCK).handle(wrapper);
+            getSpawnTrackerWithDataHandler1_19().handle(wrapper);
 
             final EntityType type = EntityTypes1_21_2.getTypeFromId(entityTypeId);
             if (type.isOrHasParent(EntityTypes1_21_2.ABSTRACT_BOAT)) {
@@ -106,9 +102,8 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             }
         });
 
-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
-        registryDataRewriter.addEnchantmentEffectRewriter("change_item_damage", tag -> tag.putString("type", "damage_item"));
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, wrapper -> {
+        protocol.getRegistryDataRewriter().addEnchantmentEffectRewriter("change_item_damage", tag -> tag.putString("type", "damage_item"));
+        protocol.replaceClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, wrapper -> {
             final String registryKey = Key.stripMinecraftNamespace(wrapper.passthrough(Types.STRING));
             final RegistryEntry[] entries = wrapper.read(Types.REGISTRY_ENTRY_ARRAY);
             if (registryKey.equals("instrument")) {
@@ -134,10 +129,10 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
                 }
             }
 
-            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_2.LOGIN, new PacketHandlers() {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.LOGIN, new PacketHandlers() {
             @Override
             public void register() {
                 map(Types.INT); // Entity id
@@ -164,7 +159,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.RESPAWN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.RESPAWN, wrapper -> {
             final int dimensionId = wrapper.passthrough(Types.VAR_INT);
             final String world = wrapper.passthrough(Types.STRING);
             wrapper.passthrough(Types.LONG); // Seed
@@ -370,7 +365,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             storage.setRotation(yaw, pitch);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE, wrapper -> {
             final BitSet actions = wrapper.read(Types.PROFILE_ACTIONS_ENUM1_21_2);
             // We need to recreate the BitSet field itself to remove the new action
             final BitSet updatedActions = new BitSet(6);
@@ -660,8 +655,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
-
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_21_2.CREAKING, EntityTypes1_21_2.WARDEN).tagName();
         mapEntityTypeWithData(EntityTypes1_21_2.CREAKING_TRANSIENT, EntityTypes1_21_2.WARDEN).tagName();
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java

@@ -17,9 +17,11 @@
  */
 package com.viaversion.viabackwards.protocol.v1_21_4to1_21_2;
 
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.BlockItemPacketRewriter1_21_4;
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.ComponentRewriter1_21_4;
@@ -27,12 +29,13 @@ import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.EntityPacke
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.ParticleRewriter1_21_4;
 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.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
-import com.viaversion.viaversion.api.minecraft.item.data.ChatType;
 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.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -45,11 +48,12 @@ import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.AttributeRewriter;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.ArrayUtil;
+import com.viaversion.viaversion.util.Key;
 import java.util.BitSet;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
@@ -62,6 +66,47 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
     private final ParticleRewriter<ClientboundPacket1_21_2> particleRewriter = new ParticleRewriter1_21_4(this);
     private final JsonNBTComponentRewriter<ClientboundPacket1_21_2> translatableRewriter = new ComponentRewriter1_21_4(this);
     private final TagRewriter<ClientboundPacket1_21_2> tagRewriter = new TagRewriter<>(this);
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter<>(this);
+    private final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(this, ChunkType1_20_2::new);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this) {
+        @Override
+        public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
+            final String strippedKey = Key.stripMinecraftNamespace(key);
+            if (strippedKey.equals("worldgen/biome")) {
+                for (final RegistryEntry entry : entries) {
+                    if (entry.tag() == null) {
+                        continue;
+                    }
+
+                    final CompoundTag effectsTag = ((CompoundTag) entry.tag()).getCompoundTag("effects");
+                    final ListTag<CompoundTag> weightedMusicTags = effectsTag.getListTag("music", CompoundTag.class);
+                    if (weightedMusicTags == null) {
+                        continue;
+                    }
+
+                    if (weightedMusicTags.isEmpty()) {
+                        effectsTag.remove("music");
+                        continue;
+                    }
+
+                    // Unwrap music
+                    final CompoundTag musicTag = weightedMusicTags.get(0);
+                    effectsTag.put("music", musicTag.get("data"));
+                }
+            } else if (strippedKey.equals("trim_material")) {
+                for (final RegistryEntry entry : entries) {
+                    if (entry.tag() == null) {
+                        continue;
+                    }
+
+                    final CompoundTag compoundTag = ((CompoundTag) entry.tag());
+                    compoundTag.putFloat("item_model_index", itemModelIndex(entry.key()));
+                }
+            }
+
+            return super.handle(connection, key, entries);
+        }
+    };
 
     public Protocol1_21_4To1_21_2() {
         super(ClientboundPacket1_21_2.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_4.class, ServerboundPacket1_21_2.class);
@@ -71,36 +116,7 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
-        tagRewriter.registerGeneric(ClientboundPackets1_21_2.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket1_21_2> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_2.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_2.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_2.AWARD_STATS);
-        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_2.UPDATE_ATTRIBUTES);
-
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_2.OPEN_SCREEN);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_2.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_2.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_21_2.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_2.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_2.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat(ClientboundPackets1_21_2.PLAYER_CHAT, ChatType.TYPE);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_2.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_2.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_2.EXPLODE);
-        registerClientbound(ClientboundPackets1_21_2.LEVEL_PARTICLES, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21_2.LEVEL_PARTICLES, wrapper -> {
             wrapper.passthrough(Types.BOOLEAN); // Override limiter
             wrapper.read(Types.BOOLEAN); // Always show
             wrapper.passthrough(Types.DOUBLE); // X
@@ -120,7 +136,7 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
             wrapper.write(Types.STRING_ARRAY, ArrayUtil.add(enabledFeatures, "winter_drop"));
         });
 
-        registerClientbound(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE, wrapper -> {
             final BitSet actions = wrapper.read(Types.PROFILE_ACTIONS_ENUM1_21_4);
             // Remove new action
             final BitSet updatedActions = new BitSet(7);
@@ -193,6 +209,11 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPacket1_21_2> getBlockRewriter() {
+        return blockRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_21_2> getParticleRewriter() {
         return particleRewriter;
@@ -208,6 +229,16 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
         return tagRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_2> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
     @Override
     public VersionedTypesHolder types() {
         return VersionedTypes.V1_21_4;
@@ -227,4 +258,20 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
             packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_2.class, ServerboundConfigurationPackets1_20_5.class)
         );
     }
+
+    private float itemModelIndex(final String trim) {
+        return switch (Key.stripNamespace(trim)) {
+            case "amethyst" -> 1.0F;
+            case "copper" -> 0.5F;
+            case "diamond" -> 0.8F;
+            case "emerald" -> 0.7F;
+            case "gold" -> 0.6F;
+            case "iron" -> 0.2F;
+            case "lapis" -> 0.9F;
+            case "netherite" -> 0.3F;
+            case "quartz" -> 0.1F;
+            case "redstone" -> 0.4F;
+            default -> 1.0f;
+        };
+    }
 }

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

@@ -31,13 +31,10 @@ import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.CustomModelData1_21_4;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 
 import static com.viaversion.viaversion.protocols.v1_21_2to1_21_4.rewriter.BlockItemPacketRewriter1_21_4.downgradeItemData;
 import static com.viaversion.viaversion.protocols.v1_21_2to1_21_4.rewriter.BlockItemPacketRewriter1_21_4.updateItemData;
@@ -50,39 +47,14 @@ public final class BlockItemPacketRewriter1_21_4 extends BackwardsStructuredItem
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_2.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_2.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_2.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_2.BLOCK_ENTITY_DATA);
-
         protocol.registerClientbound(ClientboundPackets1_21_2.SET_HELD_SLOT, wrapper -> {
             final int slot = wrapper.read(Types.VAR_INT);
             wrapper.write(Types.BYTE, (byte) slot);
         });
 
         protocol.cancelServerbound(ServerboundPackets1_21_2.PICK_ITEM);
-
-        protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
-        registerSetPlayerInventory(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_2.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_2.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_2.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_2.MERCHANT_OFFERS);
-        registerContainerClick1_21_2(ServerboundPackets1_21_2.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_21_2.SET_CREATIVE_MODE_SLOT);
-
-        final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_2.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_2.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_2.PLACE_GHOST_RECIPE);
     }
 
-
     @Override
     public Item handleItemToClient(final UserConnection connection, Item item) {
         item = super.handleItemToClient(connection, item);

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

@@ -17,25 +17,17 @@
  */
 package com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter;
 
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.Protocol1_21_4To1_21_2;
-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_4;
 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.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.util.Key;
 
 public final class EntityPacketRewriter1_21_4 extends EntityRewriter<ClientboundPacket1_21_2, Protocol1_21_4To1_21_2> {
 
@@ -45,53 +37,7 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
-
-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
-            @Override
-            public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
-                final String strippedKey = Key.stripMinecraftNamespace(key);
-                if (strippedKey.equals("worldgen/biome")) {
-                    for (final RegistryEntry entry : entries) {
-                        if (entry.tag() == null) {
-                            continue;
-                        }
-
-                        final CompoundTag effectsTag = ((CompoundTag) entry.tag()).getCompoundTag("effects");
-                        final ListTag<CompoundTag> weightedMusicTags = effectsTag.getListTag("music", CompoundTag.class);
-                        if (weightedMusicTags == null) {
-                            continue;
-                        }
-
-                        if (weightedMusicTags.isEmpty()) {
-                            effectsTag.remove("music");
-                            continue;
-                        }
-
-                        // Unwrap music
-                        final CompoundTag musicTag = weightedMusicTags.get(0);
-                        effectsTag.put("music", musicTag.get("data"));
-                    }
-                } else if (strippedKey.equals("trim_material")) {
-                    for (final RegistryEntry entry : entries) {
-                        if (entry.tag() == null) {
-                            continue;
-                        }
-
-                        final CompoundTag compoundTag = ((CompoundTag) entry.tag());
-                        compoundTag.putFloat("item_model_index", itemModelIndex(entry.key()));
-                    }
-                }
-
-                return super.handle(connection, key, entries);
-            }
-        };
-        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
-
-
-        protocol.registerClientbound(ClientboundPackets1_21_2.LOGIN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.LOGIN, wrapper -> {
             final int entityId = wrapper.passthrough(Types.INT); // Entity id
             wrapper.passthrough(Types.BOOLEAN); // Hardcore
             wrapper.passthrough(Types.STRING_ARRAY); // World List
@@ -110,7 +56,7 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
             playerLoadedPacket.scheduleSendToServer(Protocol1_21_4To1_21_2.class);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_2.RESPAWN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_2.RESPAWN, wrapper -> {
             final int dimensionId = wrapper.passthrough(Types.VAR_INT);
             final String world = wrapper.passthrough(Types.STRING);
             trackWorldDataByKey1_20_5(wrapper.user(), dimensionId, world);
@@ -129,22 +75,6 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
         });
     }
 
-    private float itemModelIndex(final String trim) {
-        return switch (Key.stripNamespace(trim)) {
-            case "amethyst" -> 1.0F;
-            case "copper" -> 0.5F;
-            case "diamond" -> 0.8F;
-            case "emerald" -> 0.7F;
-            case "gold" -> 0.6F;
-            case "iron" -> 0.2F;
-            case "lapis" -> 0.9F;
-            case "netherite" -> 0.3F;
-            case "quartz" -> 0.1F;
-            case "redstone" -> 0.4F;
-            default -> 1.0f;
-        };
-    }
-
     @Override
     protected void registerRewrites() {
         filter().mapDataType(VersionedTypes.V1_21_2.entityDataTypes::byId);
@@ -172,11 +102,6 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
         });
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_21_4.getTypeFromId(type);

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

@@ -19,8 +19,9 @@ package com.viaversion.viabackwards.protocol.v1_21_5to1_21_4;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 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.BlockPacketRewriter1_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;
@@ -32,6 +33,7 @@ import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_
 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.minecraft.entitydata.types.EntityDataTypes1_21_5;
+import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrimPattern;
 import com.viaversion.viaversion.api.minecraft.item.data.ChatType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
@@ -50,11 +52,12 @@ import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPac
 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.ServerboundPacket1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPackets1_21_5;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
@@ -77,7 +80,18 @@ 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);
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_5> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this) {
+        @Override
+        protected void handleSmithingTrimSlotDisplay(final PacketWrapper wrapper) {
+            handleSlotDisplay(wrapper); // Base
+            handleSlotDisplay(wrapper); // Material
+            wrapper.read(ArmorTrimPattern.TYPE1_21_5); // Pattern
+            // Add empty slot display...
+            wrapper.write(Types.VAR_INT, 0);
+        }
+    };
+    private final BackwardsRegistryRewriter registryDataRewriter = new RegistryDataRewriter1_21_5(this);
+    private final BlockRewriter<ClientboundPacket1_21_5> blockRewriter = new BlockPacketRewriter1_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);
@@ -87,38 +101,7 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
     protected void registerPackets() {
         super.registerPackets();
 
-        registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
-
-        tagRewriter.registerGeneric(ClientboundPackets1_21_5.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket1_21_5> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_5.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_5.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_5.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_5.AWARD_STATS);
-
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_5.OPEN_SCREEN);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_5.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_5.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_5.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_5.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_5.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_5.TAB_LIST);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_5.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_5.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_5.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_5.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_5.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_5.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_5.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_5.EXPLODE);
-
-        new CommandRewriter1_19_4<>(this) {
+        final CommandRewriter1_19_4<ClientboundPacket1_21_5> commandRewriter = new CommandRewriter1_19_4<>(this) {
             @Override
             public void handleArgument(final PacketWrapper wrapper, final String argumentType) {
                 if (argumentType.equals("minecraft:resource")) {
@@ -134,9 +117,10 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
                     super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_21_5.COMMANDS);
+        };
+        replaceClientbound(ClientboundPackets1_21_5.COMMANDS, commandRewriter::handle1_19);
 
-        registerClientbound(ClientboundPackets1_21_5.PLAYER_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21_5.PLAYER_CHAT, wrapper -> {
             wrapper.read(Types.VAR_INT); // Index
 
             wrapper.passthrough(Types.UUID); // Sender
@@ -213,7 +197,12 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket1_21_5> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 
@@ -232,6 +221,11 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
         return tagRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_5> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
     @Override
     public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> types() {
         return VersionedTypes.V1_21_5;

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

@@ -46,7 +46,6 @@ 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.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrimMaterial;
-import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrimPattern;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks.DamageReduction;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks.ItemDamageFunction;
@@ -74,8 +73,6 @@ import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPac
 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.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.util.Either;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
@@ -98,20 +95,13 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_5> blockRewriter = new BlockPacketRewriter1_21_5(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_5.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_5.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_5.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_5.LEVEL_EVENT, 2001);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_5.BLOCK_ENTITY_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_21_5.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_5.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
             final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
             final Mappings blockStateMappings = protocol.getMappingData().getBlockStateMappings();
             final Type<Chunk> chunkType = new ChunkType1_21_5(tracker.currentWorldSectionHeight(), ceilLog2(blockStateMappings.size()), ceilLog2(tracker.biomesSent()));
             final Chunk chunk = wrapper.read(chunkType);
-            blockRewriter.handleChunk(chunk);
-            blockRewriter.handleBlockEntities(chunk, wrapper.user());
+            protocol.getBlockRewriter().handleChunk(chunk);
+            protocol.getBlockRewriter().handleBlockEntities(chunk, wrapper.user());
 
             final Type<Chunk> newChunkType = new ChunkType1_20_2(tracker.currentWorldSectionHeight(), ceilLog2(blockStateMappings.mappedSize()), ceilLog2(tracker.biomesSent()));
             final CompoundTag heightmapTag = new CompoundTag();
@@ -142,21 +132,14 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_5.SET_CURSOR_ITEM, this::passthroughClientboundItem);
-        registerSetPlayerInventory(ClientboundPackets1_21_5.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_5.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_5.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_5.CONTAINER_SET_SLOT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_5.MERCHANT_OFFERS);
-
-        protocol.registerServerbound(ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT, wrapper -> {
+        protocol.replaceServerbound(ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT, wrapper -> {
             wrapper.passthrough(Types.SHORT); // Slot
 
             final Item item = handleItemToServer(wrapper.user(), wrapper.read(mappedItemType()));
             wrapper.write(VersionedTypes.V1_21_5.lengthPrefixedItem(), item);
         });
 
-        protocol.registerServerbound(ServerboundPackets1_21_4.CONTAINER_CLICK, wrapper -> {
+        protocol.replaceServerbound(ServerboundPackets1_21_4.CONTAINER_CLICK, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Container id
             wrapper.passthrough(Types.VAR_INT); // State id
             wrapper.passthrough(Types.SHORT); // Slot
@@ -176,7 +159,7 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
             wrapper.write(Types.HASHED_ITEM, ItemHasherBase.toHashedItem(hashedItemConverter.hasher(), carriedItem));
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_5.SET_EQUIPMENT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_5.SET_EQUIPMENT, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
             final TrackedEntity trackedEntity = protocol.getEntityRewriter().tracker(wrapper.user()).entity(entityId);
 
@@ -216,7 +199,7 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_5.UPDATE_ADVANCEMENTS, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_5.UPDATE_ADVANCEMENTS, wrapper -> {
             wrapper.passthrough(Types.BOOLEAN); // Reset/clear
             int size = wrapper.passthrough(Types.VAR_INT); // Mapping size
             for (int i = 0; i < size; i++) {
@@ -266,19 +249,6 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
             wrapper.read(Types.BOOLEAN); // Show advancements
         });
 
-        final RecipeDisplayRewriter<ClientboundPacket1_21_5> recipeRewriter = new RecipeDisplayRewriter<>(protocol) {
-            @Override
-            protected void handleSmithingTrimSlotDisplay(final PacketWrapper wrapper) {
-                handleSlotDisplay(wrapper); // Base
-                handleSlotDisplay(wrapper); // Material
-                wrapper.read(ArmorTrimPattern.TYPE1_21_5); // Patterm
-                // Add empty slot display...
-                wrapper.write(Types.VAR_INT, 0);
-            }
-        };
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_5.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_5.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_5.PLACE_GHOST_RECIPE);
     }
 
     private void convertClientAsset(final PacketWrapper wrapper) {

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

@@ -24,6 +24,8 @@ import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.Protocol1_21_5To1_21
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.type.Types;
+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.protocols.v1_21_4to1_21_5.packet.ClientboundPacket1_21_5;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 
@@ -34,7 +36,7 @@ public final class BlockPacketRewriter1_21_5 extends BlockRewriter<ClientboundPa
     private final Protocol1_21_5To1_21_4 protocol;
 
     public BlockPacketRewriter1_21_5(final Protocol1_21_5To1_21_4 protocol) {
-        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG);
+        super(protocol, Types.BLOCK_POSITION1_14, Types.COMPOUND_TAG, ChunkType1_21_5::new, ChunkType1_20_2::new);
         this.protocol = protocol;
     }
 

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

@@ -44,10 +44,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerSetEntityData(ClientboundPackets1_21_5.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_5.REMOVE_ENTITIES);
-
-        protocol.appendClientbound(ClientboundPackets1_21_5.ADD_ENTITY, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_5.ADD_ENTITY, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
 
             final UUID uuid = wrapper.read(Types.UUID);
@@ -62,7 +59,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
                 wrapper.passthrough(Types.BYTE); // Yaw
                 wrapper.passthrough(Types.BYTE); // Head yaw
                 wrapper.passthrough(Types.VAR_INT); // Data
-                getSpawnTrackerWithDataHandler1_19(EntityTypes1_21_5.FALLING_BLOCK).handle(wrapper);
+                getSpawnTrackerWithDataHandler1_19().handle(wrapper);
                 return;
             }
 
@@ -96,29 +93,7 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21_5.LOGIN, wrapper -> {
-            final int entityId = wrapper.passthrough(Types.INT); // Entity id
-            wrapper.passthrough(Types.BOOLEAN); // Hardcore
-            wrapper.passthrough(Types.STRING_ARRAY); // World List
-            wrapper.passthrough(Types.VAR_INT); // Max players
-            wrapper.passthrough(Types.VAR_INT); // View distance
-            wrapper.passthrough(Types.VAR_INT); // Simulation distance
-            wrapper.passthrough(Types.BOOLEAN); // Reduced debug info
-            wrapper.passthrough(Types.BOOLEAN); // Show death screen
-            wrapper.passthrough(Types.BOOLEAN); // Limited crafting
-            final int dimensionId = wrapper.passthrough(Types.VAR_INT);
-            final String world = wrapper.passthrough(Types.STRING);
-            trackWorldDataByKey1_20_5(wrapper.user(), dimensionId, world);
-            trackPlayer(wrapper.user(), entityId);
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_21_5.RESPAWN, wrapper -> {
-            final int dimensionId = wrapper.passthrough(Types.VAR_INT);
-            final String world = wrapper.passthrough(Types.STRING);
-            trackWorldDataByKey1_20_5(wrapper.user(), dimensionId, world);
-        });
-
-        protocol.registerClientbound(ClientboundPackets1_21_5.SET_PLAYER_TEAM, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_5.SET_PLAYER_TEAM, wrapper -> {
             wrapper.passthrough(Types.STRING); // Team Name
             final byte action = wrapper.passthrough(Types.BYTE); // Mode
             if (action == 0 || action == 2) {
@@ -278,11 +253,6 @@ public final class EntityPacketRewriter1_21_5 extends EntityRewriter<Clientbound
 
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_21_5.getTypeFromId(type);

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

@@ -22,7 +22,7 @@ import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.data.Dialog;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.provider.ChestDialogViewProvider;
@@ -37,12 +37,14 @@ import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.RegistryAndT
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.ServerLinks;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_6;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 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.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -54,6 +56,7 @@ import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPac
 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.ServerboundPacket1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPackets1_21_5;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.Protocol1_21_5To1_21_6;
 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;
@@ -61,11 +64,11 @@ import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundConfigurationPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
-import com.viaversion.viaversion.rewriter.AttributeRewriter;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+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;
@@ -78,7 +81,9 @@ 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);
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_6> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this);
+    private final BackwardsRegistryRewriter registryDataRewriter = new RegistryDataRewriter1_21_6(this);
+    private final BlockRewriter<ClientboundPacket1_21_6> blockRewriter = new BlockRewriter1_21_5<>(this, ChunkType1_21_5::new);
 
     public Protocol1_21_6To1_21_5() {
         super(ClientboundPacket1_21_6.class, ClientboundPacket1_21_5.class, ServerboundPacket1_21_6.class, ServerboundPacket1_21_5.class);
@@ -88,23 +93,14 @@ 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);
-
-        final SoundRewriter<ClientboundPacket1_21_6> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND);
         appendClientbound(ClientboundPackets1_21_6.SOUND, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Source
             fixSoundSource(wrapper);
         });
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND_ENTITY);
         appendClientbound(ClientboundPackets1_21_6.SOUND_ENTITY, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Source
             fixSoundSource(wrapper);
         });
-        soundRewriter.registerStopSound(ClientboundPackets1_21_6.STOP_SOUND);
         appendClientbound(ClientboundPackets1_21_6.STOP_SOUND, wrapper -> {
             final byte flags = wrapper.get(Types.BYTE, 0);
             if ((flags & 0x01) != 0) {
@@ -112,9 +108,7 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
             }
         });
 
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_6.AWARD_STATS);
-        new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_6.UPDATE_ATTRIBUTES);
-        new CommandRewriter1_19_4<>(this) {
+        final CommandRewriter1_19_4<ClientboundPacket1_21_6> commandRewriter = new CommandRewriter1_19_4<>(this) {
             @Override
             public void handleArgument(final PacketWrapper wrapper, final String argumentType) {
                 if (argumentType.equals("minecraft:hex_color") || argumentType.equals("minecraft:dialog")) {
@@ -123,28 +117,8 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
                     super.handleArgument(wrapper, argumentType);
                 }
             }
-        }.registerDeclareCommands1_19(ClientboundPackets1_21_6.COMMANDS);
-
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_6.OPEN_SCREEN);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_6.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21_6.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_6.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_21_5(ClientboundPackets1_21_6.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_6.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_6.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_6.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_6.PLAYER_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_6.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_6.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_6.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_6.EXPLODE);
+        };
+        replaceClientbound(ClientboundPackets1_21_6.COMMANDS, commandRewriter::handle1_19);
 
         registerClientbound(ClientboundPackets1_21_6.CHANGE_DIFFICULTY, wrapper -> {
             final int difficulty = wrapper.read(Types.VAR_INT);
@@ -166,13 +140,9 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
 
             final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
             final ServerLinks serverLinks = wrapper.user().get(ServerLinks.class);
-            final int id = wrapper.read(Types.VAR_INT) - 1;
-            CompoundTag tag;
-            if (id == -1) {
-                tag = (CompoundTag) wrapper.read(Types.TRUSTED_TAG);
-            } else {
-                tag = registryAndTags.fromRegistry(id);
-            }
+
+            final Holder<CompoundTag> holder = wrapper.passthrough(Types.TRUSTED_COMPOUND_TAG_HOLDER);
+            final CompoundTag tag = holder.isDirect() ? holder.value() : registryAndTags.fromRegistry(holder.id());
 
             final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
             provider.openDialog(wrapper.user(), new Dialog(registryAndTags, serverLinks, tag));
@@ -185,7 +155,7 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
 
             final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
             final ServerLinks serverLinks = wrapper.user().get(ServerLinks.class);
-            final CompoundTag tag = (CompoundTag) wrapper.read(Types.TRUSTED_TAG);
+            final CompoundTag tag = wrapper.read(Types.TRUSTED_COMPOUND_TAG);
 
             final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
             provider.openDialog(wrapper.user(), new Dialog(registryAndTags, serverLinks, tag));
@@ -363,7 +333,12 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket1_21_6> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 
@@ -382,6 +357,11 @@ public final class Protocol1_21_6To1_21_5 extends BackwardsProtocol<ClientboundP
         return tagRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_6> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
     @Override
     public VersionedTypesHolder types() {
         return VersionedTypes.V1_21_6;

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

@@ -27,15 +27,8 @@ import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_21;
 import com.viaversion.viaversion.api.minecraft.item.data.Equippable;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPacket1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPackets1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 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.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
-import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
 
 import static com.viaversion.viaversion.protocols.v1_21_5to1_21_6.rewriter.BlockItemPacketRewriter1_21_6.downgradeItemData;
 import static com.viaversion.viaversion.protocols.v1_21_5to1_21_6.rewriter.BlockItemPacketRewriter1_21_6.upgradeItemData;
@@ -46,33 +39,6 @@ public final class BlockItemPacketRewriter1_21_6 extends BackwardsStructuredItem
         super(protocol);
     }
 
-    @Override
-    public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_6> blockRewriter = new BlockRewriter1_21_5<>(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_6.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_6.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_6.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_6.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_6.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_6.BLOCK_ENTITY_DATA);
-
-        protocol.registerClientbound(ClientboundPackets1_21_6.SET_CURSOR_ITEM, this::passthroughClientboundItem);
-        registerSetPlayerInventory(ClientboundPackets1_21_6.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_6.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_6.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_6.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_6.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_5.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_5.SET_CREATIVE_MODE_SLOT);
-
-        final RecipeDisplayRewriter<ClientboundPacket1_21_6> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_6.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_6.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_6.PLACE_GHOST_RECIPE);
-    }
-
     @Override
     protected void handleItemDataComponentsToClient(final UserConnection connection, final Item item, final StructuredDataContainer container) {
         downgradeItemData(item);

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

@@ -31,32 +31,25 @@ public final class ComponentRewriter1_21_6 extends NBTComponentRewriter<Clientbo
     }
 
     @Override
-    protected void processCompoundTag(final UserConnection connection, final CompoundTag tag) {
-        super.processCompoundTag(connection, tag);
-
-        final CompoundTag clickEvent = tag.getCompoundTag("click_event");
-        if (clickEvent == null) {
-            return;
-        }
-
-        final String action = clickEvent.getString("action");
+    protected void handleClickEvent(final UserConnection connection, final CompoundTag clickEventTag) {
+        final String action = clickEventTag.getString("action");
 
         // Make them run a command generated by us executing the actual logic
         if ("show_dialog".equals(action)) {
             final ClickEvents clickEvents = connection.get(ClickEvents.class);
-            final String command = clickEvents.storeClickEvent(clickEvent.copy());
+            final String command = clickEvents.storeClickEvent(clickEventTag.copy());
 
-            clickEvent.putString("action", "run_command");
-            clickEvent.putString("command", command);
-            clickEvent.remove("dialog");
+            clickEventTag.putString("action", "run_command");
+            clickEventTag.putString("command", command);
+            clickEventTag.remove("dialog");
         } else if ("custom".equals(action)) {
             final ClickEvents clickEvents = connection.get(ClickEvents.class);
-            final String command = clickEvents.storeClickEvent(clickEvent.copy());
+            final String command = clickEvents.storeClickEvent(clickEventTag.copy());
 
-            clickEvent.putString("action", "run_command");
-            clickEvent.putString("command", command);
-            clickEvent.remove("id");
-            clickEvent.remove("payload");
+            clickEventTag.putString("action", "run_command");
+            clickEventTag.putString("command", command);
+            clickEventTag.remove("id");
+            clickEventTag.remove("payload");
         }
     }
 }

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

@@ -38,14 +38,7 @@ public final class EntityPacketRewriter1_21_6 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerSetEntityData(ClientboundPackets1_21_6.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_6.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets1_21_6.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets1_21_6.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets1_21_6.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets1_21_6.RESPAWN);
-
-        protocol.appendClientbound(ClientboundPackets1_21_6.ADD_ENTITY, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_6.ADD_ENTITY, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
             wrapper.passthrough(Types.UUID); // Entity UUID
             final int entityType = wrapper.passthrough(Types.VAR_INT);
@@ -59,7 +52,7 @@ public final class EntityPacketRewriter1_21_6 extends EntityRewriter<Clientbound
             final short velocityX = wrapper.passthrough(Types.SHORT);
             final short velocityY = wrapper.passthrough(Types.SHORT);
             final short velocityZ = wrapper.passthrough(Types.SHORT);
-            getSpawnTrackerWithDataHandler1_19(EntityTypes1_21_6.FALLING_BLOCK).handle(wrapper);
+            getSpawnTrackerWithDataHandler1_19().handle(wrapper);
             if (velocityX != 0 || velocityY != 0 || velocityZ != 0) {
                 if (!typeFromId(entityType).isOrHasParent(EntityTypes1_21_6.LIVING_ENTITY)) {
                     // Send movement separately
@@ -109,7 +102,7 @@ public final class EntityPacketRewriter1_21_6 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_21_6.HAPPY_GHAST, EntityTypes1_21_6.GHAST).tagName();
     }
 

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

@@ -20,9 +20,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;
 import com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.rewriter.BlockItemPacketRewriter1_21_7;
 import com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.rewriter.EntityPacketRewriter1_21_7;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -31,10 +29,12 @@ 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.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_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;
@@ -42,9 +42,9 @@ import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundCon
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_6to1_21_7.Protocol1_21_6To1_21_7;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
@@ -57,49 +57,14 @@ 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);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_6> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this);
+    private final BlockRewriter<ClientboundPacket1_21_6> blockRewriter = BlockRewriter.for1_20_2(this, ChunkType1_21_5::new);
 
     public Protocol1_21_7To1_21_6() {
         super(ClientboundPacket1_21_6.class, ClientboundPacket1_21_6.class, ServerboundPacket1_21_6.class, ServerboundPacket1_21_6.class);
     }
 
-    @Override
-    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);
-
-        final SoundRewriter<ClientboundPacket1_21_6> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_6.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_6.AWARD_STATS);
-
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_6.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21_6.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_6.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_21_5(ClientboundPackets1_21_6.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_6.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_6.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_6.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_6.PLAYER_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_6.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_6.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_6.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_6.EXPLODE);
-    }
-
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_6.PLAYER));
@@ -122,7 +87,7 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
     }
 
     @Override
-    public TranslatableRewriter getComponentRewriter() {
+    public NBTComponentRewriter<ClientboundPacket1_21_6> getComponentRewriter() {
         return translatableRewriter;
     }
 
@@ -137,10 +102,20 @@ public final class Protocol1_21_7To1_21_6 extends BackwardsProtocol<ClientboundP
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket1_21_6> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_6> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_21_6> getParticleRewriter() {
         return particleRewriter;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/rewriter/BlockItemPacketRewriter1_21_7.java

@@ -19,48 +19,12 @@ package com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.rewriter;
 
 import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.Protocol1_21_7To1_21_6;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_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.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
-import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 
 public final class BlockItemPacketRewriter1_21_7 extends BackwardsStructuredItemRewriter<ClientboundPacket1_21_6, ServerboundPacket1_21_6, Protocol1_21_7To1_21_6> {
 
     public BlockItemPacketRewriter1_21_7(final Protocol1_21_7To1_21_6 protocol) {
         super(protocol);
     }
-
-    @Override
-    public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_6> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_6.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_6.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_6.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_6.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_6.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_6.BLOCK_ENTITY_DATA);
-
-        registerSetCursorItem(ClientboundPackets1_21_6.SET_CURSOR_ITEM);
-        registerSetPlayerInventory(ClientboundPackets1_21_6.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_6.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_6.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21_6.SET_EQUIPMENT);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_6.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
-        registerShowDialog(ClientboundPackets1_21_6.SHOW_DIALOG);
-        registerShowDialogDirect(ClientboundConfigurationPackets1_21_6.SHOW_DIALOG);
-
-        final RecipeDisplayRewriter<ClientboundPacket1_21_6> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_6.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_6.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_6.PLACE_GHOST_RECIPE);
-    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/rewriter/EntityPacketRewriter1_21_7.java

@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.rewriter;
 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;
-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;
@@ -33,17 +32,6 @@ public final class EntityPacketRewriter1_21_7 extends EntityRewriter<Clientbound
         super(protocol, VersionedTypes.V1_21_6.entityDataTypes.optionalComponentType, VersionedTypes.V1_21_6.entityDataTypes.booleanType);
     }
 
-    @Override
-    public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_21_6.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_21_6.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_6.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets1_21_6.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets1_21_6.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets1_21_6.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets1_21_6.RESPAWN);
-    }
-
     @Override
     protected void registerRewrites() {
         final EntityDataTypes1_21_5 mappedEntityDataTypes = VersionedTypes.V1_21_6.entityDataTypes;

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

@@ -21,6 +21,7 @@ import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.ViaBackwards;
 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.protocol.v1_21_9to1_21_7.rewriter.BlockItemPacketRewriter1_21_9;
@@ -40,10 +41,12 @@ import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvide
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_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;
@@ -57,10 +60,11 @@ 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.protocols.v1_21to1_21_2.storage.BundleStateTracker;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 
@@ -72,7 +76,9 @@ 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);
+    private final RecipeDisplayRewriter<ClientboundPacket1_21_9> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(this);
+    private final BackwardsRegistryRewriter registryDataRewriter = new RegistryDataRewriter1_21_9(this);
+    private final BlockRewriter<ClientboundPacket1_21_9> blockRewriter = new BlockRewriter1_21_5<>(this, ChunkType1_21_5::new);
 
     public Protocol1_21_9To1_21_7() {
         super(ClientboundPacket1_21_9.class, ClientboundPacket1_21_6.class, ServerboundPacket1_21_9.class, ServerboundPacket1_21_6.class);
@@ -82,38 +88,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);
-
         final SoundRewriter<ClientboundPacket1_21_9> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_9.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21_9.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21_9.STOP_SOUND);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21_9.AWARD_STATS);
-
-        translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_9.OPEN_SCREEN);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21_9.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21_9.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21_9.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_21_5(ClientboundPackets1_21_9.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_9.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_9.PLAYER_INFO_UPDATE);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SYSTEM_CHAT);
-        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_9.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_9.PLAYER_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21_9.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21_9.SET_SCORE);
-        translatableRewriter.registerPing();
-
-        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_9.LEVEL_PARTICLES);
-        registerClientbound(ClientboundPackets1_21_9.EXPLODE, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21_9.EXPLODE, wrapper -> {
             wrapper.passthrough(Types.DOUBLE); // X
             wrapper.passthrough(Types.DOUBLE); // Y
             wrapper.passthrough(Types.DOUBLE); // Z
@@ -239,7 +215,12 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
     }
 
     @Override
-    public RegistryDataRewriter getRegistryDataRewriter() {
+    public BlockRewriter<ClientboundPacket1_21_9> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
         return registryDataRewriter;
     }
 
@@ -258,6 +239,11 @@ public final class Protocol1_21_9To1_21_7 extends BackwardsProtocol<ClientboundP
         return tagRewriter;
     }
 
+    @Override
+    public RecipeDisplayRewriter<ClientboundPacket1_21_9> getRecipeRewriter() {
+        return recipeRewriter;
+    }
+
     @Override
     public VersionedTypesHolder types() {
         return VersionedTypes.V1_21_9;

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

@@ -29,16 +29,9 @@ import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
-import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
-import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
-import com.viaversion.viaversion.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.BlockRewriter;
-import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
-import com.viaversion.viaversion.rewriter.block.BlockRewriter1_21_5;
 
 import static com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter.BlockItemPacketRewriter1_21_9.downgradeData;
 import static com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter.BlockItemPacketRewriter1_21_9.upgradeData;
@@ -51,31 +44,6 @@ public final class BlockItemPacketRewriter1_21_9 extends BackwardsStructuredItem
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21_9> blockRewriter = new BlockRewriter1_21_5<>(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21_9.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_9.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_9.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_9.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_9.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_9.BLOCK_ENTITY_DATA);
-
-        registerSetCursorItem(ClientboundPackets1_21_9.SET_CURSOR_ITEM);
-        registerSetPlayerInventory(ClientboundPackets1_21_9.SET_PLAYER_INVENTORY);
-        registerCooldown1_21_2(ClientboundPackets1_21_9.COOLDOWN);
-        registerSetContent1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_CONTENT);
-        registerSetSlot1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21_9.UPDATE_ADVANCEMENTS);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21_9.MERCHANT_OFFERS);
-        registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
-        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
-        registerShowDialog(ClientboundPackets1_21_9.SHOW_DIALOG);
-        registerShowDialogDirect(ClientboundConfigurationPackets1_21_9.SHOW_DIALOG);
-
-        final RecipeDisplayRewriter<ClientboundPacket1_21_9> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
-        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_9.UPDATE_RECIPES);
-        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_9.RECIPE_BOOK_ADD);
-        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_9.PLACE_GHOST_RECIPE);
-
         protocol.registerClientbound(ClientboundPackets1_21_9.INITIALIZE_BORDER, this::updateBorderCenter);
         protocol.registerClientbound(ClientboundPackets1_21_9.SET_BORDER_CENTER, this::updateBorderCenter);
     }

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

@@ -65,14 +65,7 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerSetEntityData(ClientboundPackets1_21_9.SET_ENTITY_DATA);
-        registerRemoveEntities(ClientboundPackets1_21_9.REMOVE_ENTITIES);
-        registerPlayerAbilities(ClientboundPackets1_21_9.PLAYER_ABILITIES);
-        registerGameEvent(ClientboundPackets1_21_9.GAME_EVENT);
-        registerLogin1_20_5(ClientboundPackets1_21_9.LOGIN);
-        registerRespawn1_20_5(ClientboundPackets1_21_9.RESPAWN);
-
-        protocol.registerClientbound(ClientboundPackets1_21_9.ADD_ENTITY, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_9.ADD_ENTITY, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
             final UUID uuid = wrapper.passthrough(Types.UUID);
             final int entityTypeId = wrapper.passthrough(Types.VAR_INT);
@@ -146,7 +139,7 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
         });
 
         // Track items
-        protocol.registerClientbound(ClientboundPackets1_21_9.SET_EQUIPMENT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21_9.SET_EQUIPMENT, wrapper -> {
             final int entityId = wrapper.passthrough(Types.VAR_INT);
 
             final TrackedEntity trackedEntity = tracker(wrapper.user()).entity(entityId);
@@ -520,7 +513,7 @@ public final class EntityPacketRewriter1_21_9 extends EntityRewriter<Clientbound
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         mapEntityTypeWithData(EntityTypes1_21_9.COPPER_GOLEM, EntityTypes1_21_9.FROG).tagName();
         mapEntityTypeWithData(EntityTypes1_21_9.MANNEQUIN, EntityTypes1_21_9.PLAYER);
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/Protocol1_21To1_20_5.java

@@ -19,7 +19,7 @@ package com.viaversion.viabackwards.protocol.v1_21to1_20_5;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_21to1_20_5.rewriter.BlockItemPacketRewriter1_21;
 import com.viaversion.viabackwards.protocol.v1_21to1_20_5.rewriter.ComponentRewriter1_21;
@@ -36,6 +36,7 @@ import com.viaversion.viaversion.api.minecraft.item.data.ChatType;
 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.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.Types1_21;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
@@ -50,8 +51,8 @@ import com.viaversion.viaversion.protocols.v1_20_5to1_21.Protocol1_20_5To1_21;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPacket1_21;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.ArrayUtil;
 
@@ -65,6 +66,8 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
     private final ParticleRewriter<ClientboundPacket1_21> particleRewriter = new ParticleRewriter<>(this);
     private final JsonNBTComponentRewriter<ClientboundPacket1_21> translatableRewriter = new ComponentRewriter1_21(this);
     private final TagRewriter<ClientboundPacket1_21> tagRewriter = new TagRewriter<>(this);
+    private final BlockRewriter<ClientboundPacket1_21> blockRewriter = BlockRewriter.for1_20_2(this, ChunkType1_20_2::new);
+    private final BackwardsRegistryRewriter registryDataRewriter = new BackwardsRegistryRewriter(this);
 
     public Protocol1_21To1_20_5() {
         super(ClientboundPacket1_21.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_5.class, ServerboundPacket1_20_5.class);
@@ -74,33 +77,6 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
     protected void registerPackets() {
         super.registerPackets();
 
-        tagRewriter.registerGeneric(ClientboundPackets1_21.UPDATE_TAGS);
-        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
-
-        final SoundRewriter<ClientboundPacket1_21> soundRewriter = new SoundRewriter<>(this);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND);
-        soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND_ENTITY);
-        soundRewriter.registerStopSound(ClientboundPackets1_21.STOP_SOUND);
-
-        particleRewriter.registerLevelParticles1_20_5(ClientboundPackets1_21.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_20_5(ClientboundPackets1_21.EXPLODE);
-
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_21.AWARD_STATS);
-
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21.SET_ACTION_BAR_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21.SET_TITLE_TEXT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21.SET_SUBTITLE_TEXT);
-        translatableRewriter.registerBossEvent(ClientboundPackets1_21.BOSS_EVENT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21.DISCONNECT);
-        translatableRewriter.registerComponentPacket(ClientboundConfigurationPackets1_21.DISCONNECT);
-        translatableRewriter.registerTabList(ClientboundPackets1_21.TAB_LIST);
-        translatableRewriter.registerSetPlayerTeam1_13(ClientboundPackets1_21.SET_PLAYER_TEAM);
-        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21.PLAYER_COMBAT_KILL);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21.SYSTEM_CHAT);
-        translatableRewriter.registerSetObjective(ClientboundPackets1_21.SET_OBJECTIVE);
-        translatableRewriter.registerSetScore1_20_3(ClientboundPackets1_21.SET_SCORE);
-        translatableRewriter.registerPing();
-
         // Format change we can't properly map - all this really results in is a desync one version earlier
         cancelClientbound(ClientboundPackets1_21.PROJECTILE_POWER);
 
@@ -109,7 +85,7 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
         cancelClientbound(ClientboundConfigurationPackets1_21.CUSTOM_REPORT_DETAILS);
         cancelClientbound(ClientboundConfigurationPackets1_21.SERVER_LINKS);
 
-        registerClientbound(ClientboundPackets1_21.DISGUISED_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21.DISGUISED_CHAT, wrapper -> {
             translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_TAG)); // Message
 
             final Holder<ChatType> chatType = wrapper.read(ChatType.TYPE);
@@ -121,7 +97,7 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
 
             wrapper.write(Types.VAR_INT, chatType.id());
         });
-        registerClientbound(ClientboundPackets1_21.PLAYER_CHAT, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21.PLAYER_CHAT, wrapper -> {
             wrapper.passthrough(Types.UUID); // Sender
             wrapper.passthrough(Types.VAR_INT); // Index
             wrapper.passthrough(Types.OPTIONAL_SIGNATURE_BYTES); // Signature
@@ -156,7 +132,7 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
             translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Target Name
         });
 
-        registerClientbound(ClientboundPackets1_21.UPDATE_ATTRIBUTES, wrapper -> {
+        replaceClientbound(ClientboundPackets1_21.UPDATE_ATTRIBUTES, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
 
             final int size = wrapper.passthrough(Types.VAR_INT);
@@ -222,6 +198,16 @@ public final class Protocol1_21To1_20_5 extends BackwardsProtocol<ClientboundPac
         return itemRewriter;
     }
 
+    @Override
+    public BlockRewriter<ClientboundPacket1_21> getBlockRewriter() {
+        return blockRewriter;
+    }
+
+    @Override
+    public BackwardsRegistryRewriter getRegistryDataRewriter() {
+        return registryDataRewriter;
+    }
+
     @Override
     public ParticleRewriter<ClientboundPacket1_21> getParticleRewriter() {
         return particleRewriter;

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

@@ -72,23 +72,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPacket1_21> blockRewriter = BlockRewriter.for1_20_2(protocol);
-        blockRewriter.registerBlockEvent(ClientboundPackets1_21.BLOCK_EVENT);
-        blockRewriter.registerBlockUpdate(ClientboundPackets1_21.BLOCK_UPDATE);
-        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21.SECTION_BLOCKS_UPDATE);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
-        blockRewriter.registerBlockEntityData(ClientboundPackets1_21.BLOCK_ENTITY_DATA);
-
-        registerCooldown(ClientboundPackets1_21.COOLDOWN);
-        registerSetContent1_17_1(ClientboundPackets1_21.CONTAINER_SET_CONTENT);
-        registerSetSlot1_17_1(ClientboundPackets1_21.CONTAINER_SET_SLOT);
-        registerAdvancements1_20_3(ClientboundPackets1_21.UPDATE_ADVANCEMENTS);
-        registerSetEquipment(ClientboundPackets1_21.SET_EQUIPMENT);
-        registerContainerClick1_17_1(ServerboundPackets1_20_5.CONTAINER_CLICK);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21.MERCHANT_OFFERS);
-        registerSetCreativeModeSlot(ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT);
-
-        protocol.registerClientbound(ClientboundPackets1_21.OPEN_SCREEN, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21.OPEN_SCREEN, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Id
 
             // Tracking the type actually matters now with crafters also using container data above index 3
@@ -123,7 +107,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
             wrapper.write(Types.VAR_INT, columns * 3 + 1);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_21.LEVEL_EVENT, wrapper -> {
+        protocol.replaceClientbound(ClientboundPackets1_21.LEVEL_EVENT, wrapper -> {
             final int event = wrapper.passthrough(Types.INT);
             wrapper.passthrough(Types.BLOCK_POSITION1_14);