Skip to content

Commit 1cc809c

Browse files
dktappsdktapps
authored
Merge branch 'minor-next' into feat/anvil
2 parents b1a773c + 93a270d commit 1cc809c

25 files changed

+501
-467
lines changed

‎.github/workflows/build-docker-image.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT
5454

5555
- name: Build image for tag
56-
uses: docker/build-push-action@v6.5.0
56+
uses: docker/build-push-action@v6.6.1
5757
with:
5858
push: true
5959
context: ./pocketmine-mp
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Build image for major tag
6868
if: steps.channel.outputs.CHANNEL == 'stable'
69-
uses: docker/build-push-action@v6.5.0
69+
uses: docker/build-push-action@v6.6.1
7070
with:
7171
push: true
7272
context: ./pocketmine-mp
@@ -79,7 +79,7 @@ jobs:
7979
8080
- name: Build image for minor tag
8181
if: steps.channel.outputs.CHANNEL == 'stable'
82-
uses: docker/build-push-action@v6.5.0
82+
uses: docker/build-push-action@v6.6.1
8383
with:
8484
push: true
8585
context: ./pocketmine-mp
@@ -92,7 +92,7 @@ jobs:
9292
9393
- name: Build image for latest tag
9494
if: steps.channel.outputs.CHANNEL == 'stable'
95-
uses: docker/build-push-action@v6.5.0
95+
uses: docker/build-push-action@v6.6.1
9696
with:
9797
push: true
9898
context: ./pocketmine-mp

‎.github/workflows/team-pr-auto-approve.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#Due to GitHub awkwardness, it's not easy to reduce the review requirement for collaborators.
2+
#Our policy is that 2 collaborators should be aware of every change.
3+
#For outside PRs, this means 2 collaborator reviews.
4+
#For PRs made by collaborators, this means 1 reviewer + the author.
5+
#We trust that collaborators don't need as much oversight.
6+
name: Auto approve collaborator PRs
7+
8+
on:
9+
pull_request_target:
10+
types:
11+
- opened
12+
- synchronize
13+
- reopened
14+
- ready_for_review
15+
16+
permissions:
17+
pull-requests: write
18+
19+
jobs:
20+
approve:
21+
name: Auto approve
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- name: Check if PR author has write access
26+
id: check-permission
27+
uses: actions-cool/check-user-permission@v2
28+
with:
29+
token: ${{ secrets.GITHUB_TOKEN }}
30+
require: write
31+
username: ${{ github.event.pull_request.user.login }}
32+
#technically this would be fine for dependabot but generally bots don't count as team members
33+
check-bot: true
34+
35+
#TODO: Some way to avoid unnecessary repeated reviews would be nice here
36+
37+
- name: Approve PR if authorized
38+
if: steps.check-permission.outputs.require-result == 'true' && steps.check-permission.outputs.check-result == 'false'
39+
uses: juliangruber/approve-pull-request-action@v2
40+
with:
41+
github-token: ${{ secrets.GITHUB_TOKEN }}
42+
number: ${{ github.event.pull_request.number }}

‎changelogs/5.17.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,16 @@ Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if
2323
## Fixes
2424
- Bowl can now be used as fuel.
2525
- Bells always drops themselves even when using an incompatible tool.
26+
27+
# 5.17.1
28+
Released 13th August 2024.
29+
30+
## Documentation
31+
- Added a note about `BlockStateData::CURRENT_VERSION`.
32+
33+
## Fixes
34+
- Fixed anvil placement rotation to match vanilla.
35+
- Fixed outdated `BedrockWorldData` version, this was preventing use newer worlds.
36+
37+
## Internals
38+
- Dependabot: PHPStan and patch updates are now grouped into a single PR.

‎changelogs/5.18.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# 5.18.0
2+
Released 16th August 2024.
3+
4+
**For Minecraft: Bedrock Edition 1.21.20**
5+
6+
This is a support release for Minecraft: Bedrock Edition 1.21.20.
7+
8+
**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` or `pocketmine\data` namespace.
9+
Do not update plugin minimum API versions unless you need new features added in this release.
10+
11+
**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
12+
Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
13+
14+
## General
15+
- Added support for Minecraft: Bedrock Edition 1.21.20.
16+
- Removed support for earlier versions.
17+
18+
## Fixes
19+
- Use `VISIBLE_MOB_EFFECTS` actor metadata property to send effect bubbles, this fixes effect bubbles not showing

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
"composer-runtime-api": "^2.0",
3434
"adhocore/json-comment": "~1.2.0",
3535
"pocketmine/netresearch-jsonmapper": "~v4.4.999",
36-
"pocketmine/bedrock-block-upgrade-schema": "~4.2.0+bedrock-1.21.0",
37-
"pocketmine/bedrock-data": "~2.11.0+bedrock-1.21.0",
38-
"pocketmine/bedrock-item-upgrade-schema": "~1.10.0+bedrock-1.21.0",
39-
"pocketmine/bedrock-protocol": "~32.1.0+bedrock-1.21.2",
36+
"pocketmine/bedrock-block-upgrade-schema": "~4.3.0+bedrock-1.21.20",
37+
"pocketmine/bedrock-data": "~2.12.0+bedrock-1.21.20",
38+
"pocketmine/bedrock-item-upgrade-schema": "~1.11.0+bedrock-1.21.20",
39+
"pocketmine/bedrock-protocol": "~33.0.0+bedrock-1.21.20",
4040
"pocketmine/binaryutils": "^0.2.1",
4141
"pocketmine/callback-validator": "^1.0.2",
4242
"pocketmine/color": "^0.3.0",
@@ -52,7 +52,7 @@
5252
"symfony/filesystem": "~6.4.0"
5353
},
5454
"require-dev": {
55-
"phpstan/phpstan": "1.11.9",
55+
"phpstan/phpstan": "1.11.10",
5656
"phpstan/phpstan-phpunit": "^1.1.0",
5757
"phpstan/phpstan-strict-rules": "^1.2.0",
5858
"phpunit/phpunit": "^10.5.24"

‎composer.lock

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/VersionInfo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
final class VersionInfo{
3333
public const NAME = "PocketMine-MP";
34-
public const BASE_VERSION = "5.17.1";
34+
public const BASE_VERSION = "5.18.1";
3535
public const IS_DEVELOPMENT_BUILD = true;
3636
public const BUILD_CHANNEL = "stable";
3737

‎src/block/Anvil.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player
9191

9292
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
9393
if($player !== null){
94-
$this->facing = Facing::rotateY($player->getHorizontalFacing(), true);
94+
$this->facing = Facing::rotateY($player->getHorizontalFacing(), false);
9595
}
9696
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
9797
}

‎src/block/tile/ChiseledBookshelf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function readSaveData(CompoundTag $nbt) : void{
5959
$this->loadItems($nbt);
6060
}
6161

62-
public function writeSaveData(CompoundTag $nbt) : void{
62+
protected function writeSaveData(CompoundTag $nbt) : void{
6363
$this->saveItems($nbt);
6464
}
6565

‎src/data/bedrock/block/BlockStateData.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ final class BlockStateData{
4545
public const CURRENT_VERSION =
4646
(1 << 24) | //major
4747
(21 << 16) | //minor
48-
(0 << 8) | //patch
49-
(3); //revision
48+
(20 << 8) | //patch
49+
(6); //revision
5050

5151
public const TAG_NAME = "name";
5252
public const TAG_STATES = "states";

‎src/data/bedrock/block/BlockStateNames.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ private function __construct(){
4242
public const BIG_DRIPLEAF_HEAD = "big_dripleaf_head";
4343
public const BIG_DRIPLEAF_TILT = "big_dripleaf_tilt";
4444
public const BITE_COUNTER = "bite_counter";
45-
public const BLOCK_LIGHT_LEVEL = "block_light_level";
4645
public const BLOOM = "bloom";
4746
public const BOOKS_STORED = "books_stored";
4847
public const BREWING_STAND_SLOT_A_BIT = "brewing_stand_slot_a_bit";
@@ -61,15 +60,12 @@ private function __construct(){
6160
public const CONDITIONAL_BIT = "conditional_bit";
6261
public const CORAL_DIRECTION = "coral_direction";
6362
public const CORAL_FAN_DIRECTION = "coral_fan_direction";
64-
public const CORAL_HANG_TYPE_BIT = "coral_hang_type_bit";
6563
public const COVERED_BIT = "covered_bit";
6664
public const CRACKED_STATE = "cracked_state";
6765
public const CRAFTING = "crafting";
68-
public const DAMAGE = "damage";
6966
public const DEAD_BIT = "dead_bit";
7067
public const DEPRECATED = "deprecated";
7168
public const DIRECTION = "direction";
72-
public const DIRT_TYPE = "dirt_type";
7369
public const DISARMED_BIT = "disarmed_bit";
7470
public const DOOR_HINGE_BIT = "door_hinge_bit";
7571
public const DRAG_DOWN = "drag_down";
@@ -100,7 +96,6 @@ private function __construct(){
10096
public const MC_FACING_DIRECTION = "minecraft:facing_direction";
10197
public const MC_VERTICAL_HALF = "minecraft:vertical_half";
10298
public const MOISTURIZED_AMOUNT = "moisturized_amount";
103-
public const MONSTER_EGG_STONE_TYPE = "monster_egg_stone_type";
10499
public const MULTI_FACE_DIRECTION_BITS = "multi_face_direction_bits";
105100
public const OCCUPIED_BIT = "occupied_bit";
106101
public const OMINOUS = "ominous";
@@ -112,26 +107,18 @@ private function __construct(){
112107
public const PILLAR_AXIS = "pillar_axis";
113108
public const PORTAL_AXIS = "portal_axis";
114109
public const POWERED_BIT = "powered_bit";
115-
public const PRISMARINE_BLOCK_TYPE = "prismarine_block_type";
116110
public const PROPAGULE_STAGE = "propagule_stage";
117111
public const RAIL_DATA_BIT = "rail_data_bit";
118112
public const RAIL_DIRECTION = "rail_direction";
119113
public const REDSTONE_SIGNAL = "redstone_signal";
120114
public const REPEATER_DELAY = "repeater_delay";
121115
public const RESPAWN_ANCHOR_CHARGE = "respawn_anchor_charge";
122116
public const ROTATION = "rotation";
123-
public const SAND_STONE_TYPE = "sand_stone_type";
124-
public const SAND_TYPE = "sand_type";
125117
public const SCULK_SENSOR_PHASE = "sculk_sensor_phase";
126118
public const SEA_GRASS_TYPE = "sea_grass_type";
127119
public const SPONGE_TYPE = "sponge_type";
128120
public const STABILITY = "stability";
129121
public const STABILITY_CHECK = "stability_check";
130-
public const STONE_BRICK_TYPE = "stone_brick_type";
131-
public const STONE_SLAB_TYPE = "stone_slab_type";
132-
public const STONE_SLAB_TYPE_2 = "stone_slab_type_2";
133-
public const STONE_SLAB_TYPE_3 = "stone_slab_type_3";
134-
public const STONE_SLAB_TYPE_4 = "stone_slab_type_4";
135122
public const STRIPPED_BIT = "stripped_bit";
136123
public const STRUCTURE_BLOCK_TYPE = "structure_block_type";
137124
public const STRUCTURE_VOID_TYPE = "structure_void_type";

0 commit comments

Comments
 (0)