Fix blocks_attack backup with null bypass tag

Closes #1228

Author: kennytv

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

@@ -541,7 +541,10 @@ protected void restoreBackupData(final Item item, final StructuredDataContainer
                 damageReductions.add(new DamageReduction(horizontalBlockingAngle, type, base, factor));
             }
 
-            data.set(StructuredDataKey.BLOCKS_ATTACKS1_21_5, new BlocksAttacks(blockDelaySeconds, disableCooldownScale, damageReductions.toArray(new DamageReduction[0]), itemDamage, HolderSet.of(bypassedBy), blockSound, disableSound));
+            data.set(StructuredDataKey.BLOCKS_ATTACKS1_21_5, new BlocksAttacks(
+                blockDelaySeconds, disableCooldownScale, damageReductions.toArray(new DamageReduction[0]),
+                itemDamage, bypassedBy != null ? HolderSet.of(bypassedBy) : null, blockSound, disableSound
+            ));
         }
 
         final IntTag chickenVariant = backupTag.getIntTag("chicken_variant");

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

@@ -25,7 +25,6 @@
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 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.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType26_1;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
@@ -73,22 +72,7 @@ public void registerPackets() {
         registerShowDialog(ClientboundPackets26_1.SHOW_DIALOG);
         registerShowDialogDirect(ClientboundConfigurationPackets1_21_9.SHOW_DIALOG);
 
-        final RecipeDisplayRewriter<ClientboundPacket26_1> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol) {
-            @Override
-            protected void handleDyeSlotDisplay(final PacketWrapper wrapper) {
-                wrapper.consumeReadsOnly(() -> super.handleDyeSlotDisplay(wrapper));
-            }
-
-            @Override
-            protected void handleOnlyWithComponentSlotDisplay(final PacketWrapper wrapper) {
-                wrapper.consumeReadsOnly(() -> super.handleOnlyWithComponentSlotDisplay(wrapper));
-            }
-
-            @Override
-            protected void handleWithRemainderSlotDisplay(final PacketWrapper wrapper) {
-                wrapper.consumeReadsOnly(() -> super.handleWithRemainderSlotDisplay(wrapper));
-            }
-        };
+        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);