11607 Commits

Author SHA1 Message Date
Dylan K. Taylor
cc33c8155f Language: specify key type for lang and fallbackLang fields 2020-02-01 20:20:39 +00:00
Dylan K. Taylor
ff63f6d055 fill in more iterable types (master) 2020-02-01 20:19:57 +00:00
Dylan K. Taylor
0a566f8218 LevelProvider::generate() accepts class-string<Generator>, not any
string
2020-02-01 20:16:05 +00:00
Dylan K. Taylor
829dd02eea Server: fixed more bad non-nullable phpdocs 2020-02-01 19:30:47 +00:00
Dylan K. Taylor
200209b76c RegistryTrait: provide an explicit phpstan type for __callStatic arguments 2020-02-01 17:20:36 +00:00
Dylan K. Taylor
3688f78986 Merge commit '004f7ef82e9613d60c3614dbf634836b7e2f3774' 2020-01-31 22:09:20 +00:00
Dylan K. Taylor
c372f27e06 Empty merge of commit '89ebd2b88049d264cfa94543520f3af6e303a071' 2020-01-31 22:08:40 +00:00
Dylan K. Taylor
89c6da13ac phpstan: use more class-string 2020-01-31 22:05:33 +00:00
Dylan K. Taylor
f65bf76fd8 Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/tile/Tile.php
#	src/world/generator/GeneratorManager.php
2020-01-31 21:26:40 +00:00
Dylan K. Taylor
cb16f5c142 Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/lang/Language.php
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/permission/Permission.php
#	src/pocketmine/block/Leaves.php
#	src/pocketmine/entity/DataPropertyManager.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
#	src/pocketmine/tile/Banner.php
#	src/scheduler/BulkCurlTask.php
#	src/updater/AutoUpdater.php
#	src/utils/Config.php
#	src/utils/Utils.php
#	src/world/generator/Flat.php
#	src/world/generator/Generator.php
2020-01-31 21:07:34 +00:00
Dylan K. Taylor
96ac95798b Merge commit '4ff4434a220813e446efde4a38e48a0416476dba'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
2020-01-31 20:11:29 +00:00
Dylan K. Taylor
ee4757303b Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/Achievement.php
2020-01-31 20:07:21 +00:00
Dylan K. Taylor
721bd8f02b Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'
# Conflicts:
#	resources/vanilla
2020-01-31 20:03:27 +00:00
Dylan K. Taylor
3401504bab Merge commit '9097d6c4d35b05576181f91bda68d316809f28b9'
# Conflicts:
#	resources/vanilla
2020-01-31 20:02:59 +00:00
Dylan K. Taylor
3a68f5e3d0 Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'
# Conflicts:
#	resources/vanilla
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/Utils.php
2020-01-31 20:02:39 +00:00
Dylan K. Taylor
3e80850938 Merge commit '60b405d944254c940f818ebd0b7aa2603d7968a7'
# Conflicts:
#	resources/vanilla
#	src/updater/AutoUpdater.php
2020-01-31 19:55:43 +00:00
Dylan K. Taylor
1ae7960fc4 Merge commit '92a752053df598e5fe9366601bef070d967374fc'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/tile/Banner.php
#	src/pocketmine/tile/Sign.php
#	src/pocketmine/tile/Tile.php
2020-01-31 19:50:33 +00:00
Dylan K. Taylor
9b9b955762 Merge commit '0537c66849b307465159306981bad78ba902f30b'
# Conflicts:
#	resources/vanilla
#	src/scheduler/BulkCurlTask.php
2020-01-31 19:47:59 +00:00
Dylan K. Taylor
19a6fb35e7 Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494'
# Conflicts:
#	resources/vanilla
2020-01-31 19:46:28 +00:00
Dylan K. Taylor
b46712fbe9 Merge commit '58bc08838ba18df6361cede4b420d87d5973090a'
# Conflicts:
#	resources/vanilla
#	src/permission/Permission.php
2020-01-31 19:45:31 +00:00
Dylan K. Taylor
20d39846b7 Merge commit 'fc0619ee6e4fa08aba2719e58a9289edd11f0b6e'
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
2020-01-31 19:42:07 +00:00
Dylan K. Taylor
465d8cda79 Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/world/generator/Generator.php
#	src/world/generator/GeneratorRegisterTask.php
2020-01-31 19:32:38 +00:00
Dylan K. Taylor
301460a0ea Merge commit '8bf469f7fcd428ebc8c3c9b9ab777c79e2824c67'
# Conflicts:
#	resources/vanilla
#	src/lang/Language.php
2020-01-31 19:22:14 +00:00
Dylan K. Taylor
8262633820 Merge commit '3b9a5c5ccc22170499b686f59ea55e8be231407a'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Item.php
2020-01-31 19:21:03 +00:00
Dylan K. Taylor
09b24d3c32 Merge commit '4c36ca58e2710c8fd03eec1f50a885fb97fd9b68'
# Conflicts:
#	resources/vanilla
2020-01-31 19:19:06 +00:00
Dylan K. Taylor
f66efa1aa2 Merge commit 'a67fa5c007de3a5e7e689c63955849ceba9d7541' 2020-01-31 19:18:35 +00:00
Dylan K. Taylor
eb6bb1aae1 Merge commit '839a789180cb3acd2e16006afa9b787903ffbbcd' 2020-01-31 19:16:09 +00:00
Dylan K. Taylor
dedf81a9af Merge commit 'e61c3e8bf697e5c5c6cddb4843b24279faaf25cb' 2020-01-31 19:12:32 +00:00
Dylan K. Taylor
25ead18369 Merge commit '7ce6c8aa13bd1e8eb5aa3fe267a0116ab43e9313' 2020-01-31 18:55:49 +00:00
Dylan K. Taylor
1388a2287a Merge commit '5c8a625d88e511a6ebad765714b75f1a86dfd37f' 2020-01-31 18:50:23 +00:00
Dylan K. Taylor
5be45dd793 Merge commit '259f0425a9657befcc8ef5f474ecc24ec78042fa' 2020-01-31 18:43:47 +00:00
Dylan K. Taylor
86f866de37 Merge commit '9cdea437947ed233feab875b2a6d30a68b8648fe' 2020-01-31 18:21:32 +00:00
Dylan K. Taylor
b11c350b2b composer: use new pocketmine/log & pocketmine/classloader classes 2020-01-31 15:51:26 +00:00
Dylan K. Taylor
f624e36faf composer: all of these packages are now available on packagist 2020-01-31 15:49:33 +00:00
Dylan K. Taylor
14ce9c10bb BUILDING.md: fix typo 2020-01-31 13:27:29 +00:00
Dylan K. Taylor
b27aaaeeb2 added build instructions, close #2839 2020-01-31 11:32:28 +00:00
Dylan K. Taylor
f1083bd9c4 SimpleCommandMap: beware case mismatches in alias recursion, closes #3281 2020-01-31 10:36:47 +00:00
Dylan K. Taylor
199fa61aef update composer dependencies 2020-01-30 22:41:58 +00:00
Dylan K. Taylor
af82a6bbe1 phpstan: enable checkMissingIterableValueType 2020-01-30 22:31:42 +00:00
Dylan K. Taylor
004f7ef82e phpstan: stub out the iterable bullshit with pthreads
this isn't a perfect fix, but it's better than it whining about all the things.
2020-01-30 22:31:15 +00:00
Dylan K. Taylor
89ebd2b880 remove some dead ignoreErrors 2020-01-30 22:30:04 +00:00
Dylan K. Taylor
799183e13e make use of phpstan class-string in some areas 2020-01-30 22:23:11 +00:00
Dylan K. Taylor
260ac47588 add some phpstan array types 2020-01-30 22:23:11 +00:00
Dylan K. Taylor
4ff4434a22 build/server-phar: mark metadata as mixed[] 2020-01-30 21:49:52 +00:00
Dylan K. Taylor
5d8bb84269 add more mixed[] to item namespace 2020-01-30 21:48:11 +00:00
Dylan K. Taylor
9eebfa7cc3 populate missing array value types in root namespace 2020-01-30 21:43:00 +00:00
Dylan K. Taylor
d3021c6281 populate missing array value types in utils namespace, pass 2 2020-01-30 21:39:15 +00:00
Dylan K. Taylor
9097d6c4d3 AutoUpdater: fixed type doc for updateInfo 2020-01-30 21:34:26 +00:00
Dylan K. Taylor
da43ae82fe populate missing array value types in utils namespace, pass 1 2020-01-30 21:30:01 +00:00
Dylan K. Taylor
60b405d944 populate missing array value types in updater namespace 2020-01-30 21:23:05 +00:00