18216 Commits

Author SHA1 Message Date
pmmp-admin-bot[bot]
851bbd7384 Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12268005529
2024-12-11 01:40:03 +00:00
Dylan K. Taylor
ba93665fe7
TextFormat: reduce hella duplicated code in toHTML() 2024-12-10 14:11:11 +00:00
Maxence
6817215683
TextFormat: Added new material colours for armor trims (#5838)
Unfortunately, these new formatting codes conflict with the Java strikethrough and underline, so we can't support these anymore.

A TextFormat::javaToBedrock() is provided to strip these codes, or (if these formats become supported via different codes) to convert them to Bedrock variants.

Co-authored-by: Dylan T. <dktapps@pmmp.io>
2024-12-10 13:40:03 +00:00
pmmp-admin-bot[bot]
1ee52b69b0 Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12247725255
2024-12-10 01:41:10 +00:00
pmmp-admin-bot[bot]
67b9d6222d 5.23.3 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/12240364052
2024-12-09 16:52:50 +00:00
Dylan T.
6f197bc1bb
5.23.2 (#6569) 5.23.2 2024-12-09 16:51:41 +00:00
Dylan K. Taylor
bba525da02
Remove dead PHPStan ignored errors 2024-12-09 16:44:25 +00:00
Dylan K. Taylor
ad6d34f1a6
Remove legacy make-release script
we no longer use this release workflow, all releases should now be done via pull request
2024-12-09 16:44:07 +00:00
Dylan K. Taylor
a8eaa43bc8
Recombine release workflows
having two different workflows able to trigger releases is a pain for build number continuity.
perhaps longer term we should source the build number a different way, but these workflows needed restructuring anyway.
2024-12-09 16:36:26 +00:00
dependabot[bot]
fe7c282052
Bump pocketmine/locale-data in the production-patch-updates group (#6568) 2024-12-09 12:03:09 +00:00
pmmp-admin-bot[bot]
851f7a9d80 Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12227347339
2024-12-09 01:42:26 +00:00
Dylan T.
45917d495c
Fixed CrashDump incorrectly detecting phar core crashes as plugin crashes (#6564)
fixes #6563

Since #6217 was merged, \pocketmine\PATH no longer includes the path of the original phar.
This means that the frame originating from the phar stub would not get its path cleaned up,
leading to it being incorrectly detected as a plugin frame.

We should probably explore better methods of detecting plugin crashes in the future; however
this fix should solve the immediate issue.
2024-12-08 16:52:33 +00:00
Dylan K. Taylor
0fe786af4d
Rename CombinedInventory -> CombinedInventoryProxy 2024-12-08 16:28:00 +00:00
Dylan K. Taylor
9949e3815f
CombinedInventory now propagates updates if its backing inventories were directly modified
this was always lacking with DoubleChestInventory and is a major factor in it being basically useless for custom use cases.
2024-12-08 16:15:43 +00:00
Dylan K. Taylor
3ee78e20a5
BlockInventoryTrait: include a Block ref instead of Position 2024-12-07 19:28:10 +00:00
Dylan K. Taylor
9e6e5082cd
stfu 2024-12-07 18:55:09 +00:00
Dylan K. Taylor
699a85a5d6
Replace DoubleChestInventory with a more generic CombinedInventory
this could be used for a bunch of different things aside from double chests
since the DoubleChestInventory no longer references anything specific about chests,
I figured it was time to generalize this.
2024-12-07 18:51:25 +00:00
Dylan K. Taylor
4906f5bec2
... 2024-12-07 16:08:54 +00:00
Dylan K. Taylor
ef3d16597a
Revert "Chest block now has responsibility for configuring double chest inventories"
This reverts commit 1d2b52732e3c475ddc2bab4e45726d22850e3d5c.

I hadn't considered that the likes of plugins and hoppers need to be
able to interact with double chest inventories as well as players.

If we were to move this logic to the Block side, we'd have to expose
APIs on the Chest block to get the correct inventory lazily. I'm not
sure I want to commit to having getInventory() on the block right now,
as we can't guarantee it's available (see problems around Campfire
inventory on the block).

Short term, it'll probably be better to just expose the logic in
block\Chest for deciding which side the inventories should be on.
2024-12-07 16:04:50 +00:00
Dylan K. Taylor
b5a69c829d
smh 2024-12-07 14:47:10 +00:00
Dylan K. Taylor
b76db739fd
Campfire block's inventory is now null if it hasn't been set in the world
having this created by the block was unreliable anyway. If items were set into the block's created inventory before setting the block in the world, the campfire contents would get overridden when the block was next run through readStateFromWorld() anyway.

There needs to be a deeper exploration of how to handle blocks with inventories without requiring plugins to interact with tiles. For now, this isn't the worst solution, but it's not the best either.
2024-12-07 14:45:57 +00:00
Dylan K. Taylor
15bb0c705c
Remove CampfireInventory 2024-12-07 14:19:58 +00:00
Dylan K. Taylor
76528b20c1
Remove dodgy code 2024-12-07 14:10:55 +00:00
Dylan K. Taylor
4850bd5538
Allow blocks to respond to the contents of their containers being updated
turns out relying on scheduled updates for this was a bad idea, since it causes a lot of unnecessary code to run every tick, as well as being problematic for campfire, which doesn't have any blockstates to compare against.
2024-12-06 17:46:11 +00:00
Dylan K. Taylor
40574be333
Shift inventory management responsibility to World
this removes a bunch of problematic Position usages from Tile, as well as getting rid of a bunch of code duplication.
2024-12-06 16:14:41 +00:00
Dylan K. Taylor
ce4d3aef9e
Rename Container(Trait) -> ContainerTile(Trait)
this allows introducing block variations of these without name conflicts
2024-12-06 15:34:32 +00:00
Dylan T.
6578d65cd8
Merge branch 'major-next' into inventory-rework 2024-12-06 12:58:03 +00:00
pmmp-admin-bot[bot]
6d2329128a Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12191303914
2024-12-06 01:38:37 +00:00
Dylan T.
1481977f35
Create pr-stale.yml 2024-12-05 20:47:46 +00:00
pmmp-admin-bot[bot]
8efdf501ad 5.23.2 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/12187209543
2024-12-05 20:05:36 +00:00
Dylan T.
2b0daebc2a
5.23.1 (#6562) 5.23.1 2024-12-05 20:04:43 +00:00
Dylan K. Taylor
6b2da15b80
Fixed signs 2024-12-05 19:58:52 +00:00
Dylan K. Taylor
2ef02a2c5e
Upgraded block consistency check to detect tile changes 2024-12-05 19:57:13 +00:00
pmmp-admin-bot[bot]
07045dd424 Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12184052098
2024-12-05 16:35:59 +00:00
Dylan K. Taylor
c5b0df4578
Merge remote-tracking branch 'origin/minor-next' into major-next 2024-12-05 16:07:28 +00:00
pmmp-admin-bot[bot]
15e8895e54 5.23.1 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/12183301507
2024-12-05 15:52:16 +00:00
Dylan T.
ea8f971287
Release 5.23.0 (#6561) 5.23.0 2024-12-05 15:51:13 +00:00
Dylan K. Taylor
62e1d87f5e
Mention internal timings deprecations
plugins shouldn't be using these, but since it's not marked as internal, we can't be sure.
2024-12-05 15:47:34 +00:00
Dylan T.
ea068d4907
Update 5.23.md 2024-12-05 15:01:49 +00:00
Dylan K. Taylor
fa7bc78e7c
Prepare 5.23.0 release 2024-12-05 14:29:17 +00:00
Dylan K. Taylor
0aaf4238a8
more deprecations in line with major-next 2024-12-05 13:02:09 +00:00
Dylan K. Taylor
35a90d24ec
AsyncTask: deprecate progress update related stuff 2024-12-05 12:57:26 +00:00
Dylan K. Taylor
5e9dbace90
Merge branch 'minor-next' into major-next 2024-12-05 10:13:24 +00:00
Dylan K. Taylor
9a6e258b6c
Merge branch 'stable' of github.com:pmmp/PocketMine-MP into minor-next 2024-12-05 10:13:06 +00:00
Dylan K. Taylor
205aabe11f
Fixed merge error 2024-12-04 15:27:09 +00:00
pmmp-restrictedactions-bot[bot]
a1448bfb88 5.22.1 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/12160926590
2024-12-04 13:38:41 +00:00
Dries C
ba6828c6bd
Release 5.22.0 (Bedrock 1.21.50 support) (#6559)
Co-authored-by: Dylan K. Taylor <dktapps@pmmp.io>
5.22.0
2024-12-04 13:36:52 +00:00
pmmp-restrictedactions-bot[bot]
3091e1325f Merge 'minor-next' into 'major-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12151373979
2024-12-04 01:39:59 +00:00
pmmp-restrictedactions-bot[bot]
5fc96c393d Merge 'stable' into 'minor-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12151373979
2024-12-04 01:39:58 +00:00
Dylan K. Taylor
2d0321ff02
Switch back to official JsonMapper
the issues that led to the need for a fork have been addressed in the 5.0.0 release.
2024-12-03 15:19:38 +00:00