From f687dff7022885f054d427eb3db8073ea70b186a Mon Sep 17 00:00:00 2001
From: Lucas <winx64b@hotmail.com>
Date: Sat, 4 Dec 2021 11:36:46 -0400
Subject: [PATCH] Add missing block entity NBT on 1.18 (#414)

---
 .../packets/BlockItemPackets1_18.java         | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
index e6f70777..a449b03b 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
@@ -22,6 +22,7 @@ import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.Protocol1_17_1T
 import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.data.BlockEntityIds;
 import com.viaversion.viaversion.api.data.ParticleMappings;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -131,11 +132,6 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                 handler(wrapper -> {
                     final int id = wrapper.read(Type.VAR_INT);
                     final CompoundTag tag = wrapper.read(Type.NBT);
-                    if (tag == null) {
-                        // Cancel nbt-less updates (screw open commandblocks)
-                        wrapper.cancel();
-                        return;
-                    }
 
                     final int mappedId = BlockEntityIds.mappedId(id);
                     if (mappedId == -1) {
@@ -143,9 +139,30 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                         return;
                     }
 
-                    handleSpawner(id, tag);
+                    final String identifier = protocol.getMappingData().blockEntities().get(id);
+                    if (identifier == null) {
+                        wrapper.cancel();
+                        return;
+                    }
+
+                    // The 1.18 server doesn't include the id and positions (x, y, z) in the NBT anymore
+                    // If those were the only fields on the block entity (e.g.: skull, bed), we'll receive a null NBT
+                    // We initialize one and add the missing fields, so it can be handled correctly down the line
+                    final CompoundTag newTag = tag == null ? new CompoundTag() : tag;
+                    final Position pos = wrapper.get(Type.POSITION1_14, 0);
+
+                    // The protocol converters downstream rely on this field, let's add it back
+                    newTag.put("id", new StringTag("minecraft:" + identifier));
+
+                    // Weird glitches happen with the 1.17 client and below if these fields are missing
+                    // Some examples are block entity models becoming invisible (e.g.: signs, banners)
+                    newTag.put("x", new IntTag(pos.x()));
+                    newTag.put("y", new IntTag(pos.y()));
+                    newTag.put("z", new IntTag(pos.z()));
+
+                    handleSpawner(id, newTag);
                     wrapper.write(Type.UNSIGNED_BYTE, (short) mappedId);
-                    wrapper.write(Type.NBT, tag);
+                    wrapper.write(Type.NBT, newTag);
                 });
             }
         });
@@ -199,7 +216,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                         tag.put("x", new IntTag((oldChunk.getX() << 4) + blockEntity.sectionX()));
                         tag.put("y", new IntTag(blockEntity.y()));
                         tag.put("z", new IntTag((oldChunk.getZ() << 4) + blockEntity.sectionZ()));
-                        tag.put("id", new StringTag(id));
+                        tag.put("id", new StringTag("minecraft:" + id));
                     }
 
                     final Chunk chunk = new BaseChunk(oldChunk.getX(), oldChunk.getZ(), true, false, mask,