Add getDescriptionId APIs

Author: wode490390

src/main/java/cn/nukkit/Player.java

@@ -3275,6 +3275,9 @@ public void onCompletion(Server server) {
                         return;
                     }
                     item = block.pick(pickRequestPacket.addUserData);
+                    if (item.isNull()) {
+                        return;
+                    }
 
                     if (pickRequestPacket.addUserData) {
                         BlockEntity blockEntity = this.getLevel().getBlockEntityIfLoaded(pickRequestPacket.x, pickRequestPacket.y, pickRequestPacket.z);
@@ -3298,8 +3301,8 @@ public void onCompletion(Server server) {
                         item = pickEvent.getItem();
 
                         GUIDataPickItemPacket pk = new GUIDataPickItemPacket();
-                        pk.itemName = item.getName();
-                        pk.itemEffectName = "";
+                        pk.itemName = item.getDescriptionId();
+                        pk.itemEffectName = item.getEffectDescriptionName();
 
                         boolean itemExists = false;
                         int itemSlot = -1;

src/main/java/cn/nukkit/block/Block.java

@@ -667,6 +667,14 @@ public BlockColor getColor() {
         return BlockColor.VOID_BLOCK_COLOR;
     }
 
+    public String getDescriptionId() {
+        return "tile." + getShortName() + ".name";
+    }
+
+    public String getEffectDescriptionName(Item item) {
+        return "";
+    }
+
     public abstract String getName();
 
     public abstract int getId();
@@ -1369,7 +1377,7 @@ public Item toItem(boolean addUserData) {
     }
 
     public Item pick(boolean addUserData) {
-        return toItem(true);
+        return toItem(addUserData);
     }
 
     public Item[] getSilkTouchResource() {
@@ -1416,7 +1424,7 @@ public boolean isChemistryFeature() {
         return false;
     }
 
-    //TODO: brewing stand, cauldron and composter
+    //TODO: stairs, brewing stand, cauldron and composter
     public AxisAlignedBB[] getCollisionShape() {
         AxisAlignedBB aabb = this.getCollisionBoundingBox();
         if (aabb == null) {

src/main/java/cn/nukkit/block/BlockAllium.java

@@ -14,4 +14,9 @@ public int getId() {
     public String getName() {
         return "Allium";
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.red_flower.allium.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAndesite.java

@@ -21,4 +21,9 @@ public String getName() {
     public BlockColor getColor() {
         return BlockColor.STONE_BLOCK_COLOR;
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.stone.andesite.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAndesitePolished.java

@@ -14,4 +14,9 @@ public int getId() {
     public String getName() {
         return "Polished Andesite";
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.stone.andesiteSmooth.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAnvil.java

@@ -166,4 +166,9 @@ public boolean isAnvil() {
     public int getDamagedBlockId() {
         return CHIPPED_ANVIL;
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.anvil.intact.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAnvilBroken.java

@@ -9,4 +9,9 @@ public class BlockAnvilBroken extends BlockAnvil {
     public int getId() {
         return DEPRECATED_ANVIL;
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.anvil.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAnvilChipped.java

@@ -19,4 +19,9 @@ public String getName() {
     public int getDamagedBlockId() {
         return DAMAGED_ANVIL;
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.anvil.slightlyDamaged.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAnvilDamaged.java

@@ -19,4 +19,9 @@ public String getName() {
     public int getDamagedBlockId() {
         return AIR;
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.anvil.veryDamaged.name";
+    }
 }

src/main/java/cn/nukkit/block/BlockAzureBluet.java

@@ -14,4 +14,9 @@ public int getId() {
     public String getName() {
         return "Azure Bluet";
     }
+
+    @Override
+    public String getDescriptionId() {
+        return "tile.red_flower.houstonia.name";
+    }
 }