Dylan K. Taylor
453ad997e9
Merge branch 'item-stack-request' into item-stack-request-pm5
2023-03-20 22:05:12 +00:00
Dylan K. Taylor
c9601ae67d
Fixed crash when opening crafting table and other 'UI' inventories
2023-03-20 22:00:38 +00:00
Dylan K. Taylor
758b5ee500
InventoryManager: fixed armor slots hack
...
the correct condition for this should be an unsynced armor slot changed during a transaction, but conveying this information to syncSlot() is a bit of a hassle, so this will do for now.
2023-03-20 21:27:56 +00:00
Dylan K. Taylor
ca6d51498f
Buffer slot and content syncing until the end of the tick
...
we may receive multiple requests in one tick (e.g. crafting in a batch)
2023-03-20 19:16:00 +00:00
Dylan K. Taylor
e8085e22a0
Fixed crash when opening main inventory
...
the InventoryManagerEntry was getting overwritten, since we don't expect to open the same inventory with two different window IDs.
2023-03-20 18:40:18 +00:00
Dylan K. Taylor
a83fc85f1e
InventoryManagerEntry: fixed missing default
2023-03-20 17:32:44 +00:00
Dylan K. Taylor
3d70a169e1
Reduce chaos in InventoryManager
...
the information in these arrays is usually needed all at the same time, so it doesn't make sense to force multiple array lookups for it.
in addition, this (obviously) cleans up the code quite a lot.
2023-03-20 17:31:54 +00:00
Dylan K. Taylor
6ccb8f7373
git
2023-03-20 16:57:38 +00:00
Dylan K. Taylor
59bae9b077
Give InventoryManager internals clearer names
...
and stop mixing 'window' and 'inventory' terminology...
2023-03-20 16:53:57 +00:00
Dylan K. Taylor
c91168db66
...
2023-03-20 01:35:15 +00:00
Dylan K. Taylor
4e55433ed8
Fixed request rejecting
2023-03-20 01:35:03 +00:00
Dylan K. Taylor
eece6c4433
InGamePacketHandler: remove dead code
2023-03-20 01:28:18 +00:00
Dylan K. Taylor
67b7b60d18
..............
2023-03-20 01:19:07 +00:00
Dylan K. Taylor
804feedb67
Added some dumb limits
2023-03-20 00:54:33 +00:00
Dylan K. Taylor
d57aca1367
CS
2023-03-20 00:53:00 +00:00
Dylan K. Taylor
7b0816e42f
Properly handle transaction building errors instead of kicking the player
2023-03-20 00:52:26 +00:00
Dylan K. Taylor
4864444440
Added CraftingManager::getCraftingRecipeFromIndex()
2023-03-19 22:14:23 +00:00
Dylan K. Taylor
6c29c3d2dd
Merge branch 'item-stack-request' into item-stack-request-pm5
2023-03-14 22:56:47 +00:00
Dylan K. Taylor
34ced382db
Eliminate final remaining usage of TypeConverter::netItemStackToCore()
...
instead, we can verify that the held items match by comparing the received ItemStack with the one cached in InventoryManager, which is more cost effective and closes off internal item deserializers to external attacks.
2023-03-14 22:56:11 +00:00
Dylan K. Taylor
dace20ad1f
Merge branch 'item-stack-request' into item-stack-request-pm5
2023-03-14 22:34:47 +00:00
Dylan K. Taylor
a573a279fa
Merge branch 'minor-next' into item-stack-request
2023-03-14 22:25:49 +00:00
Dylan K. Taylor
14f141fab2
NetworkSession: Stop counting DataPacketReceiveEvent in handler timings
...
we want it to be included in receive timings, but not handler timings. Handler timings should reflect the time spent in the actual session PacketHandler, not in the event.
2023-03-14 19:00:15 +00:00
Dylan K. Taylor
10d22a55ec
Updated composer dependencies (PM5)
2023-03-14 18:50:34 +00:00
Dylan K. Taylor
777b4d6ac3
PM5-specific updates for 1.19.70
2023-03-14 18:50:04 +00:00
Dylan K. Taylor
c500ccd891
Merge branch 'minor-next' into major-next
2023-03-14 18:43:43 +00:00
Dylan K. Taylor
daff955bc4
Merge remote-tracking branch 'origin/stable' into minor-next
2023-03-14 18:42:14 +00:00
Dylan K. Taylor
85a64d56fb
Updated composer dependencies (major-next)
2023-03-14 18:42:01 +00:00
Dylan K. Taylor
cc69383b6f
Merge branch 'minor-next' into major-next
2023-03-14 18:40:57 +00:00
Dylan K. Taylor
0022d82779
Merge commit 'd376399b7f332384532a82eaf69b9b02dad5bd0c' into minor-next
2023-03-14 18:39:03 +00:00
dependabot[bot]
7cad9be0d2
Bump build/php from b2207cf to 71b9f9d ( #5634 )
...
Bumps [build/php](https://github.com/pmmp/php-build-scripts ) from `b2207cf` to `71b9f9d`.
- [Release notes](https://github.com/pmmp/php-build-scripts/releases )
- [Commits](b2207cf70d...71b9f9d2d7
2023-03-14 18:32:10 +00:00
Dylan K. Taylor
2f862a552a
actions: Replace deprecated ::set-output commands
2023-03-14 18:31:25 +00:00
Dylan K. Taylor
590f6dad08
4.17.1 is next
2023-03-14 18:14:40 +00:00
Dylan K. Taylor
9564c81582
Release 4.17.0
2023-03-14 18:14:40 +00:00
Dylan K. Taylor
3de7a8c27f
Updated for 1.19.70
2023-03-14 18:08:10 +00:00
Dylan K. Taylor
d376399b7f
Update composer dependencies
...
bedrock-item-upgrade-schema and bedrock-block-upgrade-schema are now minor-version-locked, to prevent introducing new upgrade schemas not intended for the currently in-use version
previously I'd intended to do this using max schema IDs, but this has proven to be error-prone, so it makes more sense to lock them in using package version constraints instead.
2023-03-14 17:29:25 +00:00
Dylan K. Taylor
e2071e59c8
actions: update PHP versions
2023-03-13 17:44:10 +00:00
Dylan K. Taylor
a123194368
BlockStateData: added getVersionAsString()
2023-03-13 16:14:19 +00:00
Dylan K. Taylor
8e280ebb8b
RuntimeBlockMapping: avoid unnecessary PacketSerializer usage
2023-03-11 22:16:24 +00:00
Dylan K. Taylor
f03afba10e
Merge branch 'minor-next' into major-next
2023-03-11 22:13:31 +00:00
Dylan K. Taylor
fa7c38276c
Fixing gigantic clusterfuck with protocol contexts and broadcasting
...
fixes #5623
2023-03-11 21:54:14 +00:00
Dylan K. Taylor
b13e97de3d
Timings: fixed receivePacket timer showing 2x the actual number of received packets
2023-03-11 19:13:10 +00:00
dependabot[bot]
328b87fc18
Bump phpstan/phpstan from 1.10.4 to 1.10.6 ( #5617 )
...
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan ) from 1.10.4 to 1.10.6.
- [Release notes](https://github.com/phpstan/phpstan/releases )
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md )
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.4...1.10.6 )
---
updated-dependencies:
- dependency-name: phpstan/phpstan
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-10 11:49:34 +00:00
Dylan K. Taylor
f94040dead
Merge branch 'minor-next' into major-next
2023-03-08 23:33:35 +00:00
Dylan K. Taylor
7c95a65ade
...
2023-03-08 23:14:11 +00:00
Dylan K. Taylor
2b88b215bf
CS cleanup
2023-03-08 23:10:11 +00:00
Dylan K. Taylor
54c19fd662
Open-source script that generates recipes and other goodies for BedrockData
...
this script has been lurking in my workspace for years, waiting to be cleaned up and open-sourced.
2023-03-08 23:04:09 +00:00
Dylan K. Taylor
9b1ec261c4
...
2023-03-08 22:20:12 +00:00
Dylan K. Taylor
6151576baa
Added model for smithing recipe
2023-03-08 21:50:03 +00:00
Dylan T
acaa1a9ce1
contributing: update table to reflect branch name changes
...
these branches were renamed to make them more auto-complete-friendly.
2023-03-07 17:28:31 +00:00
Dylan K. Taylor
fff8f0f815
Use Item->canStackWith() instead of Item->equals() wherever possible
2023-03-07 17:08:35 +00:00
