diff --git a/src/pocketmine/Collectable.php b/src/pocketmine/Collectable.php index 4dde44cb5..ece56bb0b 100644 --- a/src/pocketmine/Collectable.php +++ b/src/pocketmine/Collectable.php @@ -25,6 +25,7 @@ namespace pocketmine; abstract class Collectable extends \Threaded{ + /** @var bool */ private $isGarbage = false; public function isGarbage() : bool{ diff --git a/src/pocketmine/CrashDump.php b/src/pocketmine/CrashDump.php index df7d0fb48..7f251175b 100644 --- a/src/pocketmine/CrashDump.php +++ b/src/pocketmine/CrashDump.php @@ -96,8 +96,11 @@ class CrashDump{ /** @var Server */ private $server; + /** @var resource */ private $fp; + /** @var int */ private $time; + /** @var mixed[] */ private $data = []; /** @var string */ private $encodedData = ""; diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 11001ede0..6cc03ce1e 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -282,6 +282,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ /** @var string */ protected $xuid = ""; + /** @var int */ protected $windowCnt = 2; /** @var int[] */ protected $windows = []; diff --git a/src/pocketmine/Thread.php b/src/pocketmine/Thread.php index 347ec62bc..00b76b125 100644 --- a/src/pocketmine/Thread.php +++ b/src/pocketmine/Thread.php @@ -33,6 +33,7 @@ abstract class Thread extends \Thread{ /** @var string|null */ protected $composerAutoloaderPath; + /** @var bool */ protected $isKilled = false; public function getClassLoader(){ diff --git a/src/pocketmine/Worker.php b/src/pocketmine/Worker.php index f4018ea48..a8b843dba 100644 --- a/src/pocketmine/Worker.php +++ b/src/pocketmine/Worker.php @@ -33,6 +33,7 @@ abstract class Worker extends \Worker{ /** @var string|null */ protected $composerAutoloaderPath; + /** @var bool */ protected $isKilled = false; public function getClassLoader(){ diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 55985964e..25cf33c45 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -39,6 +39,7 @@ class Leaves extends Transparent{ public const DARK_OAK = 1; protected $id = self::LEAVES; + /** @var int */ protected $woodType = self::WOOD; public function __construct(int $meta = 0){ diff --git a/src/pocketmine/block/Leaves2.php b/src/pocketmine/block/Leaves2.php index bb62ac2de..3abe14aec 100644 --- a/src/pocketmine/block/Leaves2.php +++ b/src/pocketmine/block/Leaves2.php @@ -29,6 +29,7 @@ use pocketmine\item\ItemFactory; class Leaves2 extends Leaves{ protected $id = self::LEAVES2; + /** @var int */ protected $woodType = self::WOOD2; public function getName() : string{ diff --git a/src/pocketmine/block/Liquid.php b/src/pocketmine/block/Liquid.php index 878b15cde..b0f200768 100644 --- a/src/pocketmine/block/Liquid.php +++ b/src/pocketmine/block/Liquid.php @@ -38,6 +38,7 @@ use function min; abstract class Liquid extends Transparent{ + /** @var int */ public $adjacentSources = 0; /** @var Vector3|null */ diff --git a/src/pocketmine/command/CommandReader.php b/src/pocketmine/command/CommandReader.php index 1aaa1721d..a313ade4f 100644 --- a/src/pocketmine/command/CommandReader.php +++ b/src/pocketmine/command/CommandReader.php @@ -54,7 +54,9 @@ class CommandReader extends Thread{ /** @var \Threaded */ protected $buffer; + /** @var bool */ private $shutdown = false; + /** @var int */ private $type = self::TYPE_STREAM; /** @var SleeperNotifier|null */ diff --git a/src/pocketmine/command/ConsoleCommandSender.php b/src/pocketmine/command/ConsoleCommandSender.php index 32c422a9c..090f52c75 100644 --- a/src/pocketmine/command/ConsoleCommandSender.php +++ b/src/pocketmine/command/ConsoleCommandSender.php @@ -37,6 +37,7 @@ use const PHP_INT_MAX; class ConsoleCommandSender implements CommandSender{ + /** @var PermissibleBase */ private $perm; /** @var int|null */ diff --git a/src/pocketmine/command/FormattedCommandAlias.php b/src/pocketmine/command/FormattedCommandAlias.php index 87655da02..d6daabed1 100644 --- a/src/pocketmine/command/FormattedCommandAlias.php +++ b/src/pocketmine/command/FormattedCommandAlias.php @@ -32,6 +32,7 @@ use function strpos; use function substr; class FormattedCommandAlias extends Command{ + /** @var string[] */ private $formatStrings = []; /** diff --git a/src/pocketmine/entity/Attribute.php b/src/pocketmine/entity/Attribute.php index a34fbbc93..b3d2df765 100644 --- a/src/pocketmine/entity/Attribute.php +++ b/src/pocketmine/entity/Attribute.php @@ -46,14 +46,22 @@ class Attribute{ public const HORSE_JUMP_STRENGTH = 14; public const ZOMBIE_SPAWN_REINFORCEMENTS = 15; + /** @var int */ private $id; + /** @var float */ protected $minValue; + /** @var float */ protected $maxValue; + /** @var float */ protected $defaultValue; + /** @var float */ protected $currentValue; + /** @var string */ protected $name; + /** @var bool */ protected $shouldSend; + /** @var bool */ protected $desynchronized = true; /** @var Attribute[] */ diff --git a/src/pocketmine/entity/DataPropertyManager.php b/src/pocketmine/entity/DataPropertyManager.php index 890ff3e2f..5f1d3606c 100644 --- a/src/pocketmine/entity/DataPropertyManager.php +++ b/src/pocketmine/entity/DataPropertyManager.php @@ -32,8 +32,10 @@ use function is_string; class DataPropertyManager{ + /** @var mixed[][] */ private $properties = []; + /** @var mixed[][] */ private $dirtyProperties = []; public function __construct(){ diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 4c756c607..dca8a8ee8 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -317,6 +317,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{ public const DATA_PLAYER_FLAG_SLEEP = 1; public const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK + /** @var int */ public static $entityCount = 1; /** @var string[] */ private static $knownEntities = []; @@ -504,6 +505,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{ /** @var float */ private $health = 20.0; + /** @var int */ private $maxHealth = 20; /** @var float */ diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index e75111c2c..7879f345b 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -81,6 +81,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{ /** @var UUID */ protected $uuid; + /** @var string */ protected $rawUUID; public $width = 0.6; @@ -90,10 +91,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{ /** @var Skin */ protected $skin; + /** @var int */ protected $foodTickTimer = 0; + /** @var int */ protected $totalXp = 0; + /** @var int */ protected $xpSeed; + /** @var int */ protected $xpCooldown = 0; protected $baseOffset = 1.62; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index 16f303b94..8ea2f5ad4 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -70,6 +70,7 @@ abstract class Living extends Entity implements Damageable{ protected $gravity = 0.08; protected $drag = 0.02; + /** @var int */ protected $attackTime = 0; /** @var int */ @@ -77,6 +78,7 @@ abstract class Living extends Entity implements Damageable{ /** @var int */ protected $maxDeadTicks = 25; + /** @var float */ protected $jumpVelocity = 0.42; /** @var EffectInstance[] */ diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index 950164fc0..3b3bfc17b 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -42,8 +42,10 @@ class Squid extends WaterAnimal{ /** @var Vector3|null */ public $swimDirection = null; + /** @var float */ public $swimSpeed = 0.1; + /** @var int */ private $switchDirectionTicker = 0; public function initEntity() : void{ diff --git a/src/pocketmine/entity/object/PrimedTNT.php b/src/pocketmine/entity/object/PrimedTNT.php index ce04b781b..227e8284a 100644 --- a/src/pocketmine/entity/object/PrimedTNT.php +++ b/src/pocketmine/entity/object/PrimedTNT.php @@ -43,6 +43,7 @@ class PrimedTNT extends Entity implements Explosive{ protected $gravity = 0.04; protected $drag = 0.02; + /** @var int */ protected $fuse; public $canCollide = false; diff --git a/src/pocketmine/event/entity/EntityCombustEvent.php b/src/pocketmine/event/entity/EntityCombustEvent.php index 17f763491..d61587585 100644 --- a/src/pocketmine/event/entity/EntityCombustEvent.php +++ b/src/pocketmine/event/entity/EntityCombustEvent.php @@ -27,6 +27,7 @@ use pocketmine\entity\Entity; use pocketmine\event\Cancellable; class EntityCombustEvent extends EntityEvent implements Cancellable{ + /** @var int */ protected $duration; /** diff --git a/src/pocketmine/event/player/PlayerDeathEvent.php b/src/pocketmine/event/player/PlayerDeathEvent.php index fa93a8ae2..754579516 100644 --- a/src/pocketmine/event/player/PlayerDeathEvent.php +++ b/src/pocketmine/event/player/PlayerDeathEvent.php @@ -40,6 +40,7 @@ class PlayerDeathEvent extends EntityDeathEvent{ /** @var TextContainer|string */ private $deathMessage; + /** @var bool */ private $keepInventory = false; /** diff --git a/src/pocketmine/inventory/MultiRecipe.php b/src/pocketmine/inventory/MultiRecipe.php index d9e667464..8309c821f 100644 --- a/src/pocketmine/inventory/MultiRecipe.php +++ b/src/pocketmine/inventory/MultiRecipe.php @@ -39,6 +39,7 @@ class MultiRecipe{ public const TYPE_FIREWORKS = "00000000-0000-0000-0000-000000000002"; public const TYPE_MAP_LOCKING_CARTOGRAPHY = "602234E4-CAC1-4353-8BB7-B1EBFF70024B"; + /** @var UUID */ private $uuid; public function __construct(UUID $uuid){ diff --git a/src/pocketmine/inventory/transaction/InventoryTransaction.php b/src/pocketmine/inventory/transaction/InventoryTransaction.php index 6ece9989e..29a744b56 100644 --- a/src/pocketmine/inventory/transaction/InventoryTransaction.php +++ b/src/pocketmine/inventory/transaction/InventoryTransaction.php @@ -53,6 +53,7 @@ use function spl_object_hash; * @see InventoryAction */ class InventoryTransaction{ + /** @var bool */ protected $hasExecuted = false; /** @var Player */ protected $source; diff --git a/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php b/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php index af861c00f..dd8374cd1 100644 --- a/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php +++ b/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php @@ -37,6 +37,7 @@ class CreativeInventoryAction extends InventoryAction{ */ public const TYPE_CREATE_ITEM = 1; + /** @var int */ protected $actionType; public function __construct(Item $sourceItem, Item $targetItem, int $actionType){ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index aa2ff0c92..7effb72a0 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -120,7 +120,9 @@ use const PHP_INT_MIN; class Level implements ChunkManager, Metadatable{ + /** @var int */ private static $levelIdCounter = 1; + /** @var int */ private static $chunkLoaderCounter = 1; public const Y_MASK = 0xFF; diff --git a/src/pocketmine/level/SimpleChunkManager.php b/src/pocketmine/level/SimpleChunkManager.php index 582598fb0..dba9854bf 100644 --- a/src/pocketmine/level/SimpleChunkManager.php +++ b/src/pocketmine/level/SimpleChunkManager.php @@ -32,7 +32,9 @@ class SimpleChunkManager implements ChunkManager{ /** @var Chunk[] */ protected $chunks = []; + /** @var int */ protected $seed; + /** @var int */ protected $worldHeight; /** diff --git a/src/pocketmine/level/biome/ForestBiome.php b/src/pocketmine/level/biome/ForestBiome.php index 30ec1475f..a756d2109 100644 --- a/src/pocketmine/level/biome/ForestBiome.php +++ b/src/pocketmine/level/biome/ForestBiome.php @@ -32,6 +32,7 @@ class ForestBiome extends GrassyBiome{ public const TYPE_NORMAL = 0; public const TYPE_BIRCH = 1; + /** @var int */ public $type; public function __construct(int $type = self::TYPE_NORMAL){ diff --git a/src/pocketmine/level/format/SubChunk.php b/src/pocketmine/level/format/SubChunk.php index 20207c563..d49f95d26 100644 --- a/src/pocketmine/level/format/SubChunk.php +++ b/src/pocketmine/level/format/SubChunk.php @@ -38,9 +38,13 @@ if(!defined(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY')){ } class SubChunk implements SubChunkInterface{ + /** @var string */ protected $ids; + /** @var string */ protected $data; + /** @var string */ protected $blockLight; + /** @var string */ protected $skyLight; private static function assignData(&$target, string $data, int $length, string $value = "\x00"){ diff --git a/src/pocketmine/level/format/io/ChunkRequestTask.php b/src/pocketmine/level/format/io/ChunkRequestTask.php index 07bf31eb0..945ae324a 100644 --- a/src/pocketmine/level/format/io/ChunkRequestTask.php +++ b/src/pocketmine/level/format/io/ChunkRequestTask.php @@ -34,12 +34,17 @@ use function strlen; class ChunkRequestTask extends AsyncTask{ + /** @var int */ protected $levelId; + /** @var string */ protected $chunk; + /** @var int */ protected $chunkX; + /** @var int */ protected $chunkZ; + /** @var int */ protected $compressionLevel; /** @var int */ diff --git a/src/pocketmine/level/format/io/LevelProviderManager.php b/src/pocketmine/level/format/io/LevelProviderManager.php index b53889f0f..ca64a5c94 100644 --- a/src/pocketmine/level/format/io/LevelProviderManager.php +++ b/src/pocketmine/level/format/io/LevelProviderManager.php @@ -31,6 +31,7 @@ use function strtolower; use function trim; abstract class LevelProviderManager{ + /** @var string[] */ protected static $providers = []; public static function init() : void{ diff --git a/src/pocketmine/level/format/io/region/RegionLoader.php b/src/pocketmine/level/format/io/region/RegionLoader.php index 6c64a2489..e00fdff44 100644 --- a/src/pocketmine/level/format/io/region/RegionLoader.php +++ b/src/pocketmine/level/format/io/region/RegionLoader.php @@ -62,6 +62,7 @@ class RegionLoader{ private const FIRST_SECTOR = 2; //location table occupies 0 and 1 + /** @var int */ public static $COMPRESSION_LEVEL = 7; /** @var int */ diff --git a/src/pocketmine/level/generator/GeneratorRegisterTask.php b/src/pocketmine/level/generator/GeneratorRegisterTask.php index f56ad5b21..af6c320d7 100644 --- a/src/pocketmine/level/generator/GeneratorRegisterTask.php +++ b/src/pocketmine/level/generator/GeneratorRegisterTask.php @@ -34,10 +34,15 @@ use function unserialize; class GeneratorRegisterTask extends AsyncTask{ + /** @var string */ public $generatorClass; + /** @var string */ public $settings; + /** @var int */ public $seed; + /** @var int */ public $levelId; + /** @var int */ public $worldHeight = Level::Y_MAX; public function __construct(Level $level, string $generatorClass, array $generatorSettings = []){ diff --git a/src/pocketmine/level/generator/GeneratorUnregisterTask.php b/src/pocketmine/level/generator/GeneratorUnregisterTask.php index 780268cac..597c2fe4f 100644 --- a/src/pocketmine/level/generator/GeneratorUnregisterTask.php +++ b/src/pocketmine/level/generator/GeneratorUnregisterTask.php @@ -28,6 +28,7 @@ use pocketmine\scheduler\AsyncTask; class GeneratorUnregisterTask extends AsyncTask{ + /** @var int */ public $levelId; public function __construct(Level $level){ diff --git a/src/pocketmine/level/generator/PopulationTask.php b/src/pocketmine/level/generator/PopulationTask.php index d061c415b..29c1f96df 100644 --- a/src/pocketmine/level/generator/PopulationTask.php +++ b/src/pocketmine/level/generator/PopulationTask.php @@ -31,18 +31,31 @@ use pocketmine\Server; class PopulationTask extends AsyncTask{ + /** @var bool */ public $state; + /** @var int */ public $levelId; + /** @var string */ public $chunk; + /** @var string */ public $chunk0; + /** @var string */ public $chunk1; + /** @var string */ public $chunk2; + /** @var string */ public $chunk3; + //center chunk + + /** @var string */ public $chunk5; + /** @var string */ public $chunk6; + /** @var string */ public $chunk7; + /** @var string */ public $chunk8; public function __construct(Level $level, Chunk $chunk){ diff --git a/src/pocketmine/level/generator/noise/Noise.php b/src/pocketmine/level/generator/noise/Noise.php index f0b4b6b50..9fd4ad515 100644 --- a/src/pocketmine/level/generator/noise/Noise.php +++ b/src/pocketmine/level/generator/noise/Noise.php @@ -31,12 +31,19 @@ use function array_fill; use function assert; abstract class Noise{ + /** @var int[] */ protected $perm = []; + /** @var float */ protected $offsetX = 0; + /** @var float */ protected $offsetY = 0; + /** @var float */ protected $offsetZ = 0; + /** @var int */ protected $octaves = 8; + /** @var float */ protected $persistence; + /** @var float */ protected $expansion; public static function floor($x) : int{ diff --git a/src/pocketmine/level/generator/noise/Perlin.php b/src/pocketmine/level/generator/noise/Perlin.php index 84b2ab2c2..6c0631218 100644 --- a/src/pocketmine/level/generator/noise/Perlin.php +++ b/src/pocketmine/level/generator/noise/Perlin.php @@ -26,6 +26,7 @@ namespace pocketmine\level\generator\noise; use pocketmine\utils\Random; class Perlin extends Noise{ + /** @var int[][] */ public static $grad3 = [ [1, 1, 0], [-1, 1, 0], [1, -1, 0], [-1, -1, 0], [1, 0, 1], [-1, 0, 1], [1, 0, -1], [-1, 0, -1], diff --git a/src/pocketmine/level/generator/noise/Simplex.php b/src/pocketmine/level/generator/noise/Simplex.php index be2de635f..cba796c0c 100644 --- a/src/pocketmine/level/generator/noise/Simplex.php +++ b/src/pocketmine/level/generator/noise/Simplex.php @@ -34,18 +34,31 @@ use function sqrt; * http://staffwww.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf */ class Simplex extends Perlin{ + /** @var float */ protected static $SQRT_3; + /** @var float */ protected static $SQRT_5; + /** @var float */ protected static $F2; + /** @var float */ protected static $G2; + /** @var float */ protected static $G22; + /** @var float */ protected static $F3; + /** @var float */ protected static $G3; + /** @var float */ protected static $F4; + /** @var float */ protected static $G4; + /** @var float */ protected static $G42; + /** @var float */ protected static $G43; + /** @var float */ protected static $G44; + /** @var int[][] */ protected static $grad4 = [[0, 1, 1, 1], [0, 1, 1, -1], [0, 1, -1, 1], [0, 1, -1, -1], [0, -1, 1, 1], [0, -1, 1, -1], [0, -1, -1, 1], [0, -1, -1, -1], [1, 0, 1, 1], [1, 0, 1, -1], [1, 0, -1, 1], [1, 0, -1, -1], @@ -54,6 +67,8 @@ class Simplex extends Perlin{ [-1, 1, 0, 1], [-1, 1, 0, -1], [-1, -1, 0, 1], [-1, -1, 0, -1], [1, 1, 1, 0], [1, 1, -1, 0], [1, -1, 1, 0], [1, -1, -1, 0], [-1, 1, 1, 0], [-1, 1, -1, 0], [-1, -1, 1, 0], [-1, -1, -1, 0]]; + + /** @var int[][] */ protected static $simplex = [ [0, 1, 2, 3], [0, 1, 3, 2], [0, 0, 0, 0], [0, 2, 3, 1], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [1, 2, 3, 0], [0, 2, 1, 3], [0, 0, 0, 0], [0, 3, 1, 2], [0, 3, 2, 1], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [1, 3, 2, 0], @@ -63,6 +78,8 @@ class Simplex extends Perlin{ [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [2, 0, 1, 3], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [3, 0, 1, 2], [3, 0, 2, 1], [0, 0, 0, 0], [3, 1, 2, 0], [2, 1, 0, 3], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [3, 1, 0, 2], [0, 0, 0, 0], [3, 2, 0, 1], [3, 2, 1, 0]]; + + /** @var float */ protected $offsetW; diff --git a/src/pocketmine/level/generator/normal/Normal.php b/src/pocketmine/level/generator/normal/Normal.php index cfb7ea65e..142920483 100644 --- a/src/pocketmine/level/generator/normal/Normal.php +++ b/src/pocketmine/level/generator/normal/Normal.php @@ -55,7 +55,9 @@ class Normal extends Generator{ /** @var BiomeSelector */ private $selector; + /** @var float[][]|null */ private static $GAUSSIAN_KERNEL = null; + /** @var int */ private static $SMOOTH_SIZE = 2; /** diff --git a/src/pocketmine/level/generator/object/BirchTree.php b/src/pocketmine/level/generator/object/BirchTree.php index 18a3cc9f5..c4e8ef023 100644 --- a/src/pocketmine/level/generator/object/BirchTree.php +++ b/src/pocketmine/level/generator/object/BirchTree.php @@ -30,6 +30,7 @@ use pocketmine\utils\Random; class BirchTree extends Tree{ + /** @var bool */ protected $superBirch = false; public function __construct(bool $superBirch = false){ diff --git a/src/pocketmine/level/generator/object/Pond.php b/src/pocketmine/level/generator/object/Pond.php index 560d64464..41af141f1 100644 --- a/src/pocketmine/level/generator/object/Pond.php +++ b/src/pocketmine/level/generator/object/Pond.php @@ -29,7 +29,9 @@ use pocketmine\math\Vector3; use pocketmine\utils\Random; class Pond{ + /** @var Random */ private $random; + /** @var Block */ public $type; public function __construct(Random $random, Block $type){ diff --git a/src/pocketmine/level/generator/object/Tree.php b/src/pocketmine/level/generator/object/Tree.php index dae399539..30570feb6 100644 --- a/src/pocketmine/level/generator/object/Tree.php +++ b/src/pocketmine/level/generator/object/Tree.php @@ -31,6 +31,7 @@ use pocketmine\utils\Random; use function abs; abstract class Tree{ + /** @var bool[] */ public $overridable = [ Block::AIR => true, Block::SAPLING => true, @@ -39,9 +40,13 @@ abstract class Tree{ Block::LEAVES2 => true ]; + /** @var int */ public $type = 0; + /** @var int */ public $trunkBlock = Block::LOG; + /** @var int */ public $leafBlock = Block::LEAVES; + /** @var int */ public $treeHeight = 7; public static function growTree(ChunkManager $level, int $x, int $y, int $z, Random $random, int $type = 0){ diff --git a/src/pocketmine/level/generator/populator/Pond.php b/src/pocketmine/level/generator/populator/Pond.php index c420cf65d..48b40a5e8 100644 --- a/src/pocketmine/level/generator/populator/Pond.php +++ b/src/pocketmine/level/generator/populator/Pond.php @@ -30,8 +30,11 @@ use pocketmine\math\Vector3; use pocketmine\utils\Random; class Pond extends Populator{ + /** @var int */ private $waterOdd = 4; + /** @var int */ private $lavaOdd = 4; + /** @var int */ private $lavaSurfaceOdd = 4; public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){ diff --git a/src/pocketmine/level/generator/populator/TallGrass.php b/src/pocketmine/level/generator/populator/TallGrass.php index 49c8fdb8b..1c89dddf9 100644 --- a/src/pocketmine/level/generator/populator/TallGrass.php +++ b/src/pocketmine/level/generator/populator/TallGrass.php @@ -30,7 +30,9 @@ use pocketmine\utils\Random; class TallGrass extends Populator{ /** @var ChunkManager */ private $level; + /** @var int */ private $randomAmount = 1; + /** @var int */ private $baseAmount = 0; public function setRandomAmount($amount){ diff --git a/src/pocketmine/level/generator/populator/Tree.php b/src/pocketmine/level/generator/populator/Tree.php index edcd48f2c..a9e031a00 100644 --- a/src/pocketmine/level/generator/populator/Tree.php +++ b/src/pocketmine/level/generator/populator/Tree.php @@ -32,9 +32,12 @@ use pocketmine\utils\Random; class Tree extends Populator{ /** @var ChunkManager */ private $level; + /** @var int */ private $randomAmount = 1; + /** @var int */ private $baseAmount = 0; + /** @var int */ private $type; public function __construct($type = Sapling::OAK){ diff --git a/src/pocketmine/level/light/LightPopulationTask.php b/src/pocketmine/level/light/LightPopulationTask.php index 6a7ab7a85..26a391303 100644 --- a/src/pocketmine/level/light/LightPopulationTask.php +++ b/src/pocketmine/level/light/LightPopulationTask.php @@ -31,7 +31,9 @@ use pocketmine\Server; class LightPopulationTask extends AsyncTask{ + /** @var int */ public $levelId; + /** @var string */ public $chunk; public function __construct(Level $level, Chunk $chunk){ diff --git a/src/pocketmine/level/particle/FloatingTextParticle.php b/src/pocketmine/level/particle/FloatingTextParticle.php index 4ec0ccce2..58b0dde28 100644 --- a/src/pocketmine/level/particle/FloatingTextParticle.php +++ b/src/pocketmine/level/particle/FloatingTextParticle.php @@ -39,9 +39,13 @@ use function str_repeat; class FloatingTextParticle extends Particle{ //TODO: HACK! + /** @var string */ protected $text; + /** @var string */ protected $title; - protected $entityId; + /** @var int|null */ + protected $entityId = null; + /** @var bool */ protected $invisible = false; /** diff --git a/src/pocketmine/network/CompressBatchedTask.php b/src/pocketmine/network/CompressBatchedTask.php index d0f6757c2..27a0e862a 100644 --- a/src/pocketmine/network/CompressBatchedTask.php +++ b/src/pocketmine/network/CompressBatchedTask.php @@ -30,7 +30,9 @@ use pocketmine\Server; class CompressBatchedTask extends AsyncTask{ + /** @var int */ public $level = 7; + /** @var string */ public $data; /** diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index c3633215f..9e6c7d7c3 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -34,6 +34,7 @@ use function spl_object_hash; class Network{ + /** @var int */ public static $BATCH_THRESHOLD = 512; /** @var Server */ @@ -45,7 +46,9 @@ class Network{ /** @var AdvancedSourceInterface[] */ private $advancedInterfaces = []; + /** @var float */ private $upload = 0; + /** @var float */ private $download = 0; /** @var string */ diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index 28c61b970..42a01dd49 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -61,12 +61,18 @@ class AddPlayerPacket extends DataPacket{ public $metadata = []; //TODO: adventure settings stuff + /** @var int */ public $uvarint1 = 0; + /** @var int */ public $uvarint2 = 0; + /** @var int */ public $uvarint3 = 0; + /** @var int */ public $uvarint4 = 0; + /** @var int */ public $uvarint5 = 0; + /** @var int */ public $long1 = 0; /** @var EntityLink[] */ diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index a05d2bc27..78ae5a584 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -62,6 +62,7 @@ class CraftingDataPacket extends DataPacket{ /** @var bool */ public $cleanRecipes = false; + /** @var mixed[][] */ public $decodedEntries = []; public function clean(){ diff --git a/src/pocketmine/permission/Permission.php b/src/pocketmine/permission/Permission.php index d1eba9dce..a387c2ad5 100644 --- a/src/pocketmine/permission/Permission.php +++ b/src/pocketmine/permission/Permission.php @@ -40,6 +40,7 @@ class Permission{ public const DEFAULT_TRUE = "true"; public const DEFAULT_FALSE = "false"; + /** @var string */ public static $DEFAULT_PERMISSION = self::DEFAULT_OP; /** diff --git a/src/pocketmine/plugin/MethodEventExecutor.php b/src/pocketmine/plugin/MethodEventExecutor.php index aeeb01269..e5651846d 100644 --- a/src/pocketmine/plugin/MethodEventExecutor.php +++ b/src/pocketmine/plugin/MethodEventExecutor.php @@ -28,6 +28,7 @@ use pocketmine\event\Listener; class MethodEventExecutor implements EventExecutor{ + /** @var string */ private $method; public function __construct($method){ diff --git a/src/pocketmine/plugin/PluginDescription.php b/src/pocketmine/plugin/PluginDescription.php index c529dd1f7..ae78ae3b6 100644 --- a/src/pocketmine/plugin/PluginDescription.php +++ b/src/pocketmine/plugin/PluginDescription.php @@ -41,20 +41,28 @@ use function version_compare; use function yaml_parse; class PluginDescription{ + /** @var mixed[] */ private $map; + /** @var string */ private $name; + /** @var string */ private $main; + /** @var string[] */ private $api; /** @var int[] */ private $compatibleMcpeProtocols = []; /** @var string[][] */ private $extensions = []; + /** @var string[] */ private $depend = []; + /** @var string[] */ private $softDepend = []; + /** @var string[] */ private $loadBefore = []; /** @var string */ private $version; + /** @var mixed[][] */ private $commands = []; /** @var string */ private $description = ""; @@ -64,6 +72,7 @@ class PluginDescription{ private $website = ""; /** @var string */ private $prefix = ""; + /** @var int */ private $order = PluginLoadOrder::POSTWORLD; /** diff --git a/src/pocketmine/plugin/PluginLogger.php b/src/pocketmine/plugin/PluginLogger.php index 585d9da39..7272064bf 100644 --- a/src/pocketmine/plugin/PluginLogger.php +++ b/src/pocketmine/plugin/PluginLogger.php @@ -29,6 +29,7 @@ use function spl_object_hash; class PluginLogger implements \AttachableLogger{ + /** @var string */ private $pluginName; /** @var \LoggerAttachment[] */ diff --git a/src/pocketmine/resourcepacks/ResourcePackInfoEntry.php b/src/pocketmine/resourcepacks/ResourcePackInfoEntry.php index 3b6e7a3e9..1da3b40b3 100644 --- a/src/pocketmine/resourcepacks/ResourcePackInfoEntry.php +++ b/src/pocketmine/resourcepacks/ResourcePackInfoEntry.php @@ -24,8 +24,11 @@ declare(strict_types=1); namespace pocketmine\resourcepacks; class ResourcePackInfoEntry{ + /** @var string */ protected $packId; //UUID + /** @var string */ protected $version; + /** @var int */ protected $packSize; public function __construct(string $packId, string $version, int $packSize = 0){ diff --git a/src/pocketmine/scheduler/AsyncTask.php b/src/pocketmine/scheduler/AsyncTask.php index d0158eb20..cf3524869 100644 --- a/src/pocketmine/scheduler/AsyncTask.php +++ b/src/pocketmine/scheduler/AsyncTask.php @@ -59,12 +59,16 @@ abstract class AsyncTask extends Collectable{ /** @var \Threaded */ public $progressUpdates; + /** @var scalar|null */ private $result = null; + /** @var bool */ private $serialized = false; + /** @var bool */ private $cancelRun = false; /** @var int|null */ private $taskId = null; + /** @var bool */ private $crashed = false; public function run(){ diff --git a/src/pocketmine/scheduler/AsyncWorker.php b/src/pocketmine/scheduler/AsyncWorker.php index c7026a46f..69400a379 100644 --- a/src/pocketmine/scheduler/AsyncWorker.php +++ b/src/pocketmine/scheduler/AsyncWorker.php @@ -35,7 +35,9 @@ class AsyncWorker extends Worker{ /** @var mixed[] */ private static $store = []; + /** @var \ThreadedLogger */ private $logger; + /** @var int */ private $id; /** @var int */ diff --git a/src/pocketmine/scheduler/BulkCurlTask.php b/src/pocketmine/scheduler/BulkCurlTask.php index 56fc3aa5b..62643419e 100644 --- a/src/pocketmine/scheduler/BulkCurlTask.php +++ b/src/pocketmine/scheduler/BulkCurlTask.php @@ -34,6 +34,7 @@ use function unserialize; * The result of this AsyncTask is an array of arrays (returned from {@link Internet::simpleCurl}) or InternetException objects. */ class BulkCurlTask extends AsyncTask{ + /** @var string */ private $operations; /** diff --git a/src/pocketmine/scheduler/SendUsageTask.php b/src/pocketmine/scheduler/SendUsageTask.php index 7edd523f7..b97c64163 100644 --- a/src/pocketmine/scheduler/SendUsageTask.php +++ b/src/pocketmine/scheduler/SendUsageTask.php @@ -44,7 +44,9 @@ class SendUsageTask extends AsyncTask{ public const TYPE_STATUS = 2; public const TYPE_CLOSE = 3; + /** @var string */ public $endpoint; + /** @var string */ public $data; /** diff --git a/src/pocketmine/utils/Config.php b/src/pocketmine/utils/Config.php index 4a1923f24..6dcaba22b 100644 --- a/src/pocketmine/utils/Config.php +++ b/src/pocketmine/utils/Config.php @@ -71,6 +71,7 @@ class Config{ /** @var array */ private $config = []; + /** @var mixed[] */ private $nestedCache = []; /** @var string */ @@ -85,6 +86,7 @@ class Config{ /** @var bool */ private $changed = false; + /** @var int[] */ public static $formats = [ "properties" => Config::PROPERTIES, "cnf" => Config::CNF, diff --git a/src/pocketmine/utils/Internet.php b/src/pocketmine/utils/Internet.php index 0198b319f..8fec39ad5 100644 --- a/src/pocketmine/utils/Internet.php +++ b/src/pocketmine/utils/Internet.php @@ -62,7 +62,9 @@ use const SOCK_DGRAM; use const SOL_UDP; class Internet{ + /** @var string|false */ public static $ip = false; + /** @var bool */ public static $online = true; /** diff --git a/src/pocketmine/utils/ServerKiller.php b/src/pocketmine/utils/ServerKiller.php index ff3ecd448..4e5ff8454 100644 --- a/src/pocketmine/utils/ServerKiller.php +++ b/src/pocketmine/utils/ServerKiller.php @@ -29,6 +29,7 @@ use function time; class ServerKiller extends Thread{ + /** @var int */ public $time; /** @var bool */ diff --git a/src/pocketmine/utils/Terminal.php b/src/pocketmine/utils/Terminal.php index dd52d6951..c30f08e56 100644 --- a/src/pocketmine/utils/Terminal.php +++ b/src/pocketmine/utils/Terminal.php @@ -31,29 +31,51 @@ use function is_array; use function stream_isatty; abstract class Terminal{ + /** @var string */ public static $FORMAT_BOLD = ""; + /** @var string */ public static $FORMAT_OBFUSCATED = ""; + /** @var string */ public static $FORMAT_ITALIC = ""; + /** @var string */ public static $FORMAT_UNDERLINE = ""; + /** @var string */ public static $FORMAT_STRIKETHROUGH = ""; + /** @var string */ public static $FORMAT_RESET = ""; + /** @var string */ public static $COLOR_BLACK = ""; + /** @var string */ public static $COLOR_DARK_BLUE = ""; + /** @var string */ public static $COLOR_DARK_GREEN = ""; + /** @var string */ public static $COLOR_DARK_AQUA = ""; + /** @var string */ public static $COLOR_DARK_RED = ""; + /** @var string */ public static $COLOR_PURPLE = ""; + /** @var string */ public static $COLOR_GOLD = ""; + /** @var string */ public static $COLOR_GRAY = ""; + /** @var string */ public static $COLOR_DARK_GRAY = ""; + /** @var string */ public static $COLOR_BLUE = ""; + /** @var string */ public static $COLOR_GREEN = ""; + /** @var string */ public static $COLOR_AQUA = ""; + /** @var string */ public static $COLOR_RED = ""; + /** @var string */ public static $COLOR_LIGHT_PURPLE = ""; + /** @var string */ public static $COLOR_YELLOW = ""; + /** @var string */ public static $COLOR_WHITE = ""; /** @var bool|null */ diff --git a/src/pocketmine/utils/Utils.php b/src/pocketmine/utils/Utils.php index c9e36d72c..91b65b465 100644 --- a/src/pocketmine/utils/Utils.php +++ b/src/pocketmine/utils/Utils.php @@ -100,6 +100,7 @@ use const STR_PAD_RIGHT; * Big collection of functions */ class Utils{ + /** @var string|null */ public static $os; /** @var UUID|null */ private static $serverUniqueId = null;