Merge pull request CloudburstMC#1081 from PowerNukkit/v1.4/item_frame/fix

Fix Prismarine Crystals rendering incorrectly in item frames and ink_sac in recipes

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,26 @@ 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 = (networkFullId & 0x1) == 0x1? 0 : item.getDamage();
+            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))
         );
     }
 

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

@@ -1,6 +1,7 @@
 package cn.nukkit.item;
 
 import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
 import cn.nukkit.api.Since;
 import cn.nukkit.utils.BinaryStream;
 import com.google.gson.Gson;
@@ -23,6 +24,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static com.google.common.base.Verify.verify;
+
 @Since("1.3.2.0-PN")
 @UtilityClass
 @Log4j2
@@ -59,8 +62,14 @@ public class RuntimeItems {
             if (entry.oldId != null) {
                 boolean hasData = entry.oldData != null;
                 int fullId = getFullId(entry.oldId, hasData ? entry.oldData : 0);
-                legacyNetworkMap.put(fullId, (entry.id << 1) | (hasData ? 1 : 0));
-                networkLegacyMap.put(entry.id, fullId | (hasData ? 1 : 0));
+                if (entry.deprecated != Boolean.TRUE) {
+                    verify(legacyNetworkMap.put(fullId, (entry.id << 1) | (hasData ? 1 : 0)) == 0,
+                            "Conflict while registering an item runtime id!"
+                    );
+                }
+                verify(networkLegacyMap.put(entry.id, fullId | (hasData ? 1 : 0)) == 0,
+                        "Conflict while registering an item runtime id!"
+                );
             }
         }
 
@@ -106,5 +115,8 @@ static class Entry {
         int id;
         Integer oldId;
         Integer oldData;
+        @PowerNukkitOnly
+        @Since("1.4.0.0-PN")
+        Boolean deprecated;
     }
 }

src/main/java/cn/nukkit/utils/BinaryStream.java

@@ -1,13 +1,15 @@
 package cn.nukkit.utils;
 
-import cn.nukkit.block.Block;
 import cn.nukkit.api.Since;
+import cn.nukkit.block.Block;
 import cn.nukkit.entity.Attribute;
 import cn.nukkit.entity.data.Skin;
-import cn.nukkit.item.*;
+import cn.nukkit.item.Item;
+import cn.nukkit.item.ItemDurable;
+import cn.nukkit.item.ItemID;
+import cn.nukkit.item.RuntimeItems;
 import cn.nukkit.level.GameRule;
 import cn.nukkit.level.GameRules;
-import cn.nukkit.level.GlobalBlockPalette;
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.math.BlockVector3;
 import cn.nukkit.math.Vector3f;
@@ -24,7 +26,6 @@
 import io.netty.util.internal.EmptyArrays;
 
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.lang.reflect.Array;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;

src/main/resources/runtime_item_ids.json

@@ -4654,22 +4654,26 @@
   {
     "name": "minecraft:boat",
     "id": 611,
-    "oldId": 333
+    "oldId": 333,
+    "deprecated": true
   },
   {
     "name": "minecraft:dye",
     "id": 612,
-    "oldId": 351
+    "oldId": 351,
+    "deprecated": true
   },
   {
     "name": "minecraft:banner_pattern",
     "id": 613,
-    "oldId": 434
+    "oldId": 434,
+    "deprecated": true
   },
   {
     "name": "minecraft:spawn_egg",
     "id": 614,
-    "oldId": 383
+    "oldId": 383,
+    "deprecated": true
   },
   {
     "name": "minecraft:end_crystal",