Release 3.15.0

this version doesn't change any packets as far as I know, but it does change some packet content (most notably, some blockstates changed, which are troublesome when not in sync).

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "src/pocketmine/lang/locale"]
 	path = src/pocketmine/lang/locale
-	url = https://github.com/pmmp/PocketMine-Language.git
+	url = https://github.com/pmmp/Language.git
 [submodule "tests/preprocessor"]
 	path = build/preprocessor
 	url = https://github.com/pmmp/preprocessor.git
-[submodule "tests/plugins/PocketMine-DevTools"]
-	path = tests/plugins/PocketMine-DevTools
-	url = https://github.com/pmmp/PocketMine-DevTools.git
+[submodule "tests/plugins/DevTools"]
+	path = tests/plugins/DevTools
+	url = https://github.com/pmmp/DevTools.git
 [submodule "build/php"]
 	path = build/php
 	url = https://github.com/pmmp/php-build-scripts.git

.travis.yml

@@ -8,7 +8,7 @@ before_script:
  - echo | pecl install channel://pecl.php.net/yaml-2.1.0
  - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d
+ - git checkout 45579e1e622acd80f9c880f3a025ba3b98b8ebef
  - phpize
  - ./configure
  - make

CONTRIBUTING.md

@@ -116,7 +116,7 @@ class ExampleClass{
 <!-- TODO: RFC and voting on the forums instead -->
 ### RFC and Voting
 * These are big Pull Requests or contributions that change important behavior.
-* RFCs will be tagged with the *PR: RFC* label
+* RFCs will be tagged with the *Type: Request For Comments* label
 * A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
 * Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
 * If your comment is a voting comment, specify the reason of your vote or it won't be counted.

README.md

@@ -19,7 +19,7 @@
 ## For developers
  * [Building and running from source](BUILDING.md)
  * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development
- * [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
+ * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  * [Contributing Guidelines](CONTRIBUTING.md)
 

changelogs/3.14.md

@@ -23,3 +23,18 @@ Plugin developers should **only** update their required API to this version if y
 - `/plugins`, `/whitelist list`, `/banlist` and `/list` now show output in alphabetical order.
 - Some `pocketmine\event` APIs which accept arrays now have more robust type checking, fixing type errors caused by plugin input occurring in core code.
 - `Attribute::getAttributeByName()` is now aware of the `minecraft:lava_movement` attribute.
+
+# 3.14.2
+- Exception stack traces are now logged as CRITICAL. It's hoped that users will recognize that they are just as important as the error message and not leave them out when asking for help with errors on Discord.
+- `TaskScheduler` no longer accepts tasks that already have a handler. This fixes undefined behaviour which occurs when scheduling the same task instance twice, but it does break plugins such as **MyPlot** which unintentionally used this buggy behaviour.
+- Players will now correctly receive the needed number of spawn chunks if they are teleported between `PlayerLoginEvent` and `PlayerJoinEvent`. This fixes a bug that could occur when teleporting players in delayed tasks between login and join.
+- `PlayerRespawnEvent->setRespawnPosition()` now throws an exception if the provided `Position` has an invalid world associated with it (null or unloaded).
+- Fixed a crash that occurred when stats reporting was enabled.
+
+# 3.14.3
+- Fixed deprecation error when running `/whitelist list` on PHP 7.4.
+- Fixed podzol breaking animation being incorrect (incorrect hardness).
+- `Entity::getSaveId()` now reports the class name in the message thrown for unregistered entities.
+- Fixed `CraftingManager->validate()` producing different results when called multiple times for the same transaction.
+- Fixed various issues with batch-crafting items using the recipe book and shift-clicking.
+- `tests/plugins/PocketMine-DevTools` submodule has been renamed to `tests/plugins/DevTools`.

changelogs/3.15.md

@@ -0,0 +1,17 @@
+**For Minecraft: Bedrock Edition 1.16.20**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.14.0
+- Added support for Minecraft: Bedrock Edition 1.16.20.
+- Removed compatibility with 1.16.0.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist

composer.json

@@ -38,7 +38,7 @@
       "ocramius/package-versions": "^1.5"
    },
    "require-dev": {
-      "phpstan/phpstan": "0.12.29",
+      "phpstan/phpstan": "0.12.37",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2",
       "phpunit/phpunit": "^9.2"

doxygen/index.md

@@ -5,6 +5,6 @@ This site contains auto-generated API documentation for PocketMine-MP (and depen
 This site can be accessed via https://apidoc.pmmp.io.
 
 ### Additional developer resources
- - [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
+ - [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  - [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  - [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API

src/pocketmine/Player.php

@@ -149,6 +149,7 @@ use pocketmine\network\mcpe\protocol\types\CommandParameter;
 use pocketmine\network\mcpe\protocol\types\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\protocol\types\GameMode;
+use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
 use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction;
 use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor;
 use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece;
@@ -1897,7 +1898,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			}
 
 			//This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client)
-			$this->close("", $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$packet->protocol ?? "unknown"]), false);
+			$this->close("", $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$packet->protocol]), false);
 
 			return true;
 		}
@@ -2392,18 +2393,20 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		/** @var InventoryAction[] $actions */
 		$actions = [];
 		$isCraftingPart = false;
-		$isFinalCraftingPart = false;
 		foreach($packet->actions as $networkInventoryAction){
 			if(
 				$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_TODO and (
 					$networkInventoryAction->windowId === NetworkInventoryAction::SOURCE_TYPE_CRAFTING_RESULT or
 					$networkInventoryAction->windowId === NetworkInventoryAction::SOURCE_TYPE_CRAFTING_USE_INGREDIENT
+				) or (
+					$this->craftingTransaction !== null &&
+					!$networkInventoryAction->oldItem->equalsExact($networkInventoryAction->newItem) &&
+					$networkInventoryAction->sourceType === NetworkInventoryAction::SOURCE_CONTAINER &&
+					$networkInventoryAction->windowId === ContainerIds::UI &&
+					$networkInventoryAction->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT
 				)
 			){
 				$isCraftingPart = true;
-				if($networkInventoryAction->windowId === NetworkInventoryAction::SOURCE_TYPE_CRAFTING_RESULT){
-					$isFinalCraftingPart = true;
-				}
 			}
 			try{
 				$action = $networkInventoryAction->createInventoryAction($this);
@@ -2426,23 +2429,23 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				}
 			}
 
-			if($isFinalCraftingPart){
-				//we get the actions for this in several packets, so we need to wait until we have all the pieces before
-				//trying to execute it
-
-				$ret = true;
-				try{
-					$this->craftingTransaction->execute();
-				}catch(TransactionValidationException $e){
-					$this->server->getLogger()->debug("Failed to execute crafting transaction for " . $this->getName() . ": " . $e->getMessage());
-					$ret = false;
-				}
-
-				$this->craftingTransaction = null;
-				return $ret;
+			try{
+				$this->craftingTransaction->validate();
+			}catch(TransactionValidationException $e){
+				//transaction is incomplete - crafting transaction comes in lots of little bits, so we have to collect
+				//all of the parts before we can execute it
+				return true;
 			}
 
-			return true;
+			try{
+				$this->craftingTransaction->execute();
+				return true;
+			}catch(TransactionValidationException $e){
+				$this->server->getLogger()->debug("Failed to execute crafting transaction for " . $this->getName() . ": " . $e->getMessage());
+				return false;
+			}finally{
+				$this->craftingTransaction = null;
+			}
 		}elseif($this->craftingTransaction !== null){
 			$this->server->getLogger()->debug("Got unexpected normal inventory action with incomplete crafting transaction from " . $this->getName() . ", refusing to execute crafting");
 			$this->craftingTransaction = null;

src/pocketmine/VersionInfo.php

@@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.14.2";
+const BASE_VERSION = "3.15.0";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/block/Podzol.php

@@ -40,6 +40,6 @@ class Podzol extends Solid{
 	}
 
 	public function getHardness() : float{
-		return 2.5;
+		return 0.5;
 	}
 }

src/pocketmine/command/defaults/WhitelistCommand.php

@@ -74,7 +74,7 @@ class WhitelistCommand extends VanillaCommand{
 				case "list":
 					$entries = $sender->getServer()->getWhitelisted()->getAll(true);
 					sort($entries, SORT_STRING);
-					$result = implode($entries, ", ");
+					$result = implode(", ", $entries);
 					$count = count($entries);
 
 					$sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count]));

src/pocketmine/entity/Entity.php

@@ -868,7 +868,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	public function getSaveId() : string{
 		if(!isset(self::$saveNames[static::class])){
-			throw new \InvalidStateException("Entity is not registered");
+			throw new \InvalidStateException("Entity " . static::class . " is not registered");
 		}
 		reset(self::$saveNames[static::class]);
 		return current(self::$saveNames[static::class]);

src/pocketmine/event/player/PlayerChatEvent.php

@@ -29,7 +29,6 @@ use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\Utils;
-use function array_values;
 use function spl_object_id;
 
 /**

src/pocketmine/inventory/CraftingManager.php

@@ -28,8 +28,10 @@ use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\CraftingDataPacket;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
+use pocketmine\utils\AssumptionFailedError;
 use function array_map;
 use function file_get_contents;
+use function is_array;
 use function json_decode;
 use function json_encode;
 use function usort;
@@ -52,41 +54,39 @@ class CraftingManager{
 
 	public function init() : void{
 		$recipes = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "vanilla" . DIRECTORY_SEPARATOR . "recipes.json"), true);
+		if(!is_array($recipes)){
+			throw new AssumptionFailedError("recipes.json root should contain a map of recipe types");
+		}
 
 		$itemDeserializerFunc = \Closure::fromCallable([Item::class, 'jsonDeserialize']);
-		foreach($recipes as $recipe){
-			switch($recipe["type"]){
-				case "shapeless":
-					if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerShapelessRecipe(new ShapelessRecipe(
-						array_map($itemDeserializerFunc, $recipe["input"]),
-						array_map($itemDeserializerFunc, $recipe["output"])
-					));
-					break;
-				case "shaped":
-					if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerShapedRecipe(new ShapedRecipe(
-						$recipe["shape"],
-						array_map($itemDeserializerFunc, $recipe["input"]),
-						array_map($itemDeserializerFunc, $recipe["output"])
-					));
-					break;
-				case "smelting":
-					if($recipe["block"] !== "furnace"){ //TODO: filter others out for now to avoid breaking economics
-						break;
-					}
-					$this->registerFurnaceRecipe(new FurnaceRecipe(
-						Item::jsonDeserialize($recipe["output"]),
-						Item::jsonDeserialize($recipe["input"]))
-					);
-					break;
-				default:
-					break;
+
+		foreach($recipes["shapeless"] as $recipe){
+			if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
 			}
+			$this->registerShapelessRecipe(new ShapelessRecipe(
+				array_map($itemDeserializerFunc, $recipe["input"]),
+				array_map($itemDeserializerFunc, $recipe["output"])
+			));
+		}
+		foreach($recipes["shaped"] as $recipe){
+			if($recipe["block"] !== "crafting_table"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
+			}
+			$this->registerShapedRecipe(new ShapedRecipe(
+				$recipe["shape"],
+				array_map($itemDeserializerFunc, $recipe["input"]),
+				array_map($itemDeserializerFunc, $recipe["output"])
+			));
+		}
+		foreach($recipes["smelting"] as $recipe){
+			if($recipe["block"] !== "furnace"){ //TODO: filter others out for now to avoid breaking economics
+				continue;
+			}
+			$this->registerFurnaceRecipe(new FurnaceRecipe(
+				Item::jsonDeserialize($recipe["output"]),
+				Item::jsonDeserialize($recipe["input"]))
+			);
 		}
 
 		$this->buildCraftingDataCache();

src/pocketmine/inventory/transaction/InventoryTransaction.php

@@ -136,6 +136,8 @@ class InventoryTransaction{
 	 * @throws TransactionValidationException
 	 */
 	protected function matchItems(array &$needItems, array &$haveItems) : void{
+		$needItems = [];
+		$haveItems = [];
 		foreach($this->actions as $key => $action){
 			if(!$action->getTargetItem()->isNull()){
 				$needItems[] = $action->getTargetItem();

src/pocketmine/network/mcpe/protocol/LoginPacket.php

@@ -78,7 +78,7 @@ class LoginPacket extends DataPacket{
 	}
 
 	public function mayHaveUnreadBytes() : bool{
-		return $this->protocol !== null and $this->protocol !== ProtocolInfo::CURRENT_PROTOCOL;
+		return $this->protocol !== ProtocolInfo::CURRENT_PROTOCOL;
 	}
 
 	protected function decodePayload(){
@@ -92,7 +92,7 @@ class LoginPacket extends DataPacket{
 			}
 
 			$logger = MainLogger::getLogger();
-			$logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version " . ($this->protocol ?? "unknown") . "): " . $e->getMessage());
+			$logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version $this->protocol): " . $e->getMessage());
 			foreach(Utils::printableTrace($e->getTrace()) as $line){
 				$logger->debug($line);
 			}

src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php

@@ -128,8 +128,8 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{
 	}
 
 	protected function decodePayload() : void{
-		$this->yaw = $this->getLFloat();
 		$this->pitch = $this->getLFloat();
+		$this->yaw = $this->getLFloat();
 		$this->position = $this->getVector3();
 		$this->moveVecX = $this->getLFloat();
 		$this->moveVecZ = $this->getLFloat();
@@ -143,8 +143,8 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{
 	}
 
 	protected function encodePayload() : void{
-		$this->putLFloat($this->yaw);
 		$this->putLFloat($this->pitch);
+		$this->putLFloat($this->yaw);
 		$this->putVector3($this->position);
 		$this->putLFloat($this->moveVecX);
 		$this->putLFloat($this->moveVecZ);

src/pocketmine/network/mcpe/protocol/ProtocolInfo.php

@@ -37,11 +37,11 @@ interface ProtocolInfo{
 	 */
 
 	/** Actual Minecraft: PE protocol version */
-	public const CURRENT_PROTOCOL = 407;
+	public const CURRENT_PROTOCOL = 408;
 	/** Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. */
-	public const MINECRAFT_VERSION = 'v1.16.0';
+	public const MINECRAFT_VERSION = 'v1.16.20';
 	/** Version number sent to clients in ping responses. */
-	public const MINECRAFT_VERSION_NETWORK = '1.16.0';
+	public const MINECRAFT_VERSION_NETWORK = '1.16.20';
 
 	public const LOGIN_PACKET = 0x01;
 	public const PLAY_STATUS_PACKET = 0x02;

src/pocketmine/timings/Timings.php

@@ -149,7 +149,7 @@ abstract class Timings{
 	}
 
 	public static function getScheduledTaskTimings(TaskHandler $task, int $period) : TimingsHandler{
-		$name = "Task: " . ($task->getOwnerName() ?? "Unknown") . " Runnable: " . $task->getTaskName();
+		$name = "Task: " . $task->getOwnerName() . " Runnable: " . $task->getTaskName();
 
 		if($period > 0){
 			$name .= "(interval:" . $period . ")";

src/pocketmine/utils/VersionString.php

@@ -52,7 +52,7 @@ class VersionString{
 		$this->development = $isDevBuild;
 		$this->build = $buildNumber;
 
-		preg_match('/(\d+)\.(\d+)\.(\d+)(?:-(.*))?$/', $this->baseVersion, $matches);
+		preg_match('/^(\d+)\.(\d+)\.(\d+)(?:-(.*))?$/', $this->baseVersion, $matches);
 		if(count($matches) < 4){
 			throw new \InvalidArgumentException("Invalid base version \"$baseVersion\", should contain at least 3 version digits");
 		}

tests/phpstan/configs/check-explicit-mixed-baseline.neon

@@ -205,11 +205,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/event/EventPriority.php
 
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/inventory/CraftingManager.php
-
 		-
 			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
 			count: 1

tests/travis.sh

@@ -17,7 +17,7 @@ PLUGINS_DIR="$DATA_DIR/plugins"
 rm -rf "$DATA_DIR"
 rm PocketMine-MP.phar 2> /dev/null
 
-cd tests/plugins/PocketMine-DevTools
+cd tests/plugins/DevTools
 php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar
 cd ../../..