17737 Commits

Author SHA1 Message Date
Dylan T.
33a7b46329
Use reflection to locate BlockTypeIds and ItemTypeIds for VanillaBlocks/VanillaItems (#6498)
Use reflection to locate BlockTypeIds and ItemTypeIds for VanillaBlocks/VanillaItems

Since BlockTypeIds and ItemTypeIds are derived from VanillaBlocks and VanillaItems respectively anyway (they only exist to allow identifying blocks/items without having to create instances of them), this hack is probably OK, and reduces the chances of mistakes.
Previously it was explored to have these IDs generated by auto-incrementing in VanillaBlocks/Items and have the constants generated that way, but this proved to be too problematic because of unstable diffs no matter how we chose to sort the elements. See #6313 for previous research on the subject.

This is obviously not a desirable hack to keep long-term. In the future it will probably make sense to redesign VanillaBlocks like so:

enum VanillaBlocks { ... }
VanillaBlocks::STONE (the type ID)
VanillaBlocks::STONE->new() (to create a block)

However, more research is needed on this, as I'd prefer not to make block creation any more verbose.
2024-11-14 17:32:22 +00:00
IvanCraft623
9b58d35516
Implement Goat horns (#5232)
Co-authored-by: ipad54 <63200545+ipad54@users.noreply.github.com>
Co-authored-by: Dylan T. <dktapps@pmmp.io>
2024-11-14 13:57:07 +00:00
github-actions
3629ee7e7b Merge 'stable' into 'minor-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11824307499
2024-11-13 19:21:16 +00:00
Dylan K. Taylor
fbeb017670
Promise: allow zero promises
not supporting this has caused problems every time this function has been used in reality so far (#6092 and #6333).
2024-11-13 14:55:14 +00:00
Dylan T.
09bf203267
Update RuntimeDataDescriber.php 2024-11-12 22:57:14 +00:00
Dylan K. Taylor
f3cc4a28e1
Easy wins for PHPStan 2.0 support 2024-11-12 22:12:54 +00:00
Dylan K. Taylor
fe70150db2
Update composer dependencies 2024-11-12 21:47:52 +00:00
Dylan T.
054538e6b7
Update PULL_REQUEST_TEMPLATE.md 2024-11-12 17:54:31 +00:00
github-actions
3586bc42a9 Merge 'stable' into 'minor-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11802296296
2024-11-12 17:14:24 +00:00
Dylan T.
1f86949836
Create CODEOWNERS 2024-11-12 14:37:02 +00:00
dependabot[bot]
053a71c59d
Bump build/php from 084822a to a51259d (#6495) 2024-11-12 14:28:32 +00:00
github-actions
07d5046b83 5.21.2 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/11796630402
2024-11-12 11:48:59 +00:00
ipad54
4a702b97fd
Prepare 5.21.1 release (#6493) 5.21.1 2024-11-12 11:48:01 +00:00
kostamax27
d2c3b8dacb
Fix GC cycle count increases on player disconnect (#6487) 2024-11-11 16:10:19 +01:00
github-actions
fa3529966f Merge 'stable' into 'minor-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11769186885
2024-11-10 22:56:08 +00:00
ipad54
2ff6470792
Fixed server crash when applying item cooldown (#6491)
This commit fixes server crash when applying a cooldown to any item which count is equals to 1.

closes #6490 
closes #6488
2024-11-10 19:15:30 +00:00
ipad54
05a9e9c76e
Implemented sound when drinking a potion (#6444) 2024-11-10 15:07:18 +00:00
WavyCraftNetwork
231eec911f
Enchanted Golden Apple: Regeneration 5 => 2 matching Java (#6445) 2024-11-09 19:43:30 +00:00
Muqsit
8c04d47b1b
Make weakness effect only applicable for melee damage (#6489) 2024-11-09 19:18:30 +00:00
dependabot[bot]
b3b8aaddff
Bump docker/build-push-action from 6.8.0 to 6.9.0 (#6465) 2024-11-04 16:29:01 +00:00
dependabot[bot]
2173aab967
Bump thollander/actions-comment-pull-request from 2 to 3 (#6482) 2024-11-04 16:05:38 +00:00
github-actions
e598364f06 5.21.1 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/11652565588
2024-11-03 15:30:16 +00:00
Dylan T.
734ca1cc6b
Merge pull request #6480 from pmmp/minor-next
5.21.0
5.21.0
2024-11-03 15:29:06 +00:00
Dylan K. Taylor
96b12bddc1
Prepare 5.21.0 release 2024-11-03 15:24:43 +00:00
Dylan K. Taylor
84464cde4f
Update BedrockBlockUpgradeSchema 2024-11-03 14:44:50 +00:00
Dylan K. Taylor
72fc138631
Regenerate PHPStan baselines 2024-11-03 14:43:34 +00:00
Dylan K. Taylor
c63d0ef1b6
Fix dodgy ignored PHPStan error 2024-11-03 14:43:34 +00:00
Dylan T.
82c416624d
Merge pull request #6416 from pmmp/blockstate-schema-generator-improvements
Blockstate schema generator improvements
2024-11-03 14:10:38 +00:00
Dylan T.
9e19391f20
Merge branch 'minor-next' into blockstate-schema-generator-improvements 2024-11-03 14:06:57 +00:00
Dylan T.
c0b74b0341
Update BlockStateUpgrader.php 2024-11-03 14:05:46 +00:00
Dylan K. Taylor
3c96e72f7d
Merge remote-tracking branch 'origin/stable' into minor-next 2024-11-03 14:01:47 +00:00
github-actions
0376e37966 5.20.2 is next
Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/11614028030
2024-10-31 14:38:30 +00:00
Dylan T.
94dff74494
Prepare 5.20.1 release (#6479) 5.20.1 2024-10-31 14:35:42 +00:00
Dylan K. Taylor
0065fe649f
New release workflow triggered by the merge of a PR changing
IS_DEVELOPMENT_BUILD to false

This is more streamlined than the previous approach, and works better
for a world where 1 person isn't doing all the work.

Now, the flow is simpler:
- Do changes (e.g. protocol update), changelog & set IS_DEVELOPMENT_BUILD to false all in a single PR, which can be squash-merged if desired
- Once the PR is merged, a draft release will be prepared
- RestrictedActions will automatically set IS_DEVELOPMENT_BUILD back to
  true and bump the version
- Tag will be created when the release is published

Previously, multiple PRs might be needed, and the PR containing the
release changelog couldn't be squash-merged. Manual intervention was
also required to create a tag and prepare a release.

This PR also includes new CI checks to check for basic errors like
forgotten changelog files to ensure changelog links work correctly.

Note: Only PRs from PMMP Team members with **write** access to the
repository can trigger release generation. Random people cannot trigger
release generation by sending PRs.
2024-10-31 13:57:38 +00:00
Dries C
8ef5e737de
Temporary resolve loading old skulls from storage (#6476) 2024-10-27 01:29:34 +01:00
Dylan K. Taylor
e7d8d99ca6
5.20.1 is next 2024-10-26 15:42:43 +01:00
Dylan K. Taylor
414e8acf8c
Release 5.20.0 5.20.0 2024-10-26 15:42:43 +01:00
Dylan K. Taylor
d372af351a
Fix changelog typo 2024-10-26 15:40:22 +01:00
Dries C
4814db4fe7
Assemble 1.21.40 (#6471) 2024-10-25 14:21:51 +01:00
Dylan K. Taylor
d01203d7c4
Reduce code duplication 2024-10-24 18:50:39 +01:00
Dylan T.
847f931660
Merge branch 'minor-next' into blockstate-schema-generator-improvements 2024-10-24 17:46:57 +01:00
Dylan K. Taylor
22718c4971
Add support for specialized flattenedProperties in schema format 2024-10-24 16:12:28 +01:00
Dylan K. Taylor
acbfb0a3e9
Support for updating a batch of schemas using BlockPaletteArchive 2024-10-24 13:30:55 +01:00
Dylan K. Taylor
7f9e79c83e
Automatically test new schemas to ensure they produce the results predicted by the input file 2024-10-24 13:30:24 +01:00
ipad54
7e343617b9
Rename ICopper to CopperMaterial (#6470) 2024-10-23 11:34:42 +01:00
Dylan K. Taylor
d945cbf517
Merge remote-tracking branch 'origin/minor-next' into blockstate-schema-generator-improvements 2024-10-17 21:00:11 +01:00
github-actions
c4e72c880e Merge 'stable' into 'minor-next'
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11392123557
2024-10-17 19:59:13 +00:00
Dylan K. Taylor
3ef7001d8e
Merge branch 'stable' into blockstate-schema-generator-improvements 2024-10-17 20:55:34 +01:00
Dylan K. Taylor
f1b1a7022d
and a sanity check just in case 2024-10-17 20:55:12 +01:00
Dylan K. Taylor
59d14de1d8
generate-blockstate-upgrade-schema: fallback to exact state match when encountering ambiguous filters
this popped up due to new changes in 1.20.40. Really we need to improve the way the filters are calculated, but this workaround solves the issue for now.
2024-10-17 20:51:17 +01:00