Release 3.9.1

changelogs/3.9.md

@@ -9,4 +9,38 @@ Plugin developers should **only** update their required API to this version if y
 # 3.9.0
 - Added support for Minecraft: Bedrock Edition 1.12.0
 - Removed compatibility with 1.11.0
-- All packets pertaining to `Entity`s have been renamed to their appropriate `Actor` names to resolve conflicts with new packets.
+
+## Protocol
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been renamed:
+  - `AddEntityPacket` -> `AddActorPacket`
+  - `AddItemEntityPacket` -> `AddItemActorPacket`
+  - `AvailableEntityIdentifiersPacket` -> `AvailableActorIdentifiersPacket`
+  - `BlockEntityDataPacket` -> `BlockActorDataPacket`
+  - `EntityEventPacket` -> `ActorEventPacket`
+  - `EntityFallPacket` -> `ActorFallPacket`
+  - `EntityPickRequestPacket` -> `ActorPickRequestPacket`
+  - `MoveEntityAbsolutePacket` -> `MoveActorAbsolutePacket`
+  - `MoveEntityDeltaPacket` -> `MoveActorDeltaPacket`
+  - `RemoveEntityPacket` -> `RemoveActorPacket`
+  - `SetEntityDataPacket` -> `SetActorDataPacket`
+  - `SetEntityLinkPacket` -> `SetActorLinkPacket`
+  - `SetEntityMotionPacket` -> `SetActorMotionPacket`
+  - `TakeItemEntityPacket` -> `TakeItemActorPacket`
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been removed:
+  - `FullChunkDataPacket`
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been added:
+  - `AddEntityPacket` (not to be confused with the old one)
+  - `ClientCacheBlobStatusPacket`
+  - `ClientCacheMissResponsePacket`
+  - `ClientCacheStatusPacket`
+  - `LevelChunkPacket`
+  - `RemoveEntityPacket` (not to be confused with the old one)
+  - `StructureTemplateDataExportRequestPacket`
+  - `StructureTemplateDataExportResponsePacket`
+
+# 3.9.1
+- Fixed resource packs not working on 1.12 clients.
+- Fixed some particles displaying incorrectly (some still don't render at all).
+- Fixed `Entity->setFireTicks()` with a value of `0` setting the on-fire flag.
+- Silenced a debug message which appeared every time a player right-clicked a block.
+- Updated constants for `LevelSoundEventPacket`.

src/pocketmine/Player.php

@@ -99,10 +99,11 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\DoubleTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\network\mcpe\PlayerNetworkSessionAdapter;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
-use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
 use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
+use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
 use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
 use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
@@ -112,7 +113,6 @@ use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\DisconnectPacket;
-use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
@@ -2855,6 +2855,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			case PlayerActionPacket::ACTION_STOP_SWIMMING:
 				//TODO: handle this when it doesn't spam every damn tick (yet another spam bug!!)
 				break;
+			case PlayerActionPacket::ACTION_INTERACT_BLOCK: //ignored (for now)
+				break;
 			default:
 				$this->server->getLogger()->debug("Unhandled/unknown player action type " . $packet->action . " from " . $this->getName());
 				return false;

src/pocketmine/VersionInfo.php

@@ -22,6 +22,6 @@
 namespace pocketmine;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.9.0";
+const BASE_VERSION = "3.9.1";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/entity/Entity.php

@@ -62,8 +62,8 @@ use pocketmine\nbt\tag\DoubleTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket;
 use pocketmine\network\mcpe\protocol\RemoveActorPacket;
 use pocketmine\network\mcpe\protocol\SetActorDataPacket;
@@ -1143,7 +1143,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$this->setFireTicks($ticks);
 		}
 
-		$this->setGenericFlag(self::DATA_FLAG_ONFIRE, true);
+		$this->setGenericFlag(self::DATA_FLAG_ONFIRE, $this->isOnFire());
 	}
 
 	/**

src/pocketmine/entity/Human.php

@@ -46,8 +46,8 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;

src/pocketmine/level/particle/Particle.php

@@ -29,59 +29,67 @@ use pocketmine\network\mcpe\protocol\DataPacket;
 abstract class Particle extends Vector3{
 
 	public const TYPE_BUBBLE = 1;
-	public const TYPE_CRITICAL = 2;
-	public const TYPE_BLOCK_FORCE_FIELD = 3;
-	public const TYPE_SMOKE = 4;
-	public const TYPE_EXPLODE = 5;
-	public const TYPE_EVAPORATION = 6;
-	public const TYPE_FLAME = 7;
-	public const TYPE_LAVA = 8;
-	public const TYPE_LARGE_SMOKE = 9;
-	public const TYPE_REDSTONE = 10;
-	public const TYPE_RISING_RED_DUST = 11;
-	public const TYPE_ITEM_BREAK = 12;
-	public const TYPE_SNOWBALL_POOF = 13;
-	public const TYPE_HUGE_EXPLODE = 14;
-	public const TYPE_HUGE_EXPLODE_SEED = 15;
-	public const TYPE_MOB_FLAME = 16;
-	public const TYPE_HEART = 17;
-	public const TYPE_TERRAIN = 18;
-	public const TYPE_SUSPENDED_TOWN = 19, TYPE_TOWN_AURA = 19;
-	public const TYPE_PORTAL = 20;
-	public const TYPE_SPLASH = 21, TYPE_WATER_SPLASH = 21;
-	public const TYPE_WATER_WAKE = 22;
-	public const TYPE_DRIP_WATER = 23;
-	public const TYPE_DRIP_LAVA = 24;
-	public const TYPE_FALLING_DUST = 25, TYPE_DUST = 25;
-	public const TYPE_MOB_SPELL = 26;
-	public const TYPE_MOB_SPELL_AMBIENT = 27;
-	public const TYPE_MOB_SPELL_INSTANTANEOUS = 28;
-	public const TYPE_INK = 29;
-	public const TYPE_SLIME = 30;
-	public const TYPE_RAIN_SPLASH = 31;
-	public const TYPE_VILLAGER_ANGRY = 32;
-	public const TYPE_VILLAGER_HAPPY = 33;
-	public const TYPE_ENCHANTMENT_TABLE = 34;
-	public const TYPE_TRACKING_EMITTER = 35;
-	public const TYPE_NOTE = 36;
-	public const TYPE_WITCH_SPELL = 37;
-	public const TYPE_CARROT = 38;
-	//39 unknown
-	public const TYPE_END_ROD = 40;
-	public const TYPE_DRAGONS_BREATH = 41;
-	public const TYPE_SPIT = 42;
-	public const TYPE_TOTEM = 43;
-	public const TYPE_FOOD = 44;
-	public const TYPE_FIREWORKS_STARTER = 45;
-	public const TYPE_FIREWORKS_SPARK = 46;
-	public const TYPE_FIREWORKS_OVERLAY = 47;
-	public const TYPE_BALLOON_GAS = 48;
-	public const TYPE_COLORED_FLAME = 49;
-	public const TYPE_SPARKLER = 50;
-	public const TYPE_CONDUIT = 51;
-	public const TYPE_BUBBLE_COLUMN_UP = 52;
-	public const TYPE_BUBBLE_COLUMN_DOWN = 53;
-	public const TYPE_SNEEZE = 54;
+	//2 same as 1
+	public const TYPE_CRITICAL = 3;
+	public const TYPE_BLOCK_FORCE_FIELD = 4;
+	public const TYPE_SMOKE = 5;
+	public const TYPE_EXPLODE = 6;
+	public const TYPE_EVAPORATION = 7;
+	public const TYPE_FLAME = 8;
+	public const TYPE_LAVA = 9;
+	public const TYPE_LARGE_SMOKE = 10;
+	public const TYPE_REDSTONE = 11;
+	public const TYPE_RISING_RED_DUST = 12;
+	//62 same as 12
+	public const TYPE_ITEM_BREAK = 13;
+	public const TYPE_SNOWBALL_POOF = 14;
+	public const TYPE_HUGE_EXPLODE = 15;
+	//60 same as 15
+	public const TYPE_HUGE_EXPLODE_SEED = 16;
+	public const TYPE_MOB_FLAME = 17;
+	public const TYPE_HEART = 18;
+	public const TYPE_TERRAIN = 19;
+	public const TYPE_SUSPENDED_TOWN = 20, TYPE_TOWN_AURA = 20;
+	//61 same as 20
+	public const TYPE_PORTAL = 21;
+	//22 same as 21
+	public const TYPE_SPLASH = 23, TYPE_WATER_SPLASH = 23;
+	//24 same as 23
+	public const TYPE_WATER_WAKE = 25;
+	public const TYPE_DRIP_WATER = 26;
+	public const TYPE_DRIP_LAVA = 27;
+	public const TYPE_FALLING_DUST = 28, TYPE_DUST = 28;
+	public const TYPE_MOB_SPELL = 29;
+	public const TYPE_MOB_SPELL_AMBIENT = 30;
+	public const TYPE_MOB_SPELL_INSTANTANEOUS = 31;
+	public const TYPE_INK = 32;
+	public const TYPE_SLIME = 33;
+	public const TYPE_RAIN_SPLASH = 34;
+	public const TYPE_VILLAGER_ANGRY = 35;
+	//59 same as 35
+	public const TYPE_VILLAGER_HAPPY = 36;
+	public const TYPE_ENCHANTMENT_TABLE = 37;
+	public const TYPE_TRACKING_EMITTER = 38;
+	public const TYPE_NOTE = 39;
+	public const TYPE_WITCH_SPELL = 40;
+	public const TYPE_CARROT = 41;
+	//42 unknown
+	public const TYPE_END_ROD = 43;
+	//58 same as 43
+	public const TYPE_DRAGONS_BREATH = 44;
+	public const TYPE_SPIT = 45;
+	public const TYPE_TOTEM = 46;
+	public const TYPE_FOOD = 47;
+	public const TYPE_FIREWORKS_STARTER = 48;
+	public const TYPE_FIREWORKS_SPARK = 49;
+	public const TYPE_FIREWORKS_OVERLAY = 50;
+	public const TYPE_BALLOON_GAS = 51;
+	public const TYPE_COLORED_FLAME = 52;
+	public const TYPE_SPARKLER = 53;
+	public const TYPE_CONDUIT = 54;
+	public const TYPE_BUBBLE_COLUMN_UP = 55;
+	public const TYPE_BUBBLE_COLUMN_DOWN = 56;
+	public const TYPE_SNEEZE = 57;
 
 	/**
 	 * @return DataPacket|DataPacket[]

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -41,7 +41,6 @@ use pocketmine\utils\BinaryStream;
 use pocketmine\utils\UUID;
 use function count;
 use function strlen;
-use function var_dump;
 
 class NetworkBinaryStream extends BinaryStream{
 

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -25,6 +25,9 @@ namespace pocketmine\network\mcpe;
 
 
 use pocketmine\event\server\DataPacketReceiveEvent;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\ActorFallPacket;
+use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
 use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
@@ -37,9 +40,6 @@ use pocketmine\network\mcpe\protocol\CommandRequestPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\CraftingEventPacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
-use pocketmine\network\mcpe\protocol\ActorEventPacket;
-use pocketmine\network\mcpe\protocol\ActorFallPacket;
-use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
 use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;

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

@@ -25,9 +25,9 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use function count;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\ChunkCacheBlob;
+use function count;
 
 class ClientCacheMissResponsePacket extends DataPacket/* implements ClientboundPacket*/{
 	public const NETWORK_ID = ProtocolInfo::CLIENT_CACHE_MISS_RESPONSE_PACKET;

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

@@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use function count;
 use pocketmine\network\mcpe\NetworkSession;
+use function count;
 
 class LevelChunkPacket extends DataPacket/* implements ClientboundPacket*/{
 	public const NETWORK_ID = ProtocolInfo::LEVEL_CHUNK_PACKET;

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

@@ -292,8 +292,8 @@ class LevelSoundEventPacket extends DataPacket{
 	public const SOUND_STUN = 261;
 	public const SOUND_BLOCK_SWEET_BERRY_BUSH_HURT = 262;
 	public const SOUND_BLOCK_SWEET_BERRY_BUSH_PICK = 263;
-	public const SOUND_UI_CARTOGRAPHY_TABLE_TAKE_RESULT = 264;
-	public const SOUND_UI_STONECUTTER_TAKE_RESULT = 265;
+	public const SOUND_BLOCK_CARTOGRAPHY_TABLE_USE = 264;
+	public const SOUND_BLOCK_STONECUTTER_USE = 265;
 	public const SOUND_BLOCK_COMPOSTER_EMPTY = 266;
 	public const SOUND_BLOCK_COMPOSTER_FILL = 267;
 	public const SOUND_BLOCK_COMPOSTER_FILL_SUCCESS = 268;
@@ -302,7 +302,14 @@ class LevelSoundEventPacket extends DataPacket{
 	public const SOUND_BLOCK_BARREL_CLOSE = 271;
 	public const SOUND_RAID_HORN = 272;
 	public const SOUND_BLOCK_LOOM_USE = 273;
-	public const SOUND_UNDEFINED = 274;
+	public const SOUND_AMBIENT_IN_RAID = 274;
+	public const SOUND_UI_CARTOGRAPHY_TABLE_TAKE_RESULT = 275;
+	public const SOUND_UI_STONECUTTER_TAKE_RESULT = 276;
+	public const SOUND_UI_LOOM_TAKE_RESULT = 277;
+	public const SOUND_BLOCK_SMOKER_SMOKE = 278;
+	public const SOUND_BLOCK_BLASTFURNACE_FIRE_CRACKLE = 279;
+	public const SOUND_BLOCK_SMITHING_TABLE_USE = 280;
+	public const SOUND_UNDEFINED = 281;
 
 	/** @var int */
 	public $sound;

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

@@ -56,6 +56,7 @@ class PlayerActionPacket extends DataPacket{
 	public const ACTION_STOP_SWIMMING = 22;
 	public const ACTION_START_SPIN_ATTACK = 23;
 	public const ACTION_STOP_SPIN_ATTACK = 24;
+	public const ACTION_INTERACT_BLOCK = 25;
 
 	/** @var int */
 	public $entityRuntimeId;

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

@@ -28,6 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\ResourcePackType;
 
 class ResourcePackDataInfoPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET;
@@ -45,7 +46,7 @@ class ResourcePackDataInfoPacket extends DataPacket{
 	/** @var bool */
 	public $isPremium = false;
 	/** @var int */
-	public $packType = 0; //TODO: check the values for this
+	public $packType = ResourcePackType::RESOURCES; //TODO: check the values for this
 
 	protected function decodePayload(){
 		$this->packId = $this->getString();

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

@@ -26,15 +26,14 @@ namespace pocketmine\network\mcpe\protocol;
 #include <rules/DataPacket.h>
 
 
-use function file_get_contents;
-use function json_decode;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkBinaryStream;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
 use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
 use function count;
-use pocketmine\network\mcpe\protocol\types\RuntimeItemMapping;
+use function file_get_contents;
+use function json_decode;
 use const pocketmine\RESOURCE_PATH;
 
 class StartGamePacket extends DataPacket{

src/pocketmine/network/mcpe/protocol/types/ResourcePackType.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol\types;
+
+final class ResourcePackType{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	public const INVALID = 0;
+	public const RESOURCES = 1;
+	public const BEHAVIORS = 2;
+	public const WORLD_TEMPLATE = 3;
+	public const ADDON = 4; //scripts?
+	public const SKINS = 5;
+}