mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.0

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-12-29 11:36:14 +00:00
parent b082bec150 efc6d429f6
commit 850afed2c6
9 changed files with 219 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/item/Item.php
View File

@ -212,6 +212,9 @@ class Item implements ItemIds, \JsonSerializable{
self::$list[self::BEETROOT] = Beetroot::class;
self::$list[self::BEETROOT_SEEDS] = BeetrootSeeds::class;
self::$list[self::BEETROOT_SOUP] = BeetrootSoup::class;
self::$list[self::PRISMARINE_CRYSTALS] = PrismarineCrystals::class;
self::$list[self::PRISMARINE_SHARD] = PrismarineShard::class;
self::$list[self::NETHER_STAR] = NetherStar::class;
for($i = 0; $i < 256; ++$i){
if(Block::$list[$i] !== null){
@ -799,7 +802,7 @@ class Item implements ItemIds, \JsonSerializable{
$tag->tag = clone $this->getNamedTag();
$tag->tag->setName("tag");
}
if($slot !== -1){
$tag->Slot = new ByteTag("Slot", $slot);
}

8
src/pocketmine/item/ItemIds.php
View File

@ -167,7 +167,7 @@ interface ItemIds extends BlockIds{
const GOLDEN_CARROT = 396;
const MOB_HEAD = 397, SKULL = 397;
const CARROT_ON_A_STICK = 398;
const NETHER_STAR = 399;
const PUMPKIN_PIE = 400;
const ENCHANTED_BOOK = 403;
@ -176,7 +176,9 @@ interface ItemIds extends BlockIds{
const QUARTZ = 406;
const NETHER_QUARTZ = 406;
const MINECART_WITH_TNT = 407;
const MINECART_WITH_HOPPER = 408, HOPPER = 410;
const MINECART_WITH_HOPPER = 408;
const PRISMARINE_SHARD = 409;
const HOPPER = 410;
const RAW_RABBIT = 411;
const COOKED_RABBIT = 412;
const RABBIT_STEW = 413;
@ -188,7 +190,7 @@ interface ItemIds extends BlockIds{
const DIAMOND_HORSE_ARMOR = 419;
const LEAD = 420, LEASH = 420;
const NAMETAG = 421;
const PRISMARINE_CRYSTALS = 422;
const RAW_MUTTON = 423;
const COOKED_MUTTON = 424;

29
src/pocketmine/item/NetherStar.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author Pocketmine Team
* @link http://www.pocketmine.net
*
*
*/
namespace pocketmine\item;
class NetherStar extends Item{
public function __construct($meta = 0, $count = 1){
parent::__construct(self::NETHER_STAR, $meta, $count, "Nether Star");
}
}

29
src/pocketmine/item/PrismarineCrystals.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author Pocketmine Team
* @link http://www.pocketmine.net
*
*
*/
namespace pocketmine\item;
class PrismarineCrystals extends Item{
public function __construct($meta = 0, $count = 1){
parent::__construct(self::PRISMARINE_CRYSTALS, $meta, $count, "Prismarine Crystals");
}
}

29
src/pocketmine/item/PrismarineShard.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author Pocketmine Team
* @link http://www.pocketmine.net
*
*
*/
namespace pocketmine\item;
class PrismarineShard extends Item{
public function __construct($meta = 0, $count = 1){
parent::__construct(self::PRISMARINE_SHARD, $meta, $count, "Prismarine Shard");
}
}