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

and more typehints

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-07-14 10:56:51 +01:00
parent b9355387da
commit c3b8be3f60
119 changed files with 598 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/CrashDump.php
View File

@ -38,7 +38,9 @@ class CrashDump{
private $fp;
private $time;
private $data = [];
private $encodedData = null;
/** @var string */
private $encodedData = "";
/** @var string */
private $path;
public function __construct(Server $server){
@ -64,7 +66,7 @@ class CrashDump{
$this->encodeData();
}
public function getPath(){
public function getPath() : string{
return $this->path;
}
@ -72,7 +74,7 @@ class CrashDump{
return $this->encodedData;
}
public function getData(){
public function getData() : array{
return $this->data;
}

14
src/pocketmine/IPlayer.php
View File

@ -30,7 +30,7 @@ interface IPlayer extends ServerOperator{
/**
* @return bool
*/
public function isOnline();
public function isOnline() : bool;
/**
* @return string
@ -40,22 +40,22 @@ interface IPlayer extends ServerOperator{
/**
* @return bool
*/
public function isBanned();
public function isBanned() : bool;
/**
* @param bool $banned
*/
public function setBanned($banned);
public function setBanned(bool $banned);
/**
* @return bool
*/
public function isWhitelisted();
public function isWhitelisted() : bool;
/**
* @param bool $value
*/
public function setWhitelisted($value);
public function setWhitelisted(bool $value);
/**
* @return Player|null
@ -73,8 +73,8 @@ interface IPlayer extends ServerOperator{
public function getLastPlayed();
/**
* @return mixed
* @return bool
*/
public function hasPlayedBefore();
public function hasPlayedBefore() : bool;
}

4
src/pocketmine/MemoryManager.php
View File

@ -116,11 +116,11 @@ class MemoryManager{
gc_enable();
}
public function isLowMemory(){
public function isLowMemory() : bool{
return $this->lowMemory;
}
public function canUseChunkCache(){
public function canUseChunkCache() : bool{
return !($this->lowMemory and $this->chunkTrigger);
}

16
src/pocketmine/OfflinePlayer.php
View File

@ -48,7 +48,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
}
}
public function isOnline(){
public function isOnline() : bool{
return $this->getPlayer() !== null;
}
@ -60,11 +60,11 @@ class OfflinePlayer implements IPlayer, Metadatable{
return $this->server;
}
public function isOp(){
public function isOp() : bool{
return $this->server->isOp(strtolower($this->getName()));
}
public function setOp($value){
public function setOp(bool $value){
if($value === $this->isOp()){
return;
}
@ -76,11 +76,11 @@ class OfflinePlayer implements IPlayer, Metadatable{
}
}
public function isBanned(){
public function isBanned() : bool{
return $this->server->getNameBans()->isBanned(strtolower($this->getName()));
}
public function setBanned($value){
public function setBanned(bool $value){
if($value === true){
$this->server->getNameBans()->addBan($this->getName(), null, null, null);
}else{
@ -88,11 +88,11 @@ class OfflinePlayer implements IPlayer, Metadatable{
}
}
public function isWhitelisted(){
public function isWhitelisted() : bool{
return $this->server->isWhitelisted(strtolower($this->getName()));
}
public function setWhitelisted($value){
public function setWhitelisted(bool $value){
if($value === true){
$this->server->addWhitelist(strtolower($this->getName()));
}else{
@ -112,7 +112,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
return $this->namedtag instanceof CompoundTag ? $this->namedtag["lastPlayed"] : null;
}
public function hasPlayedBefore(){
public function hasPlayedBefore() : bool{
return $this->namedtag instanceof CompoundTag;
}

70
src/pocketmine/Player.php
View File

@ -77,7 +77,6 @@ use pocketmine\inventory\BigShapedRecipe;
use pocketmine\inventory\BigShapelessRecipe;
use pocketmine\inventory\FurnaceInventory;
use pocketmine\inventory\Inventory;
use pocketmine\inventory\InventoryHolder;
use pocketmine\inventory\PlayerInventory;
use pocketmine\inventory\ShapedRecipe;
use pocketmine\inventory\ShapelessRecipe;
@ -196,6 +195,7 @@ use pocketmine\network\mcpe\protocol\UseItemPacket;
use pocketmine\network\SourceInterface;
use pocketmine\permission\PermissibleBase;
use pocketmine\permission\PermissionAttachment;
use pocketmine\permission\PermissionAttachmentInfo;
use pocketmine\plugin\Plugin;
use pocketmine\resourcepacks\ResourcePack;
use pocketmine\tile\ItemFrame;
@ -283,7 +283,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
protected $sleeping = null;
protected $clientID = null;
private $loaderId = null;
private $loaderId = 0;
protected $stepHeight = 0.6;
@ -350,11 +350,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
return $this->clientSecret;
}
public function isBanned(){
public function isBanned() : bool{
return $this->server->getNameBans()->isBanned($this->iusername);
}
public function setBanned($value){
public function setBanned(bool $value){
if($value === true){
$this->server->getNameBans()->addBan($this->getName(), null, null, null);
$this->kick("You have been banned");
@ -363,11 +363,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
}
}
public function isWhitelisted(){
public function isWhitelisted() : bool{
return $this->server->isWhitelisted($this->iusername);
}
public function setWhitelisted($value){
public function setWhitelisted(bool $value){
if($value === true){
$this->server->addWhitelist($this->iusername);
}else{
@ -387,12 +387,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
return $this->namedtag instanceof CompoundTag ? $this->namedtag["lastPlayed"] : null;
}
public function hasPlayedBefore(){
public function hasPlayedBefore() : bool{
return $this->playedBefore;
}
public function setAllowFlight($value){
$this->allowFlight = (bool) $value;
public function setAllowFlight(bool $value){
$this->allowFlight = $value;
$this->sendSettings();
}
@ -453,7 +453,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @return bool
*/
public function getRemoveFormat(){
public function getRemoveFormat() : bool{
return $this->removeFormat;
}
@ -480,7 +480,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function canSee(Player $player){
public function canSee(Player $player) : bool{
return !isset($this->hiddenPlayers[$player->getRawUniqueId()]);
}
@ -539,21 +539,21 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @return bool
*/
public function isOnline(){
public function isOnline() : bool{
return $this->connected === true and $this->loggedIn === true;
}
/**
* @return bool
*/
public function isOp(){
public function isOp() : bool{
return $this->server->isOp($this->getName());
}
/**
* @param bool $value
*/
public function setOp($value){
public function setOp(bool $value){
if($value === $this->isOp()){
return;
}
@ -572,7 +572,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function isPermissionSet($name){
public function isPermissionSet($name) : bool{
return $this->perm->isPermissionSet($name);
}
@ -583,7 +583,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @throws \InvalidStateException if the player is closed
*/
public function hasPermission($name){
public function hasPermission($name) : bool{
if($this->closed){
throw new \InvalidStateException("Trying to get permissions of closed player");
}
@ -629,9 +629,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
}
/**
* @return permission\PermissionAttachmentInfo[]
* @return PermissionAttachmentInfo[]
*/
public function getEffectivePermissions(){
public function getEffectivePermissions() : array{
return $this->perm->getEffectivePermissions();
}
@ -698,7 +698,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function hasAchievement($achievementId){
public function hasAchievement(string $achievementId) : bool{
if(!isset(Achievement::$list[$achievementId])){
return false;
}
@ -709,7 +709,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @return bool
*/
public function isConnected(){
public function isConnected() : bool{
return $this->connected === true;
}
@ -718,7 +718,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return string
*/
public function getDisplayName(){
public function getDisplayName() : string{
return $this->displayName;
}
@ -744,14 +744,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return string
*/
public function getAddress(){
public function getAddress() : string{
return $this->ip;
}
/**
* @return int
*/
public function getPort(){
public function getPort() : int{
return $this->port;
}
@ -762,7 +762,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @return bool
*/
public function isSleeping(){
public function isSleeping() : bool{
return $this->sleeping !== null;
}
@ -1035,7 +1035,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function batchDataPacket(DataPacket $packet){
public function batchDataPacket(DataPacket $packet) : bool{
if($this->connected === false){
return false;
}
@ -1133,9 +1133,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @param Vector3 $pos
*
* @return boolean
* @return bool
*/
public function sleepOn(Vector3 $pos){
public function sleepOn(Vector3 $pos) : bool{
if(!$this->isOnline()){
return false;
}
@ -1209,7 +1209,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function awardAchievement($achievementId){
public function awardAchievement(string $achievementId) : bool{
if(isset(Achievement::$list[$achievementId]) and !$this->hasAchievement($achievementId)){
foreach(Achievement::$list[$achievementId]["requires"] as $requirementId){
if(!$this->hasAchievement($requirementId)){
@ -1233,7 +1233,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
/**
* @return int
*/
public function getGamemode(){
public function getGamemode() : int{
return $this->gamemode;
}
@ -1265,7 +1265,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
*
* @return bool
*/
public function setGamemode(int $gm, bool $client = false){
public function setGamemode(int $gm, bool $client = false) : bool{
if($gm < 0 or $gm > 3 or $this->gamemode === $gm){
return false;
}
@ -1402,7 +1402,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
return $this->isCreative();
}
public function getDrops(){
public function getDrops() : array{
if(!$this->isCreative()){
return parent::getDrops();
}
@ -3477,11 +3477,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
* Kicks a player from the server
*
* @param string $reason
* @param bool $isAdmin
* @param bool $isAdmin
*
* @return bool
*/
public function kick($reason = "", $isAdmin = true){
public function kick($reason = "", bool $isAdmin = true) : bool{
$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $this->getLeaveMessage()));
if(!$ev->isCancelled()){
if($isAdmin){
@ -4137,11 +4137,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer, Netwo
}
public function getLoaderId(){
public function getLoaderId() : int{
return $this->loaderId;
}
public function isLoaderActive(){
public function isLoaderActive() : bool{
return $this->isConnected();
}
}

17
src/pocketmine/Server.php
View File

@ -1042,12 +1042,12 @@ class Server{
*
* @return bool
*/
public function generateLevel(string $name, $seed = null, $generator = null, array $options = []){
public function generateLevel(string $name, int $seed = null, $generator = null, array $options = []) : bool{
if(trim($name) === "" or $this->isLevelGenerated($name)){
return false;
}
$seed = $seed === null ? Binary::readInt(random_bytes(4)) : (int) $seed;
$seed = $seed ?? Binary::readInt(random_bytes(4));
if(!isset($options["preset"])){
$options["preset"] = $this->getConfigString("generator-settings", "");
@ -1327,7 +1327,7 @@ class Server{
*
* @return bool
*/
public function isWhitelisted(string $name){
public function isWhitelisted(string $name) : bool{
return !$this->hasWhitelist() or $this->operators->exists($name, true) or $this->whitelist->exists($name, true);
}
@ -1336,7 +1336,7 @@ class Server{
*
* @return bool
*/
public function isOp(string $name){
public function isOp(string $name) : bool{
return $this->operators->exists($name, true);
}
@ -1764,7 +1764,7 @@ class Server{
*
* @return int
*/
public function broadcastTitle(string $title, string $subtitle = "", int $fadeIn = -1, int $stay = -1, int $fadeOut = -1, $recipients = null){
public function broadcastTitle(string $title, string $subtitle = "", int $fadeIn = -1, int $stay = -1, int $fadeOut = -1, array $recipients = null) : int{
if(!is_array($recipients)){
/** @var Player[] $recipients */
$recipients = [];
@ -1933,7 +1933,7 @@ class Server{
*
* @return bool
*/
public function dispatchCommand(CommandSender $sender, string $commandLine){
public function dispatchCommand(CommandSender $sender, string $commandLine) : bool{
if($this->commandMap->dispatch($sender, $commandLine)){
return true;
}
@ -2056,6 +2056,9 @@ class Server{
}
/**
* @return QueryRegenerateEvent
*/
public function getQueryInformation(){
return $this->queryRegenerateTask;
}
@ -2430,7 +2433,7 @@ class Server{
/**
* Tries to execute a server tick
*/
private function tick(){
private function tick() : bool{
$tickTime = microtime(true);
if(($tickTime - $this->nextTick) < -0.025){ //Allow half a tick of diff
return false;

2
src/pocketmine/ThreadManager.php
View File

@ -60,7 +60,7 @@ class ThreadManager extends \Volatile{
/**
* @return Worker[]|Thread[]
*/
public function getAll(){
public function getAll() : array{
$array = [];
foreach($this as $key => $thread){
$array[$key] = $thread;

4
src/pocketmine/command/Command.php
View File

@ -100,7 +100,7 @@ abstract class Command{
*
* @return array
*/
public function generateCustomCommandData(Player $player){
public function generateCustomCommandData(Player $player) : array{
//TODO: fix command permission filtering on join
/*if(!$this->testPermissionSilent($player)){
return null;
@ -202,7 +202,7 @@ abstract class Command{
return $this->label;
}
public function setLabel(string $name){
public function setLabel(string $name) : bool{
$this->nextLabel = $name;
if(!$this->isRegistered()){
if($this->timings instanceof TimingsHandler){

2
src/pocketmine/command/CommandMap.php
View File

@ -47,7 +47,7 @@ interface CommandMap{
*
* @return bool
*/
public function dispatch(CommandSender $sender, $cmdLine);
public function dispatch(CommandSender $sender, string $cmdLine) : bool;
/**
* @return void

13
src/pocketmine/command/ConsoleCommandSender.php
View File

@ -31,7 +31,6 @@ use pocketmine\permission\PermissionAttachmentInfo;
use pocketmine\plugin\Plugin;
use pocketmine\Server;
use pocketmine\utils\MainLogger;
use pocketmine\utils\Terminal;
class ConsoleCommandSender implements CommandSender{
@ -49,7 +48,7 @@ class ConsoleCommandSender implements CommandSender{
*
* @return bool
*/
public function isPermissionSet($name){
public function isPermissionSet($name) : bool{
return $this->perm->isPermissionSet($name);
}
@ -58,7 +57,7 @@ class ConsoleCommandSender implements CommandSender{
*
* @return bool
*/
public function hasPermission($name){
public function hasPermission($name) : bool{
return $this->perm->hasPermission($name);
}
@ -89,14 +88,14 @@ class ConsoleCommandSender implements CommandSender{
/**
* @return PermissionAttachmentInfo[]
*/
public function getEffectivePermissions(){
public function getEffectivePermissions() : array{
return $this->perm->getEffectivePermissions();
}
/**
* @return bool
*/
public function isPlayer(){
public function isPlayer() : bool{
return false;
}
@ -132,14 +131,14 @@ class ConsoleCommandSender implements CommandSender{
/**
* @return bool
*/
public function isOp(){
public function isOp() : bool{
return true;
}
/**
* @param bool $value
*/
public function setOp($value){
public function setOp(bool $value){
}

4
src/pocketmine/command/SimpleCommandMap.php
View File

@ -207,7 +207,7 @@ class SimpleCommandMap implements CommandMap{
return null;
}
public function dispatch(CommandSender $sender, $commandLine){
public function dispatch(CommandSender $sender, string $commandLine) : bool{
$args = explode(" ", $commandLine);
$sentCommandLabel = "";
$target = $this->matchCommand($sentCommandLabel, $args);
@ -248,7 +248,7 @@ class SimpleCommandMap implements CommandMap{
/**
* @return Command[]
*/
public function getCommands(){
public function getCommands() : array{
return $this->knownCommands;
}

1
src/pocketmine/command/defaults/HelpCommand.php
View File

@ -25,7 +25,6 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\ConsoleCommandSender;
use pocketmine\event\TranslationContainer;
use pocketmine\utils\TextFormat;

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

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace pocketmine\entity;
use pocketmine\block\Block;
use pocketmine\block\Liquid;
use pocketmine\event\entity\EntityBlockChangeEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\Item as ItemItem;

4
src/pocketmine/entity/Human.php
View File

@ -99,7 +99,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
/**
* @return string
*/
public function getRawUniqueId(){
public function getRawUniqueId() : string{
return $this->rawUUID;
}
@ -431,7 +431,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
return $this->getNameTag();
}
public function getDrops(){
public function getDrops() : array{
return $this->inventory !== null ? array_values($this->inventory->getContents()) : [];
}

3
src/pocketmine/entity/Living.php
View File

@ -33,7 +33,6 @@ use pocketmine\event\Timings;
use pocketmine\item\Item as ItemItem;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\FloatTag;
use pocketmine\nbt\tag\ShortTag;
use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\utils\BlockIterator;
@ -275,7 +274,7 @@ abstract class Living extends Entity implements Damageable{
/**
* @return ItemItem[]
*/
public function getDrops(){
public function getDrops() : array{
return [];
}

2
src/pocketmine/entity/Squid.php
View File

@ -164,7 +164,7 @@ class Squid extends WaterAnimal{
parent::spawnTo($player);
}
public function getDrops(){
public function getDrops() : array{
return [
ItemItem::get(ItemItem::DYE, 0, mt_rand(1, 3))
];

2
src/pocketmine/entity/Zombie.php
View File

@ -57,7 +57,7 @@ class Zombie extends Monster{
parent::spawnTo($player);
}
public function getDrops(){
public function getDrops() : array{
$drops = [
ItemItem::get(ItemItem::FEATHER, 0, 1)
];

2
src/pocketmine/event/Cancellable.php
View File

@ -31,7 +31,7 @@ interface Cancellable{
/**
* @return bool
*/
public function isCancelled();
public function isCancelled() : bool;
/**
* @param bool $value

10
src/pocketmine/event/Timings.php
View File

@ -176,7 +176,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getPluginTaskTimings(TaskHandler $task, int $period){
public static function getPluginTaskTimings(TaskHandler $task, int $period) : TimingsHandler{
$ftask = $task->getTask();
if($ftask instanceof PluginTask and $ftask->getOwner() !== null){
$plugin = $ftask->getOwner()->getDescription()->getFullName();
@ -208,7 +208,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getEntityTimings(Entity $entity){
public static function getEntityTimings(Entity $entity) : TimingsHandler{
$entityType = (new \ReflectionClass($entity))->getShortName();
if(!isset(self::$entityTypeTimingMap[$entityType])){
if($entity instanceof Player){
@ -226,7 +226,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getTileEntityTimings(Tile $tile){
public static function getTileEntityTimings(Tile $tile) : TimingsHandler{
$tileType = (new \ReflectionClass($tile))->getShortName();
if(!isset(self::$tileEntityTypeTimingMap[$tileType])){
self::$tileEntityTypeTimingMap[$tileType] = new TimingsHandler("** tickTileEntity - " . $tileType, self::$tickTileEntityTimer);
@ -240,7 +240,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getReceiveDataPacketTimings(DataPacket $pk){
public static function getReceiveDataPacketTimings(DataPacket $pk) : TimingsHandler{
if(!isset(self::$packetReceiveTimingMap[$pk::NETWORK_ID])){
$pkName = (new \ReflectionClass($pk))->getShortName();
self::$packetReceiveTimingMap[$pk::NETWORK_ID] = new TimingsHandler("** receivePacket - " . $pkName . " [0x" . dechex($pk::NETWORK_ID) . "]", self::$playerNetworkReceiveTimer);
@ -255,7 +255,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getSendDataPacketTimings(DataPacket $pk){
public static function getSendDataPacketTimings(DataPacket $pk) : TimingsHandler{
if(!isset(self::$packetSendTimingMap[$pk::NETWORK_ID])){
$pkName = (new \ReflectionClass($pk))->getShortName();
self::$packetSendTimingMap[$pk::NETWORK_ID] = new TimingsHandler("** sendPacket - " . $pkName . " [0x" . dechex($pk::NETWORK_ID) . "]", self::$playerNetworkTimer);

2
src/pocketmine/event/block/BlockFormEvent.php
View File

@ -23,8 +23,6 @@ declare(strict_types=1);
namespace pocketmine\event\block;
use pocketmine\block\Block;
class BlockFormEvent extends BlockGrowEvent{
public static $handlerList = null;

4
src/pocketmine/event/player/PlayerBucketFillEvent.php
View File

@ -23,10 +23,6 @@ declare(strict_types=1);
namespace pocketmine\event\player;
use pocketmine\block\Block;
use pocketmine\item\Item;
use pocketmine\Player;
class PlayerBucketFillEvent extends PlayerBucketEvent{
public static $handlerList = null;
}

1
src/pocketmine/event/player/PlayerExhaustEvent.php
View File

@ -26,7 +26,6 @@ namespace pocketmine\event\player;
use pocketmine\entity\Human;
use pocketmine\event\Cancellable;
use pocketmine\event\entity\EntityEvent;
use pocketmine\Player;
class PlayerExhaustEvent extends EntityEvent implements Cancellable{
public static $handlerList = null;

44
src/pocketmine/inventory/BaseInventory.php
View File

@ -84,32 +84,32 @@ abstract class BaseInventory implements Inventory{
$this->slots = [];
}
public function getSize(){
public function getSize() : int{
return $this->size;
}
public function setSize($size){
$this->size = (int) $size;
public function setSize(int $size){
$this->size = $size;
}
public function getMaxStackSize(){
public function getMaxStackSize() : int{
return $this->maxStackSize;
}
public function getName(){
public function getName() : string{
return $this->name;
}
public function getTitle(){
public function getTitle() : string{
return $this->title;
}
public function getItem($index){
public function getItem(int $index) : Item{
assert($index >= 0, "Inventory slot should not be negative");
return isset($this->slots[$index]) ? clone $this->slots[$index] : Item::get(Item::AIR, 0, 0);
}
public function getContents(){
public function getContents() : array{
return $this->slots;
}
@ -134,7 +134,7 @@ abstract class BaseInventory implements Inventory{
}
}
public function setItem($index, Item $item){
public function setItem(int $index, Item $item) : bool{
$item = clone $item;
if($index < 0 or $index >= $this->size){
return false;
@ -159,7 +159,7 @@ abstract class BaseInventory implements Inventory{
return true;
}
public function contains(Item $item){
public function contains(Item $item) : bool{
$count = max(1, $item->getCount());
$checkDamage = !$item->hasAnyDamageValue();
$checkTags = $item->hasCompoundTag();
@ -175,7 +175,7 @@ abstract class BaseInventory implements Inventory{
return false;
}
public function all(Item $item){
public function all(Item $item) : array{
$slots = [];
$checkDamage = !$item->hasAnyDamageValue();
$checkTags = $item->hasCompoundTag();
@ -199,7 +199,7 @@ abstract class BaseInventory implements Inventory{
}
}
public function first(Item $item){
public function first(Item $item) : int{
$count = max(1, $item->getCount());
$checkDamage = !$item->hasAnyDamageValue();
$checkTags = $item->hasCompoundTag();
@ -213,7 +213,7 @@ abstract class BaseInventory implements Inventory{
return -1;
}
public function firstEmpty(){
public function firstEmpty() : int{
for($i = 0; $i < $this->size; ++$i){
if($this->getItem($i)->getId() === Item::AIR){
return $i;
@ -223,7 +223,7 @@ abstract class BaseInventory implements Inventory{
return -1;
}
public function canAddItem(Item $item){
public function canAddItem(Item $item) : bool{
$item = clone $item;
$checkDamage = !$item->hasAnyDamageValue();
$checkTags = $item->hasCompoundTag();
@ -245,7 +245,7 @@ abstract class BaseInventory implements Inventory{
return false;
}
public function addItem(Item ...$slots){
public function addItem(Item ...$slots) : array{
/** @var Item[] $itemSlots */
/** @var Item[] $slots */
$itemSlots = [];
@ -302,7 +302,7 @@ abstract class BaseInventory implements Inventory{
return $itemSlots;
}
public function removeItem(Item ...$slots){
public function removeItem(Item ...$slots) : array{
/** @var Item[] $itemSlots */
/** @var Item[] $slots */
$itemSlots = [];
@ -338,7 +338,7 @@ abstract class BaseInventory implements Inventory{
return $itemSlots;
}
public function clear($index){
public function clear(int $index) : bool{
if(isset($this->slots[$index])){
$item = Item::get(Item::AIR, 0, 0);
$old = $this->slots[$index];
@ -372,7 +372,7 @@ abstract class BaseInventory implements Inventory{
/**
* @return Player[]
*/
public function getViewers(){
public function getViewers() : array{
return $this->viewers;
}
@ -380,11 +380,11 @@ abstract class BaseInventory implements Inventory{
return $this->holder;
}
public function setMaxStackSize($size){
$this->maxStackSize = (int) $size;
public function setMaxStackSize(int $size){
$this->maxStackSize = $size;
}
public function open(Player $who){
public function open(Player $who) : bool{
$who->getServer()->getPluginManager()->callEvent($ev = new InventoryOpenEvent($this, $who));
if($ev->isCancelled()){
return false;
@ -459,7 +459,7 @@ abstract class BaseInventory implements Inventory{
}
}
public function getType(){
public function getType() : InventoryType{
return $this->type;
}

14
src/pocketmine/inventory/BaseTransaction.php
View File

@ -43,31 +43,31 @@ class BaseTransaction implements Transaction{
* @param Item $sourceItem
* @param Item $targetItem
*/
public function __construct(Inventory $inventory, $slot, Item $sourceItem, Item $targetItem){
public function __construct(Inventory $inventory, int $slot, Item $sourceItem, Item $targetItem){
$this->inventory = $inventory;
$this->slot = (int) $slot;
$this->slot = $slot;
$this->sourceItem = clone $sourceItem;
$this->targetItem = clone $targetItem;
$this->creationTime = microtime(true);
}
public function getCreationTime(){
public function getCreationTime() : float{
return $this->creationTime;
}
public function getInventory(){
public function getInventory() : Inventory{
return $this->inventory;
}
public function getSlot(){
public function getSlot() : int{
return $this->slot;
}
public function getSourceItem(){
public function getSourceItem() : Item{
return clone $this->sourceItem;
}
public function getTargetItem(){
public function getTargetItem() : Item{
return clone $this->targetItem;
}
}

2
src/pocketmine/inventory/CraftingInventory.php
View File

@ -56,7 +56,7 @@ class CraftingInventory extends BaseInventory{
return $this->resultInventory;
}
public function getSize(){
public function getSize() : int{
return $this->getResultInventory()->getSize() + parent::getSize();
}
}

6
src/pocketmine/inventory/CraftingManager.php
View File

@ -161,14 +161,14 @@ class CraftingManager{
/**
* @return Recipe[]
*/
public function getRecipes(){
public function getRecipes() : array{
return $this->recipes;
}
/**
* @return FurnaceRecipe[]
*/
public function getFurnaceRecipes(){
public function getFurnaceRecipes() : array{
return $this->furnaceRecipes;
}
@ -239,7 +239,7 @@ class CraftingManager{
* @param ShapelessRecipe $recipe
* @return bool
*/
public function matchRecipe(ShapelessRecipe $recipe){
public function matchRecipe(ShapelessRecipe $recipe) : bool{
if(!isset($this->recipeLookup[$idx = $recipe->getResult()->getId() . ":" . $recipe->getResult()->getDamage()])){
return false;
}

12
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -50,19 +50,19 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
return $this->left->getHolder();
}
public function getItem($index){
public function getItem(int $index) : Item{
return $index < $this->left->getSize() ? $this->left->getItem($index) : $this->right->getItem($index - $this->right->getSize());
}
public function setItem($index, Item $item){
public function setItem(int $index, Item $item) : bool{
return $index < $this->left->getSize() ? $this->left->setItem($index, $item) : $this->right->setItem($index - $this->right->getSize(), $item);
}
public function clear($index){
public function clear(int $index) : bool{
return $index < $this->left->getSize() ? $this->left->clear($index) : $this->right->clear($index - $this->right->getSize());
}
public function getContents(){
public function getContents() : array{
$contents = [];
for($i = 0; $i < $this->getSize(); ++$i){
$contents[$i] = $this->getItem($i);
@ -129,14 +129,14 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
/**
* @return ChestInventory
*/
public function getLeftSide(){
public function getLeftSide() : ChestInventory{
return $this->left;
}
/**
* @return ChestInventory
*/
public function getRightSide(){
public function getRightSide() : ChestInventory{
return $this->right;
}
}

12
src/pocketmine/inventory/FurnaceInventory.php
View File

@ -41,21 +41,21 @@ class FurnaceInventory extends ContainerInventory{
/**
* @return Item
*/
public function getResult(){
public function getResult() : Item{
return $this->getItem(2);
}
/**
* @return Item
*/
public function getFuel(){
public function getFuel() : Item{
return $this->getItem(1);
}
/**
* @return Item
*/
public function getSmelting(){
public function getSmelting() : Item{
return $this->getItem(0);
}
@ -64,7 +64,7 @@ class FurnaceInventory extends ContainerInventory{
*
* @return bool
*/
public function setResult(Item $item){
public function setResult(Item $item) : bool{
return $this->setItem(2, $item);
}
@ -73,7 +73,7 @@ class FurnaceInventory extends ContainerInventory{
*
* @return bool
*/
public function setFuel(Item $item){
public function setFuel(Item $item) : bool{
return $this->setItem(1, $item);
}
@ -82,7 +82,7 @@ class FurnaceInventory extends ContainerInventory{
*
* @return bool
*/
public function setSmelting(Item $item){
public function setSmelting(Item $item) : bool{
return $this->setItem(0, $item);
}

51
src/pocketmine/inventory/Inventory.php
View File

@ -32,37 +32,48 @@ use pocketmine\Player;
interface Inventory{
const MAX_STACK = 64;
public function getSize();
/**
* @return int
*/
public function getSize() : int;
public function getMaxStackSize();
/**
* @return int
*/
public function getMaxStackSize() : int;
/**
* @param int $size
*/
public function setMaxStackSize($size);
public function setMaxStackSize(int $size);
public function getName();
/**
* @return string
*/
public function getName() : string;
public function getTitle();
/**
* @return string
*/
public function getTitle() : string;
/**
* @param int $index
*
* @return Item
*/
public function getItem($index);
public function getItem(int $index) : Item;
/**
* Puts an Item in a slot.
* If a plugin refuses the update or $index is invalid, it'll return false
* If a source Player is specified, it won't send a Inventory update to it
*
* @param int $index
* @param Item $item
*
* @return bool
*/
public function setItem($index, Item $item);
public function setItem(int $index, Item $item) : bool;
/**
* Stores the given Items in the inventory. This will try to fill
@ -74,7 +85,7 @@ interface Inventory{
*
* @return Item[]
*/
public function addItem(Item ...$slots);
public function addItem(Item ...$slots) : array;
/**
* Checks if a given Item can be added to the inventory
@ -83,7 +94,7 @@ interface Inventory{
*
* @return bool
*/
public function canAddItem(Item $item);
public function canAddItem(Item $item) : bool;
/**
* Removes the given Item from the inventory.
@ -93,12 +104,12 @@ interface Inventory{
*
* @return Item[]
*/
public function removeItem(Item ...$slots);
public function removeItem(Item ...$slots) : array;
/**
* @return Item[]
*/
public function getContents();
public function getContents() : array;
/**
* @param Item[] $items
@ -124,7 +135,7 @@ interface Inventory{
*
* @return bool
*/
public function contains(Item $item);
public function contains(Item $item) : bool;
/**
* Will return all the Items that has the same id and metadata (if not null).
@ -134,7 +145,7 @@ interface Inventory{
*
* @return Item[]
*/
public function all(Item $item);
public function all(Item $item) : array;
/**
* Will return the first slot has the same id and metadata (if not null) as the Item.
@ -144,14 +155,14 @@ interface Inventory{
*
* @return int
*/
public function first(Item $item);
public function first(Item $item) : int;
/**
* Returns the first empty slot, or -1 if not found
*
* @return int
*/
public function firstEmpty();
public function firstEmpty() : int;
/**
* Will remove all the Items that has the same id and metadata (if not null)
@ -167,7 +178,7 @@ interface Inventory{
*
* @return bool
*/
public function clear($index);
public function clear(int $index) : bool;
/**
* Clears all the slots
@ -180,12 +191,12 @@ interface Inventory{
*
* @return Player[]
*/
public function getViewers();
public function getViewers() : array;
/**
* @return InventoryType
*/
public function getType();
public function getType() : InventoryType;
/**
* @return InventoryHolder
@ -204,7 +215,7 @@ interface Inventory{
*
* @return bool
*/
public function open(Player $who);
public function open(Player $who) : bool;
public function close(Player $who);

6
src/pocketmine/inventory/InventoryType.php
View File

@ -91,21 +91,21 @@ class InventoryType{
/**
* @return int
*/
public function getDefaultSize(){
public function getDefaultSize() : int{
return $this->size;
}
/**
* @return string
*/
public function getDefaultTitle(){
public function getDefaultTitle() : string{
return $this->title;
}
/**
* @return int
*/
public function getNetworkType(){
public function getNetworkType() : int{
return $this->typeId;
}
}

8
src/pocketmine/inventory/PlayerInventory.php
View File

@ -46,11 +46,11 @@ class PlayerInventory extends BaseInventory{
parent::__construct($player, InventoryType::get(InventoryType::PLAYER));
}
public function getSize(){
public function getSize() : int{
return parent::getSize() - 4; //Remove armor slots
}
public function setSize($size){
public function setSize(int $size){
parent::setSize($size + 4);
$this->sendContents($this->getViewers());
}
@ -315,7 +315,7 @@ class PlayerInventory extends BaseInventory{
return $this->setItem($this->getSize() + 3, $boots);
}
public function setItem($index, Item $item){
public function setItem(int $index, Item $item) : bool{
if($index < 0 or $index >= $this->size){
return false;
}elseif($item->getId() === 0 or $item->getCount() <= 0){
@ -346,7 +346,7 @@ class PlayerInventory extends BaseInventory{
return true;
}
public function clear($index){
public function clear(int $index) : bool{
if(isset($this->slots[$index])){
$item = Item::get(Item::AIR, 0, 0);
$old = $this->slots[$index];

2
src/pocketmine/inventory/ShapedRecipe.php
View File

@ -155,7 +155,7 @@ class ShapedRecipe implements Recipe{
*
* @return Item
*/
public function getIngredient(int $x, int $y){
public function getIngredient(int $x, int $y) : Item{
return $this->ingredients[$y][$x] ?? Item::get(Item::AIR);
}

2
src/pocketmine/inventory/ShapelessRecipe.php
View File

@ -70,7 +70,7 @@ class ShapelessRecipe implements Recipe{
*
* @throws \InvalidArgumentException
*/
public function addIngredient(Item $item){
public function addIngredient(Item $item) : ShapelessRecipe{
if(count($this->ingredients) >= 9){
throw new \InvalidArgumentException("Shapeless recipes cannot have more than 9 ingredients");
}

25
src/pocketmine/inventory/SimpleTransactionGroup.php
View File

@ -54,19 +54,25 @@ class SimpleTransactionGroup implements TransactionGroup{
/**
* @return Player
*/
public function getSource(){
public function getSource() : Player{
return $this->source;
}
public function getCreationTime(){
public function getCreationTime() : float{
return $this->creationTime;
}
public function getInventories(){
/**
* @return Inventory[]
*/
public function getInventories() : array{
return $this->inventories;
}
public function getTransactions(){
/**
* @return Transaction[]
*/
public function getTransactions() : array{
return $this->transactions;
}
@ -93,7 +99,7 @@ class SimpleTransactionGroup implements TransactionGroup{
*
* @return bool
*/
protected function matchItems(array &$needItems, array &$haveItems){
protected function matchItems(array &$needItems, array &$haveItems) : bool{
foreach($this->transactions as $key => $ts){
if($ts->getTargetItem()->getId() !== Item::AIR){
$needItems[] = $ts->getTargetItem();
@ -128,7 +134,7 @@ class SimpleTransactionGroup implements TransactionGroup{
return true;
}
public function canExecute(){
public function canExecute() : bool{
$haveItems = [];
$needItems = [];
@ -149,7 +155,10 @@ class SimpleTransactionGroup implements TransactionGroup{
return false;
}
public function execute(){
/**
* @return bool
*/
public function execute() : bool{
if($this->hasExecuted() or !$this->canExecute()){
return false;
}
@ -175,7 +184,7 @@ class SimpleTransactionGroup implements TransactionGroup{
return true;
}
public function hasExecuted(){
public function hasExecuted() : bool{
return $this->hasExecuted;
}
}

10
src/pocketmine/inventory/Transaction.php
View File

@ -30,25 +30,25 @@ interface Transaction{
/**
* @return Inventory
*/
public function getInventory();
public function getInventory() : Inventory;
/**
* @return int
*/
public function getSlot();
public function getSlot() : int;
/**
* @return Item
*/
public function getSourceItem();
public function getSourceItem() : Item;
/**
* @return Item
*/
public function getTargetItem();
public function getTargetItem() : Item;
/**
* @return float
*/
public function getCreationTime();
public function getCreationTime() : float;
}

12
src/pocketmine/inventory/TransactionGroup.php
View File

@ -28,17 +28,17 @@ interface TransactionGroup{
/**
* @return float
*/
public function getCreationTime();
public function getCreationTime() : float;
/**
* @return Transaction[]
*/
public function getTransactions();
public function getTransactions() : array;
/**
* @return Inventory[]
*/
public function getInventories();
public function getInventories() : array;
/**
* @param Transaction $transaction
@ -48,16 +48,16 @@ interface TransactionGroup{
/**
* @return bool
*/
public function canExecute();
public function canExecute() : bool;
/**
* @return bool
*/
public function execute();
public function execute() : bool;
/**
* @return bool
*/
public function hasExecuted();
public function hasExecuted() : bool;
}

10
src/pocketmine/lang/BaseLang.php
View File

@ -106,7 +106,7 @@ class BaseLang{
*
* @return string
*/
public function translateString($str, array $params = [], $onlyPrefix = null){
public function translateString(string $str, array $params = [], string $onlyPrefix = null) : string{
$baseText = $this->get($str);
$baseText = $this->parseTranslation(($baseText !== null and ($onlyPrefix === null or strpos($str, $onlyPrefix) === 0)) ? $baseText : $str, $onlyPrefix);
@ -152,7 +152,13 @@ class BaseLang{
return $id;
}
protected function parseTranslation($text, $onlyPrefix = null){
/**
* @param string $text
* @param string|null $onlyPrefix
*
* @return string
*/
protected function parseTranslation(string $text, string $onlyPrefix = null) : string{
$newString = "";
$replaceString = null;

4
src/pocketmine/level/ChunkLoader.php
View File

@ -45,14 +45,14 @@ interface ChunkLoader{
*
* @return int
*/
public function getLoaderId();
public function getLoaderId() : int;
/**
* Returns if the chunk loader is currently active
*
* @return bool
*/
public function isLoaderActive();
public function isLoaderActive() : bool;
/**
* @return Position

2
src/pocketmine/level/ChunkManager.php
View File

@ -130,7 +130,7 @@ interface ChunkManager{
*
* @return int
*/
public function getSeed();
public function getSeed() : int;
/**
* Returns the height of the world

4
src/pocketmine/level/Explosion.php
View File

@ -63,7 +63,7 @@ class Explosion{
/**
* @return bool
*/
public function explodeA(){
public function explodeA() : bool{
if($this->size < 0.1){
return false;
}
@ -114,7 +114,7 @@ class Explosion{
return true;
}
public function explodeB(){
public function explodeB() : bool{
$send = [];
$updateBlocks = [];

6
src/pocketmine/level/Level.php
View File

@ -292,7 +292,7 @@ class Level implements ChunkManager, Metadatable{
}
public static function generateChunkLoaderId(ChunkLoader $loader) : int{
if($loader->getLoaderId() === 0 or $loader->getLoaderId() === null){
if($loader->getLoaderId() === 0){
return self::$chunkLoaderCounter++;
}else{
throw new \InvalidStateException("ChunkLoader has a loader id already assigned: " . $loader->getLoaderId());
@ -2774,9 +2774,9 @@ class Level implements ChunkManager, Metadatable{
/**
* Gets the level seed
*
* @return int|string int value of seed, or the string numeric representation of a long in 32-bit systems
* @return int
*/
public function getSeed(){
public function getSeed() : int{
return $this->provider->getSeed();
}

4
src/pocketmine/level/Location.php
View File

@ -55,7 +55,7 @@ class Location extends Position{
*
* @return Location
*/
public static function fromObject(Vector3 $pos, Level $level = null, $yaw = 0.0, $pitch = 0.0){
public static function fromObject(Vector3 $pos, Level $level = null, $yaw = 0.0, $pitch = 0.0) : Location{
return new Location($pos->x, $pos->y, $pos->z, $yaw, $pitch, $level ?? (($pos instanceof Position) ? $pos->level : null));
}
@ -80,7 +80,7 @@ class Location extends Position{
return "Location (level=" . ($this->isValid() ? $this->getLevel()->getName() : "null") . ", x=$this->x, y=$this->y, z=$this->z, yaw=$this->yaw, pitch=$this->pitch)";
}
public function equals(Vector3 $v){
public function equals(Vector3 $v) : bool{
if($v instanceof Location){
return parent::equals($v) and $v->yaw == $this->yaw and $v->pitch == $this->pitch;
}

12
src/pocketmine/level/MovingObjectPosition.php
View File

@ -52,15 +52,15 @@ class MovingObjectPosition{
}
/**
* @param int $x
* @param int $y
* @param int $z
* @param int $side
* @param int $x
* @param int $y
* @param int $z
* @param int $side
* @param Vector3 $hitVector
*
* @return MovingObjectPosition
*/
public static function fromBlock($x, $y, $z, $side, Vector3 $hitVector){
public static function fromBlock(int $x, int $y, int $z, int $side, Vector3 $hitVector) : MovingObjectPosition{
$ob = new MovingObjectPosition;
$ob->typeOfHit = 0;
$ob->blockX = $x;
@ -75,7 +75,7 @@ class MovingObjectPosition{
*
* @return MovingObjectPosition
*/
public static function fromEntity(Entity $entity){
public static function fromEntity(Entity $entity) : MovingObjectPosition{
$ob = new MovingObjectPosition;
$ob->typeOfHit = 1;
$ob->entityHit = $entity;

4
src/pocketmine/level/Position.php
View File

@ -95,7 +95,7 @@ class Position extends Vector3{
*
* @return bool
*/
public function isValid(){
public function isValid() : bool{
return $this->getLevel() instanceof Level;
}
@ -133,7 +133,7 @@ class Position extends Vector3{
return $this;
}
public function equals(Vector3 $v){
public function equals(Vector3 $v) : bool{
if($v instanceof Position){
return parent::equals($v) and $v->getLevel() === $this->getLevel();
}

2
src/pocketmine/level/SimpleChunkManager.php
View File

@ -164,7 +164,7 @@ class SimpleChunkManager implements ChunkManager{
*
* @return int
*/
public function getSeed(){
public function getSeed() : int{
return $this->seed;
}

3
src/pocketmine/level/format/Chunk.php
View File

@ -28,7 +28,6 @@ namespace pocketmine\level\format;
use pocketmine\block\Block;
use pocketmine\entity\Entity;
use pocketmine\level\format\ChunkException;
use pocketmine\level\Level;
use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\CompoundTag;
@ -989,7 +988,7 @@ class Chunk{
*
* @return Chunk
*/
public static function fastDeserialize(string $data){
public static function fastDeserialize(string $data) : Chunk{
$stream = new BinaryStream();
$stream->setBuffer($data);
$data = null;

2
src/pocketmine/level/format/io/BaseLevelProvider.php
View File

@ -76,7 +76,7 @@ abstract class BaseLevelProvider implements LevelProvider{
return $this->level->getServer();
}
public function getLevel(){
public function getLevel() : Level{
return $this->level;
}

4
src/pocketmine/level/format/io/LevelProvider.php
View File

@ -174,7 +174,7 @@ interface LevelProvider{
/**
* @return string
*/
public function getName();
public function getName() : string;
/**
* @return int|string int, or the string numeric representation of a long in 32-bit systems
@ -216,7 +216,7 @@ interface LevelProvider{
/**
* @return Level
*/
public function getLevel();
public function getLevel() : Level;
public function close();

3
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -25,7 +25,6 @@ namespace pocketmine\level\format\io\leveldb;
use pocketmine\entity\Entity;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\ChunkException;
use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\format\io\exception\UnsupportedChunkFormatException;
@ -576,7 +575,7 @@ class LevelDB extends BaseLevelProvider{
/**
* @return \LevelDB
*/
public function getDatabase(){
public function getDatabase() : \LevelDB{
return $this->db;
}

2
src/pocketmine/level/format/io/region/McRegion.php
View File

@ -422,7 +422,7 @@ class McRegion extends BaseLevelProvider{
*
* @return Chunk
*/
public function getEmptyChunk(int $chunkX, int $chunkZ){
public function getEmptyChunk(int $chunkX, int $chunkZ) : Chunk{
return Chunk::getEmptyChunk($chunkX, $chunkZ);
}

10
src/pocketmine/level/generator/Flat.php
View File

@ -50,11 +50,11 @@ class Flat extends Generator{
private $populators = [];
private $structure, $chunks, $options, $floorLevel, $preset;
public function getSettings(){
public function getSettings() : array{
return $this->options;
}
public function getName(){
public function getName() : string{
return "flat";
}
@ -155,7 +155,7 @@ class Flat extends Generator{
*/
}
public function generateChunk($chunkX, $chunkZ){
public function generateChunk(int $chunkX, int $chunkZ){
if($this->chunk === null){
if(isset($this->options["preset"]) and $this->options["preset"] != ""){
$this->parsePreset($this->options["preset"], $chunkX, $chunkZ);
@ -169,7 +169,7 @@ class Flat extends Generator{
$this->level->setChunk($chunkX, $chunkZ, $chunk);
}
public function populateChunk($chunkX, $chunkZ){
public function populateChunk(int $chunkX, int $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random);
@ -177,7 +177,7 @@ class Flat extends Generator{
}
public function getSpawn(){
public function getSpawn() : Vector3{
return new Vector3(128, $this->floorLevel, 128);
}
}

71
src/pocketmine/level/generator/Generator.php
View File

@ -29,12 +29,13 @@ namespace pocketmine\level\generator;
use pocketmine\level\ChunkManager;
use pocketmine\level\generator\noise\Noise;
use pocketmine\level\generator\normal\Normal;
use pocketmine\math\Vector3;
use pocketmine\utils\Random;
abstract class Generator{
private static $list = [];
public static function addGenerator($object, $name){
public static function addGenerator($object, $name) : bool{
if(is_subclass_of($object, Generator::class) and !isset(Generator::$list[$name = strtolower($name)])){
Generator::$list[$name] = $object;
@ -47,7 +48,7 @@ abstract class Generator{
/**
* @return string[]
*/
public static function getGeneratorList(){
public static function getGeneratorList() : array{
return array_keys(Generator::$list);
}
@ -76,17 +77,15 @@ abstract class Generator{
/**
* @param Noise $noise
* @param int $xSize
* @param int $samplingRate
* @param int $x
* @param int $y
* @param int $z
* @param int $xSize
* @param int $samplingRate
* @param int $x
* @param int $y
* @param int $z
*
* @return \SplFixedArray
*
* @throws \InvalidArgumentCountException
*/
public static function getFastNoise1D(Noise $noise, $xSize, $samplingRate, $x, $y, $z){
public static function getFastNoise1D(Noise $noise, int $xSize, int $samplingRate, int $x, int $y, int $z) : \SplFixedArray{
if($samplingRate === 0){
throw new \InvalidArgumentException("samplingRate cannot be 0");
}
@ -112,19 +111,16 @@ abstract class Generator{
/**
* @param Noise $noise
* @param int $xSize
* @param int $zSize
* @param int $samplingRate
* @param int $x
* @param int $y
* @param int $z
* @param int $xSize
* @param int $zSize
* @param int $samplingRate
* @param int $x
* @param int $y
* @param int $z
*
* @return \SplFixedArray
*
* @throws \InvalidArgumentException
* @throws \InvalidArgumentCountException
*/
public static function getFastNoise2D(Noise $noise, $xSize, $zSize, $samplingRate, $x, $y, $z){
public static function getFastNoise2D(Noise $noise, int $xSize, int $zSize, int $samplingRate, int $x, int $y, int $z) : \SplFixedArray{
assert($samplingRate !== 0, new \InvalidArgumentException("samplingRate cannot be 0"));
assert($xSize % $samplingRate === 0, new \InvalidArgumentCountException("xSize % samplingRate must return 0"));
@ -162,22 +158,19 @@ abstract class Generator{
/**
* @param Noise $noise
* @param int $xSize
* @param int $ySize
* @param int $zSize
* @param int $xSamplingRate
* @param int $ySamplingRate
* @param int $zSamplingRate
* @param int $x
* @param int $y
* @param int $z
* @param int $xSize
* @param int $ySize
* @param int $zSize
* @param int $xSamplingRate
* @param int $ySamplingRate
* @param int $zSamplingRate
* @param int $x
* @param int $y
* @param int $z
*
* @return \SplFixedArray
*
* @throws \InvalidArgumentException
* @throws \InvalidArgumentCountException
* @return array
*/
public static function getFastNoise3D(Noise $noise, $xSize, $ySize, $zSize, $xSamplingRate, $ySamplingRate, $zSamplingRate, $x, $y, $z){
public static function getFastNoise3D(Noise $noise, int $xSize, int $ySize, int $zSize, int $xSamplingRate, int $ySamplingRate, int $zSamplingRate, int $x, int $y, int $z) : array{
assert($xSamplingRate !== 0, new \InvalidArgumentException("xSamplingRate cannot be 0"));
assert($zSamplingRate !== 0, new \InvalidArgumentException("zSamplingRate cannot be 0"));
@ -239,13 +232,13 @@ abstract class Generator{
abstract public function init(ChunkManager $level, Random $random);
abstract public function generateChunk($chunkX, $chunkZ);
abstract public function generateChunk(int $chunkX, int $chunkZ);
abstract public function populateChunk($chunkX, $chunkZ);
abstract public function populateChunk(int $chunkX, int $chunkZ);
abstract public function getSettings();
abstract public function getSettings() : array;
abstract public function getName();
abstract public function getName() : string;
abstract public function getSpawn();
abstract public function getSpawn() : Vector3;
}

43
src/pocketmine/level/generator/biome/Biome.php
View File

@ -70,7 +70,9 @@ abstract class Biome{
/** @var Populator[] */
private $populators = [];
/** @var int */
private $minElevation;
/** @var int */
private $maxElevation;
private $groundCover = [];
@ -78,9 +80,9 @@ abstract class Biome{
protected $rainfall = 0.5;
protected $temperature = 0.5;
protected static function register($id, Biome $biome){
self::$biomes[(int) $id] = $biome;
$biome->setId((int) $id);
protected static function register(int $id, Biome $biome){
self::$biomes[$id] = $biome;
$biome->setId($id);
}
public static function init(){
@ -102,11 +104,11 @@ abstract class Biome{
}
/**
* @param $id
* @param int $id
*
* @return Biome
*/
public static function getBiome($id){
public static function getBiome(int $id) : Biome{
return self::$biomes[$id] ?? self::$biomes[self::OCEAN];
}
@ -118,38 +120,47 @@ abstract class Biome{
$this->populators[] = $populator;
}
public function populateChunk(ChunkManager $level, $chunkX, $chunkZ, Random $random){
/**
* @param ChunkManager $level
* @param int $chunkX
* @param int $chunkZ
* @param Random $random
*/
public function populateChunk(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
foreach($this->populators as $populator){
$populator->populate($level, $chunkX, $chunkZ, $random);
}
}
public function getPopulators(){
/**
* @return Populator[]
*/
public function getPopulators() : array{
return $this->populators;
}
public function setId($id){
public function setId(int $id){
if(!$this->registered){
$this->registered = true;
$this->id = $id;
}
}
public function getId(){
public function getId() : int{
return $this->id;
}
abstract public function getName();
abstract public function getName() : string;
public function getMinElevation(){
public function getMinElevation() : int{
return $this->minElevation;
}
public function getMaxElevation(){
public function getMaxElevation() : int{
return $this->maxElevation;
}
public function setElevation($min, $max){
public function setElevation(int $min, int $max){
$this->minElevation = $min;
$this->maxElevation = $max;
}
@ -157,7 +168,7 @@ abstract class Biome{
/**
* @return Block[]
*/
public function getGroundCover(){
public function getGroundCover() : array{
return $this->groundCover;
}
@ -168,11 +179,11 @@ abstract class Biome{
$this->groundCover = $covers;
}
public function getTemperature(){
public function getTemperature() : float{
return $this->temperature;
}
public function getRainfall(){
public function getRainfall() : float{
return $this->rainfall;
}
}

2
src/pocketmine/level/generator/biome/BiomeSelector.php
View File

@ -78,7 +78,7 @@ class BiomeSelector{
*
* @return Biome
*/
public function pickBiome($x, $z){
public function pickBiome($x, $z) : Biome{
$temperature = (int) ($this->getTemperature($x, $z) * 63);
$rainfall = (int) ($this->getRainfall($x, $z) * 63);

2
src/pocketmine/level/generator/hell/HellBiome.php
View File

@ -27,7 +27,7 @@ use pocketmine\level\generator\biome\Biome;
class HellBiome extends Biome{
public function getName(){
public function getName() : string{
return "Hell";
}
}

10
src/pocketmine/level/generator/hell/Nether.php
View File

@ -81,11 +81,11 @@ class Nether extends Generator{
}
}
public function getName(){
public function getName() : string{
return "nether";
}
public function getSettings(){
public function getSettings() : array{
return [];
}
@ -110,7 +110,7 @@ class Nether extends Generator{
$this->populators[] = $ores;*/
}
public function generateChunk($chunkX, $chunkZ){
public function generateChunk(int $chunkX, int $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
$noise = Generator::getFastNoise3D($this->noiseBase, 16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16);
@ -145,7 +145,7 @@ class Nether extends Generator{
}
}
public function populateChunk($chunkX, $chunkZ){
public function populateChunk(int $chunkX, int $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random);
@ -156,7 +156,7 @@ class Nether extends Generator{
$biome->populateChunk($this->level, $chunkX, $chunkZ, $this->random);
}
public function getSpawn(){
public function getSpawn() : Vector3{
return new Vector3(127.5, 128, 127.5);
}

2
src/pocketmine/level/generator/noise/Noise.php
View File

@ -36,7 +36,7 @@ abstract class Noise{
protected $persistence;
protected $expansion;
public static function floor($x){
public static function floor($x) : int{
return $x >= 0 ? (int) $x : (int) ($x - 1);
}

12
src/pocketmine/level/generator/normal/Normal.php
View File

@ -90,15 +90,15 @@ class Normal extends Generator{
}
}
public function getName(){
public function getName() : string{
return "normal";
}
public function getSettings(){
public function getSettings() : array{
return [];
}
public function pickBiome($x, $z){
public function pickBiome(int $x, int $z){
$hash = $x * 2345803 ^ $z * 9236449 ^ $this->level->getSeed();
$hash *= $hash + 223;
$xNoise = $hash >> 20 & 3;
@ -189,7 +189,7 @@ class Normal extends Generator{
$this->populators[] = $ores;
}
public function generateChunk($chunkX, $chunkZ){
public function generateChunk(int $chunkX, int $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
$noise = Generator::getFastNoise3D($this->noiseBase, 16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16);
@ -256,7 +256,7 @@ class Normal extends Generator{
}
}
public function populateChunk($chunkX, $chunkZ){
public function populateChunk(int $chunkX, int $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random);
@ -267,7 +267,7 @@ class Normal extends Generator{
$biome->populateChunk($this->level, $chunkX, $chunkZ, $this->random);
}
public function getSpawn(){
public function getSpawn() : Vector3{
return new Vector3(127.5, 128, 127.5);
}

2
src/pocketmine/level/generator/normal/biome/DesertBiome.php
View File

@ -34,7 +34,7 @@ class DesertBiome extends SandyBiome{
$this->rainfall = 0;
}
public function getName(){
public function getName() : string{
return "Desert";
}
}

2
src/pocketmine/level/generator/normal/biome/ForestBiome.php
View File

@ -59,7 +59,7 @@ class ForestBiome extends GrassyBiome{
}
}
public function getName(){
public function getName() : string{
return $this->type === self::TYPE_BIRCH ? "Birch Forest" : "Forest";
}
}

2
src/pocketmine/level/generator/normal/biome/IcePlainsBiome.php
View File

@ -41,7 +41,7 @@ class IcePlainsBiome extends SnowyBiome{
$this->rainfall = 0.8;
}
public function getName(){
public function getName() : string{
return "Ice Plains";
}
}

2
src/pocketmine/level/generator/normal/biome/MountainsBiome.php
View File

@ -48,7 +48,7 @@ class MountainsBiome extends GrassyBiome{
$this->rainfall = 0.5;
}
public function getName(){
public function getName() : string{
return "Mountains";
}
}

2
src/pocketmine/level/generator/normal/biome/OceanBiome.php
View File

@ -41,7 +41,7 @@ class OceanBiome extends GrassyBiome{
$this->rainfall = 0.5;
}
public function getName(){
public function getName() : string{
return "Ocean";
}
}

2
src/pocketmine/level/generator/normal/biome/PlainBiome.php
View File

@ -41,7 +41,7 @@ class PlainBiome extends GrassyBiome{
$this->rainfall = 0.4;
}
public function getName(){
public function getName() : string{
return "Plains";
}
}

2
src/pocketmine/level/generator/normal/biome/RiverBiome.php
View File

@ -41,7 +41,7 @@ class RiverBiome extends GrassyBiome{
$this->rainfall = 0.7;
}
public function getName(){
public function getName() : string{
return "River";
}
}

2
src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php
View File

@ -32,7 +32,7 @@ class SmallMountainsBiome extends MountainsBiome{
$this->setElevation(63, 97);
}
public function getName(){
public function getName() : string{
return "Small Mountains";
}
}

2
src/pocketmine/level/generator/normal/biome/SwampBiome.php
View File

@ -34,7 +34,7 @@ class SwampBiome extends GrassyBiome{
$this->rainfall = 0.9;
}
public function getName(){
public function getName() : string{
return "Swamp";
}
}

2
src/pocketmine/level/generator/normal/biome/TaigaBiome.php
View File

@ -47,7 +47,7 @@ class TaigaBiome extends SnowyBiome{
$this->rainfall = 0.8;
}
public function getName(){
public function getName() : string{
return "Taiga";
}
}

2
src/pocketmine/level/generator/object/BigTree.php
View File

@ -41,7 +41,7 @@ class BigTree extends Tree{
private $addLogVines = false;
private $addCocoaPlants = false;
public function canPlaceObject(ChunkManager $level, $x, $y, $z, Random $random){
public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : bool{
return false;
}

2
src/pocketmine/level/generator/object/Pond.php
View File

@ -37,7 +37,7 @@ class Pond{
$this->random = $random;
}
public function canPlaceObject(ChunkManager $level, Vector3 $pos){
public function canPlaceObject(ChunkManager $level, Vector3 $pos) : bool{
return false;
}

2
src/pocketmine/level/generator/object/Tree.php
View File

@ -75,7 +75,7 @@ abstract class Tree{
}
public function canPlaceObject(ChunkManager $level, $x, $y, $z, Random $random){
public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : bool{
$radiusToCheck = 0;
for($yy = 0; $yy < $this->treeHeight + 3; ++$yy){
if($yy == 1 or $yy === $this->treeHeight){

24
src/pocketmine/math/AxisAlignedBB.php
View File

@ -54,7 +54,7 @@ class AxisAlignedBB{
return $this;
}
public function addCoord($x, $y, $z){
public function addCoord($x, $y, $z) : AxisAlignedBB{
$minX = $this->minX;
$minY = $this->minY;
$minZ = $this->minZ;
@ -83,7 +83,7 @@ class AxisAlignedBB{
return new AxisAlignedBB($minX, $minY, $minZ, $maxX, $maxY, $maxZ);
}
public function grow($x, $y, $z){
public function grow($x, $y, $z) : AxisAlignedBB{
return new AxisAlignedBB($this->minX - $x, $this->minY - $y, $this->minZ - $z, $this->maxX + $x, $this->maxY + $y, $this->maxZ + $z);
}
@ -109,7 +109,7 @@ class AxisAlignedBB{
return $this;
}
public function shrink($x, $y, $z){
public function shrink($x, $y, $z) : AxisAlignedBB{
return new AxisAlignedBB($this->minX + $x, $this->minY + $y, $this->minZ + $z, $this->maxX - $x, $this->maxY - $y, $this->maxZ - $z);
}
@ -134,7 +134,7 @@ class AxisAlignedBB{
return $this;
}
public function getOffsetBoundingBox($x, $y, $z){
public function getOffsetBoundingBox($x, $y, $z) : AxisAlignedBB{
return new AxisAlignedBB($this->minX + $x, $this->minY + $y, $this->minZ + $z, $this->maxX + $x, $this->maxY + $y, $this->maxZ + $z);
}
@ -207,7 +207,7 @@ class AxisAlignedBB{
return $z;
}
public function intersectsWith(AxisAlignedBB $bb){
public function intersectsWith(AxisAlignedBB $bb) : bool{
if($bb->maxX > $this->minX and $bb->minX < $this->maxX){
if($bb->maxY > $this->minY and $bb->minY < $this->maxY){
return $bb->maxZ > $this->minZ and $bb->minZ < $this->maxZ;
@ -217,7 +217,7 @@ class AxisAlignedBB{
return false;
}
public function isVectorInside(Vector3 $vector){
public function isVectorInside(Vector3 $vector) : bool{
if($vector->x <= $this->minX or $vector->x >= $this->maxX){
return false;
}
@ -232,18 +232,24 @@ class AxisAlignedBB{
return ($this->maxX - $this->minX + $this->maxY - $this->minY + $this->maxZ - $this->minZ) / 3;
}
public function isVectorInYZ(Vector3 $vector){
public function isVectorInYZ(Vector3 $vector) : bool{
return $vector->y >= $this->minY and $vector->y <= $this->maxY and $vector->z >= $this->minZ and $vector->z <= $this->maxZ;
}
public function isVectorInXZ(Vector3 $vector){
public function isVectorInXZ(Vector3 $vector) : bool{
return $vector->x >= $this->minX and $vector->x <= $this->maxX and $vector->z >= $this->minZ and $vector->z <= $this->maxZ;
}
public function isVectorInXY(Vector3 $vector){
public function isVectorInXY(Vector3 $vector) : bool{
return $vector->x >= $this->minX and $vector->x <= $this->maxX and $vector->y >= $this->minY and $vector->y <= $this->maxY;
}
/**
* @param Vector3 $pos1
* @param Vector3 $pos2
*
* @return MovingObjectPosition|null
*/
public function calculateIntercept(Vector3 $pos1, Vector3 $pos2){
$v1 = $pos1->getIntermediateWithXValue($pos2, $this->minX);
$v2 = $pos1->getIntermediateWithXValue($pos2, $this->maxX);

4
src/pocketmine/math/Math.php
View File

@ -29,12 +29,12 @@ namespace pocketmine\math;
abstract class Math{
public static function floorFloat($n){
public static function floorFloat($n) : int{
$i = (int) $n;
return $n >= $i ? $i : $i - 1;
}
public static function ceilFloat($n){
public static function ceilFloat($n) : int{
$i = (int) ($n + 1);
return $n >= $i ? $i : $i - 1;
}

2
src/pocketmine/math/Vector3.php
View File

@ -234,7 +234,7 @@ class Vector3{
);
}
public function equals(Vector3 $v){
public function equals(Vector3 $v) : bool{
return $this->x == $v->x and $this->y == $v->y and $this->z == $v->z;
}

2
src/pocketmine/metadata/BlockMetadataStore.php
View File

@ -35,7 +35,7 @@ class BlockMetadataStore extends MetadataStore{
$this->owningLevel = $owningLevel;
}
public function disambiguate(Metadatable $block, $metadataKey){
public function disambiguate(Metadatable $block, string $metadataKey) : string{
if(!($block instanceof Block)){
throw new \InvalidArgumentException("Argument must be a Block instance");
}

2
src/pocketmine/metadata/EntityMetadataStore.php
View File

@ -27,7 +27,7 @@ use pocketmine\entity\Entity;
class EntityMetadataStore extends MetadataStore{
public function disambiguate(Metadatable $entity, $metadataKey){
public function disambiguate(Metadatable $entity, string $metadataKey) : string{
if(!($entity instanceof Entity)){
throw new \InvalidArgumentException("Argument must be an Entity instance");
}

2
src/pocketmine/metadata/LevelMetadataStore.php
View File

@ -27,7 +27,7 @@ use pocketmine\level\Level;
class LevelMetadataStore extends MetadataStore{
public function disambiguate(Metadatable $level, $metadataKey){
public function disambiguate(Metadatable $level, string $metadataKey) : string{
if(!($level instanceof Level)){
throw new \InvalidArgumentException("Argument must be a Level instance");
}

2
src/pocketmine/metadata/MetadataStore.php
View File

@ -138,5 +138,5 @@ abstract class MetadataStore{
*
* @throws \InvalidArgumentException
*/
abstract public function disambiguate(Metadatable $subject, $metadataKey);
abstract public function disambiguate(Metadatable $subject, string $metadataKey) : string;
}

2
src/pocketmine/metadata/PlayerMetadataStore.php
View File

@ -27,7 +27,7 @@ use pocketmine\IPlayer;
class PlayerMetadataStore extends MetadataStore{
public function disambiguate(Metadatable $player, $metadataKey){
public function disambiguate(Metadatable $player, string $metadataKey) : string{
if(!($player instanceof IPlayer)){
throw new \InvalidArgumentException("Argument must be an IPlayer instance");
}

2
src/pocketmine/nbt/JsonNBTParser.php
View File

@ -237,7 +237,7 @@ class JsonNBTParser{
* @return string
* @throws \Exception
*/
private static function readKey(string $data, int &$offset){
private static function readKey(string $data, int &$offset) : string{
$key = "";
$len = strlen($data);

22
src/pocketmine/nbt/NBT.php
View File

@ -109,7 +109,7 @@ class NBT{
}
}
public static function matchList(ListTag $tag1, ListTag $tag2){
public static function matchList(ListTag $tag1, ListTag $tag2) : bool{
if($tag1->getName() !== $tag2->getName() or $tag1->getCount() !== $tag2->getCount()){
return false;
}
@ -141,7 +141,7 @@ class NBT{
return true;
}
public static function matchTree(CompoundTag $tag1, CompoundTag $tag2){
public static function matchTree(CompoundTag $tag1, CompoundTag $tag2) : bool{
if($tag1->getName() !== $tag2->getName() or $tag1->getCount() !== $tag2->getCount()){
return false;
}
@ -188,7 +188,7 @@ class NBT{
$this->buffer .= $v;
}
public function feof(){
public function feof() : bool{
return !isset($this->buffer{$this->offset});
}
@ -269,11 +269,11 @@ class NBT{
$tag->write($this, $network);
}
public function getByte(){
public function getByte() : int{
return Binary::readByte($this->get(1));
}
public function getSignedByte(){
public function getSignedByte() : int{
return Binary::readSignedByte($this->get(1));
}
@ -281,7 +281,7 @@ class NBT{
$this->buffer .= Binary::writeByte($v);
}
public function getShort(){
public function getShort() : int{
return $this->endianness === self::BIG_ENDIAN ? Binary::readShort($this->get(2)) : Binary::readLShort($this->get(2));
}
@ -293,7 +293,7 @@ class NBT{
$this->buffer .= $this->endianness === self::BIG_ENDIAN ? Binary::writeShort($v) : Binary::writeLShort($v);
}
public function getInt(bool $network = false){
public function getInt(bool $network = false) : int{
if($network === true){
return Binary::readVarInt($this->buffer, $this->offset);
}
@ -308,7 +308,7 @@ class NBT{
}
}
public function getLong(){
public function getLong() : int{
return $this->endianness === self::BIG_ENDIAN ? Binary::readLong($this->get(8)) : Binary::readLLong($this->get(8));
}
@ -316,7 +316,7 @@ class NBT{
$this->buffer .= $this->endianness === self::BIG_ENDIAN ? Binary::writeLong($v) : Binary::writeLLong($v);
}
public function getFloat(){
public function getFloat() : float{
return $this->endianness === self::BIG_ENDIAN ? Binary::readFloat($this->get(4)) : Binary::readLFloat($this->get(4));
}
@ -324,7 +324,7 @@ class NBT{
$this->buffer .= $this->endianness === self::BIG_ENDIAN ? Binary::writeFloat($v) : Binary::writeLFloat($v);
}
public function getDouble(){
public function getDouble() : float{
return $this->endianness === self::BIG_ENDIAN ? Binary::readDouble($this->get(8)) : Binary::readLDouble($this->get(8));
}
@ -346,7 +346,7 @@ class NBT{
$this->buffer .= $v;
}
public function getArray(){
public function getArray() : array{
$data = [];
self::toArray($data, $this->data);
return $data;

2
src/pocketmine/network/SourceInterface.php
View File

@ -42,7 +42,7 @@ interface SourceInterface{
* @param bool $needACK
* @param bool $immediate
*
* @return int
* @return int|null
*/
public function putPacket(Player $player, DataPacket $packet, $needACK = false, $immediate = true);

9
src/pocketmine/network/upnp/UPnP.php
View File

@ -29,14 +29,15 @@ namespace pocketmine\network\upnp;
use pocketmine\utils\Utils;
abstract class UPnP{
public static function PortForward($port){
public static function PortForward(int $port) : bool{
if(Utils::$online === false){
return false;
}
if(Utils::getOS() != "win" or !class_exists("COM")){
return false;
}
$port = (int) $port;
$myLocalIP = gethostbyname(trim(`hostname`));
try{
/** @noinspection PhpUndefinedClassInspection */
@ -54,14 +55,14 @@ abstract class UPnP{
return true;
}
public static function RemovePortForward($port){
public static function RemovePortForward(int $port) : bool{
if(Utils::$online === false){
return false;
}
if(Utils::getOS() != "win" or !class_exists("COM")){
return false;
}
$port = (int) $port;
try{
/** @noinspection PhpUndefinedClassInspection */
$com = new \COM("HNetCfg.NATUPnP") or false;

25
src/pocketmine/permission/BanEntry.php
View File

@ -28,24 +28,27 @@ use pocketmine\utils\MainLogger;
class BanEntry{
public static $format = "Y-m-d H:i:s O";
/** @var string */
private $name;
/** @var \DateTime */
private $creationDate = null;
/** @var string */
private $source = "(Unknown)";
/** @var \DateTime */
private $expirationDate = null;
/** @var string */
private $reason = "Banned by an operator.";
public function __construct($name){
public function __construct(string $name){
$this->name = strtolower($name);
$this->creationDate = new \DateTime();
}
public function getName(){
public function getName() : string{
return $this->name;
}
public function getCreated(){
public function getCreated() : \DateTime{
return $this->creationDate;
}
@ -53,40 +56,40 @@ class BanEntry{
$this->creationDate = $date;
}
public function getSource(){
public function getSource() : string{
return $this->source;
}
public function setSource($source){
public function setSource(string $source){
$this->source = $source;
}
public function getExpires(){
public function getExpires() : \DateTime{
return $this->expirationDate;
}
/**
* @param \DateTime $date
*/
public function setExpires($date){
public function setExpires(\DateTime $date){
$this->expirationDate = $date;
}
public function hasExpired(){
public function hasExpired() : bool{
$now = new \DateTime();
return $this->expirationDate === null ? false : $this->expirationDate < $now;
}
public function getReason(){
public function getReason() : string{
return $this->reason;
}
public function setReason($reason){
public function setReason(string $reason){
$this->reason = $reason;
}
public function getString(){
public function getString() : string{
$str = "";
$str .= $this->getName();
$str .= "|";

21
src/pocketmine/permission/BanList.php
View File

@ -40,28 +40,28 @@ class BanList{
/**
* @param string $file
*/
public function __construct($file){
public function __construct(string $file){
$this->file = $file;
}
/**
* @return bool
*/
public function isEnabled(){
public function isEnabled() : bool{
return $this->enabled === true;
}
/**
* @param bool $flag
*/
public function setEnabled($flag){
$this->enabled = (bool) $flag;
public function setEnabled(bool $flag){
$this->enabled = $flag;
}
/**
* @return BanEntry[]
*/
public function getEntries(){
public function getEntries() : array{
$this->removeExpired();
return $this->list;
@ -72,7 +72,7 @@ class BanList{
*
* @return bool
*/
public function isBanned($name){
public function isBanned(string $name) : bool{
$name = strtolower($name);
if(!$this->isEnabled()){
return false;
@ -99,7 +99,7 @@ class BanList{
*
* @return BanEntry
*/
public function addBan($target, $reason = null, $expires = null, $source = null){
public function addBan(string $target, string $reason = null, \DateTime $expires = null, string $source = null) : BanEntry{
$entry = new BanEntry($target);
$entry->setSource($source != null ? $source : $entry->getSource());
$entry->setExpires($expires);
@ -114,7 +114,7 @@ class BanList{
/**
* @param string $name
*/
public function remove($name){
public function remove(string $name){
$name = strtolower($name);
if(isset($this->list[$name])){
unset($this->list[$name]);
@ -148,7 +148,10 @@ class BanList{
}
}
public function save($flag = true){
/**
* @param bool $flag
*/
public function save(bool $flag = true){
$this->removeExpired();
$fp = @fopen($this->file, "w");
if(is_resource($fp)){

2
src/pocketmine/permission/DefaultPermissions.php
View File

@ -34,7 +34,7 @@ abstract class DefaultPermissions{
*
* @return Permission
*/
public static function registerPermission(Permission $perm, Permission $parent = null){
public static function registerPermission(Permission $perm, Permission $parent = null) : Permission{
if($parent instanceof Permission){
$parent->getChildren()[$perm->getName()] = true;

10
src/pocketmine/permission/Permissible.php
View File

@ -34,16 +34,16 @@ interface Permissible extends ServerOperator{
*
* @return bool
*/
public function isPermissionSet($name);
public function isPermissionSet($name) : bool;
/**
* Returns the permission value if overridden, or the default value if not
*
* @param string|Permission $name
*
* @return mixed
* @return bool
*/
public function hasPermission($name);
public function hasPermission($name) : bool;
/**
* @param Plugin $plugin
@ -68,8 +68,8 @@ interface Permissible extends ServerOperator{
public function recalculatePermissions();
/**
* @return Permission[]
* @return PermissionAttachmentInfo[]
*/
public function getEffectivePermissions();
public function getEffectivePermissions() : array;
}

10
src/pocketmine/permission/PermissibleBase.php
View File

@ -63,7 +63,7 @@ class PermissibleBase implements Permissible{
/**
* @return bool
*/
public function isOp(){
public function isOp() : bool{
if($this->opable === null){
return false;
}else{
@ -76,7 +76,7 @@ class PermissibleBase implements Permissible{
*
* @throws \Exception
*/
public function setOp($value){
public function setOp(bool $value){
if($this->opable === null){
throw new \LogicException("Cannot change op value as no ServerOperator is set");
}else{
@ -89,7 +89,7 @@ class PermissibleBase implements Permissible{
*
* @return bool
*/
public function isPermissionSet($name){
public function isPermissionSet($name) : bool{
return isset($this->permissions[$name instanceof Permission ? $name->getName() : $name]);
}
@ -98,7 +98,7 @@ class PermissibleBase implements Permissible{
*
* @return bool
*/
public function hasPermission($name){
public function hasPermission($name) : bool{
if($name instanceof Permission){
$name = $name->getName();
}
@ -214,7 +214,7 @@ class PermissibleBase implements Permissible{
/**
* @return PermissionAttachmentInfo[]
*/
public function getEffectivePermissions(){
public function getEffectivePermissions() : array{
return $this->permissions;
}
}

14
src/pocketmine/permission/Permission.php
View File

@ -111,28 +111,28 @@ class Permission{
/**
* @return string
*/
public function getName(){
public function getName() : string{
return $this->name;
}
/**
* @return string[]
*/
public function &getChildren(){
public function &getChildren() : array{
return $this->children;
}
/**
* @return string
*/
public function getDefault(){
public function getDefault() : string{
return $this->defaultValue;
}
/**
* @param string $value
*/
public function setDefault($value){
public function setDefault(string $value){
if($value !== $this->defaultValue){
$this->defaultValue = $value;
$this->recalculatePermissibles();
@ -142,7 +142,7 @@ class Permission{
/**
* @return string
*/
public function getDescription(){
public function getDescription() : string{
return $this->description;
}
@ -156,7 +156,7 @@ class Permission{
/**
* @return Permissible[]
*/
public function getPermissibles(){
public function getPermissibles() : array{
return Server::getInstance()->getPluginManager()->getPermissionSubscriptions($this->name);
}
@ -201,7 +201,7 @@ class Permission{
*
* @return Permission[]
*/
public static function loadPermissions(array $data, $default = self::DEFAULT_OP){
public static function loadPermissions(array $data, $default = self::DEFAULT_OP) : array{
$result = [];
foreach($data as $key => $entry){
$result[] = self::loadPermission($key, $entry, $default, $result);

6
src/pocketmine/permission/ServerOperator.php
View File

@ -30,14 +30,12 @@ interface ServerOperator{
*
* @return bool
*/
public function isOp();
public function isOp() : bool;
/**
* Sets the operator permission for the current object
*
* @param bool $value
*
* @return void
*/
public function setOp($value);
public function setOp(bool $value);
}

10
src/pocketmine/plugin/PharPluginLoader.php
View File

@ -48,10 +48,8 @@ class PharPluginLoader implements PluginLoader{
* @param string $file
*
* @return Plugin|null
*
* @throws \Exception
*/
public function loadPlugin($file){
public function loadPlugin(string $file){
if(($description = $this->getPluginDescription($file)) instanceof PluginDescription){
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.plugin.load", [$description->getFullName()]));
$dataFolder = dirname($file) . DIRECTORY_SEPARATOR . $description->getName();
@ -80,9 +78,9 @@ class PharPluginLoader implements PluginLoader{
*
* @param string $file
*
* @return PluginDescription|null
* @return null|PluginDescription
*/
public function getPluginDescription($file){
public function getPluginDescription(string $file){
$phar = new \Phar($file);
if(isset($phar["plugin.yml"])){
$pluginYml = $phar["plugin.yml"];
@ -99,7 +97,7 @@ class PharPluginLoader implements PluginLoader{
*
* @return string
*/
public function getPluginFilters(){
public function getPluginFilters() : string{
return "/\\.phar$/i";
}

43
src/pocketmine/plugin/Plugin.php
View File

@ -50,7 +50,7 @@ interface Plugin extends CommandExecutor{
/**
* @return bool
*/
public function isEnabled();
public function isEnabled() : bool;
/**
* Called when the plugin is disabled
@ -58,61 +58,78 @@ interface Plugin extends CommandExecutor{
*/
public function onDisable();
public function isDisabled();
/**
* @return bool
*/
public function isDisabled() : bool;
/**
* Gets the plugin's data folder to save files and configuration.
* This directory name has a trailing slash.
*
* @return string
*/
public function getDataFolder();
public function getDataFolder() : string;
/**
* @return PluginDescription
*/
public function getDescription();
public function getDescription() : PluginDescription;
/**
* Gets an embedded resource in the plugin file.
*
* @param string $filename
*
* @return
*/
public function getResource($filename);
public function getResource(string $filename);
/**
* Saves an embedded resource to its relative location in the data folder
*
* @param string $filename
* @param bool $replace
* @param bool $replace
*
* @return bool
*/
public function saveResource($filename, $replace = false);
public function saveResource(string $filename, bool $replace = false) : bool;
/**
* Returns all the resources packaged with the plugin
*
* @return string[]
*/
public function getResources();
public function getResources() : array;
/**
* @return Config
*/
public function getConfig();
public function getConfig() : Config;
public function saveConfig();
public function saveDefaultConfig();
/**
* @return bool
*/
public function saveDefaultConfig() : bool;
public function reloadConfig();
/**
* @return Server
*/
public function getServer();
public function getServer() : Server;
public function getName();
/**
* @return string
*/
public function getName() : string;
/**
* @return PluginLogger
*/
public function getLogger();
public function getLogger() : PluginLogger;
/**
* @return PluginLoader

47
src/pocketmine/plugin/PluginBase.php
View File

@ -48,9 +48,11 @@ abstract class PluginBase implements Plugin{
/** @var string */
private $dataFolder;
private $config;
/** @var Config|null */
private $config = null;
/** @var string */
private $configFile;
/** @var string */
private $file;
/** @var PluginLogger */
@ -74,14 +76,14 @@ abstract class PluginBase implements Plugin{
/**
* @return bool
*/
final public function isEnabled(){
final public function isEnabled() : bool{
return $this->isEnabled === true;
}
/**
* @param bool $boolean
*/
final public function setEnabled($boolean = true){
final public function setEnabled(bool $boolean = true){
if($this->isEnabled !== $boolean){
$this->isEnabled = $boolean;
if($this->isEnabled === true){
@ -95,15 +97,15 @@ abstract class PluginBase implements Plugin{
/**
* @return bool
*/
final public function isDisabled(){
final public function isDisabled() : bool{
return $this->isEnabled === false;
}
final public function getDataFolder(){
final public function getDataFolder() : string{
return $this->dataFolder;
}
final public function getDescription(){
final public function getDescription() : PluginDescription{
return $this->description;
}
@ -123,14 +125,14 @@ abstract class PluginBase implements Plugin{
/**
* @return PluginLogger
*/
public function getLogger(){
public function getLogger() : PluginLogger{
return $this->logger;
}
/**
* @return bool
*/
final public function isInitialized(){
final public function isInitialized() : bool{
return $this->initialized;
}
@ -167,7 +169,7 @@ abstract class PluginBase implements Plugin{
/**
* @return bool
*/
protected function isPhar(){
protected function isPhar() : bool{
return strpos($this->file, "phar://") === 0;
}
@ -177,9 +179,9 @@ abstract class PluginBase implements Plugin{
*
* @param string $filename
*
* @return resource|null Resource data, or null
* @return null|resource Resource data, or null
*/
public function getResource($filename){
public function getResource(string $filename){
$filename = rtrim(str_replace("\\", "/", $filename), "/");
if(file_exists($this->file . "resources/" . $filename)){
return fopen($this->file . "resources/" . $filename, "rb");
@ -190,11 +192,11 @@ abstract class PluginBase implements Plugin{
/**
* @param string $filename
* @param bool $replace
* @param bool $replace
*
* @return bool
*/
public function saveResource($filename, $replace = false){
public function saveResource(string $filename, bool $replace = false) : bool{
if(trim($filename) === ""){
return false;
}
@ -223,7 +225,7 @@ abstract class PluginBase implements Plugin{
*
* @return string[]
*/
public function getResources(){
public function getResources() : array{
$resources = [];
if(is_dir($this->file . "resources/")){
foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->file . "resources/")) as $resource){
@ -237,8 +239,8 @@ abstract class PluginBase implements Plugin{
/**
* @return Config
*/
public function getConfig(){
if(!isset($this->config)){
public function getConfig() : Config{
if($this->config === null){
$this->reloadConfig();
}
@ -251,7 +253,7 @@ abstract class PluginBase implements Plugin{
}
}
public function saveDefaultConfig(){
public function saveDefaultConfig() : bool{
if(!file_exists($this->configFile)){
return $this->saveResource("config.yml", false);
}
@ -269,25 +271,28 @@ abstract class PluginBase implements Plugin{
/**
* @return Server
*/
final public function getServer(){
final public function getServer() : Server{
return $this->server;
}
/**
* @return string
*/
final public function getName(){
final public function getName() : string{
return $this->description->getName();
}
/**
* @return string
*/
final public function getFullName(){
final public function getFullName() : string{
return $this->description->getFullName();
}
protected function getFile(){
/**
* @return string
*/
protected function getFile() : string{
return $this->file;
}

43
src/pocketmine/plugin/PluginDescription.php
View File

@ -33,12 +33,17 @@ class PluginDescription{
private $depend = [];
private $softDepend = [];
private $loadBefore = [];
/** @var string */
private $version;
private $commands = [];
private $description = null;
/** @var string */
private $description = "";
/** @var string[] */
private $authors = [];
private $website = null;
private $prefix = null;
/** @var string */
private $website = "";
/** @var string */
private $prefix = "";
private $order = PluginLoadOrder::POSTWORLD;
/**
@ -131,42 +136,42 @@ class PluginDescription{
/**
* @return string
*/
public function getFullName(){
public function getFullName() : string{
return $this->name . " v" . $this->version;
}
/**
* @return array
*/
public function getCompatibleApis(){
public function getCompatibleApis() : array{
return $this->api;
}
/**
* @return array
* @return string[]
*/
public function getAuthors(){
public function getAuthors() : array{
return $this->authors;
}
/**
* @return string
*/
public function getPrefix(){
public function getPrefix() : string{
return $this->prefix;
}
/**
* @return array
*/
public function getCommands(){
public function getCommands() : array{
return $this->commands;
}
/**
* @return array
*/
public function getRequiredExtensions(){
public function getRequiredExtensions() : array{
return $this->extensions;
}
@ -210,49 +215,49 @@ class PluginDescription{
/**
* @return array
*/
public function getDepend(){
public function getDepend() : array{
return $this->depend;
}
/**
* @return string
*/
public function getDescription(){
public function getDescription() : string{
return $this->description;
}
/**
* @return array
*/
public function getLoadBefore(){
public function getLoadBefore() : array{
return $this->loadBefore;
}
/**
* @return string
*/
public function getMain(){
public function getMain() : string{
return $this->main;
}
/**
* @return string
*/
public function getName(){
public function getName() : string{
return $this->name;
}
/**
* @return int
*/
public function getOrder(){
public function getOrder() : int{
return $this->order;
}
/**
* @return Permission[]
*/
public function getPermissions(){
public function getPermissions() : array{
return $this->permissions;
}
@ -266,14 +271,14 @@ class PluginDescription{
/**
* @return string
*/
public function getVersion(){
public function getVersion() : string{
return $this->version;
}
/**
* @return string
*/
public function getWebsite(){
public function getWebsite() : string{
return $this->website;
}
}

10
src/pocketmine/plugin/PluginLoader.php
View File

@ -33,25 +33,25 @@ interface PluginLoader{
*
* @param string $file
*
* @return Plugin
* @return Plugin|null
*/
public function loadPlugin($file);
public function loadPlugin(string $file);
/**
* Gets the PluginDescription from the file
*
* @param string $file
*
* @return PluginDescription
* @return null|PluginDescription
*/
public function getPluginDescription($file);
public function getPluginDescription(string $file);
/**
* Returns the filename regex patterns that this loader accepts
*
* @return string
*/
public function getPluginFilters();
public function getPluginFilters() : string;
/**
* @param Plugin $plugin

24
src/pocketmine/plugin/PluginManager.php
View File

@ -119,7 +119,7 @@ class PluginManager{
*
* @return bool
*/
public function registerInterface($loaderName){
public function registerInterface(string $loaderName) : bool{
if(is_subclass_of($loaderName, PluginLoader::class)){
$loader = new $loaderName($this->server);
}else{
@ -134,7 +134,7 @@ class PluginManager{
/**
* @return Plugin[]
*/
public function getPlugins(){
public function getPlugins() : array{
return $this->plugins;
}
@ -372,7 +372,7 @@ class PluginManager{
*
* @return bool
*/
public function addPermission(Permission $permission){
public function addPermission(Permission $permission) : bool{
if(!isset($this->permissions[$permission->getName()])){
$this->permissions[$permission->getName()] = $permission;
$this->calculatePermissionDefault($permission);
@ -471,9 +471,9 @@ class PluginManager{
/**
* @param string $permission
*
* @return Permissible[]
* @return array|Permissible[]
*/
public function getPermissionSubscriptions($permission){
public function getPermissionSubscriptions(string $permission) : array{
if(isset($this->permSubs[$permission])){
return $this->permSubs[$permission];
$subs = [];
@ -522,7 +522,7 @@ class PluginManager{
*
* @return Permissible[]
*/
public function getDefaultPermSubscriptions($op){
public function getDefaultPermSubscriptions(bool $op) : array{
$subs = [];
if($op === true){
@ -555,7 +555,7 @@ class PluginManager{
/**
* @return Permission[]
*/
public function getPermissions(){
public function getPermissions() : array{
return $this->permissions;
}
@ -594,7 +594,7 @@ class PluginManager{
*
* @return PluginCommand[]
*/
protected function parseYamlCommands(Plugin $plugin){
protected function parseYamlCommands(Plugin $plugin) : array{
$pluginCmds = [];
foreach($plugin->getDescription()->getCommands() as $key => $data){
@ -799,7 +799,7 @@ class PluginManager{
*
* @return HandlerList
*/
private function getEventListeners($event){
private function getEventListeners($event) : HandlerList{
if($event::$handlerList === null){
$event::$handlerList = new HandlerList();
}
@ -810,15 +810,15 @@ class PluginManager{
/**
* @return bool
*/
public function useTimings(){
public function useTimings() : bool{
return self::$useTimings;
}
/**
* @param bool $use
*/
public function setUseTimings($use){
self::$useTimings = (bool) $use;
public function setUseTimings(bool $use){
self::$useTimings = $use;
}
}

8
src/pocketmine/plugin/RegisteredListener.php
View File

@ -69,21 +69,21 @@ class RegisteredListener{
/**
* @return Listener
*/
public function getListener(){
public function getListener() : Listener{
return $this->listener;
}
/**
* @return Plugin
*/
public function getPlugin(){
public function getPlugin() : Plugin{
return $this->plugin;
}
/**
* @return int
*/
public function getPriority(){
public function getPriority() : int{
return $this->priority;
}
@ -106,7 +106,7 @@ class RegisteredListener{
/**
* @return bool
*/
public function isIgnoringCancelled(){
public function isIgnoringCancelled() : bool{
return $this->ignoreCancelled === true;
}
}

10
src/pocketmine/plugin/ScriptPluginLoader.php
View File

@ -49,10 +49,8 @@ class ScriptPluginLoader implements PluginLoader{
* @param string $file
*
* @return Plugin|null
*
* @throws \Exception
*/
public function loadPlugin($file){
public function loadPlugin(string $file){
if(($description = $this->getPluginDescription($file)) instanceof PluginDescription){
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.plugin.load", [$description->getFullName()]));
$dataFolder = dirname($file) . DIRECTORY_SEPARATOR . $description->getName();
@ -82,9 +80,9 @@ class ScriptPluginLoader implements PluginLoader{
*
* @param string $file
*
* @return PluginDescription|null
* @return null|PluginDescription
*/
public function getPluginDescription($file){
public function getPluginDescription(string $file){
$content = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
$data = [];
@ -122,7 +120,7 @@ class ScriptPluginLoader implements PluginLoader{
*
* @return string
*/
public function getPluginFilters(){
public function getPluginFilters() : string{
return "/\\.php$/i";
}

4
src/pocketmine/resourcepacks/ResourcePackInfoEntry.php
View File

@ -28,7 +28,7 @@ class ResourcePackInfoEntry{
protected $version;
protected $packSize;
public function __construct(string $packId, string $version, $packSize = 0){
public function __construct(string $packId, string $version, int $packSize = 0){
$this->packId = $packId;
$this->version = $version;
$this->packSize = $packSize;
@ -42,7 +42,7 @@ class ResourcePackInfoEntry{
return $this->version;
}
public function getPackSize(){
public function getPackSize() : int{
return $this->packSize;
}

2
src/pocketmine/resourcepacks/ZippedResourcePack.php
View File

@ -34,7 +34,7 @@ class ZippedResourcePack implements ResourcePack{
* @param \stdClass $manifest
* @return bool
*/
public static function verifyManifest(\stdClass $manifest){
public static function verifyManifest(\stdClass $manifest) : bool{
if(!isset($manifest->format_version) or !isset($manifest->header) or !isset($manifest->modules)){
return false;
}

Some files were not shown because too many files have changed in this diff Show More