mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 08:17:34 +00:00
Code Issues Projects Releases Wiki Activity

Updated creative inventory data

Browse Source 
some items will show wrong damage values due to a bug in meta handling on master
This commit is contained in:
Dylan K. Taylor 2017-06-02 11:00:36 +01:00
parent b6ae92e1a7
commit 2db6ea6b18
2 changed files with 576 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php
View File

@ -53,11 +53,10 @@ class ContainerSetContentPacket extends DataPacket{
for($s = 0; $s < $count and !$this->feof(); ++$s){
$this->slots[$s] = $this->getSlot();
}
if($this->windowid === self::SPECIAL_INVENTORY){
$count = $this->getUnsignedVarInt();
for($s = 0; $s < $count and !$this->feof(); ++$s){
$this->hotbar[$s] = $this->getVarInt();
}
$hotbarCount = $this->getUnsignedVarInt(); //MCPE always sends this, even when it's not a player inventory
for($s = 0; $s < $hotbarCount and !$this->feof(); ++$s){
$this->hotbar[$s] = $this->getVarInt();
}
}

610
src/pocketmine/resources/creativeitems.json
View File

@ -191,24 +191,42 @@
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 8,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 15,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 12,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 3,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 4,
@ -223,19 +241,7 @@
},
{
"id": 159,
"damage": 6,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 8,
"damage": 13,
"count": 1,
"nbt": ""
},
@ -247,7 +253,7 @@
},
{
"id": 159,
"damage": 10,
"damage": 3,
"count": 1,
"nbt": ""
},
@ -259,25 +265,19 @@
},
{
"id": 159,
"damage": 12,
"damage": 10,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 13,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 159,
"damage": 15,
"damage": 6,
"count": 1,
"nbt": ""
},
@ -913,7 +913,7 @@
},
{
"id": 19,
"damage": 0,
"damage": 1,
"count": 1,
"nbt": ""
},
@ -1025,6 +1025,12 @@
"count": 1,
"nbt": ""
},
{
"id": 395,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 96,
"damage": 0,
@ -1127,6 +1133,96 @@
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 8,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 15,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 12,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 4,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 5,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 13,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 9,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 3,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 11,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 10,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 355,
"damage": 6,
"count": 1,
"nbt": ""
},
{
"id": 47,
"damage": 0,
@ -1229,6 +1325,102 @@
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 8,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 15,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 12,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 4,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 5,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 13,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 9,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 3,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 11,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 10,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 218,
"damage": 6,
"count": 1,
"nbt": ""
},
{
"id": 145,
"damage": 0,
@ -1237,13 +1429,13 @@
},
{
"id": 145,
"damage": 4,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 145,
"damage": 8,
"damage": 2,
"count": 1,
"nbt": ""
},
@ -1709,6 +1901,102 @@
"count": 1,
"nbt": ""
},
{
"id": 220,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 228,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 227,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 235,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 232,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 234,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 221,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 224,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 225,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 233,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 229,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 223,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 231,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 219,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 222,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 226,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 295,
"damage": 0,
@ -1985,6 +2273,12 @@
"count": 1,
"nbt": ""
},
{
"id": 452,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 396,
"damage": 0,
@ -2303,6 +2597,12 @@
"count": 1,
"nbt": ""
},
{
"id": 383,
"damage": 29,
"count": 1,
"nbt": ""
},
{
"id": 383,
"damage": 23,
@ -2459,6 +2759,24 @@
"count": 1,
"nbt": ""
},
{
"id": 383,
"damage": 57,
"count": 1,
"nbt": ""
},
{
"id": 383,
"damage": 104,
"count": 1,
"nbt": ""
},
{
"id": 383,
"damage": 105,
"count": 1,
"nbt": ""
},
{
"id": 97,
"damage": 0,
@ -2789,6 +3107,12 @@
"count": 1,
"nbt": ""
},
{
"id": 450,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 69,
"damage": 0,
@ -3443,6 +3767,24 @@
"count": 1,
"nbt": "\n\u0000\u0000\t\u0004\u0000ench\n\u0001\u0000\u0000\u0000\u0002\u0002\u0000id\u0018\u0000\u0002\u0003\u0000lvl\u0003\u0000\u0000\u0000"
},
{
"id": 403,
"damage": 0,
"count": 1,
"nbt": "\n\u0000\u0000\t\u0004\u0000ench\n\u0001\u0000\u0000\u0000\u0002\u0002\u0000id\u0019\u0000\u0002\u0003\u0000lvl\u0001\u0000\u0000\u0000"
},
{
"id": 403,
"damage": 0,
"count": 1,
"nbt": "\n\u0000\u0000\t\u0004\u0000ench\n\u0001\u0000\u0000\u0000\u0002\u0002\u0000id\u0019\u0000\u0002\u0003\u0000lvl\u0002\u0000\u0000\u0000"
},
{
"id": 403,
"damage": 0,
"count": 1,
"nbt": "\n\u0000\u0000\t\u0004\u0000ench\n\u0001\u0000\u0000\u0000\u0002\u0002\u0000id\u001a\u0000\u0002\u0003\u0000lvl\u0001\u0000\u0000\u0000"
},
{
"id": 35,
"damage": 0,
@ -3731,6 +4073,198 @@
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 8,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 15,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 12,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 4,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 5,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 13,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 9,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 3,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 11,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 10,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 237,
"damage": 6,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 0,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 8,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 7,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 15,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 12,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 14,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 1,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 4,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 5,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 13,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 9,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 3,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 11,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 10,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 2,
"count": 1,
"nbt": ""
},
{
"id": 236,
"damage": 6,
"count": 1,
"nbt": ""
},
{
"id": 374,
"damage": 0,