Dylan K. Taylor
2d55b2db1b
Merge branch 'next-minor'
2020-04-26 00:38:20 +01:00
Dylan K. Taylor
f87e96026c
Merge branch 'stable' into next-minor
2020-04-26 00:28:09 +01:00
Dylan K. Taylor
b63ad032a9
phpstan 0.12.19
2020-04-26 00:08:41 +01:00
Dylan K. Taylor
d9b0e373bb
Populator: fix return type of populate()
2020-04-26 00:04:17 +01:00
Dylan K. Taylor
2a4d936fd4
Merge branch 'master' of https://github.com/pmmp/pocketmine-mp
2020-04-25 12:36:24 +01:00
Dylan K. Taylor
040fdc2875
Merge commit '8e1b3ed'
...
# Conflicts:
# phpstan.neon.dist
# resources/vanilla
# tests/phpstan/configs/phpstan-bugs.neon
# tests/phpstan/configs/phpunit-wiring-tests.neon
# tests/phpstan/configs/pthreads-bugs.neon
# tests/phpstan/configs/runtime-type-checks.neon
2020-04-25 12:35:30 +01:00
Dylan K. Taylor
bb8ef3ff6d
Merge commit 'da9731e'
...
# Conflicts:
# phpstan.neon.dist
# resources/vanilla
# src/PocketMine.php
2020-04-25 12:20:23 +01:00
Dylan K. Taylor
45bed454f2
Merge commit '3d2ca45'
2020-04-25 12:14:45 +01:00
Dylan K. Taylor
a178a14732
Merge commit '34a3e0d'
2020-04-25 12:13:03 +01:00
Dylan K. Taylor
8e1b3edd2c
Merge branch 'stable' into next-minor
2020-04-25 12:06:52 +01:00
Dylan K. Taylor
32262d9bb5
Merge branch 'stable' of https://github.com/pmmp/pocketmine-mp into stable
2020-04-25 11:59:35 +01:00
Dylan K. Taylor
4c1b10b24b
restructure ignoreErrors to allow regenerating them file by file
2020-04-25 11:59:06 +01:00
Dylan K. Taylor
61dc9d7f6b
phpstan: split up phpstan-bugs and phpstan-bugs-generated configs
2020-04-25 11:26:54 +01:00
Dylan K. Taylor
da9731ef59
phpstan: add stub defines to improve analysis
2020-04-25 11:07:05 +01:00
Dylan K. Taylor
e6f64c609e
bootstrap: avoid making COMPOSER_AUTOLOADER_PATH having a possible false type
2020-04-25 11:04:09 +01:00
Dylan K. Taylor
d3da485278
fix phpstan analyze failure
2020-04-25 10:43:06 +01:00
Muqsit Rayyan
b1eff87ad1
fix incorrect conversion of CreateItemAction, close #3436 ( #3437 )
2020-04-25 10:21:40 +01:00
Dylan K. Taylor
1f7f33d35d
NetworkSession: privatise setAuthenticationStatus()
...
this is accessed via a closure proxy, so it doesn't need to be exported anymore.
2020-04-25 03:33:44 +01:00
Dylan K. Taylor
80680f15f4
seal up resource pack completion callback visibility
2020-04-25 03:31:13 +01:00
Dylan K. Taylor
6dd31cc3f5
break cycle between block and inventory packages
2020-04-24 23:53:49 +01:00
Dylan K. Taylor
4fbf4dcdc6
Rename InventoryChangeListener -> InventoryListener
2020-04-24 23:44:38 +01:00
Dylan K. Taylor
c869a7f099
HandshakePacketHandler no longer depends on NetworkSession
2020-04-24 23:18:29 +01:00
Dylan K. Taylor
7d9df6af6f
Convert EntityFactory to singleton
2020-04-24 22:43:02 +01:00
dependabot-preview[bot]
8c7fbf379b
Bump irstea/phpunit-shim from 8.5.3 to 8.5.4 ( #3435 )
2020-04-24 20:45:43 +00:00
Dylan K. Taylor
a75241ef03
RuntimeBlockMapping: use SingletonTrait
2020-04-24 21:32:47 +01:00
Dylan K. Taylor
3a42c21cc1
wrap up block_id_map in a class
2020-04-24 21:28:27 +01:00
Dylan K. Taylor
1df345ba6f
tools/convert-world: do not redefine RESOURCE_PATH
...
this is now defined automatically when including the autoloader.
2020-04-24 20:55:57 +01:00
Dylan K. Taylor
ff915b829c
StartGamePacket: remove hardcoded cache, move to RuntimeBlockMapping
2020-04-24 20:50:56 +01:00
Dylan K. Taylor
287bf4274f
move RuntimeBlockMapping to convert package
2020-04-24 12:42:43 +01:00
Dylan K. Taylor
08ac6a3c43
Convert CreativeInventory to singleton
2020-04-24 00:38:18 +01:00
Dylan K. Taylor
5cc03775d3
added a SingletonTrait to reduce code duplication
2020-04-24 00:31:55 +01:00
Muqsit Rayyan
a5441e009d
remove "resource/" suffixed to DiskResourceProvider::$file ( #3433 )
2020-04-24 00:21:00 +01:00
Dylan K. Taylor
5a94af40e2
Convert ItemFactory to singleton
2020-04-24 00:18:31 +01:00
Dylan K. Taylor
13d784cd0c
Convert BlockFactory to singleton
2020-04-23 23:45:13 +01:00
Dylan K. Taylor
accc0da0cb
Chunk no longer depends on BlockFactory
...
really this light population crap shouldn't be in the chunk to begin with, but that's a bit more complicated.
2020-04-23 21:31:28 +01:00
Dylan K. Taylor
aa1828aa98
RuntimeBlockMapping is now a singleton instead of static class
...
this prepares for a fully dynamic block mapper, as well as allowing a small performance improvement to chunk encoding by eliding the constant lazy-init checks.
2020-04-23 21:09:58 +01:00
Dylan K. Taylor
f3fed60d57
crafting: ditch MultiRecipe, it's a network-only thing
...
MultiRecipes are really nothing more than feature toggles at the network layer, and they don't belong in the main core code.
2020-04-23 19:45:59 +01:00
Dylan K. Taylor
b2636161f7
PrepareEncryptionTask: move a bunch of stuff out of the AsyncTask class
2020-04-23 16:27:49 +01:00
Dylan K. Taylor
095a21ea5a
PacketPool is now non-static
...
this allows greater flexibility for customisation, and will facilitate future multi version support.
2020-04-23 16:11:47 +01:00
Dylan K. Taylor
f3d7c320a1
move SkinAdapter stuff to convert package
2020-04-23 15:46:37 +01:00
Dylan K. Taylor
ebcfab4b61
NetworkInventoryAction: move type translation to TypeConverter
2020-04-23 15:40:23 +01:00
Dylan K. Taylor
33f899f2fc
protocol: imports cleanup
2020-04-23 15:38:17 +01:00
Dylan K. Taylor
1b26cf1df9
break the hard cycle between mcpe\handler and mcpe\protocol
...
preparing to move mcpe\protocol to a separate library
2020-04-23 15:38:11 +01:00
Dylan K. Taylor
18d48869a0
the great airgapping of recipes and itemstacks
2020-04-23 14:11:48 +01:00
Dylan K. Taylor
843993f02b
Throw a specific exception for zlib decompression failure
2020-04-22 13:45:29 +01:00
Dylan K. Taylor
35d656c6e5
ProcessLoginTask no longer depends on NetworkSession
2020-04-22 13:30:37 +01:00
Dylan K. Taylor
dd37d286f0
use a dedicated exception class for throwing exceptions on decrypt failure
2020-04-22 09:40:26 +01:00
Muqsit
5a33dbd4c6
Player: drop isAdmin from kick(), closes #3275
2020-04-19 18:27:37 +01:00
Twisted
3d2ca457f8
protocol: Added missing Window Types ( #3420 )
2020-04-19 15:43:11 +01:00
Twisted
1579f41056
Added missing Enchantment IDs ( #3419 )
2020-04-19 15:42:27 +01:00
