mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-26 21:03:45 +00:00
Code Issues Projects Releases Wiki Activity

Added more typehints to Tile namespace

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-16 16:14:44 +01:00
parent 45b003ac2e
commit 0b1a9ba062
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/tile/Bed.php
View File

@ -49,7 +49,7 @@ class Bed extends Spawnable{
$this->onChanged(); $this->onChanged();
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->color = $this->namedtag->color; $nbt->color = $this->namedtag->color;
} }

10
src/pocketmine/tile/Chest.php
View File

@ -58,7 +58,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
} }
} }
public function close(){ public function close() : void{
if($this->closed === false){ if($this->closed === false){
$this->inventory->removeAllViewers(true); $this->inventory->removeAllViewers(true);
@ -74,7 +74,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
} }
} }
public function saveNBT(){ public function saveNBT() : void{
$this->namedtag->Items->setValue([]); $this->namedtag->Items->setValue([]);
for($index = 0; $index < $this->getSize(); ++$index){ for($index = 0; $index < $this->getSize(); ++$index){
$this->setItem($index, $this->inventory->getItem($index)); $this->setItem($index, $this->inventory->getItem($index));
@ -93,7 +93,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
* *
* @return int * @return int
*/ */
protected function getSlotIndex(int $index){ protected function getSlotIndex(int $index) : int{
foreach($this->namedtag->Items as $i => $slot){ foreach($this->namedtag->Items as $i => $slot){
if($slot->Slot->getValue() === $index){ if($slot->Slot->getValue() === $index){
return (int) $i; return (int) $i;
@ -200,7 +200,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
/** /**
* @return Chest|null * @return Chest|null
*/ */
public function getPair(){ public function getPair() : ?Chest{
if($this->isPaired()){ if($this->isPaired()){
$tile = $this->getLevel()->getTile(new Vector3($this->namedtag->pairx->getValue(), $this->y, $this->namedtag->pairz->getValue())); $tile = $this->getLevel()->getTile(new Vector3($this->namedtag->pairx->getValue(), $this->y, $this->namedtag->pairz->getValue()));
if($tile instanceof Chest){ if($tile instanceof Chest){
@ -253,7 +253,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
return true; return true;
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
if($this->isPaired()){ if($this->isPaired()){
$nbt->pairx = $this->namedtag->pairx; $nbt->pairx = $this->namedtag->pairx;
$nbt->pairz = $this->namedtag->pairz; $nbt->pairz = $this->namedtag->pairz;

2
src/pocketmine/tile/EnchantTable.php
View File

@ -39,7 +39,7 @@ class EnchantTable extends Spawnable implements Nameable{
return "Enchanting Table"; return "Enchanting Table";
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
if($this->hasName()){ if($this->hasName()){
$nbt->CustomName = $this->namedtag->CustomName; $nbt->CustomName = $this->namedtag->CustomName;
} }

2
src/pocketmine/tile/FlowerPot.php
View File

@ -85,7 +85,7 @@ class FlowerPot extends Spawnable{
return $this->getItem()->isNull(); return $this->getItem()->isNull();
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->item = $this->namedtag->item; $nbt->item = $this->namedtag->item;
$nbt->mData = $this->namedtag->mData; $nbt->mData = $this->namedtag->mData;
} }

6
src/pocketmine/tile/Furnace.php
View File

@ -87,7 +87,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
return "Furnace"; return "Furnace";
} }
public function close(){ public function close() : void{
if($this->closed === false){ if($this->closed === false){
$this->inventory->removeAllViewers(true); $this->inventory->removeAllViewers(true);
$this->inventory = null; $this->inventory = null;
@ -96,7 +96,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
} }
} }
public function saveNBT(){ public function saveNBT() : void{
$this->namedtag->Items->setValue([]); $this->namedtag->Items->setValue([]);
for($index = 0; $index < $this->getSize(); ++$index){ for($index = 0; $index < $this->getSize(); ++$index){
$this->setItem($index, $this->inventory->getItem($index)); $this->setItem($index, $this->inventory->getItem($index));
@ -273,7 +273,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
return $ret; return $ret;
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->BurnTime = $this->namedtag->BurnTime; $nbt->BurnTime = $this->namedtag->BurnTime;
$nbt->CookTime = $this->namedtag->CookTime; $nbt->CookTime = $this->namedtag->CookTime;

2
src/pocketmine/tile/ItemFrame.php
View File

@ -85,7 +85,7 @@ class ItemFrame extends Spawnable{
$this->onChanged(); $this->onChanged();
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->ItemDropChance = $this->namedtag->ItemDropChance; $nbt->ItemDropChance = $this->namedtag->ItemDropChance;
$nbt->ItemRotation = $this->namedtag->ItemRotation; $nbt->ItemRotation = $this->namedtag->ItemRotation;

4
src/pocketmine/tile/Sign.php
View File

@ -54,7 +54,7 @@ class Sign extends Spawnable{
parent::__construct($level, $nbt); parent::__construct($level, $nbt);
} }
public function saveNBT(){ public function saveNBT() : void{
parent::saveNBT(); parent::saveNBT();
$this->namedtag->Text = new StringTag("Text", implode("\n", $this->text)); $this->namedtag->Text = new StringTag("Text", implode("\n", $this->text));
@ -127,7 +127,7 @@ class Sign extends Spawnable{
return $this->text; return $this->text;
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->Text = new StringTag("Text", implode("\n", $this->text)); $nbt->Text = new StringTag("Text", implode("\n", $this->text));
} }

2
src/pocketmine/tile/Skull.php
View File

@ -57,7 +57,7 @@ class Skull extends Spawnable{
return $this->namedtag->SkullType->getValue(); return $this->namedtag->SkullType->getValue();
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt) : void{
$nbt->SkullType = $this->namedtag->SkullType; $nbt->SkullType = $this->namedtag->SkullType;
$nbt->Rot = $this->namedtag->Rot; $nbt->Rot = $this->namedtag->Rot;
} }

6
src/pocketmine/tile/Spawnable.php
View File

@ -43,7 +43,7 @@ abstract class Spawnable extends Tile{
return $pk; return $pk;
} }
public function spawnTo(Player $player){ public function spawnTo(Player $player) : bool{
if($this->closed){ if($this->closed){
return false; return false;
} }
@ -67,7 +67,7 @@ abstract class Spawnable extends Tile{
$this->level->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $pk); $this->level->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $pk);
} }
protected function onChanged(){ protected function onChanged() : void{
$this->spawnToAll(); $this->spawnToAll();
if($this->chunk !== null){ if($this->chunk !== null){
@ -96,7 +96,7 @@ abstract class Spawnable extends Tile{
* *
* @param CompoundTag $nbt * @param CompoundTag $nbt
*/ */
abstract public function addAdditionalSpawnData(CompoundTag $nbt); abstract public function addAdditionalSpawnData(CompoundTag $nbt) : void;
/** /**
* Called when a player updates a block entity's NBT data * Called when a player updates a block entity's NBT data

12
src/pocketmine/tile/Tile.php
View File

@ -97,7 +97,7 @@ abstract class Tile extends Position{
* *
* @return Tile|null * @return Tile|null
*/ */
public static function createTile($type, Level $level, CompoundTag $nbt, ...$args){ public static function createTile($type, Level $level, CompoundTag $nbt, ...$args) : ?Tile{
if(isset(self::$knownTiles[$type])){ if(isset(self::$knownTiles[$type])){
$class = self::$knownTiles[$type]; $class = self::$knownTiles[$type];
return new $class($level, $nbt, ...$args); return new $class($level, $nbt, ...$args);
@ -149,11 +149,11 @@ abstract class Tile extends Position{
$this->getLevel()->addTile($this); $this->getLevel()->addTile($this);
} }
public function getId(){ public function getId() : int{
return $this->id; return $this->id;
} }
public function saveNBT(){ public function saveNBT() : void{
$this->namedtag->id->setValue(static::getSaveId()); $this->namedtag->id->setValue(static::getSaveId());
$this->namedtag->x->setValue($this->x); $this->namedtag->x->setValue($this->x);
$this->namedtag->y->setValue($this->y); $this->namedtag->y->setValue($this->y);
@ -164,7 +164,7 @@ abstract class Tile extends Position{
return $this->namedtag; return $this->namedtag;
} }
public function getCleanedNBT(){ public function getCleanedNBT() : ?CompoundTag{
$this->saveNBT(); $this->saveNBT();
$tag = clone $this->namedtag; $tag = clone $this->namedtag;
unset($tag->x, $tag->y, $tag->z, $tag->id); unset($tag->x, $tag->y, $tag->z, $tag->id);
@ -236,7 +236,7 @@ abstract class Tile extends Position{
return false; return false;
} }
final public function scheduleUpdate(){ final public function scheduleUpdate() : void{
$this->level->updateTiles[$this->id] = $this; $this->level->updateTiles[$this->id] = $this;
} }
@ -248,7 +248,7 @@ abstract class Tile extends Position{
$this->close(); $this->close();
} }
public function close(){ public function close() : void{
if(!$this->closed){ if(!$this->closed){
$this->closed = true; $this->closed = true;
unset($this->level->updateTiles[$this->id]); unset($this->level->updateTiles[$this->id]);