From f60e31ac78c423e125f3b3dd09a900a68e23a8af Mon Sep 17 00:00:00 2001
From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com>
Date: Thu, 9 May 2024 20:37:20 +0200
Subject: [PATCH] Add block entity ids in 1.20.3->.5 conversion (#3837)

---
 .../rewriter/BlockItemPacketRewriter1_20_5.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 86598b601..253d5cb58 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -1340,6 +1340,12 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         }
     }
 
+    private void addBlockEntityId(final CompoundTag tag, final String id) {
+        if (!tag.contains("id")) {
+            tag.putString("id", id);
+        }
+    }
+
     private void updateBlockEntityTag(final UserConnection connection, @Nullable final StructuredDataContainer data, final CompoundTag tag) {
         if (tag == null) {
             return;
@@ -1354,6 +1360,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             final ListTag<CompoundTag> beesTag = tag.getListTag("Bees", CompoundTag.class);
             if (beesTag != null) {
                 updateBees(data, beesTag);
+                addBlockEntityId(tag, "beehive");
             }
 
             final ListTag<StringTag> sherdsTag = tag.getListTag("sherds", StringTag.class);
@@ -1369,11 +1376,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                     toMappedItemId(rightSherd),
                     toMappedItemId(frontSherd)
                 ));
+                addBlockEntityId(tag, "decorated_pot");
             }
 
             final StringTag noteBlockSoundTag = tag.getStringTag("note_block_sound");
             if (noteBlockSoundTag != null) {
                 data.set(StructuredDataKey.NOTE_BLOCK_SOUND, noteBlockSoundTag.getValue());
+                addBlockEntityId(tag, "player_head");
             }
 
             final StringTag lootTableTag = tag.getStringTag("LootTable");
@@ -1424,6 +1433,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             }).filter(Objects::nonNull).toArray(BannerPatternLayer[]::new);
             tag.remove("Patterns");
             tag.put("patterns", patternsTag);
+            addBlockEntityId(tag, "banner");
 
             if (data != null) {
                 data.set(StructuredDataKey.BANNER_PATTERNS, layers);