From b5c718098d774f5d743c81a522cfe375385e2e4f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 3 May 2024 14:36:35 +0200
Subject: [PATCH] 24w18a Abstract item rewriters still need additional handling
 for once there are actual item changes, but this works as is for now

---
 .../api/protocol/version/ProtocolVersion.java |   1 +
 .../api/type/types/misc/ParticleType.java     |   6 +-
 .../api/type/types/version/Types1_21.java     |  55 +++++++
 .../protocol/ProtocolManagerImpl.java         |   2 +
 .../Protocol1_21To1_20_5.java                 | 145 +++++++++++++++++
 .../data/MappingData.java                     |  42 +++++
 .../data/Paintings1_20_5.java                 |  78 +++++++++
 .../rewriter/BlockItemPacketRewriter1_21.java |  62 ++++++++
 .../rewriter/EntityPacketRewriter1_21.java    | 150 ++++++++++++++++++
 .../Protocol1_20_3To1_20_5.java               |   2 +-
 .../BlockItemPacketRewriter1_20_5.java        |   2 +-
 .../rewriter/AttributeRewriter.java           |  22 ++-
 .../viaversion/rewriter/EntityRewriter.java   |   8 +
 .../viaversion/rewriter/RecipeRewriter.java   |   6 +-
 .../viaversion/data/enchantments-1.21.nbt     | Bin 0 -> 29022 bytes
 .../viaversion/data/identifier-table.nbt      | Bin 28167 -> 28239 bytes
 .../viaversion/data/identifiers-1.21.nbt      | Bin 0 -> 4864 bytes
 .../viaversion/data/mappings-1.20.5to1.21.nbt | Bin 0 -> 312 bytes
 gradle.properties                             |   2 +-
 .../template/protocols/Protocol1_99To_98.java |  14 ++
 20 files changed, 587 insertions(+), 10 deletions(-)
 create mode 100644 api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_21.java
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/Protocol1_21To1_20_5.java
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/MappingData.java
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/Paintings1_20_5.java
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java
 create mode 100644 common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt
 create mode 100644 common/src/main/resources/assets/viaversion/data/identifiers-1.21.nbt
 create mode 100644 common/src/main/resources/assets/viaversion/data/mappings-1.20.5to1.21.nbt

diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index 58f78d5e4..cdba22f1d 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -84,6 +84,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
     public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
     public static final ProtocolVersion v1_20_3 = register(765, "1.20.3-1.20.4", new SubVersionRange("1.20", 3, 4));
     public static final ProtocolVersion v1_20_5 = register(766, "1.20.5-1.20.6", new SubVersionRange("1.20", 5, 6));
+    public static final ProtocolVersion v1_21 = register(767, 193, "1.21");
     public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
index b3485b581..f02573c07 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
@@ -71,8 +71,6 @@ public class ParticleType extends DynamicType<Particle> {
         };
         public static final DataReader<Particle> ITEM1_13 = itemHandler(Types.ITEM1_13);
         public static final DataReader<Particle> ITEM1_13_2 = itemHandler(Types.ITEM1_13_2);
-        public static final DataReader<Particle> ITEM1_20_2 = itemHandler(Types.ITEM1_20_2);
-        public static final DataReader<Particle> ITEM1_20_5 = itemHandler(Types1_20_5.ITEM);
         public static final DataReader<Particle> DUST = (buf, particle) -> {
             particle.add(Types.FLOAT, Types.FLOAT.readPrimitive(buf)); // Red 0-1
             particle.add(Types.FLOAT, Types.FLOAT.readPrimitive(buf)); // Green 0-1
@@ -139,5 +137,9 @@ public class ParticleType extends DynamicType<Particle> {
             particle.add(Types.VAR_INT, Types.VAR_INT.readPrimitive(buf)); // Delay
         };
         public static final DataReader<Particle> COLOR = (buf, particle) -> particle.add(Types.INT, buf.readInt());
+
+        public static DataReader<Particle> item(Type<Item> item) {
+            return (buf, particle) -> particle.add(item, item.read(buf));
+        }
     }
 }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_21.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_21.java
new file mode 100644
index 000000000..39b2ba473
--- /dev/null
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_21.java
@@ -0,0 +1,55 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.type.types.version;
+
+import com.viaversion.viaversion.api.minecraft.Particle;
+import com.viaversion.viaversion.api.minecraft.data.StructuredData;
+import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_20_5;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.ArrayType;
+import com.viaversion.viaversion.api.type.types.item.ItemCostType1_20_5;
+import com.viaversion.viaversion.api.type.types.item.ItemType1_20_5;
+import com.viaversion.viaversion.api.type.types.item.StructuredDataType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
+import java.util.List;
+
+// Most of these are only safe to use after protocol loading
+public final class Types1_21 {
+
+    public static final StructuredDataType STRUCTURED_DATA = new StructuredDataType();
+    public static final Type<StructuredData<?>[]> STRUCTURED_DATA_ARRAY = new ArrayType<>(STRUCTURED_DATA);
+    public static final Type<Item> ITEM = new ItemType1_20_5(STRUCTURED_DATA);
+    public static final Type<Item[]> ITEM_ARRAY = new ArrayType<>(ITEM);
+    public static final Type<Item> ITEM_COST = new ItemCostType1_20_5(STRUCTURED_DATA_ARRAY);
+    public static final Type<Item> OPTIONAL_ITEM_COST = new ItemCostType1_20_5.OptionalItemCostType(ITEM_COST);
+
+    public static final ParticleType PARTICLE = new ParticleType();
+    public static final ArrayType<Particle> PARTICLES = new ArrayType<>(PARTICLE);
+    public static final MetaTypes1_20_5 META_TYPES = new MetaTypes1_20_5(PARTICLE, PARTICLES);
+    public static final Type<Metadata> METADATA = new MetadataType(META_TYPES);
+    public static final Type<List<Metadata>> METADATA_LIST = new MetaListType(METADATA);
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
index a12e19ccf..6b7725b24 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
@@ -187,6 +187,8 @@ public class ProtocolManagerImpl implements ProtocolManager {
         registerProtocol(new Protocol1_20To1_20_2(), ProtocolVersion.v1_20_2, ProtocolVersion.v1_20);
         registerProtocol(new Protocol1_20_2To1_20_3(), ProtocolVersion.v1_20_3, ProtocolVersion.v1_20_2);
         registerProtocol(new Protocol1_20_3To1_20_5(), ProtocolVersion.v1_20_5, ProtocolVersion.v1_20_3);
+
+        registerProtocol(new Protocol1_21To1_20_5(), ProtocolVersion.v1_21, ProtocolVersion.v1_20_5);
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/Protocol1_21To1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/Protocol1_21To1_20_5.java
new file mode 100644
index 000000000..1b2c3ff6f
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/Protocol1_21To1_20_5.java
@@ -0,0 +1,145 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 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.viaversion.protocols.protocol1_21to1_20_5;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
+import com.viaversion.viaversion.api.protocol.AbstractProtocol;
+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.misc.ParticleType;
+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.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundConfigurationPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.data.MappingData;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.rewriter.BlockItemPacketRewriter1_21;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.rewriter.EntityPacketRewriter1_21;
+import com.viaversion.viaversion.rewriter.AttributeRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
+
+import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
+
+public final class Protocol1_21To1_20_5 extends AbstractProtocol<ClientboundPacket1_20_5, ClientboundPacket1_20_5, ServerboundPacket1_20_5, ServerboundPacket1_20_5> {
+
+    public static final MappingData MAPPINGS = new MappingData();
+    private final EntityPacketRewriter1_21 entityRewriter = new EntityPacketRewriter1_21(this);
+    private final BlockItemPacketRewriter1_21 itemRewriter = new BlockItemPacketRewriter1_21(this);
+    private final TagRewriter<ClientboundPacket1_20_5> tagRewriter = new TagRewriter<>(this);
+
+    public Protocol1_21To1_20_5() {
+        super(ClientboundPacket1_20_5.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_5.class, ServerboundPacket1_20_5.class);
+    }
+
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+
+        tagRewriter.registerGeneric(ClientboundPackets1_20_5.TAGS);
+        tagRewriter.registerGeneric(ClientboundConfigurationPackets1_20_5.UPDATE_TAGS);
+
+        final SoundRewriter<ClientboundPacket1_20_5> soundRewriter = new SoundRewriter<>(this);
+        soundRewriter.register1_19_3Sound(ClientboundPackets1_20_5.SOUND);
+        soundRewriter.register1_19_3Sound(ClientboundPackets1_20_5.ENTITY_SOUND);
+
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_20_5.STATISTICS);
+        new AttributeRewriter<>(this).register1_20_5(ClientboundPackets1_20_5.ENTITY_PROPERTIES);
+    }
+
+    @Override
+    protected void onMappingDataLoaded() {
+        super.onMappingDataLoaded();
+
+        // Added preemptively TODO Check if there are actual changes before release
+        Types1_21.PARTICLE.filler(this)
+            .reader("block", ParticleType.Readers.BLOCK)
+            .reader("block_marker", ParticleType.Readers.BLOCK)
+            .reader("dust", ParticleType.Readers.DUST)
+            .reader("dust_pillar", ParticleType.Readers.BLOCK)
+            .reader("falling_dust", ParticleType.Readers.BLOCK)
+            .reader("dust_color_transition", ParticleType.Readers.DUST_TRANSITION)
+            .reader("item", ParticleType.Readers.item(Types1_20_5.ITEM))
+            .reader("vibration", ParticleType.Readers.VIBRATION1_20_3)
+            .reader("sculk_charge", ParticleType.Readers.SCULK_CHARGE)
+            .reader("shriek", ParticleType.Readers.SHRIEK)
+            .reader("entity_effect", ParticleType.Readers.COLOR);
+        Types1_21.STRUCTURED_DATA.filler(this)
+            .add(StructuredDataKey.CUSTOM_DATA).add(StructuredDataKey.MAX_STACK_SIZE).add(StructuredDataKey.MAX_DAMAGE)
+            .add(StructuredDataKey.DAMAGE).add(StructuredDataKey.UNBREAKABLE).add(StructuredDataKey.RARITY)
+            .add(StructuredDataKey.HIDE_TOOLTIP).add(StructuredDataKey.FOOD).add(StructuredDataKey.FIRE_RESISTANT)
+            .add(StructuredDataKey.CUSTOM_NAME).add(StructuredDataKey.LORE).add(StructuredDataKey.ENCHANTMENTS)
+            .add(StructuredDataKey.CAN_PLACE_ON).add(StructuredDataKey.CAN_BREAK).add(StructuredDataKey.ATTRIBUTE_MODIFIERS)
+            .add(StructuredDataKey.CUSTOM_MODEL_DATA).add(StructuredDataKey.HIDE_ADDITIONAL_TOOLTIP).add(StructuredDataKey.REPAIR_COST)
+            .add(StructuredDataKey.CREATIVE_SLOT_LOCK).add(StructuredDataKey.ENCHANTMENT_GLINT_OVERRIDE).add(StructuredDataKey.INTANGIBLE_PROJECTILE)
+            .add(StructuredDataKey.STORED_ENCHANTMENTS).add(StructuredDataKey.DYED_COLOR).add(StructuredDataKey.MAP_COLOR)
+            .add(StructuredDataKey.MAP_ID).add(StructuredDataKey.MAP_DECORATIONS).add(StructuredDataKey.MAP_POST_PROCESSING)
+            .add(StructuredDataKey.CHARGED_PROJECTILES).add(StructuredDataKey.BUNDLE_CONTENTS).add(StructuredDataKey.POTION_CONTENTS)
+            .add(StructuredDataKey.SUSPICIOUS_STEW_EFFECTS).add(StructuredDataKey.WRITABLE_BOOK_CONTENT).add(StructuredDataKey.WRITTEN_BOOK_CONTENT)
+            .add(StructuredDataKey.TRIM).add(StructuredDataKey.DEBUG_STICK_STATE).add(StructuredDataKey.ENTITY_DATA)
+            .add(StructuredDataKey.BUCKET_ENTITY_DATA).add(StructuredDataKey.BLOCK_ENTITY_DATA).add(StructuredDataKey.INSTRUMENT)
+            .add(StructuredDataKey.RECIPES).add(StructuredDataKey.LODESTONE_TRACKER).add(StructuredDataKey.FIREWORK_EXPLOSION)
+            .add(StructuredDataKey.FIREWORKS).add(StructuredDataKey.PROFILE).add(StructuredDataKey.NOTE_BLOCK_SOUND)
+            .add(StructuredDataKey.BANNER_PATTERNS).add(StructuredDataKey.BASE_COLOR).add(StructuredDataKey.POT_DECORATIONS)
+            .add(StructuredDataKey.CONTAINER).add(StructuredDataKey.BLOCK_STATE).add(StructuredDataKey.BEES)
+            .add(StructuredDataKey.LOCK).add(StructuredDataKey.CONTAINER_LOOT).add(StructuredDataKey.TOOL)
+            .add(StructuredDataKey.ITEM_NAME).add(StructuredDataKey.OMINOUS_BOTTLE_AMPLIFIER);
+    }
+
+    @Override
+    public void init(final UserConnection connection) {
+        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_20_5.PLAYER));
+    }
+
+    @Override
+    public MappingData getMappingData() {
+        return MAPPINGS;
+    }
+
+    @Override
+    public EntityPacketRewriter1_21 getEntityRewriter() {
+        return entityRewriter;
+    }
+
+    @Override
+    public BlockItemPacketRewriter1_21 getItemRewriter() {
+        return itemRewriter;
+    }
+
+    @Override
+    public TagRewriter<ClientboundPacket1_20_5> getTagRewriter() {
+        return tagRewriter;
+    }
+
+    @Override
+    protected PacketTypesProvider<ClientboundPacket1_20_5, ClientboundPacket1_20_5, ServerboundPacket1_20_5, ServerboundPacket1_20_5> createPacketTypesProvider() {
+        return new SimplePacketTypesProvider<>(
+            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_20_5.class, ClientboundConfigurationPackets1_20_5.class),
+            packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_20_5.class, ClientboundConfigurationPackets1_20_5.class),
+            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_20_5.class, ServerboundConfigurationPackets1_20_5.class),
+            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_20_5.class, ServerboundConfigurationPackets1_20_5.class)
+        );
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/MappingData.java
new file mode 100644
index 000000000..f0d6faa49
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/MappingData.java
@@ -0,0 +1,42 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 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.viaversion.protocols.protocol1_21to1_20_5.data;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.viaversion.viaversion.api.data.MappingDataBase;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
+
+public final class MappingData extends MappingDataBase {
+
+    private ListTag<CompoundTag> enchantments;
+
+    public MappingData() {
+        super("1.20.5", "1.21");
+    }
+
+    @Override
+    protected void loadExtras(final CompoundTag data) {
+        final CompoundTag extraMappings = MappingDataLoader.INSTANCE.loadNBT("enchantments-1.21.nbt");
+        enchantments = extraMappings.getListTag("entries", CompoundTag.class);
+    }
+
+    public CompoundTag enchantment(final int id) {
+        return enchantments.get(id).copy();
+    }
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/Paintings1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/Paintings1_20_5.java
new file mode 100644
index 000000000..7d83316d0
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/data/Paintings1_20_5.java
@@ -0,0 +1,78 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 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.viaversion.protocols.protocol1_21to1_20_5.data;
+
+public final class Paintings1_20_5 {
+
+    public static final PaintingVariant[] PAINTINGS = {
+        new PaintingVariant("kebab", 1, 1),
+        new PaintingVariant("aztec", 1, 1),
+        new PaintingVariant("alban", 1, 1),
+        new PaintingVariant("aztec2", 1, 1),
+        new PaintingVariant("bomb", 1, 1),
+        new PaintingVariant("plant", 1, 1),
+        new PaintingVariant("wasteland", 1, 1),
+        new PaintingVariant("pool", 2, 1),
+        new PaintingVariant("courbet", 2, 1),
+        new PaintingVariant("sea", 2, 1),
+        new PaintingVariant("sunset", 2, 1),
+        new PaintingVariant("creebet", 2, 1),
+        new PaintingVariant("wanderer", 1, 2),
+        new PaintingVariant("graham", 1, 2),
+        new PaintingVariant("match", 2, 2),
+        new PaintingVariant("bust", 2, 2),
+        new PaintingVariant("stage", 2, 2),
+        new PaintingVariant("void", 2, 2),
+        new PaintingVariant("skull_and_roses", 2, 2),
+        new PaintingVariant("wither", 2, 2),
+        new PaintingVariant("fighters", 4, 2),
+        new PaintingVariant("pointer", 4, 4),
+        new PaintingVariant("pigscene", 4, 4),
+        new PaintingVariant("burning_skull", 4, 4),
+        new PaintingVariant("skeleton", 4, 3),
+        new PaintingVariant("earth", 2, 2),
+        new PaintingVariant("wind", 2, 2),
+        new PaintingVariant("water", 2, 2),
+        new PaintingVariant("fire", 2, 2),
+        new PaintingVariant("donkey_kong", 4, 3)
+    };
+
+    public static final class PaintingVariant {
+        private final String key;
+        private final int width;
+        private final int height;
+
+        public PaintingVariant(final String key, final int width, final int height) {
+            this.key = key;
+            this.width = width;
+            this.height = height;
+        }
+
+        public String key() {
+            return key;
+        }
+
+        public int width() {
+            return width;
+        }
+
+        public int height() {
+            return height;
+        }
+    }
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
new file mode 100644
index 000000000..bdbeb477c
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
@@ -0,0 +1,62 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 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.viaversion.protocols.protocol1_21to1_20_5.rewriter;
+
+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.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.Protocol1_21To1_20_5;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
+import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
+
+public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<ClientboundPacket1_20_5, ServerboundPacket1_20_5, Protocol1_21To1_20_5> {
+
+    public BlockItemPacketRewriter1_21(final Protocol1_21To1_20_5 protocol) {
+        super(protocol, Types1_20_5.ITEM, Types1_20_5.ITEM_ARRAY, Types1_21.ITEM, Types1_21.ITEM_ARRAY);
+    }
+
+    @Override
+    public void registerPackets() {
+        final BlockRewriter<ClientboundPacket1_20_5> blockRewriter = BlockRewriter.for1_20_2(protocol);
+        blockRewriter.registerBlockAction(ClientboundPackets1_20_5.BLOCK_ACTION);
+        blockRewriter.registerBlockChange(ClientboundPackets1_20_5.BLOCK_CHANGE);
+        blockRewriter.registerVarLongMultiBlockChange1_20(ClientboundPackets1_20_5.MULTI_BLOCK_CHANGE);
+        blockRewriter.registerEffect(ClientboundPackets1_20_5.EFFECT, 1010, 2001);
+        blockRewriter.registerChunkData1_19(ClientboundPackets1_20_5.CHUNK_DATA, ChunkType1_20_2::new);
+        blockRewriter.registerBlockEntityData(ClientboundPackets1_20_5.BLOCK_ENTITY_DATA);
+
+        registerSetCooldown(ClientboundPackets1_20_5.COOLDOWN);
+        registerWindowItems1_17_1(ClientboundPackets1_20_5.WINDOW_ITEMS);
+        registerSetSlot1_17_1(ClientboundPackets1_20_5.SET_SLOT);
+        registerAdvancements1_20_3(ClientboundPackets1_20_5.ADVANCEMENTS);
+        registerEntityEquipmentArray(ClientboundPackets1_20_5.ENTITY_EQUIPMENT);
+        registerClickWindow1_17_1(ServerboundPackets1_20_5.CLICK_WINDOW);
+        registerTradeList1_20_5(ClientboundPackets1_20_5.TRADE_LIST, Types1_20_5.ITEM_COST, Types1_20_5.ITEM_COST, Types1_21.OPTIONAL_ITEM_COST, Types1_21.OPTIONAL_ITEM_COST);
+        registerCreativeInvAction(ServerboundPackets1_20_5.CREATIVE_INVENTORY_ACTION);
+        registerWindowPropertyEnchantmentHandler(ClientboundPackets1_20_5.WINDOW_PROPERTY);
+        registerSpawnParticle1_20_5(ClientboundPackets1_20_5.SPAWN_PARTICLE, Types1_20_5.PARTICLE, Types1_21.PARTICLE);
+        registerExplosion(ClientboundPackets1_20_5.EXPLOSION, Types1_20_5.PARTICLE, Types1_21.PARTICLE); // Rewrites the included sound and particles
+
+        new RecipeRewriter1_20_3<>(protocol).register1_20_5(ClientboundPackets1_20_5.DECLARE_RECIPES);
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java
new file mode 100644
index 000000000..8dd39ed38
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java
@@ -0,0 +1,150 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 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.viaversion.protocols.protocol1_21to1_20_5.rewriter;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.type.Type;
+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.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.Protocol1_21To1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_21to1_20_5.data.Paintings1_20_5;
+import com.viaversion.viaversion.rewriter.EntityRewriter;
+import com.viaversion.viaversion.util.Key;
+
+public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPacket1_20_5, Protocol1_21To1_20_5> {
+
+    public EntityPacketRewriter1_21(final Protocol1_21To1_20_5 protocol) {
+        super(protocol);
+    }
+
+    @Override
+    public void registerPackets() {
+        registerTrackerWithData1_19(ClientboundPackets1_20_5.SPAWN_ENTITY, EntityTypes1_20_5.FALLING_BLOCK);
+        registerMetadataRewriter(ClientboundPackets1_20_5.ENTITY_METADATA, Types1_20_5.METADATA_LIST, Types1_21.METADATA_LIST);
+        registerRemoveEntities(ClientboundPackets1_20_5.REMOVE_ENTITIES);
+
+        protocol.registerClientbound(ClientboundConfigurationPackets1_20_5.REGISTRY_DATA, new PacketHandlers() {
+            @Override
+            protected void register() {
+                map(Type.STRING); // Registry
+                map(Type.REGISTRY_ENTRY_ARRAY); // Data
+                handler(registryDataHandler1_20_5());
+                handler(wrapper -> {
+                    // Add required damage type
+                    final String type = wrapper.get(Type.STRING, 0);
+                    final RegistryEntry[] entries = wrapper.get(Type.REGISTRY_ENTRY_ARRAY, 0);
+                    if (Key.stripMinecraftNamespace(type).equals("damage_type")) {
+                        final CompoundTag campfireDamageType = new CompoundTag();
+                        campfireDamageType.putString("scaling", "when_caused_by_living_non_player");
+                        campfireDamageType.putString("message_id", "inFire");
+                        campfireDamageType.putFloat("exhaustion", 0.1F);
+                        wrapper.set(Type.REGISTRY_ENTRY_ARRAY, 0, addRegistryEnties(entries, new RegistryEntry("minecraft:campfire", campfireDamageType)));
+                    }
+                });
+            }
+        });
+
+        protocol.registerClientbound(ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION, wrapper -> {
+            // Add new registries
+            final PacketWrapper paintingRegistryPacket = wrapper.create(ClientboundConfigurationPackets1_20_5.REGISTRY_DATA);
+            paintingRegistryPacket.write(Type.STRING, "minecraft:painting_variant");
+            final RegistryEntry[] paintingsRegistry = new RegistryEntry[Paintings1_20_5.PAINTINGS.length];
+            for (int i = 0; i < Paintings1_20_5.PAINTINGS.length; i++) {
+                final Paintings1_20_5.PaintingVariant painting = Paintings1_20_5.PAINTINGS[i];
+                final CompoundTag tag = new CompoundTag();
+                tag.putInt("width", painting.width());
+                tag.putInt("height", painting.height());
+                tag.putString("asset_id", painting.key());
+                paintingsRegistry[i] = new RegistryEntry(painting.key(), tag);
+            }
+            paintingRegistryPacket.write(Type.REGISTRY_ENTRY_ARRAY, paintingsRegistry);
+            paintingRegistryPacket.send(Protocol1_21To1_20_5.class);
+
+            final PacketWrapper enchantmentRegistryPacket = wrapper.create(ClientboundConfigurationPackets1_20_5.REGISTRY_DATA);
+            enchantmentRegistryPacket.write(Type.STRING, "minecraft:enchantment");
+            final RegistryEntry[] enchantmentRegistry = new RegistryEntry[Enchantments1_20_5.ENCHANTMENTS.size()];
+            for (int i = 0; i < Enchantments1_20_5.ENCHANTMENTS.size(); i++) {
+                final String key = Enchantments1_20_5.idToKey(i);
+                final CompoundTag tag = protocol.getMappingData().enchantment(i);
+                enchantmentRegistry[i] = new RegistryEntry(key, tag);
+            }
+            enchantmentRegistryPacket.write(Type.REGISTRY_ENTRY_ARRAY, enchantmentRegistry);
+            enchantmentRegistryPacket.send(Protocol1_21To1_20_5.class);
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_20_5.JOIN_GAME, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.INT); // Entity id
+                map(Type.BOOLEAN); // Hardcore
+                map(Type.STRING_ARRAY); // World List
+                map(Type.VAR_INT); // Max players
+                map(Type.VAR_INT); // View distance
+                map(Type.VAR_INT); // Simulation distance
+                map(Type.BOOLEAN); // Reduced debug info
+                map(Type.BOOLEAN); // Show death screen
+                map(Type.BOOLEAN); // Limited crafting
+                map(Type.VAR_INT); // Dimension id
+                map(Type.STRING); // World
+                handler(worldDataTrackerHandlerByKey1_20_5(3));
+                handler(playerTrackerHandler());
+            }
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_20_5.RESPAWN, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.VAR_INT); // Dimension
+                map(Type.STRING); // World
+                handler(worldDataTrackerHandlerByKey1_20_5(0)); // Tracks world height and name for chunk data and entity (un)tracking
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        filter().mapMetaType(Types1_21.META_TYPES::byId);
+
+        registerMetaTypeHandler(
+            Types1_21.META_TYPES.itemType,
+            Types1_21.META_TYPES.blockStateType,
+            Types1_21.META_TYPES.optionalBlockStateType,
+            Types1_21.META_TYPES.particleType,
+            Types1_21.META_TYPES.particlesType
+        );
+
+        filter().type(EntityTypes1_20_5.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
+            final int blockState = meta.value();
+            meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
+        });
+    }
+
+    @Override
+    public EntityType typeFromId(final int type) {
+        return EntityTypes1_20_5.getTypeFromId(type);
+    }
+}
\ No newline at end of file
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 dc7752d1c..997413b5b 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
@@ -253,7 +253,7 @@ public final class Protocol1_20_3To1_20_5 extends AbstractProtocol<ClientboundPa
             .reader("dust_pillar", ParticleType.Readers.BLOCK)
             .reader("falling_dust", ParticleType.Readers.BLOCK)
             .reader("dust_color_transition", ParticleType.Readers.DUST_TRANSITION)
-            .reader("item", ParticleType.Readers.ITEM1_20_5)
+            .reader("item", ParticleType.Readers.item(Types1_20_5.ITEM))
             .reader("vibration", ParticleType.Readers.VIBRATION1_20_3)
             .reader("sculk_charge", ParticleType.Readers.SCULK_CHARGE)
             .reader("shriek", ParticleType.Readers.SHRIEK)
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
index 9fc39e63d..22e66fb5c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -340,7 +340,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                 wrapper.passthrough(Types.STRING); // Recipe Identifier
 
                 wrapper.write(Types.VAR_INT, protocol.getMappingData().getRecipeSerializerMappings().mappedId(type));
-                recipeRewriter.handleRecipeType(wrapper, Key.stripMinecraftNamespace(type));
+                recipeRewriter.handleRecipeType(wrapper, type);
             }
         });
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/AttributeRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/AttributeRewriter.java
index 64e0ebde5..a3fce352b 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/AttributeRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/AttributeRewriter.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.rewriter;
 
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
-import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.Types.Types;
 
 public class AttributeRewriter<C extends ClientboundPacketType> {
     private final Protocol<C, ?, ?, ?> protocol;
@@ -33,10 +33,24 @@ public class AttributeRewriter<C extends ClientboundPacketType> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
 
             final int size = wrapper.passthrough(Types.VAR_INT);
+            int newSize = size;
             for (int i = 0; i < size; i++) {
                 final int attributeId = wrapper.read(Types.VAR_INT);
-                wrapper.write(Types.VAR_INT, protocol.getMappingData().getNewAttributeId(attributeId));
+                final int mappedId = protocol.getMappingData().getNewAttributeId(attributeId);
+                if (mappedId == -1) {
+                    newSize--;
 
+                    wrapper.read(Types.DOUBLE); // Base
+                    final int modifierSize = wrapper.read(Types.VAR_INT);
+                    for (int j = 0; j < modifierSize; j++) {
+                        wrapper.read(Types.UUID); // ID
+                        wrapper.read(Types.DOUBLE); // Amount
+                        wrapper.read(Types.BYTE); // Operation
+                    }
+                    continue;
+                }
+
+                wrapper.write(Types.VAR_INT, mappedId);
                 wrapper.passthrough(Types.DOUBLE); // Base
                 final int modifierSize = wrapper.passthrough(Types.VAR_INT);
                 for (int j = 0; j < modifierSize; j++) {
@@ -45,6 +59,10 @@ public class AttributeRewriter<C extends ClientboundPacketType> {
                     wrapper.passthrough(Types.BYTE); // Operation
                 }
             }
+
+            if (size != newSize) {
+                wrapper.set(Types.VAR_INT, 1, newSize);
+            }
         });
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
index f70dd480f..6257f593f 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
@@ -51,6 +51,7 @@ import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEventImpl;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.TagUtil;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -579,6 +580,13 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
 
     // ---------------------------------------------------------------------------
 
+    public RegistryEntry[] addRegistryEnties(final RegistryEntry[] entries, final RegistryEntry... toAdd) {
+        final int length = entries.length;
+        final RegistryEntry[] newEntries = Arrays.copyOf(entries, length + toAdd.length);
+        System.arraycopy(toAdd, 0, newEntries, length, toAdd.length);
+        return newEntries;
+    }
+
     public void rewriteParticle(UserConnection connection, Particle particle) {
         ParticleMappings mappings = protocol.getMappingData().getParticleMappings();
         int id = particle.id();
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
index a713d9d6d..75b47cc0b 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
@@ -56,7 +56,7 @@ public class RecipeRewriter<C extends ClientboundPacketType> {
     }
 
     public void handleRecipeType(PacketWrapper wrapper, String type) {
-        RecipeConsumer handler = recipeHandlers.get(type);
+        RecipeConsumer handler = recipeHandlers.get(Key.stripMinecraftNamespace(type));
         if (handler != null) {
             handler.accept(wrapper);
         }
@@ -73,7 +73,7 @@ public class RecipeRewriter<C extends ClientboundPacketType> {
             for (int i = 0; i < size; i++) {
                 String type = wrapper.passthrough(Types.STRING);
                 wrapper.passthrough(Types.STRING); // Recipe Identifier
-                handleRecipeType(wrapper, Key.stripMinecraftNamespace(type));
+                handleRecipeType(wrapper, type);
             }
         });
     }
@@ -82,7 +82,7 @@ public class RecipeRewriter<C extends ClientboundPacketType> {
         protocol.registerClientbound(packetType, wrapper -> {
             int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
-                wrapper.passthrough(Types.STRING);// Recipe Identifier
+                wrapper.passthrough(Types.STRING); // Recipe Identifier
 
                 final int typeId = wrapper.passthrough(Types.VAR_INT);
                 final String type = protocol.getMappingData().getRecipeSerializerMappings().identifier(typeId);
diff --git a/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt b/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..2c613fe55e60dc266557f358a17040d4d0693452
GIT binary patch
literal 29022
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
Za4;j{l^N7#tlMbVkg+ZvrPo=~_<!d)DfR#W

literal 0
HcmV?d00001

diff --git a/common/src/main/resources/assets/viaversion/data/identifier-table.nbt b/common/src/main/resources/assets/viaversion/data/identifier-table.nbt
index 045d153adad06610bb0772d5dc243bc36378376a..32aa5c47330c8aeebdca130d94dbb663b61ebbd6 100644
GIT binary patch
delta 105
zcmZp_!+8D<qW~8J11AG(W=U#pF$V(!tItM(s7Mb6q1@8q%;fl#%;Mzu<f7EXlKdhD
f8BDQwh)_~~1%n8ZY(Y_Ka%Mqha_Z)+$hjf_7%C+j

delta 32
ocmX?qhq3(*qW~8J11AG(W=U#pF$V(!tLH|6sL0KmBIk+#0GpQylmGw#

diff --git a/common/src/main/resources/assets/viaversion/data/identifiers-1.21.nbt b/common/src/main/resources/assets/viaversion/data/identifiers-1.21.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..36189349a105242e46619faf4bd930a8361f6685
GIT binary patch
literal 4864
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
Sl!DQbgEgOK^<MLhvipBSSU;rz

literal 0
HcmV?d00001

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.5to1.21.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.5to1.21.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..54faa5422a245be27ec072fcaec5362b84f789f4
GIT binary patch
literal 312
zcmZXPy$ZrG6opTk{$M&O{(y_`Ah@{;u0BDu0fV+FO<K_B5NE*`^;Q~(IDErBIea%)
z032DT8mmnOfC=Qst2te)lTKL<QOdej#X;W{aNaURy5JnK9Rdg>+Nm<ECYx`S{i?}2
zM<gBXh=BM(yeM#H2%Z$YNtRmERz+w__kk_lc^jh(I&bQS8(D;OuF=Q#{{*Z86XxC&
W(^oQLOiYNWxAqSsVn!^8CGY`+gE!y+

literal 0
HcmV?d00001

diff --git a/gradle.properties b/gradle.properties
index 981c064fc..de83ae393 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=5.0.0-SNAPSHOT
+projectVersion=5.0.0-24w18a-SNAPSHOT
 
 # Smile emoji
 mcVersions=1.20.6,1.20.5,1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9
diff --git a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java
index 5240c8264..4617443cd 100644
--- a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java
+++ b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java
@@ -22,6 +22,8 @@ import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.data.MappingDataBase;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
+import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
+import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5;
@@ -34,6 +36,8 @@ import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.template.protocols.rewriter.BlockItemPacketRewriter1_99;
 import com.viaversion.viaversion.template.protocols.rewriter.EntityPacketRewriter1_99;
 
+import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
+
 // Placeholders to replace (in the entire package):
 //   Protocol1_99To_98, EntityPacketRewriter1_99, BlockItemPacketRewriter1_99
 //   ClientboundPacket1_20_5
@@ -130,4 +134,14 @@ public final class Protocol1_99To_98 extends AbstractProtocol<ClientboundPacket1
     public TagRewriter<ClientboundPacket1_20_5> getTagRewriter() {
         return tagRewriter;
     }
+
+    @Override
+    protected PacketTypesProvider<ClientboundPacket1_20_5, ClientboundPacket1_20_5, ServerboundPacket1_20_5, ServerboundPacket1_20_5> createPacketTypesProvider() {
+        return new SimplePacketTypesProvider<>(
+            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_20_5.class, ClientboundConfigurationPackets1_20_5.class),
+            packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_20_5.class, ClientboundConfigurationPackets1_20_5.class),
+            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_20_5.class, ServerboundConfigurationPackets1_20_5.class),
+            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_20_5.class, ServerboundConfigurationPackets1_20_5.class)
+        );
+    }
 }
\ No newline at end of file