new data

.github/workflows/php.yml

@@ -37,7 +37,7 @@ jobs:
       run: composer make-server
 
     - name: Archive generated Phar file
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: BetterAltay
         path: BetterAltay.phar

.gitignore

@@ -17,6 +17,7 @@ memory_dumps/*
 resource_packs/
 server.lock
 /phpstan.neon
+start_dev.sh
 
 # Common IDEs
 .idea/*
@@ -40,6 +41,7 @@ Desktop.ini
 
 # Composer
 vendor/*
+pm_composer.sh
 
 # Travis files
 test_data/*
@@ -54,3 +56,5 @@ Documentation/*
 /.php_cs.cache
 /.php-cs-fixer.cache
 
+# Vscode
+/.vscode

src/pocketmine/Player.php

@@ -3373,7 +3373,7 @@ public function handlePlayerAction(PlayerActionPacket $packet) : bool{
 				break;
 			case PlayerActionPacket::ACTION_CRACK_BREAK:
 				$block = $this->level->getBlock($pos);
-				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, $block->getRuntimeId() | ($packet->face << 24));
+				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, $block->getNetworkId() | ($packet->face << 24));
 				//TODO: destroy-progress level event
 				break;
 			case PlayerActionPacket::ACTION_START_SWIMMING:
@@ -3398,8 +3398,16 @@ public function handlePlayerAction(PlayerActionPacket $packet) : bool{
 			case PlayerActionPacket::ACTION_DIMENSION_CHANGE_ACK:
 				$this->sendPlayStatus(PlayStatusPacket::PLAYER_SPAWN);
 				break;
+			case PlayerActionPacket::ACTION_START_CRAWLING:
+			case PlayerActionPacket::ACTION_STOP_CRAWLING:
+				//TODO
+				break;
 			case PlayerActionPacket::ACTION_START_FLYING:
 			case PlayerActionPacket::ACTION_STOP_FLYING:
+				//TODO: ignored for now
+				break;
+			case PlayerActionPacket::ACTION_MISSED_SWING:
+				//ignored
 				break;
 			default:
 				$this->server->getLogger()->debug("Unhandled/unknown player action type " . $packet->action . " from " . $this->getName());

src/pocketmine/Server.php

@@ -78,7 +78,6 @@
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
-use pocketmine\network\mcpe\protocol\types\LegacySkinAdapter;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\network\mcpe\RakLibInterface;

src/pocketmine/block/Block.php

@@ -38,7 +38,7 @@
 use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\NetworkBlockMapping;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use function array_merge;
@@ -104,8 +104,8 @@ public function getItemId() : int{
 	/**
 	 * @internal
 	 */
-	public function getRuntimeId() : int{
-		return RuntimeBlockMapping::toStaticRuntimeId($this->getId(), $this->getDamage());
+	public function getNetworkId() : int{
+		return NetworkBlockMapping::toStaticNetworkId($this->getId(), $this->getDamage());
 	}
 
 	final public function getDamage() : int{

src/pocketmine/block/BlockFactory.php

@@ -26,7 +26,6 @@
 use InvalidArgumentException;
 use pocketmine\item\Item;
 use pocketmine\level\Position;
-use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use RuntimeException;
 use SplFixedArray;
 use function min;
@@ -431,22 +430,4 @@ public static function isRegistered(int $id) : bool{
 		$b = self::$fullList[$id << 4];
 		return $b !== null and !($b instanceof UnknownBlock);
 	}
-
-	/**
-	 * @internal
-	 * @deprecated
-	 */
-	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
-		return RuntimeBlockMapping::toStaticRuntimeId($id, $meta);
-	}
-
-	/**
-	 * @return int[] [id, meta]
-	 * @internal
-	 *
-	 * @deprecated
-	 */
-	public static function fromStaticRuntimeId(int $runtimeId) : array{
-		return RuntimeBlockMapping::fromStaticRuntimeId($runtimeId);
-	}
 }

src/pocketmine/block/Cauldron.php

@@ -373,7 +373,7 @@ private function updateLiquid() : void{
 		$pk->x = $this->x;
 		$pk->y = $this->y;
 		$pk->z = $this->z;
-		$pk->blockRuntimeId = $this->getRuntimeId();
+		$pk->blockNetworkId = $this->getNetworkId();
 		$pk->dataLayerId = UpdateBlockPacket::DATA_LAYER_LIQUID;
 		$pk->flags = UpdateBlockPacket::FLAG_ALL_PRIORITY;