From 91f31b578f6f2a49eb3b85dd51282c473cbd151e Mon Sep 17 00:00:00 2001
From: RK_01 <50594595+RaphiMC@users.noreply.github.com>
Date: Thu, 16 May 2024 10:31:05 +0200
Subject: [PATCH] Clean up tags rewriting (#3856)

---
 .../viaversion/api/data/MappingDataBase.java  |   3 +-
 .../viaversion/api/rewriter/TagRewriter.java  |   6 +-
 .../v1_12_2to1_13/Protocol1_12_2To1_13.java   |   8 +-
 .../v1_13_2to1_14/Protocol1_13_2To1_14.java   |  71 ++++-------------
 .../v1_14_4to1_15/Protocol1_14_4To1_15.java   |  12 ++-
 .../v1_15_2to1_16/Protocol1_15_2To1_16.java   |  51 ++----------
 .../Protocol1_16_1To1_16_2.java               |  18 +----
 .../v1_16_4to1_17/Protocol1_16_4To1_17.java   |  32 +++-----
 .../v1_17_1to1_18/Protocol1_17_1To1_18.java   |  14 ++--
 .../v1_18_2to1_19/Protocol1_18_2To1_19.java   |  15 +++-
 .../v1_18to1_18_2/Protocol1_18To1_18_2.java   |   4 +-
 .../Protocol1_19_1To1_19_3.java               |  15 ++--
 .../v1_19_4to1_20/Protocol1_19_4To1_20.java   |   5 ++
 .../Protocol1_20_3To1_20_5.java               |   6 +-
 .../viaversion/rewriter/TagRewriter.java      |  74 ++++++++++++------
 .../viaversion/data/mappings-1.12to1.13.nbt   | Bin 23564 -> 23876 bytes
 .../viaversion/data/mappings-1.13.2to1.14.nbt | Bin 2231 -> 3170 bytes
 .../viaversion/data/mappings-1.14to1.15.nbt   | Bin 528 -> 973 bytes
 .../viaversion/data/mappings-1.15to1.16.nbt   | Bin 8833 -> 10135 bytes
 .../viaversion/data/mappings-1.16.2to1.17.nbt | Bin 4776 -> 5334 bytes
 .../viaversion/data/mappings-1.16to1.16.2.nbt | Bin 632 -> 817 bytes
 .../viaversion/data/mappings-1.17to1.18.nbt   | Bin 351 -> 1549 bytes
 .../viaversion/data/mappings-1.18to1.19.nbt   | Bin 2519 -> 3253 bytes
 .../data/mappings-1.19.3to1.19.4.nbt          | Bin 1617 -> 2197 bytes
 .../viaversion/data/mappings-1.19.4to1.20.nbt | Bin 1136 -> 2962 bytes
 .../viaversion/data/mappings-1.19to1.19.3.nbt | Bin 1024 -> 1257 bytes
 .../data/mappings-1.20.2to1.20.3.nbt          | Bin 897 -> 1161 bytes
 .../data/mappings-1.20.3to1.20.5.nbt          | Bin 1021 -> 5406 bytes
 .../viaversion/data/mappings-1.20to1.20.2.nbt | Bin 451 -> 716 bytes
 29 files changed, 140 insertions(+), 194 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
index 03de76d00..e3061df7f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
@@ -107,6 +107,7 @@ public class MappingDataBase implements MappingData {
             this.tags = new EnumMap<>(RegistryType.class);
             loadTags(RegistryType.ITEM, tagsTag);
             loadTags(RegistryType.BLOCK, tagsTag);
+            loadTags(RegistryType.ENTITY, tagsTag);
         }
 
         loadExtras(data);
@@ -309,4 +310,4 @@ public class MappingDataBase implements MappingData {
 
     protected void loadExtras(final CompoundTag data) {
     }
-}
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/viaversion/viaversion/api/rewriter/TagRewriter.java b/api/src/main/java/com/viaversion/viaversion/api/rewriter/TagRewriter.java
index 9ea232f69..edba7249f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/rewriter/TagRewriter.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/rewriter/TagRewriter.java
@@ -32,7 +32,9 @@ public interface TagRewriter extends MappingDataListener {
 
     void removeTags(String registryKey);
 
-    void renameTag(RegistryType type, String registryKey, String renameTo);
+    void removeTag(RegistryType type, String tagId);
+
+    void renameTag(RegistryType type, String tagId, String renameTo);
 
     /**
      * Adds an empty tag (since the client crashes if a checked tag is not registered).
@@ -74,4 +76,4 @@ public interface TagRewriter extends MappingDataListener {
     List<TagData> getNewTags(RegistryType tagType);
 
     List<TagData> getOrComputeNewTags(RegistryType tagType);
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
index 452fb8fc6..c22f5c5be 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -151,19 +151,19 @@ public class Protocol1_12_2To1_13 extends AbstractProtocol<ClientboundPackets1_1
                 for (Map.Entry<String, int[]> tag : MAPPINGS.getBlockTags().entrySet()) {
                     wrapper.write(Types.STRING, tag.getKey());
                     // Needs copy as other protocols may modify it
-                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue());
+                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue().clone());
                 }
                 wrapper.write(Types.VAR_INT, MAPPINGS.getItemTags().size()); // item tags
                 for (Map.Entry<String, int[]> tag : MAPPINGS.getItemTags().entrySet()) {
                     wrapper.write(Types.STRING, tag.getKey());
                     // Needs copy as other protocols may modify it
-                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue());
+                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue().clone());
                 }
                 wrapper.write(Types.VAR_INT, MAPPINGS.getFluidTags().size()); // fluid tags
                 for (Map.Entry<String, int[]> tag : MAPPINGS.getFluidTags().entrySet()) {
                     wrapper.write(Types.STRING, tag.getKey());
                     // Needs copy as other protocols may modify it
-                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue());
+                    wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue().clone());
                 }
             }).scheduleSend(Protocol1_12_2To1_13.class);
         };
@@ -920,4 +920,4 @@ public class Protocol1_12_2To1_13 extends AbstractProtocol<ClientboundPackets1_1
     public ComponentRewriter1_13 getComponentRewriter() {
         return componentRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java
index 14126c468..7efa794bd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java
@@ -19,9 +19,10 @@ package com.viaversion.viaversion.protocols.v1_13_2to1_14;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
-import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
@@ -40,6 +41,7 @@ import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_13, ClientboundPackets1_14, ServerboundPackets1_13, ServerboundPackets1_14> {
@@ -47,6 +49,7 @@ public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_1
     public static final MappingData1_14 MAPPINGS = new MappingData1_14();
     private final EntityPacketRewriter1_14 entityRewriter = new EntityPacketRewriter1_14(this);
     private final ItemPacketRewriter1_14 itemRewriter = new ItemPacketRewriter1_14(this);
+    private final TagRewriter<ClientboundPackets1_13> tagRewriter = new TagRewriter<>(this);
 
     public Protocol1_13_2To1_14() {
         super(ClientboundPackets1_13.class, ClientboundPackets1_14.class, ServerboundPackets1_13.class, ServerboundPackets1_14.class);
@@ -76,59 +79,12 @@ public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_1
         };
         commandRewriter.registerDeclareCommands(ClientboundPackets1_13.COMMANDS);
 
-        registerClientbound(ClientboundPackets1_13.UPDATE_TAGS, wrapper -> {
-            int blockTagsSize = wrapper.read(Types.VAR_INT);
-            wrapper.write(Types.VAR_INT, blockTagsSize + 6); // block tags
-            for (int i = 0; i < blockTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                int[] blockIds = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-                for (int j = 0; j < blockIds.length; j++) {
-                    blockIds[j] = MAPPINGS.getNewBlockId(blockIds[j]);
-                }
+        registerClientbound(ClientboundPackets1_13.UPDATE_TAGS, new PacketHandlers() {
+            @Override
+            protected void register() {
+                handler(tagRewriter.getHandler(RegistryType.FLUID));
+                handler(wrapper -> tagRewriter.appendNewTags(wrapper, RegistryType.ENTITY));
             }
-            // Minecraft crashes if we not send signs tags
-            wrapper.write(Types.STRING, "minecraft:signs");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{
-                MAPPINGS.getNewBlockId(150), MAPPINGS.getNewBlockId(155)
-            });
-            wrapper.write(Types.STRING, "minecraft:wall_signs");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{
-                MAPPINGS.getNewBlockId(155)
-            });
-            wrapper.write(Types.STRING, "minecraft:standing_signs");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{
-                MAPPINGS.getNewBlockId(150)
-            });
-            // Fences and walls tags - used for block connections
-            wrapper.write(Types.STRING, "minecraft:fences");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{189, 248, 472, 473, 474, 475});
-            wrapper.write(Types.STRING, "minecraft:walls");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{271, 272});
-            wrapper.write(Types.STRING, "minecraft:wooden_fences");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{189, 472, 473, 474, 475});
-            int itemTagsSize = wrapper.read(Types.VAR_INT);
-            wrapper.write(Types.VAR_INT, itemTagsSize + 2); // item tags
-            for (int i = 0; i < itemTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                int[] itemIds = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-                for (int j = 0; j < itemIds.length; j++) {
-                    itemIds[j] = MAPPINGS.getNewItemId(itemIds[j]);
-                }
-            }
-            // Should fix fuel shift clicking
-            wrapper.write(Types.STRING, "minecraft:signs");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{
-                MAPPINGS.getNewItemId(541)
-            });
-            // Arrows tag (used by bow)
-            wrapper.write(Types.STRING, "minecraft:arrows");
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{526, 825, 826});
-            int fluidTagsSize = wrapper.passthrough(Types.VAR_INT); // fluid tags
-            for (int i = 0; i < fluidTagsSize; i++) {
-                wrapper.passthrough(Types.STRING);
-                wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
-            }
-            wrapper.write(Types.VAR_INT, 0);  // new entity tags - do we need to send this?
         });
 
         // Set Difficulty packet added in 19w11a
@@ -157,6 +113,8 @@ public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_1
             .reader("falling_dust", ParticleType.Readers.BLOCK)
             .reader("item", ParticleType.Readers.ITEM1_13_2);
 
+        tagRewriter.addEmptyTag(RegistryType.BLOCK, "bamboo_plantable_on");
+
         super.onMappingDataLoaded();
     }
 
@@ -182,4 +140,9 @@ public class Protocol1_13_2To1_14 extends AbstractProtocol<ClientboundPackets1_1
     public ItemPacketRewriter1_14 getItemRewriter() {
         return itemRewriter;
     }
-}
+
+    @Override
+    public TagRewriter<ClientboundPackets1_13> getTagRewriter() {
+        return tagRewriter;
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java
index 281e2918d..a852fca13 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java
@@ -67,12 +67,10 @@ public class Protocol1_14_4To1_15 extends AbstractProtocol<ClientboundPackets1_1
     protected void onMappingDataLoaded() {
         EntityTypes1_15.initialize(this);
 
-        int[] shulkerBoxes = new int[17];
-        int shulkerBoxOffset = 501;
-        for (int i = 0; i < 17; i++) {
-            shulkerBoxes[i] = shulkerBoxOffset + i;
-        }
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:shulker_boxes", shulkerBoxes);
+        tagRewriter.removeTag(RegistryType.BLOCK, "minecraft:dirt_like");
+        tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:lectern_books");
+        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:bee_growables", "minecraft:beehives");
+        tagRewriter.addEmptyTag(RegistryType.ENTITY, "minecraft:beehive_inhabitors");
 
         super.onMappingDataLoaded();
     }
@@ -101,4 +99,4 @@ public class Protocol1_14_4To1_15 extends AbstractProtocol<ClientboundPackets1_1
     public TagRewriter<ClientboundPackets1_14_4> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java
index 93ddbea78..2a17b3f49 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java
@@ -213,49 +213,6 @@ public class Protocol1_15_2To1_16 extends AbstractProtocol<ClientboundPackets1_1
 
     @Override
     protected void onMappingDataLoaded() {
-        int[] wallPostOverrideTag = new int[47];
-        int arrayIndex = 0;
-        wallPostOverrideTag[arrayIndex++] = 140;
-        wallPostOverrideTag[arrayIndex++] = 179;
-        wallPostOverrideTag[arrayIndex++] = 264;
-        for (int i = 153; i <= 158; i++) {
-            wallPostOverrideTag[arrayIndex++] = i;
-        }
-        for (int i = 163; i <= 168; i++) {
-            wallPostOverrideTag[arrayIndex++] = i;
-        }
-        for (int i = 408; i <= 439; i++) {
-            wallPostOverrideTag[arrayIndex++] = i;
-        }
-
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:wall_post_override", wallPostOverrideTag);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:beacon_base_blocks", 133, 134, 148, 265);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:climbable", 160, 241, 658);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:fire", 142);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:campfires", 679);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:fence_gates", 242, 467, 468, 469, 470, 471);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:unstable_bottom_center", 242, 467, 468, 469, 470, 471);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:wooden_trapdoors", 193, 194, 195, 196, 197, 198);
-        tagRewriter.addTag(RegistryType.ITEM, "minecraft:wooden_trapdoors", 215, 216, 217, 218, 219, 220);
-        tagRewriter.addTag(RegistryType.ITEM, "minecraft:beacon_payment_items", 529, 530, 531, 760);
-        tagRewriter.addTag(RegistryType.ENTITY, "minecraft:impact_projectiles", 2, 72, 71, 37, 69, 79, 83, 15, 93);
-
-        // The client crashes if we don't send all tags it may use
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:guarded_by_piglins");
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:soul_speed_blocks");
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:soul_fire_base_blocks");
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:non_flammable_wood");
-        tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:non_flammable_wood");
-
-        // The rest of not accessed tags added in older versions; #1830
-        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:bamboo_plantable_on", "minecraft:beds", "minecraft:bee_growables",
-            "minecraft:beehives", "minecraft:coral_plants", "minecraft:crops", "minecraft:dragon_immune", "minecraft:flowers",
-            "minecraft:portals", "minecraft:shulker_boxes", "minecraft:small_flowers", "minecraft:tall_flowers", "minecraft:trapdoors",
-            "minecraft:underwater_bonemeals", "minecraft:wither_immune", "minecraft:wooden_fences", "minecraft:wooden_trapdoors");
-        tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:arrows", "minecraft:beehive_inhabitors", "minecraft:raiders", "minecraft:skeletons");
-        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:beds", "minecraft:coals", "minecraft:fences", "minecraft:flowers",
-            "minecraft:lectern_books", "minecraft:music_discs", "minecraft:small_flowers", "minecraft:tall_flowers", "minecraft:trapdoors", "minecraft:walls", "minecraft:wooden_fences");
-
         EntityTypes1_16.initialize(this);
         Types1_16.PARTICLE.filler(this)
             .reader("block", ParticleType.Readers.BLOCK)
@@ -263,6 +220,12 @@ public class Protocol1_15_2To1_16 extends AbstractProtocol<ClientboundPackets1_1
             .reader("falling_dust", ParticleType.Readers.BLOCK)
             .reader("item", ParticleType.Readers.ITEM1_13_2);
 
+        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:crimson_stems", "minecraft:non_flammable_wood", "minecraft:piglin_loved",
+            "minecraft:piglin_repellents", "minecraft:soul_fire_base_blocks", "minecraft:warped_stems");
+        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:crimson_stems", "minecraft:guarded_by_piglins", "minecraft:hoglin_repellents",
+            "minecraft:non_flammable_wood", "minecraft:nylium", "minecraft:piglin_repellents", "minecraft:soul_fire_base_blocks", "minecraft:soul_speed_blocks",
+            "minecraft:strider_warm_blocks", "minecraft:warped_stems");
+
         super.onMappingDataLoaded();
     }
 
@@ -300,4 +263,4 @@ public class Protocol1_15_2To1_16 extends AbstractProtocol<ClientboundPackets1_1
     public TagRewriter<ClientboundPackets1_15> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
index 20917c4d3..0e62e1cc6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
@@ -26,9 +26,9 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 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.data.MappingData1_16_2;
-import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.EntityPacketRewriter1_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.protocols.v1_16_1to1_16_2.rewriter.EntityPacketRewriter1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.ItemPacketRewriter1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.WorldPacketRewriter1_16_2;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
@@ -86,19 +86,7 @@ public class Protocol1_16_1To1_16_2 extends AbstractProtocol<ClientboundPackets1
     protected void onMappingDataLoaded() {
         EntityTypes1_16_2.initialize(this);
 
-        tagRewriter.addTag(RegistryType.ITEM, "minecraft:stone_crafting_materials", 14, 962);
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:mushroom_grow_block");
-
-        // The client now wants ALL (previous) tags to be sent, sooooo :>
-        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:soul_fire_base_blocks", "minecraft:furnace_materials", "minecraft:crimson_stems",
-            "minecraft:gold_ores", "minecraft:piglin_loved", "minecraft:piglin_repellents", "minecraft:creeper_drop_music_discs",
-            "minecraft:logs_that_burn", "minecraft:stone_tool_materials", "minecraft:warped_stems");
-        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:infiniburn_nether", "minecraft:crimson_stems",
-            "minecraft:wither_summon_base_blocks", "minecraft:infiniburn_overworld", "minecraft:piglin_repellents",
-            "minecraft:hoglin_repellents", "minecraft:prevent_mob_spawning_inside", "minecraft:wart_blocks",
-            "minecraft:stone_pressure_plates", "minecraft:nylium", "minecraft:gold_ores", "minecraft:pressure_plates",
-            "minecraft:logs_that_burn", "minecraft:strider_warm_blocks", "minecraft:warped_stems", "minecraft:infiniburn_end",
-            "minecraft:base_stone_nether", "minecraft:base_stone_overworld");
+        tagRewriter.removeTag(RegistryType.ITEM, "minecraft:furnace_materials");
 
         super.onMappingDataLoaded();
     }
@@ -127,4 +115,4 @@ public class Protocol1_16_1To1_16_2 extends AbstractProtocol<ClientboundPackets1
     public TagRewriter<ClientboundPackets1_16> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java
index 78b8d9cd0..4d976e120 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java
@@ -45,8 +45,6 @@ import com.viaversion.viaversion.rewriter.TagRewriter;
 public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPackets1_16_2, ClientboundPackets1_17, ServerboundPackets1_16_2, ServerboundPackets1_17> {
 
     public static final MappingData MAPPINGS = new MappingDataBase("1.16.2", "1.17");
-    private static final String[] NEW_GAME_EVENT_TAGS = {"minecraft:ignore_vibrations_sneaking", "minecraft:vibrations"};
-    private static final int[] EMPTY_ARRAY = new int[0];
     private final EntityPacketRewriter1_17 entityRewriter = new EntityPacketRewriter1_17(this);
     private final ItemPacketRewriter1_17 itemRewriter = new ItemPacketRewriter1_17(this);
     private final TagRewriter<ClientboundPackets1_16_2> tagRewriter = new TagRewriter<>(this);
@@ -80,11 +78,7 @@ public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPack
 
             // New Game Event tags type
             wrapper.write(Types.STRING, RegistryType.GAME_EVENT.resourceLocation());
-            wrapper.write(Types.VAR_INT, NEW_GAME_EVENT_TAGS.length);
-            for (String tag : NEW_GAME_EVENT_TAGS) {
-                wrapper.write(Types.STRING, tag);
-                wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, EMPTY_ARRAY);
-            }
+            tagRewriter.appendNewTags(wrapper, RegistryType.GAME_EVENT);
         });
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_16_2.AWARD_STATS);
@@ -174,19 +168,6 @@ public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPack
 
     @Override
     protected void onMappingDataLoaded() {
-        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:candles", "minecraft:ignored_by_piglin_babies", "minecraft:piglin_food", "minecraft:freeze_immune_wearables",
-            "minecraft:axolotl_tempt_items", "minecraft:occludes_vibration_signals", "minecraft:fox_food",
-            "minecraft:diamond_ores", "minecraft:iron_ores", "minecraft:lapis_ores", "minecraft:redstone_ores",
-            "minecraft:coal_ores", "minecraft:copper_ores", "minecraft:emerald_ores", "minecraft:cluster_max_harvestables");
-        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:crystal_sound_blocks", "minecraft:candle_cakes", "minecraft:candles",
-            "minecraft:snow_step_sound_blocks", "minecraft:inside_step_sound_blocks", "minecraft:occludes_vibration_signals", "minecraft:dripstone_replaceable_blocks",
-            "minecraft:cave_vines", "minecraft:moss_replaceable", "minecraft:deepslate_ore_replaceables", "minecraft:lush_ground_replaceable",
-            "minecraft:diamond_ores", "minecraft:iron_ores", "minecraft:lapis_ores", "minecraft:redstone_ores", "minecraft:stone_ore_replaceables",
-            "minecraft:coal_ores", "minecraft:copper_ores", "minecraft:emerald_ores", "minecraft:snow", "minecraft:small_dripleaf_placeable",
-            "minecraft:features_cannot_replace", "minecraft:lava_pool_stone_replaceables", "minecraft:geode_invalid_blocks");
-        tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:powder_snow_walkable_mobs", "minecraft:axolotl_always_hostiles", "minecraft:axolotl_tempted_hostiles",
-            "minecraft:axolotl_hunt_targets", "minecraft:freeze_hurts_extra_types", "minecraft:freeze_immune_entity_types");
-
         EntityTypes1_17.initialize(this);
         Types1_17.PARTICLE.filler(this)
             .reader("block", ParticleType.Readers.BLOCK)
@@ -196,6 +177,15 @@ public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPack
             .reader("item", ParticleType.Readers.ITEM1_13_2)
             .reader("vibration", ParticleType.Readers.VIBRATION);
 
+        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:axolotl_tempt_items", "minecraft:candles", "minecraft:cluster_max_harvestables",
+            "minecraft:copper_ores", "minecraft:freeze_immune_wearables", "minecraft:occludes_vibration_signals");
+        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:candle_cakes", "minecraft:candles", "minecraft:cave_vines", "minecraft:copper_ores",
+            "minecraft:crystal_sound_blocks", "minecraft:deepslate_ore_replaceables", "minecraft:dripstone_replaceable_blocks", "minecraft:geode_invalid_blocks",
+            "minecraft:lush_ground_replaceable", "minecraft:moss_replaceable", "minecraft:occludes_vibration_signals", "minecraft:small_dripleaf_placeable");
+        tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:axolotl_always_hostiles", "minecraft:axolotl_hunt_targets",
+            "minecraft:freeze_hurts_extra_types", "minecraft:freeze_immune_entity_types", "minecraft:powder_snow_walkable_mobs");
+        tagRewriter.addEmptyTags(RegistryType.GAME_EVENT, "minecraft:ignore_vibrations_sneaking", "minecraft:vibrations");
+
         super.onMappingDataLoaded();
     }
 
@@ -224,4 +214,4 @@ public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPack
     public TagRewriter<ClientboundPackets1_16_2> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java
index d401a7e73..9fa698ee4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java
@@ -63,11 +63,6 @@ public final class Protocol1_17_1To1_18 extends AbstractProtocol<ClientboundPack
         soundRewriter.registerSound(ClientboundPackets1_17_1.SOUND_ENTITY);
 
         tagRewriter.registerGeneric(ClientboundPackets1_17_1.UPDATE_TAGS);
-        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:lava_pool_stone_cannot_replace", "minecraft:big_dripleaf_placeable",
-            "minecraft:wolves_spawnable_on", "minecraft:rabbits_spawnable_on", "minecraft:polar_bears_spawnable_on_in_frozen_ocean", "minecraft:parrots_spawnable_on",
-            "minecraft:mooshrooms_spawnable_on", "minecraft:goats_spawnable_on", "minecraft:foxes_spawnable_on", "minecraft:axolotls_spawnable_on", "minecraft:animals_spawnable_on",
-            "minecraft:azalea_grows_on", "minecraft:azalea_root_replaceable", "minecraft:replaceable_plants", "minecraft:terracotta");
-        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:dirt", "minecraft:terracotta");
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_17_1.AWARD_STATS);
 
@@ -97,6 +92,8 @@ public final class Protocol1_17_1To1_18 extends AbstractProtocol<ClientboundPack
             .reader("item", ParticleType.Readers.ITEM1_13_2)
             .reader("vibration", ParticleType.Readers.VIBRATION);
 
+        tagRewriter.renameTag(RegistryType.BLOCK, "minecraft:lava_pool_stone_replaceables", "minecraft:lava_pool_stone_cannot_replace");
+
         super.onMappingDataLoaded();
     }
 
@@ -125,4 +122,9 @@ public final class Protocol1_17_1To1_18 extends AbstractProtocol<ClientboundPack
     public ItemPacketRewriter1_18 getItemRewriter() {
         return itemRewriter;
     }
-}
+
+    @Override
+    public TagRewriter<ClientboundPackets1_17_1> getTagRewriter() {
+        return tagRewriter;
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java
index f1d010ccf..0ca01ebfe 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java
@@ -19,6 +19,7 @@ package com.viaversion.viaversion.protocols.v1_18_2to1_19;
 
 import com.google.gson.JsonElement;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
@@ -302,6 +303,18 @@ public final class Protocol1_18_2To1_19 extends AbstractProtocol<ClientboundPack
             .reader("shriek", ParticleType.Readers.SHRIEK);
         EntityTypes1_19.initialize(this);
 
+        tagRewriter.removeTag(RegistryType.ITEM, "minecraft:occludes_vibration_signals");
+        tagRewriter.renameTag(RegistryType.ITEM, "minecraft:carpets", "minecraft:wool_carpets");
+        tagRewriter.renameTag(RegistryType.BLOCK, "minecraft:carpets", "minecraft:wool_carpets");
+        tagRewriter.renameTag(RegistryType.BLOCK, "minecraft:polar_bears_spawnable_on_in_frozen_ocean", "minecraft:polar_bears_spawnable_on_alternate");
+        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:chest_boats", "minecraft:dampens_vibrations", "minecraft:mangrove_logs", "minecraft:overworld_natural_logs");
+        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:ancient_city_replaceable", "minecraft:convertable_to_mud", "minecraft:dampens_vibrations",
+            "minecraft:frog_prefer_jump_to", "minecraft:frogs_spawnable_on", "minecraft:mangrove_logs", "minecraft:mangrove_logs_can_grow_through",
+            "minecraft:mangrove_roots_can_grow_through", "minecraft:nether_carver_replaceables", "minecraft:overworld_carver_replaceables",
+            "minecraft:overworld_natural_logs", "minecraft:sculk_replaceable", "minecraft:sculk_replaceable_world_gen", "minecraft:snaps_goat_horn");
+        tagRewriter.addEmptyTag(RegistryType.ENTITY, "minecraft:frog_food");
+        tagRewriter.addEmptyTags(RegistryType.GAME_EVENT, "minecraft:allay_can_listen", "minecraft:shrieker_can_listen", "minecraft:warden_can_listen");
+
         super.onMappingDataLoaded();
     }
 
@@ -338,4 +351,4 @@ public final class Protocol1_18_2To1_19 extends AbstractProtocol<ClientboundPack
     public TagRewriter<ClientboundPackets1_18> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java
index cb2cd952d..2ff2d377d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java
@@ -39,7 +39,7 @@ public final class Protocol1_18To1_18_2 extends AbstractProtocol<ClientboundPack
     @Override
     protected void registerPackets() {
         final TagRewriter<ClientboundPackets1_18> tagRewriter = new TagRewriter<>(this);
-        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:fall_damage_resetting");
+        tagRewriter.addTagRaw(RegistryType.BLOCK, "minecraft:fall_damage_resetting", 169, 257, 680, 713, 714, 715, 716, 859, 860, 696, 100);
         tagRewriter.registerGeneric(ClientboundPackets1_18.UPDATE_TAGS);
 
         registerClientbound(ClientboundPackets1_18.UPDATE_MOB_EFFECT, new PacketHandlers() {
@@ -89,4 +89,4 @@ public final class Protocol1_18To1_18_2 extends AbstractProtocol<ClientboundPack
             infiniburn.setValue("#" + infiniburn.getValue());
         }
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
index 382356bb3..4685803b2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
@@ -45,12 +45,12 @@ import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 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_19to1_19_1.packet.ClientboundPackets1_19_1;
-import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.EntityPacketRewriter1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.ItemPacketRewriter1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage.NonceStorage1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage.ReceivedMessagesStorage;
+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.CommandRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
@@ -76,12 +76,6 @@ public final class Protocol1_19_1To1_19_3 extends AbstractProtocol<ClientboundPa
 
     @Override
     protected void registerPackets() {
-        // Flint and steel was hardcoded before 1.19.3 to ignite a creeper; has been moved to a tag - adding this ensures offhand doesn't trigger as well
-        tagRewriter.addTagRaw(RegistryType.ITEM, "minecraft:creeper_igniters", 733); // 733 = flint_and_steel 1.19.3
-
-        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:bookshelf_books", "minecraft:hanging_signs", "minecraft:stripped_logs");
-        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:all_hanging_signs", "minecraft:ceiling_hanging_signs", "minecraft:invalid_spawn_inside",
-            "minecraft:stripped_logs", "minecraft:wall_hanging_signs");
         tagRewriter.registerGeneric(ClientboundPackets1_19_1.UPDATE_TAGS);
 
         entityRewriter.register();
@@ -359,6 +353,9 @@ public final class Protocol1_19_1To1_19_3 extends AbstractProtocol<ClientboundPa
             .reader("shriek", ParticleType.Readers.SHRIEK);
         EntityTypes1_19_3.initialize(this);
 
+        tagRewriter.removeTag(RegistryType.ITEM, "minecraft:overworld_natural_logs");
+        tagRewriter.removeTag(RegistryType.BLOCK, "minecraft:non_flammable_wood");
+
         super.onMappingDataLoaded();
     }
 
@@ -387,4 +384,4 @@ public final class Protocol1_19_1To1_19_3 extends AbstractProtocol<ClientboundPa
     public TagRewriter<ClientboundPackets1_19_1> getTagRewriter() {
         return tagRewriter;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
index 8494ae7e6..ef1dd980e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
@@ -20,6 +20,7 @@ package com.viaversion.viaversion.protocols.v1_19_4to1_20;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.data.MappingDataBase;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.type.Types;
@@ -80,6 +81,10 @@ public final class Protocol1_19_4To1_20 extends AbstractProtocol<ClientboundPack
             .reader("sculk_charge", ParticleType.Readers.SCULK_CHARGE)
             .reader("shriek", ParticleType.Readers.SHRIEK);
 
+        tagRewriter.removeTag(RegistryType.BLOCK, "minecraft:replaceable_plants");
+        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:decorated_pot_ingredients", "minecraft:decorated_pot_sherds");
+        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:trail_ruins_replaceable");
+
         super.onMappingDataLoaded();
     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
index 279cbff18..dc7752d1c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
@@ -34,7 +34,6 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.CommandRewriter1_19_4;
-import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundConfigurationPackets1_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;
@@ -51,6 +50,7 @@ import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.BlockItemPac
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.ComponentRewriter1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.EntityPacketRewriter1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.AcknowledgedMessagesStorage;
+import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
@@ -279,7 +279,9 @@ public final class Protocol1_20_3To1_20_5 extends AbstractProtocol<ClientboundPa
             .add(StructuredDataKey.LOCK).add(StructuredDataKey.CONTAINER_LOOT).add(StructuredDataKey.TOOL)
             .add(StructuredDataKey.ITEM_NAME).add(StructuredDataKey.OMINOUS_BOTTLE_AMPLIFIER);
 
-        tagRewriter.addTag(RegistryType.ITEM, "minecraft:dyeable", 853, 854, 855, 856, 1120);
+        tagRewriter.renameTag(RegistryType.ITEM, "minecraft:axolotl_tempt_items", "minecraft:axolotl_food");
+        tagRewriter.removeTag(RegistryType.ITEM, "minecraft:tools");
+        tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:badlands_terracotta");
 
         super.onMappingDataLoaded();
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
index 3075a5fb9..1e9cdd494 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
@@ -43,7 +43,8 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
     private final Protocol<C, ?, ?, ?> protocol;
     private final Map<RegistryType, List<TagData>> newTags = new EnumMap<>(RegistryType.class);
     private final Map<RegistryType, Map<String, String>> toRename = new EnumMap<>(RegistryType.class);
-    private final Set<String> toRemove = new HashSet<>();
+    private final Map<RegistryType, Set<String>> toRemove = new EnumMap<>(RegistryType.class);
+    private final Set<String> toRemoveRegistries = new HashSet<>();
 
     public TagRewriter(final Protocol<C, ?, ?, ?> protocol) {
         this.protocol = protocol;
@@ -65,12 +66,17 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
 
     @Override
     public void removeTags(final String registryKey) {
-        toRemove.add(registryKey);
+        toRemoveRegistries.add(Key.stripMinecraftNamespace(registryKey));
     }
 
     @Override
-    public void renameTag(final RegistryType type, final String registryKey, final String renameTo) {
-        toRename.computeIfAbsent(type, t -> new HashMap<>()).put(registryKey, renameTo);
+    public void removeTag(final RegistryType type, final String tagId) {
+        toRemove.computeIfAbsent(type, t -> new HashSet<>()).add(Key.stripMinecraftNamespace(tagId));
+    }
+
+    @Override
+    public void renameTag(final RegistryType type, final String tagId, final String renameTo) {
+        toRename.computeIfAbsent(type, t -> new HashMap<>()).put(Key.stripMinecraftNamespace(tagId), renameTo);
     }
 
     @Override
@@ -124,7 +130,7 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
     public PacketHandler getHandler(@Nullable RegistryType readUntilType) {
         return wrapper -> {
             for (RegistryType type : RegistryType.getValues()) {
-                handle(wrapper, getRewriter(type), getNewTags(type), toRename.get(type));
+                handle(wrapper, getRewriter(type), getNewTags(type), toRename.get(type), toRemove.get(type));
 
                 // Stop iterating
                 if (type == readUntilType) {
@@ -140,7 +146,7 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
             int editedLength = length;
             for (int i = 0; i < length; i++) {
                 String registryKey = wrapper.read(Types.STRING);
-                if (toRemove.contains(registryKey)) {
+                if (toRemoveRegistries.contains(Key.stripMinecraftNamespace(registryKey))) {
                     wrapper.set(Types.VAR_INT, 0, --editedLength);
                     int tagsSize = wrapper.read(Types.VAR_INT);
                     for (int j = 0; j < tagsSize; j++) {
@@ -155,31 +161,30 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
 
                 RegistryType type = RegistryType.getByKey(registryKey);
                 if (type != null) {
-                    handle(wrapper, getRewriter(type), getNewTags(type), toRename.get(type));
+                    handle(wrapper, getRewriter(type), getNewTags(type), toRename.get(type), toRemove.get(type));
                 } else {
-                    handle(wrapper, null, null, null);
+                    handle(wrapper, null, null, null, null);
                 }
             }
         };
     }
 
     public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags) {
-        handle(wrapper, rewriteFunction, newTags, null);
+        handle(wrapper, rewriteFunction, newTags, null, null);
     }
 
-    public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags, @Nullable Map<String, String> tagsToRename) {
+    public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags, @Nullable Map<String, String> tagsToRename, @Nullable Set<String> tagsToRemove) {
         int tagsSize = wrapper.read(Types.VAR_INT);
-        wrapper.write(Types.VAR_INT, newTags != null ? tagsSize + newTags.size() : tagsSize); // add new tags count
+        final List<TagData> tags = new ArrayList<>(newTags != null ? tagsSize + newTags.size() : tagsSize);
 
         for (int i = 0; i < tagsSize; i++) {
             String key = wrapper.read(Types.STRING);
             if (tagsToRename != null) {
-                String renamedKey = tagsToRename.get(key);
+                String renamedKey = tagsToRename.get(Key.stripMinecraftNamespace(key));
                 if (renamedKey != null) {
                     key = renamedKey;
                 }
             }
-            wrapper.write(Types.STRING, key);
 
             int[] ids = wrapper.read(Types.VAR_INT_ARRAY_PRIMITIVE);
             if (rewriteFunction != null) {
@@ -192,19 +197,39 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
                     }
                 }
 
-                wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, idList.toArray(EMPTY_ARRAY));
-            } else {
-                // Write the original array
-                wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, ids);
+                ids = idList.toArray(EMPTY_ARRAY);
             }
+
+            tags.add(new TagData(key, ids));
         }
 
-        // Send new tags if present
+        if (tagsToRemove != null) {
+            tags.removeIf(tag -> tagsToRemove.contains(Key.stripMinecraftNamespace(tag.identifier())));
+        }
+
+        // Add new tags if present
         if (newTags != null) {
+            tags.addAll(newTags);
+        }
+
+        // Write the tags
+        wrapper.write(Types.VAR_INT, tags.size());
+        for (TagData tag : tags) {
+            wrapper.write(Types.STRING, tag.identifier());
+            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.entries());
+        }
+    }
+
+    public void appendNewTags(PacketWrapper wrapper, RegistryType type) {
+        List<TagData> newTags = getNewTags(type);
+        if (newTags != null) {
+            wrapper.write(Types.VAR_INT, newTags.size());
             for (TagData tag : newTags) {
                 wrapper.write(Types.STRING, tag.identifier());
-                wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.entries());
+                wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.entries().clone());
             }
+        } else {
+            wrapper.write(Types.VAR_INT, 0);
         }
     }
 
@@ -221,13 +246,10 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
     public @Nullable IdRewriteFunction getRewriter(RegistryType tagType) {
         MappingData mappingData = protocol.getMappingData();
         return switch (tagType) {
-            case BLOCK ->
-                mappingData != null && mappingData.getBlockMappings() != null ? mappingData::getNewBlockId : null;
-            case ITEM ->
-                mappingData != null && mappingData.getItemMappings() != null ? mappingData::getNewItemId : null;
-            case ENTITY ->
-                protocol.getEntityRewriter() != null ? id -> protocol.getEntityRewriter().newEntityId(id) : null;
+            case BLOCK -> mappingData != null && mappingData.getBlockMappings() != null ? mappingData::getNewBlockId : null;
+            case ITEM -> mappingData != null && mappingData.getItemMappings() != null ? mappingData::getNewItemId : null;
+            case ENTITY -> protocol.getEntityRewriter() != null ? id -> protocol.getEntityRewriter().newEntityId(id) : null;
             case FLUID, GAME_EVENT -> null;
         };
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.12to1.13.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.12to1.13.nbt
index 050e32146af8ad318f6939d3400f8058a547bbc9..3d0cf4feaa85e3ec9d257fca8f2e52547e3e2620 100644
GIT binary patch
delta 1507
zcmZ|PTWl0n9LMo9v-h3dra-aV?xLkyw(a(!AXv0TipC%nY<%*TY-hW}vUHdsdud-x
zNPX6L`D=_u;ZdV6L=#0!j6`D)6vY@XF;QPc<Mn~WOT2#1b|Kq}51(%L%-J(%&j0tH
z2aXwU9XF1Snes@Wo_tX$^)kN1w{j%(@L;S~u@4q~zfxr=f>St+ckv$1;C-cxS-CIV
zCBI~L${X3(YD+~5^;*sMF8u5{Ih#!-Eft>iE4Hgg<8or4bJZ@T%qiT4-Pj{1qr>uZ
zyifiJc9n*hw+UM<6{^_f#_xiBzZ>`9Np3u0srCimFFIbnb+2JAUvjUON;LM6Kj_+C
zP46VcPCE47T*sbw^hj79noP+Rv23rUto?Pb<T`oRFX>DA_I(({HMmX|6Kj)K@?Sqj
zv02VXM<gBCBio{zrC_Z|ZeTQrjTn>R@Ti=ROx+%?*6ecQTvsvvAfCcGe1jkGEB?aY
z_=iUwM;<dMVIRtP0UycHXt%s+txjFV>;YVjEtU#4H=dHw$r(9pU3SOET=)c^;xis_
z!FJvJ#kz#3!gfqz2X4a6mg=Z`MW?c0*PKee;Cs#iXQ_<sEMn_Y%8vCNx&M^YQi1ZU
z!yJ8X&$G`(e9n^7vc<fsziN9$E||z*9d)j{c0nKX8Yb??99((4Kev`-8n56OUd3^|
zCL@uIoQ!8>S0pzR_3gRVLiMuFFh+1KYqtjZ3C0ey!YP~vfi?)VaYn^etXy*r<ZE`R
zs)KBMp3|sPy95(M9IyEuz6V7zf5cCgTHYu!ZFYAUsY|p$kCl>iTO;DVp@MHW5=dB0
zLS_C53T{$xlY$47j9cmP96N19ZABOCWc*e<&8|cL(*<lK)we9#{9p`QaXoGTxl$AI
zdaNs^bF-A;#Y9&u%Qt;|o8*?ZA^9pcO`<QCcaoi?x-&M&l}5%$bf?TEQZkdAI<!31
zk22>mJcCBu`1}H2gF{ptqE5O&It=b)P$+}uHfV0+Uf4Xc?ah~6<^`ZT;y3)xBke6$
z_bqiRr^REKJcgN^;LkSPi0yL1N@a9kHUn_67Z~cndV1ncdZKS#uqBDzTuHYkQT$9=
z+R{C8F3@h=FK@>O4keneoC}Gfg3a_OL%$9`z*&4~sg<GBH`Z^2A#7Y8%9aqWScXu>
l_qz3RaVeD>Xlr}kW(D0k`ecHv)acIUn4v#kdbZ8k{V#uAC`$kU

delta 1588
zcmZwHNo*T+6vy%ZOgwh&ags(Qb(WHbwkD)b38f??C27T>g;F9_Tv#PDPMpN;;0d-9
zvxjm93Gt9n#d1baplMi&;fMqj5Eq1iLUUpfaG>H)cKAN4Sedqmk7hg`|L4v7zn|Z$
zS&yHvj*Zx|wC2`XKbR>SV>-}>9T>nUHsMNa!!@`ZS0jTFY{6CN$1u{^j;**Bn=yzh
zFeHJ~8E<?mE6#xyXDSFv`tTT@k=8_elQA#Iuw5N^lPfFu0moglCh!hr&s7@XQm8Wd
zE7~#oH&@RZV`Vx1i+?!3o8!;;9^di#GmPP7%wh%wX>08l%S|U^x%o;ZDAwzdUz$4f
zIWNi+k?we-C-P~sy+70i*El7w;Omd{{v)^pce3)hoQb73CUS++<m~F&LtT@a{iOVw
zY?o)F9U@L@W20ZLai{&DnlEMNf{L!co;4$~zo*YiN~Wj#cKw_JJ7>A*bWNn}6{on>
z#s*yKn&@Ou^6K>^xK96VcF^XHY<AQh!XE6!4Y(2eWG=ozmgAYVZq@VsY-0gOwzpk!
z8*g0py_{CGj;9{STUf?1yox2fhNE}|@8E6Jz{Xl{-~?XBK^%fFOVJ4#j1G-Q{k*r3
z*Y%?q$4*>_-PnaO*EAI-^PFkVU*gw?se3=iQ!)|jlHHMvY@(+pos`_<q!&%X#0!=D
zJ=uykQ>II+MqWo&M>PW-&R*z<>n3XqbhCz`Bdw#ZgQro@k=AJFh||P+1a#{z!w&Re
z8(VmAzBnTbPD^v>M!7k8U~%>ITOUyThd7Ck@G(BY`xnlBFH1K{WP{5UuTW1>8(%z)
z=kX)H<@Xw0jlfTwYrUuOCB86>&Qn~ZgO&%KSSHuH>*9HMH_^yLsyWm&GSQiCwCKD%
zJjbJ$DYK829rCbVj<mF1e_<v<ZFNm7=M{_j`b({4XTQQJe2s5#T6QG{w(zK2;MJqS
zpxC`Qi{J1&{=lDdCOJr~*6lfOU!v26^6dXJW>dY*jM)r=&79ez7zwATi<jt@rFi?|
z#kVS)3bVlN52A_+N|=XE^&IZSA|A#gcmVg~A>4;YaTt$LMKuU~PHBX>#TXfE9wR0_
zQcI>bhoeI2^}l7xug7ML<4&nHcgg1o4aC+Vf{>W@=L=KklHgRmN?vQzKMchmNyPUS
Q7>N2ujaSq1N^5@NKi%#9GXMYp

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.13.2to1.14.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.13.2to1.14.nbt
index def3738b20cea9724bd41c5c80d4a63405e353ec..ebc33d4573c63a8068a903af6ebf5884c5d94232 100644
GIT binary patch
delta 955
zcmZwGxpUJ%6vy#rW9RVV5E=$b{st=O=(s`%cZNbEOKWGbEHRRdVlMpw%y3`fD46^M
zG$g<b{|8qE9fT5w3iv)3<RHao*0Yj!_xIj<dHd&`FP6s2hSYMulQFp5_Kb}9X_^$7
zh-?w5PB84nJ|nf34Rv~w>HBzsM_9m9Ji`Or!A(5GZ9K*;+`v8DHBt`}Khm|TQc86j
z<0KomZ5&vg9mO)<;1yot3tnT%i0Sn+7kHt|0)2Zc$D6`&oWMa$<1mil5Dwr7j$(%W
zGuMgr+luZ#Wu%$){3!C;QBv4cA2iTG8x}2`M+k=ibLg^I!KeC76+iHk^@=13ZS4Jv
zG{XGGNW(ZKTh&`p60p*m3d<}X%-|GG<19!dq!1Db$>a=3ETj@DAXGp|E+>tQhc3;%
z$aVGbb&Np|Hx7dahYVA{Qzo(JdcA(EFE+7@AkP{9;Hy>$DZW9UUq_$c-x+^1u59RB
z<s*~t@d+Pz=@;Je``wzlYpE8nXv)oNKj7gd%;O@ipu{y4xQwetCbHa*Ll<|v)sC{V
zk%l&9-Q?o>PF1*d6>eSGEL=Wk)72u-dJU|F(2yEh!)w@KQ8fID7HRV~|CfK5oh}<2
t=Pn<3`QU;zGMf4><gV>u)f%+NJFpwG^e^k$$mYrLmhwlG{Wu5h{a?<psP+H=

delta 9
QcmaDPv0ZS(HV#Gx02G7+G5`Po

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.14to1.15.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.14to1.15.nbt
index 3c6b8118803407d4820723175da628851fc009b0..492941aae6394cd58bb0467d591cd356e3d507e5 100644
GIT binary patch
delta 457
zcmZY5TTX*O6oBCaLYsibxD8!}(HeI_0H-ZNI}M-|Z&g=dysg7E`0hfC5BlQ$`cG}@
zgAZTM8P3d^!<;xb&8vBP<cU*;oq~{*s^?3yo#{&Dg@`Obp^Xh>h(xSaVh>%Utk;N}
zh|yu)!U}nUzAv+7m}S9VTj#fhIcBv+<Gr4^QKsY67dOuJz+B#-aEnFq2jUX(9+&?{
ztogcwAr7(4?la;s_F%5KAReH?F6(oglJ8TLBU%o0&Y0%n8A^A=FI@XFS9G_sROLaW
zhidXFwku*=u-W^KPjYka6`Zr)@q%Z3P@|P?e)|zmc$>b;^7OS$ow3cRlkq(9RliKi
VIw<Rb@}&{xxvtC%<A%g_`~XorP>uiq

delta 9
QcmX@hK7nNeKNBMZ01q+(D*ylh

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.15to1.16.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.15to1.16.nbt
index ce1925932b4aa1cb2c7d6cadd45767147987d0e9..842fcf02cf163542a0cb340dea1f73d75513dbeb 100644
GIT binary patch
delta 1321
zcmaKsM{m_Y6h_A(Ac0XJC?F6EMDM*LQ6)ek0u~6d0BL0VO&$g}+4FeH>cIv!^eWLi
z0Rn{HLGU+dKZCO3+=LR8h{f@>$9HCYzweIstUk4|WA~Wa099|jazO~KiCxv?8!t!`
zoq4UXNvxL9LMc_RRNZQ&`Ya)?g*C1k9^}SkCfB7r&2(HT!a$e8B9Qcfq@INRa1ai_
zAvg?2;3yn}+Ho$Y;DoChTPk_t1xCl7HF@YovXBD}uIgV-qmoW@^LuQxs~V!TTxh%9
zv)X4SiNj$stb~cM9Hzi3m;@_eJS>F?uuRpIn$68(m<bDE4p60<1&d%h%!e7U0D%gd
zCPv#dje35l8ld|6Q5x)Y)sSC8`d(pl=a_stGAeX&8i{+MwvXBZFV0%RKeg4h$ygM|
zzUN1Vq&{#N%}*1*yUJ}b2`ZIQNtW!#a-ZQNe1T7l{UCmDRlTgrqlkE@7ZFFfHPsL%
zEnyOhg4!e{GG)6FO!`WEhb`R_5@WZUobkH9@0+^4Pj{KTn&y!#(=DZUr^KP!TrOgX
zxF8nI1F=S27z^UcI1o3cfjA|Wic{i@I5ic-DRD@gk`}<JK^c-3mE7no`lVHW-aLQ~
zct{D&_^<ABvyONd?m@e&MlyAmw11rXy2!k05+-FGCPi2hJ#o?5Oxy-r;fkw<cC|&%
zEk%1)99BsRD}HJ}wKk1)!15-S{r_X&kg69&I!g<yMcTY;d#P2bI1g<g)trMHd=>>b
zZ{aq)gm!oZH{m%sRIM(;EuP7*IZwH{1FxZ(7pS2wfK0doA`_c9&j6L2Yw#FoNJl<G
zR67GQehEa)>+l3*lNUga^M)Mebt-(8NRDck^T)5j84MSJN}Q|kh%T>sIR{$~Q$Z>+
zI^SG1q8dsE>Y@_I{H6XqTq5;*j-ZRQp>5T+H8UK<FwVTd>MT!pn81cn=c$oSphHKi
SLELNt=|-u4J#2t2;KNTd7Y!x=

delta 9
QcmbR4-{`ubL5Yz8020ju00000

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.16.2to1.17.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.16.2to1.17.nbt
index 28de2297756e121cecc025300dbb36c1f91d7ffa..1fcc9b7dc9683f47daa4cf4a0e31561a3e9fc508 100644
GIT binary patch
literal 5334
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
Lf1joc%w6~|;ZO8Q

literal 4776
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

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.16to1.16.2.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.16to1.16.2.nbt
index 31a994e84d6852c59618cac91a8f4ae56eaff937..2df2db3d858d59a81224e164f06bf43c1e189688 100644
GIT binary patch
delta 195
zcmYj~K?=e^3`M_f?V<yM=)${rm|<FDTkJHD8ST;|sXMo#ckv2t1f$)!_`E<~eqPxn
zKM%>VKo(sc6m2ALunLiTvX!`PZ2Q`J7fD*z1po<<-jy>Hn3f$^JA--Y0@?AXr`V9F
zkZK<4Kb1Fw<)6a`l7Xe$=qdx&$j9MZj)}p-??WTZ-qyl{{e2mY<f?pYj5eQ?AC$B(
A-2eap

delta 9
QcmdnU_Jd_ZITIrT01~DG-T(jq

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.17to1.18.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.17to1.18.nbt
index e516b004a1064b80d514f720116d4939605dcda2..04cb086fcbd5c3629755efb689bcd28e0c116149 100644
GIT binary patch
literal 1549
zcmb7^$#2t85QoRH+tL_ODBA@%At?L4@7oQ;feQ#E>m_kgQztLj?xF(XgoOAfKuGLx
z;>2<&rHBIu{w2O~5)|rkAkwGj_cEUO&GK9pab;*KOw!1<M8qkJUx{sXBF#(|rmmEm
zrri!}*P_`_<m!|orKsk*;-%dKDa$~Vh0VpL-j&?c`D5x`_N8PpjUnQ>Y%<&3csLnM
z?PRM~@bY1?mlr)RL%jS1XFo+slQ0W+;U3)Yc~_%n82#!RJY;<Y58yFThubE}qH0{o
zRIV=yEH`?AJ$#nH1$`dq1=EclDr%r<d6{XXELtL8yjqlK1yt5b7=ab=1BrWBSHY++
z<t$7RQ?*%UI)~0344OcToC%14>N)hpxeX1dK^4X!hBlC|Q-Qj+DetQ<YfLL@nm7&8
zwwZ33N*o5A))Q-)FKf+=jcvB{{|mm1m{}8tCTJvfI_<o<fe0z6BBBy2S1ZHnk!Mw`
z8K_ECrt0g|iR_#~=w=~4X9wBqAZ}z$*kdR7mwEQjL9-n9WqnsgVr>>AVLLX}P*cHj
zGpN@-Mea>J-Qs)!y6Rli<o#2X+AfsJCf@rGwM!~xyj7{YkF~3IT_tJ+wIpg&xO&hp
zR)cp%<>h+X5z;G7UXr>mqjftI7CJV7G1=tGsh!NhJjM-cvVt)s$<uq;DRRe{Glya}
ztxd-%WwY>>CNs#)a8D9jbh;e}=Rw!QpudZ77RG>XmPoHe_v8ZXfFp1TwBF}n8yteu
zum$$R8Q2O3KrhBg*agS&^&P(PycbTvZa4wdTaLm`IEKv^_ynKfqc3A^8=EAkgeLhr
z%OGk6^~BDGt-vxwI(%d;U&%T#l}c31+T(9kuX8yETJydc)CRXQ#!r@mj#(X-I$|NU
z2j@M!hPUtrUcoz{7sb2ZH^=!m;2-nZyG8jof}7KSTUJloc&a!*`k~T1=0H328zk=p
A8vp<R

delta 9
QcmeC>xzDsAj**c801$8jivR!s

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.18to1.19.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.18to1.19.nbt
index 17c09d3067f1a0bedebbf7b47a8996509e502c87..1bf5ab69f5d62baa538d75b37c057d2f6303b7ef 100644
GIT binary patch
delta 748
zcma*l$!-%t5P;!o4@lT^11VBaM6Rp{R*?jh1Q4s>6<QrnlMETpIMZz#CnOF_fJCf`
z-~bZ50v9C2J8)q!NG#97-@qj|4xg%~U9Ik}^4A@22jBFoy_#(CX4(-_ZyT{x>qVn!
zoU=|ult?rg%TQR$thY{IP4h(i(pv3Xz9>_ZQMMQB2>B|W;R&wc9v)y08)#q+&+$~G
zC$l8?IqD1X5oWN0$4GG(9W0}TCEUh5uHz=!=po$s20RvV2Mc(Jk~8|T#2r(5J(U&p
z*-+i9{5@Lrr6ybdEdSqoFS2<*PT(@mBlKZZr1BHr$uHpmPT~qKU?0Z#eHZa;xb<$5
z<2Z*s7{L*o#vx2n{0l$GkKzmt;}niz90xH$4Lz)U!e@NMw^#-eYZ5)xax=PNy1JQ}
zy46L_hMl~8g{~<&sBW=PBZe+kv5lM#DmtyYpzDfGDmos8d;m;Eg>J{hW#TZAjz?iS
zJWss?lTq`rY)?uvUF7_8OzxVdw0Rg&B$CK0DqiyOI+j6~7ag6Mt}S)l<l42$cG~`T
bT?Q4gL73st=DNJ_n@cHEFDU&$d{6uhpV^6c

delta 9
Qcmdlgd0lwJHBLqb02F2eNdN!<

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.19.3to1.19.4.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.19.3to1.19.4.nbt
index 21c7158db4d9bd846b4b44355c8b786e766f46f1..08e653709dadf10395168ba69a05ca573ccf0006 100644
GIT binary patch
delta 593
zcmZY5%S!@L6vy#HIliuCn!VrBCWxR#yJ%6+V<)t1F^qZ}2WK2}u9++UivExOmHwl?
zM=*kf4;QXy&N;vPUHPniweqvF<XjMD9Fen$kzDX$GZD#)EbpU^Eu3HlMM`?<Z^;2y
z>)1vUt0);M4x>*0Pp3VuYuLmwDkvB!WV2rSZsWzkU9Q)#fg>2?ja0M5#xC<+>W6WV
zY4s8=aBd`@P0~?!(PD>Bs%YR4Wq3wBm!|VE+E#Pv;%qfr)|vW|2Gu0GrtY9kG`J?y
zwRI<Lst=(_HHJ3RA^I?yTx03Z49z8+MU+s0KBy;U@!E0P=`TXf{-ru4Rg*en2QG3`
z-%W?sNTVBNNje_z3gbc7jwXS#BPy9ltq9u+8_FfFaf?T^;G>NY6C?H4AddZRkOZOi
kpQ0og4=n#^2mN_qS7B!%%l!U~^9nb(!#y7Gj2FD&2Qx!QiU0rr

delta 9
QcmbO#c#&sA02?C%01%M^ivR!s

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.19.4to1.20.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.19.4to1.20.nbt
index a44466b0a1f5b617ac01c3409f6ebd13f5d9346f..26434acbc10b8135565c7586df71143471061166 100644
GIT binary patch
literal 2962
zcmchZS&S4_6oyZC)qqT~2+lAJh^#u0xPYRd?4sfuI4mk4HPziUJtf^;ovNCd04}_l
zXd(|R?rWkL72+E&t{^)mZYanqvZ&~Tiui)!cdDm!(%`ETzTDe)Irp6ZoO_E}5kq=*
zxIyUoB@s#0ij^t&*=1qmL~dwEZP6*0-P}BHg)6djc1qG-E@g-r#sf<>T9S4mHuiu{
zk#RF%rpWl5Nb^-9OI~9^<aaGt$>c1U%YqJ(dGBCyy3|UK%8^y48E2|aGfpL^nHaoA
zB)t$e5W<tmDLT=_;QjCx6Kk+u<3(<<Iu!GCm2q=#V!Rd`*TZMnm;g_Rm~-Gk*a^E}
zH|$9c)eSem7c8C#tC^e+W%v?~!#+5vp@x2YDOc@H&6X-}YBnX_SQs7&uLGgV8zkun
zkqv^;a5dnqxm~1YY2uM?8dX^=Z_>Warqe7Od4WG#yfvn==>VGoyy_Dtz%4~y<Xx0?
z8C&I?j7gj`y3QdN(v%#ogQF`4$rz0HDmy{sWeXP@wyO=dB!<)2pnPOlVpIo)#*omW
zTWYVCPzF^SYwT{Uj=lBWjrC-p4)4s!$%iyrBo;zA#f<OUm4al6p1T58Thfn-Wnr6J
zXtm=Wqc!N*j*izt3k-w?OX@R$>nscHoSXFn?orMz`%%dHVXPkxBS8CvXb_dbKBEEZ
z0Z)x9U<h0ZgP{>L;hJo;juTIQjginF2EgUe5BlN*XBoYr4^RsR6>9Xd#LBk0L9pB|
z_<8k4FN?P8U==)0{B2Gt@0Id)=;cc~r@J2j2NuIp$bbz?par;W#v;gC(pd5%Hx|#1
z{Iczp!YF7bU2*hCZW4h>1ZEQufr%0(QJAAG=^d85)>b#LTYW#r(J6+TaVd=al51z$
zBU*JS%|BdDueGFa6nI6uh{S>C6m(J}r7?&teIEX#-ve~hU$pp;<_4r!CYwonxu9<y
zy9n0Y1|Ngo^u4eZ_P{5w8}#<?fbA57o?dh^1=n_hq90&E6U7r?+zb=o7MKoGVG2xx
zSuhi3!0j*@ZiPv38{7orVI15Dv*Av-1Mb50vz83%@CpSdk5>3zieeW+*Uf1VH8{5b
zs2`L1F`L<T9lF%SX|bfgQz+QgX{G@6`H~~>4V;9};V|%o$x-+kzJsseTi6H3-~b$l
zPvIc&ZptCp4=4WPN)fBf<f3F<ub|~t?GKrV{ZU`k5A{LM*R%CpJyXxqv-V%Iuu)M^
zPEcOvSTZ#07c*YTiTKXhVdR$W_#yuHqSsS!Kf@33Ba)4!Jq;+4Is-(UIt3_@I>!7*
zFqA&Zq)x#1@DpeK!8o$(8=X3C$zZpXCAdiM0Ixu&rY!I~yqp`bI0YMU?&3vJ;FQ9m
z7g5=);qL2S8hO)5qRz>~@DOao3}q!N8Q($w9Q_frNTUwQBY;z~iM?6If2aQ_EyARc
zQJt0HmJBF59+kw6wOgrX$|}bM*C|C!rl?Q-rlxe`6j%k5nP1EJLfXybAaE(htgFSy
z$p7GSUAGhM%yK&l-1r)6MC#Ncm=E`MDRv+IM76~P&`mX2z;BdG{mL2wjg@QW_gVOj
zF;#IM{a>J)f{A(qlea79<@51%jBgv8E(27QUX{MF72~_;PXwym*l9^avf0h+O^C8>
z`hf`}R!|_u)=R&EMho-jc!k1FKgii`Ypa*_s4_+gCKg}_?Nb=(%AoN9zg3i{E7>%7
z=ZtOqR*@QEJ-ott%`*NP@4|bGA)p{?`W~3eoUVV7xly2{xCT^QEw?U#jSuNpiOhd4
zE4~fJMk4mh^m*A-bp7I|CIJ=p&;7caaS|a7@GQK*{8{F=(0?A*@p~2R1zN4hSK%4@
zB+b|k@AI3)#r1feaT2JX*f@!6E7fZ>F*b&=skHc}NliYrvYEZl!Aq9Zb$A&*=lX&K
tZs_xv_(8~&Ch0M5Q0JvyR(;8iz)3g^M}apaenF4X>dSc$4gv3o{0*hs65#*<

delta 353
zcmXZXH%dfN6b9g<55;G#jA5n{(+<ql6jn0k)M=^U0#u%Ba4^Sl1$H(nj2L#{I?R=z
zpJ4Iv{~QkYa<+3X4VP(BU$?Znw!BiVrp?(zMEsd#ifLw;WsZ3kSR_Xat+dfjo<c<J
zGj?k-w#=^N5QBP|9d_Acp92mfvN%$XIpLIZ&i?zl++fo~!;J9C8}EGZ$yY@3WUs;n
y-~5=TG}1>u0~B#+(!_O)MRKFuQss_&9(c4kDqWi7DbPVDU3Ak!uggn}`}7xW+AR41

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.19to1.19.3.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.19to1.19.3.nbt
index 838a529fec202fda2da7ce5c954aad14f17b462c..0dee2b6d05e7ca8b093c330dc242dc36d4bc86e2 100644
GIT binary patch
delta 243
zcmWm8T}}cq6o%nXki?-k#;^dzh3HP2GL%WfP{?$mm$D>K1cLnOK3srH@Csfoo}81@
zucw{f{AIIK^R2Dx+7*csYCkf%%`5LGzOtc+OsXWQAvOOgzeZ-@WA1I?YJWM&m@cuv
z1}l7Gjdy(DOKr7!<v1T2Wv(o3V)f<n9fl-y0BP-c=N?^pw&)vd))Bm-AIz}D96PcP
ecr@yS_~OdYw`t;DqYW{Iz9+)h8_&|!6a5*es5IFC

delta 9
QcmaFK*}$>kKQki(028SLE&u=k

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.2to1.20.3.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.2to1.20.3.nbt
index 682b709a4c1d0af09fdf3ee211212b13198f688a..171a63dd0a1d99842040f997c1ba48ae278ff80a 100644
GIT binary patch
delta 275
zcmaLQF$%&!5QX7IgTX8oR*EOE5eqM2C)jAW?3zWR7$sSWiAA*ZHXhM`g@~2KHv_})
z-XnZ=U-xz$iNNV?9tmkvm$*{7@@%CTY;>wjX0_W{bxC8JsX{xO2_Z&kAwVBP_}ds0
zOfkb83oNn18X5*M_Bhmx91aDpC{f`iMaNfb|J{RcYLc5opY|sptWHOhSpO0JBz&tR
I$4?jg4FlIGmjD0&

delta 9
QcmeC=Y-Hciz|6=101i$9PXGV_

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt
index 95f929e4769bed6f2e2daff251a6dcf4f77a5bb3..38ed842b82b0e7a7a228c1794f07409da3ed08fa 100644
GIT binary patch
literal 5406
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
Nlp0ZT+@b`b!0UbtmwNyJ

delta 14
VcmbQI^_P9a0p`h*_^g>27yvC^1h4=A

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20to1.20.2.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20to1.20.2.nbt
index e5b33d7a3c632ba061be56169296a219d20a783c..1a2a590c22a6f579b49d543f0b648f0c10874467 100644
GIT binary patch
delta 276
zcmbWwOA5j;5C-6}+D#)Uh&xy6IXs8EP}5L~F)2wzy6P=_zaM+gpj!{+kG+A54`%q8
z`QP<V_<YsMh#EdlT}0tT88Kzl6Y)$c?qZ#A=Vi{FnPdE=j)*!$!2>REg%cd$1{*lS
z4%V=OJ)Gf=+adH}fPD#DR#HnCEv)pC=Vp;ei@1&G&x-0TMZ~1`nJ>66a>=Nxjpiuw
S)+m+fl-sPTY6j>V!5F@<DLlvk

delta 9
QcmX@ZdYE~`Ax1_9024t23;+NC