Register a couple of simple missing redstone blocks

This commit is contained in:
Dylan K. Taylor 2018-12-05 19:11:54 +00:00
parent 281d8fd813
commit c53d3c28fb
3 changed files with 178 additions and 3 deletions

View File

@ -202,7 +202,7 @@ class BlockFactory{
self::registerBlock(new MonsterSpawner());
self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
self::registerBlock(new Chest());
//TODO: REDSTONE_WIRE
self::registerBlock(new RedstoneWire());
self::registerBlock(new DiamondOre());
self::registerBlock(new Diamond());
self::registerBlock(new CraftingTable());
@ -242,8 +242,8 @@ class BlockFactory{
//TODO: PORTAL
self::registerBlock(new LitPumpkin());
self::registerBlock(new Cake());
//TODO: REPEATER_BLOCK
//TODO: POWERED_REPEATER
self::registerBlock(new RedstoneRepeater());
self::registerBlock((new RedstoneRepeater())->setPowered());
//TODO: INVISIBLEBEDROCK
self::registerBlock(new Trapdoor());
//TODO: MONSTER_EGG

View File

@ -0,0 +1,114 @@
<?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\item\Item;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Bearing;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
class RedstoneRepeater extends Flowable{
/** @var int */
protected $itemId = Item::REPEATER;
/** @var bool */
protected $powered = false;
/** @var int */
protected $facing = Facing::NORTH;
/** @var int */
protected $delay = 1;
public function __construct(){
}
public function getId() : int{
return $this->powered ? Block::POWERED_REPEATER : Block::UNPOWERED_REPEATER;
}
public function readStateFromMeta(int $meta) : void{
$this->facing = Bearing::toFacing($meta & 0x03);
$this->delay = ($meta >> 2) + 1;
}
public function writeStateToMeta() : int{
return Bearing::fromFacing($this->facing) | (($this->delay - 1) << 2);
}
public function getStateBitmask() : int{
return 0b1111;
}
public function getName() : string{
return "Redstone Repeater";
}
protected function recalculateBoundingBox() : ?AxisAlignedBB{
return AxisAlignedBB::one()->trim(Facing::UP, 7 / 8);
}
public function isPowered() : bool{
return $this->powered;
}
/**
* @param bool $powered
*
* @return $this
*/
public function setPowered(bool $powered = true) : self{
$this->powered = $powered;
return $this;
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
if(!$blockReplace->getSide(Facing::DOWN)->isTransparent()){
if($player !== null){
$this->facing = Facing::opposite(Bearing::toFacing($player->getDirection()));
}
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
}
return false;
}
public function onActivate(Item $item, Player $player = null) : bool{
if(++$this->delay > 4){
$this->delay = 1;
}
$this->level->setBlock($this, $this);
return true;
}
public function onNearbyBlockChange() : void{
if($this->getSide(Facing::DOWN)->isTransparent()){
$this->level->useBreakOn($this);
}
}
//TODO: redstone functionality
}

View File

@ -0,0 +1,61 @@
<?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\item\Item;
class RedstoneWire extends Flowable{
/** @var int */
protected $id = Block::REDSTONE_WIRE;
/** @var int */
protected $itemId = Item::REDSTONE;
/** @var int */
protected $power = 0;
public function __construct(){
}
public function readStateFromMeta(int $meta) : void{
$this->power = $meta;
}
protected function writeStateToMeta() : int{
return $this->power;
}
public function getStateBitmask() : int{
return 0b1111;
}
public function getName() : string{
return "Redstone";
}
public function readStateFromWorld() : void{
parent::readStateFromWorld();
//TODO: check connections to nearby redstone components
}
}