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

Implemented concrete powder

Browse Source 
this is a little buggy with water updating due to a hack for liquids to fix a CPU leak (210bdc2436269ca4d634aa791b1054e594769baa), but everything works fine when a block nearby gets updated.
This commit is contained in:
Dylan K. Taylor 2017-09-26 18:56:43 +01:00
parent 827ee5d4f9
commit c79a5509f6
4 changed files with 117 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/block/BlockFactory.php
View File

@ -302,7 +302,7 @@ class BlockFactory{
self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
self::registerBlock(new Concrete());
//TODO: CONCRETEPOWDER
self::registerBlock(new ConcretePowder());
//TODO: CHORUS_PLANT
self::registerBlock(new StainedGlass());

74
src/pocketmine/block/ConcretePowder.php Normal file
View File

@ -0,0 +1,74 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\utils\ColorBlockMetaHelper;
use pocketmine\level\Level;
use pocketmine\level\Position;
class ConcretePowder extends Fallable{
protected $id = self::CONCRETE_POWDER;
public function __construct(int $meta = 0){
$this->meta = $meta;
}
public function getName() : string{
return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Concrete Powder";
}
public function getHardness() : float{
return 0.5;
}
public function onUpdate(int $type){
if($type === Level::BLOCK_UPDATE_NORMAL and ($block = $this->checkAdjacentWater()) !== null){
$this->level->setBlock($this, $block);
return $type;
}
return parent::onUpdate($type);
}
/**
* @return null|Block
*/
public function tickFalling() : ?Block{
return $this->checkAdjacentWater();
}
/**
* @return null|Block
*/
private function checkAdjacentWater(){
for($i = 1; $i < 6; ++$i){ //Do not check underneath
if($this->getSide($i) instanceof Water){
return Block::get(Block::CONCRETE, $this->meta);
}
}
return null;
}
}

9
src/pocketmine/block/Fallable.php
View File

@ -39,7 +39,7 @@ abstract class Fallable extends Solid{
if($type === Level::BLOCK_UPDATE_NORMAL){
$down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === self::AIR or ($down instanceof Liquid)){
$this->level->setBlock($this, BlockFactory::get(Block::AIR), true, true);
$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
$fall = Entity::createEntity("FallingSand", $this->getLevel(), new CompoundTag("", [
new ListTag("Pos", [
new DoubleTag("", $this->x + 0.5),
@ -63,4 +63,11 @@ abstract class Fallable extends Solid{
}
}
}
/**
* @return null|Block
*/
public function tickFalling() : ?Block{
return null;
}
}

51
src/pocketmine/entity/FallingSand.php
View File

@ -23,10 +23,12 @@ declare(strict_types=1);
namespace pocketmine\entity;
use pocketmine\block\BlockFactory;
use pocketmine\block\Block;
use pocketmine\block\Fallable;
use pocketmine\event\entity\EntityBlockChangeEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\ItemFactory;
use pocketmine\level\Position;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\IntTag;
@ -43,30 +45,37 @@ class FallingSand extends Entity{
protected $gravity = 0.04;
protected $drag = 0.02;
protected $blockId = 0;
protected $damage;
/** @var Block */
protected $block;
public $canCollide = false;
protected function initEntity(){
parent::initEntity();
$blockId = 0;
$damage = 0;
if(isset($this->namedtag->TileID)){
$this->blockId = $this->namedtag["TileID"];
$blockId = (int) $this->namedtag["TileID"];
}elseif(isset($this->namedtag->Tile)){
$this->blockId = $this->namedtag["Tile"];
$this->namedtag["TileID"] = new IntTag("TileID", $this->blockId);
$blockId = (int) $this->namedtag["Tile"];
$this->namedtag["TileID"] = new IntTag("TileID", $blockId);
}
if(isset($this->namedtag->Data)){
$this->damage = $this->namedtag["Data"];
$damage = (int) $this->namedtag["Data"];
}
if($this->blockId === 0){
if($blockId === 0){
$this->close();
return;
}
$this->setDataProperty(self::DATA_VARIANT, self::DATA_TYPE_INT, $this->getBlock() | ($this->getDamage() << 8));
$this->block = Block::get($blockId, $damage);
$this->setDataProperty(self::DATA_VARIANT, self::DATA_TYPE_INT, $this->block->getId() | ($this->block->getDamage() << 8));
}
public function canCollideWith(Entity $entity) : bool{
@ -87,16 +96,24 @@ class FallingSand extends Entity{
$hasUpdate = parent::entityBaseTick($tickDiff);
if($this->isAlive()){
$pos = (new Vector3($this->x - 0.5, $this->y, $this->z - 0.5))->floor();
$pos = Position::fromObject($this->add(-0.5, $this->height, -0.5)->floor(), $this->getLevel());
if($this->onGround){
$this->block->position($pos);
$blockTarget = null;
if($this->block instanceof Fallable){
$blockTarget = $this->block->tickFalling();
}
if($this->onGround or $blockTarget !== null){
$this->kill();
$block = $this->level->getBlock($pos);
if($block->getId() > 0 and $block->isTransparent() and !$block->canBeReplaced()){
//FIXME: anvils are supposed to destroy torches
$this->getLevel()->dropItem($this, ItemFactory::get($this->getBlock(), $this->getDamage(), 1));
$this->getLevel()->dropItem($this, ItemFactory::get($this->getBlock(), $this->getDamage()));
}else{
$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, BlockFactory::get($this->getBlock(), $this->getDamage())));
$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, $blockTarget ?? $this->block));
if(!$ev->isCancelled()){
$this->getLevel()->setBlock($pos, $ev->getTo(), true);
}
@ -109,16 +126,16 @@ class FallingSand extends Entity{
}
public function getBlock(){
return $this->blockId;
return $this->block->getId();
}
public function getDamage(){
return $this->damage;
return $this->block->getDamage();
}
public function saveNBT(){
$this->namedtag->TileID = new IntTag("TileID", $this->blockId);
$this->namedtag->Data = new ByteTag("Data", $this->damage);
$this->namedtag->TileID = new IntTag("TileID", $this->block->getId());
$this->namedtag->Data = new ByteTag("Data", $this->block->getDamage());
}
public function spawnTo(Player $player){