Merge branch 'dev/4.0'

fuyutsuki · Apr 8, 2021 · 37be14e · 37be14e
2 parents 2410872 + 0e8ad6c
commit 37be14e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/.github/changelogs/4.x/en_us.md b/.github/changelogs/4.x/en_us.md
@@ -2,6 +2,17 @@
 
 ## 4.0.x
 
+### 4.0.4
+
+#### :arrow_heading_up: Follow pmmp updates
+
+- Confirmed the operation of [pmmp/PocketMine-MP](https://github.com/pmmp/PocketMine-MP) with the latest release `3.19.0` of Minecraft: Bedrock Edition 1.16.220 release
+- Corresponds for changing item stacks (#111)
+
+#### :warning: BCBreak
+
+- Texter now requires PocketMine-MP >= 3.19.0
+
 ### 4.0.3
 
 #### :bug: Bug fix

diff --git a/.github/changelogs/4.x/ja_jp.md b/.github/changelogs/4.x/ja_jp.md
@@ -2,6 +2,17 @@
 
 ## 4.0.x
 
+### 4.0.4
+
+#### :arrow_heading_up: PMMPの変更に追従
+
+- Minecraft: Bedrock Edition 1.16.220 リリースに伴う [pmmp/PocketMine-MP](https://github.com/pmmp/PocketMine-MP) の最新リリース `3.19.0` での動作確認を行いました
+- アイテムスタックの変更に対応 (#111)
+
+#### :warning: 後方互換性を損なう変更
+
+- TexterはPocketMine-MP 3.19.0以上が必要になりました
+
 ### 4.0.3
 
 #### :bug: バグ修正

diff --git a/plugin.yml b/plugin.yml
@@ -1,13 +1,10 @@
 name: Texter
 prefix: Texter
 main: jp\mcbe\fuyutsuki\Texter\Main
-version: 4.0.3
-api: 3.15.0 # pmmp/PocketMine-MP
+version: 4.0.4
+api: 3.19.0 # pmmp/PocketMine-MP
 mcpe-protocol:
-  - 408 # 1.16.20
-  - 419 # 1.16.100
-  - 422 # 1.16.200
-  - 428 # 1.16.210
+  - 431 # 1.16.220
 softdepend:
   # aieuo/Mineflow
   - Mineflow # >= 2.0
@@ -45,4 +42,4 @@ permissions:
         children:
           texter.command.txt:
             default: op
-            description: permission that allows player to use /txt
+            description: permission that allows player to use /txt
diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php
@@ -19,6 +19,7 @@
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\RemoveActorPacket;
 use pocketmine\network\mcpe\protocol\SetActorDataPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\Player;
@@ -128,7 +129,7 @@ public function asPackets(Player $player, SendType $type): array {
 				$pk->entityRuntimeId = $this->entityRuntimeId;
 				$pk->entityUniqueId = $this->entityRuntimeId;
 				$pk->position = $this->position;
-				$pk->item = Item::get(ItemIds::AIR);
+				$pk->item = ItemStackWrapper::legacy(Item::get(ItemIds::AIR));
 				$pk->metadata = [
 					Entity::DATA_FLAGS => [
 						Entity::DATA_TYPE_LONG, 1 << Entity::DATA_FLAG_IMMOBILE