Fix CloudburstMC#1032 Prismarine Crystals rendering incorrectly in item frames

Author: Polyana-Fontes

src/main/java/cn/nukkit/blockentity/BlockEntityItemFrame.java

@@ -7,9 +7,7 @@
 import cn.nukkit.block.BlockID;
 import cn.nukkit.entity.item.EntityItem;
 import cn.nukkit.event.block.ItemFrameDropItemEvent;
-import cn.nukkit.item.Item;
-import cn.nukkit.item.ItemBlock;
-import cn.nukkit.item.MinecraftItemID;
+import cn.nukkit.item.*;
 import cn.nukkit.level.Level;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.NBTIO;
@@ -102,16 +100,28 @@ public CompoundTag getSpawnCompound() {
         if (!this.namedTag.contains("Item")) {
             this.setItem(new ItemBlock(Block.get(BlockID.AIR)), false);
         }
-        CompoundTag item = namedTag.getCompound("Item").copy();
-        item.setName("Item");
+        Item item = getItem();
         CompoundTag tag = new CompoundTag()
                 .putString("id", BlockEntity.ITEM_FRAME)
                 .putInt("x", (int) this.x)
                 .putInt("y", (int) this.y)
                 .putInt("z", (int) this.z);
 
-        if (item.getShort("id") != Item.AIR) {
-            tag.putCompound("Item", item)
+        if (!item.isNull()) {
+            CompoundTag itemTag = NBTIO.putItemHelper(item);
+            int networkFullId = item.getNetworkFullId();
+            int networkDamage = RuntimeItems.hasData(networkFullId)? RuntimeItems.getData(networkFullId)
+                    : item.hasMeta() && ! (item instanceof ItemDurable) ? item.getDamage()
+                    : 0 ;
+            String namespacedId = RuntimeItems.getRuntimeMapping().getNamespacedIdByNetworkId(
+                    RuntimeItems.getNetworkId(networkFullId)
+            );
+            if (namespacedId != null) {
+                itemTag.remove("id");
+                itemTag.putShort("Damage", networkDamage);
+                itemTag.putString("Name", namespacedId);
+            }
+            tag.putCompound("Item", itemTag)
                     .putByte("ItemRotation", this.getItemRotation());
         }
         return tag;

src/main/java/cn/nukkit/item/Item.java

@@ -1216,8 +1216,9 @@ public final int getNetworkId() throws UnknownNetworkIdException {
     @PowerNukkitOnly
     @Since("1.3.2.0-PN")
     public String getNamespaceId() {
-        return RuntimeItems.getRuntimeMapping().getNamespacedIdByNetworkId(
-                RuntimeItems.getRuntimeMapping().getNetworkFullId(this)
+        RuntimeItemMapping runtimeMapping = RuntimeItems.getRuntimeMapping();
+        return runtimeMapping.getNamespacedIdByNetworkId(
+                RuntimeItems.getNetworkId(runtimeMapping.getNetworkFullId(this))
         );
     }