mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Added Mob Heads

Browse Source 
Fixed duplicated items in JSON file
This commit is contained in:
Jorge González 2015-12-24 00:09:36 -06:00 committed by iksaku
parent 085ff56362
commit 012d46dfd8
8 changed files with 228 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -106,6 +106,7 @@ use pocketmine\tile\Chest;
use pocketmine\tile\EnchantTable;
use pocketmine\tile\Furnace;
use pocketmine\tile\Sign;
use pocketmine\tile\Skull;
use pocketmine\tile\Tile;
use pocketmine\updater\AutoUpdater;
use pocketmine\utils\Binary;
@ -2504,6 +2505,7 @@ class Server{
Tile::registerTile(Chest::class);
Tile::registerTile(Furnace::class);
Tile::registerTile(Sign::class);
Tile::registerTile(Skull::class);
Tile::registerTile(EnchantTable::class);
}

4
src/pocketmine/block/Block.php
View File

@ -218,7 +218,8 @@ class Block extends Position implements Metadatable{
const CARROT_BLOCK = 141;
const POTATO_BLOCK = 142;
const WOODEN_BUTTON = 143;
const MOB_HEAD_BLOCK = 144;
const MOB_HEAD = 144;
const SKULL = 144;
const ANVIL = 145;
const TRAPPED_CHEST = 146;
const WEIGHTED_PRESSURE_PLATE_LIGHT = 147;
@ -438,6 +439,7 @@ class Block extends Position implements Metadatable{
self::$list[self::CARROT_BLOCK] = Carrot::class;
self::$list[self::POTATO_BLOCK] = Potato::class;
self::$list[self::WOODEN_BUTTON] = WoodenButton::class;
self::$list[self::MOB_HEAD] = MobHead::class;
self::$list[self::ANVIL] = Anvil::class;
self::$list[self::TRAPPED_CHEST] = TrappedChest::class;
self::$list[self::WEIGHTED_PRESSURE_PLATE_LIGHT] = WeightedPressurePlateLight::class;

105
src/pocketmine/block/MobHead.php Normal file
View File

@ -0,0 +1,105 @@
<?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\block;
use pocketmine\item\Item;
use pocketmine\level\Level;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\StringTag;
use pocketmine\Player;
use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile;
class MobHead extends Solid{
protected $id = self::MOB_HEAD;
protected $type;
public function __construct($meta = 0){
$this->meta = $meta;
}
public function getHardness(){
return 1;
}
public function getName(){
return "Mob Head";
}
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($face !== 0){
$this->meta = $face;
if($face === 1){
$rot = floor(($player->yaw * 16 / 360) + 0.5) & 0x0F;
}else{
$rot = $face;
}
$this->getLevel()->setBlock($block, $this, true);
$nbt = new CompoundTag("", [
new StringTag("id", Tile::SKULL),
new ByteTag("SkullType", $item->getDamage()),
new ByteTag("Rot", $rot),
new IntTag("x", (int) $this->x),
new IntTag("y", (int) $this->y),
new IntTag("z", (int) $this->z)
]);
if($item->hasCustomName()){
$nbt->CustomName = new StringTag("CustomName", $item->getCustomName());
}
/** @var Spawnable $tile */
Tile::createTile("Skull", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
return true;
}
return false;
}
public function onUpdate($type){
parent::onUpdate($type);
$faces = [
1 => 0,
2 => 3,
3 => 2,
4 => 5,
5 => 4,
];
if($type === Level::BLOCK_UPDATE_NORMAL){
if($this->getSide($faces[$this->meta])->getId() === self::AIR){
$this->getLevel()->useBreakOn($this);
return Level::BLOCK_UPDATE_NORMAL;
}
}
return false;
}
public function getDrops(Item $item){
if($this->meta === 3){
return [];
}
return [
[Item::MOB_HEAD, $this->type, 1]
];
}
}

10
src/pocketmine/block/SignPost.php
View File

@ -53,19 +53,13 @@ class SignPost extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($face !== 0){
$faces = [
2 => 2,
3 => 3,
4 => 4,
5 => 5,
];
if(!isset($faces[$face])){
if($face === 1){
$this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
$this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true);
return true;
}else{
$this->meta = $faces[$face];
$this->meta = $face;
$this->getLevel()->setBlock($block, Block::get(Item::WALL_SIGN, $this->meta), true);
return true;

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

@ -241,6 +241,7 @@ class Item{
const WOODEN_BUTTON = 143;
const MOB_HEAD_BLOCK = 144;
const ANVIL = 145;
const SKULL_BLOCK = 144;
const TRAPPED_CHEST = 146;
const WEIGHTED_PRESSURE_PLATE_LIGHT = 147;
const WEIGHTED_PRESSURE_PLATE_HEAVY = 148;
@ -449,6 +450,8 @@ class Item{
const POISONOUS_POTATO = 394;
const GOLDEN_CARROT = 396;
const MOB_HEAD = 397;
const SKULL = 397;
const PUMPKIN_PIE = 400;
const ENCHANTED_BOOK = 403;
@ -608,6 +611,7 @@ class Item{
self::$list[self::POTATO] = Potato::class;
self::$list[self::BAKED_POTATO] = BakedPotato::class;
self::$list[self::GOLDEN_CARROT] = GoldenCarrot::class;
self::$list[self::MOB_HEAD] = MobHead::class;
self::$list[self::PUMPKIN_PIE] = PumpkinPie::class;
self::$list[self::NETHER_BRICK] = NetherBrick::class;
self::$list[self::QUARTZ] = Quartz::class;
@ -634,7 +638,7 @@ class Item{
self::clearCreativeItems();
$creativeItems = new Config(Server::getInstance()->getFilePath() . "src/pocketmine/resources/creativeitems.json", Config::JSON, []);
foreach($creativeItems->getAll() as $item){
self::addCreativeItem(Item::get($item["ID"], $item["Damage"]));
}

35
src/pocketmine/item/MobHead.php Normal file
View File

@ -0,0 +1,35 @@
<?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;
use pocketmine\block\Block;
class MobHead extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::SKULL_BLOCK);
parent::__construct(self::MOB_HEAD, $meta, $count, "Mob Head");
}
public function getMaxStackSize(){
return 1;
}
}

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

File diff suppressed because one or more lines are too long

75
src/pocketmine/tile/Skull.php Normal file
View File

@ -0,0 +1,75 @@
<?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\tile;
use pocketmine\level\format\FullChunk;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\StringTag;
class Skull extends Spawnable{
const TYPE_SKELETON = 0;
const TYPE_WITHER = 1;
const TYPE_ZOMBIE = 2;
const TYPE_HUMAN = 3;
const TYPE_CREEPER = 4;
public function __construct(FullChunk $chunk, CompoundTag $nbt){
if(!isset($nbt->SkullType)){
$nbt->SkullType = new ByteTag("SkullType", 0);
}
if(!isset($nbt->Rot)){
$nbt->Rot = new ByteTag("Rot", 0);
}
parent::__construct($chunk, $nbt);
}
public function setType($type){
if($type >= 0 && $type <= 4){
$this->namedtag->SkullType = new ByteTag("SkullType", $type);
$this->spawnToAll();
if($this->chunk){
$this->chunk->setChanged();
$this->level->clearChunkCache($this->chunk->getX(), $this->chunk->getZ());
}
return true;
}
return false;
}
public function getType(){
return $this->namedtag["SkullType"];
}
public function getSpawnCompound(){
return new CompoundTag("", [
new StringTag("id", Tile::SKULL),
$this->namedtag->SkullType,
$this->namedtag->Rot,
new IntTag("x", (int) $this->x),
new IntTag("y", (int) $this->y),
new IntTag("z", (int) $this->z)
]);
}
}