Merge remote-tracking branch 'origin/stable' into next-minor

composer.json

@@ -34,14 +34,14 @@
       "adhocore/json-comment": "^1.1",
       "fgrosse/phpasn1": "^2.3",
       "netresearch/jsonmapper": "^4.0",
-      "pocketmine/bedrock-data": "^1.5.0+bedrock-1.18.0",
+      "pocketmine/bedrock-data": "~1.5.0+bedrock-1.18.0",
-      "pocketmine/bedrock-protocol": "^7.0.0+bedrock-1.18.0",
+      "pocketmine/bedrock-protocol": "~7.1.0+bedrock-1.18.0",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/classloader": "^0.2.0",
       "pocketmine/color": "^0.2.0",
       "pocketmine/errorhandler": "^0.4.0",
-      "pocketmine/locale-data": "^2.2.0",
+      "pocketmine/locale-data": "~2.3.0",
       "pocketmine/log": "^0.4.0",
       "pocketmine/log-pthreads": "^0.4.0",
       "pocketmine/math": "^0.4.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f830ed22b7f602d1b03f52118371d559",
+    "content-hash": "1e11dbe91c0a485cacf0b0a5bb1eeee3",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -535,16 +535,16 @@
         },
         {
             "name": "pocketmine/locale-data",
-            "version": "2.2.1",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Language.git",
-                "reference": "9fdd36f0ac3a2dfe1acacbee8b23eb6615129701"
+                "reference": "a16e5899709387ff03db8bba7f903a15c7c0a9af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/9fdd36f0ac3a2dfe1acacbee8b23eb6615129701",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/a16e5899709387ff03db8bba7f903a15c7c0a9af",
-                "reference": "9fdd36f0ac3a2dfe1acacbee8b23eb6615129701",
+                "reference": "a16e5899709387ff03db8bba7f903a15c7c0a9af",
                 "shasum": ""
             },
             "type": "library",
@@ -552,9 +552,9 @@
             "description": "Language resources used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/Language/issues",
-                "source": "https://github.com/pmmp/Language/tree/2.2.1"
+                "source": "https://github.com/pmmp/Language/tree/2.3.0"
             },
-            "time": "2021-12-17T23:42:12+00:00"
+            "time": "2022-01-04T00:42:11+00:00"
         },
         {
             "name": "pocketmine/log",

src/block/BaseSign.php

@@ -37,8 +37,6 @@ use function assert;
 use function strlen;
 
 abstract class BaseSign extends Transparent{
-	//TODO: conditionally useless properties, find a way to fix
-
 	protected SignText $text;
 	protected ?int $editorEntityRuntimeId = null;
 

src/lang/KnownTranslationFactory.php

@@ -1974,6 +1974,26 @@ final class KnownTranslationFactory{
 		]);
 	}
 
+	public static function pocketmine_server_obsolete_warning1(Translatable|string $param0, Translatable|string $param1) : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_OBSOLETE_WARNING1, [
+			0 => $param0,
+			1 => $param1,
+		]);
+	}
+
+	public static function pocketmine_server_obsolete_warning2(Translatable|string $param0, Translatable|string $param1) : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_OBSOLETE_WARNING2, [
+			0 => $param0,
+			1 => $param1,
+		]);
+	}
+
+	public static function pocketmine_server_obsolete_warning3(Translatable|string $param0) : Translatable{
+		return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_OBSOLETE_WARNING3, [
+			0 => $param0,
+		]);
+	}
+
 	public static function pocketmine_server_query_running(Translatable|string $param0, Translatable|string $param1) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_QUERY_RUNNING, [
 			0 => $param0,

src/lang/KnownTranslationKeys.php

@@ -406,6 +406,9 @@ final class KnownTranslationKeys{
 	public const POCKETMINE_SERVER_LICENSE = "pocketmine.server.license";
 	public const POCKETMINE_SERVER_NETWORKSTART = "pocketmine.server.networkStart";
 	public const POCKETMINE_SERVER_NETWORKSTARTFAILED = "pocketmine.server.networkStartFailed";
+	public const POCKETMINE_SERVER_OBSOLETE_WARNING1 = "pocketmine.server.obsolete.warning1";
+	public const POCKETMINE_SERVER_OBSOLETE_WARNING2 = "pocketmine.server.obsolete.warning2";
+	public const POCKETMINE_SERVER_OBSOLETE_WARNING3 = "pocketmine.server.obsolete.warning3";
 	public const POCKETMINE_SERVER_QUERY_RUNNING = "pocketmine.server.query.running";
 	public const POCKETMINE_SERVER_START = "pocketmine.server.start";
 	public const POCKETMINE_SERVER_STARTFINISHED = "pocketmine.server.startFinished";

src/network/mcpe/handler/InGamePacketHandler.php

@@ -27,6 +27,7 @@ use pocketmine\block\BaseSign;
 use pocketmine\block\ItemFrame;
 use pocketmine\block\utils\SignText;
 use pocketmine\entity\animation\ConsumingItemAnimation;
+use pocketmine\entity\Attribute;
 use pocketmine\entity\InvalidSkinException;
 use pocketmine\event\player\PlayerEditBookEvent;
 use pocketmine\inventory\transaction\action\InventoryAction;
@@ -428,6 +429,8 @@ class InGamePacketHandler extends PacketHandler{
 			case UseItemTransactionData::ACTION_CLICK_AIR:
 				if($this->player->isUsingItem()){
 					if(!$this->player->consumeHeldItem()){
+						$hungerAttr = $this->player->getAttributeMap()->get(Attribute::HUNGER) ?? throw new AssumptionFailedError();
+						$hungerAttr->markSynchronized(false);
 						$this->inventoryManager->syncSlot($this->player->getInventory(), $this->player->getInventory()->getHeldItemIndex());
 					}
 					return true;
@@ -789,7 +792,16 @@ class InGamePacketHandler extends PacketHandler{
 				return false;
 		}
 
-		$event = new PlayerEditBookEvent($this->player, $oldBook, $newBook, $packet->type, $modifiedPages);
+		//for redundancy, in case of protocol changes, we don't want to pass these directly
+		$action = match($packet->type){
+			BookEditPacket::TYPE_REPLACE_PAGE => PlayerEditBookEvent::ACTION_REPLACE_PAGE,
+			BookEditPacket::TYPE_ADD_PAGE => PlayerEditBookEvent::ACTION_ADD_PAGE,
+			BookEditPacket::TYPE_DELETE_PAGE => PlayerEditBookEvent::ACTION_DELETE_PAGE,
+			BookEditPacket::TYPE_SWAP_PAGES => PlayerEditBookEvent::ACTION_SWAP_PAGES,
+			BookEditPacket::TYPE_SIGN_BOOK => PlayerEditBookEvent::ACTION_SIGN_BOOK,
+			default => throw new AssumptionFailedError("We already filtered unknown types in the switch above")
+		};
+		$event = new PlayerEditBookEvent($this->player, $oldBook, $newBook, $action, $modifiedPages);
 		$event->call();
 		if($event->isCancelled()){
 			return true;