From 6b037d6a4ccafd3c9dc1273c0a19be586fea1952 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 11 May 2020 12:40:55 +0100
Subject: [PATCH] RuntimeBlockMapping: these IDs are not static any more

---
 src/block/Block.php                              | 2 +-
 src/network/mcpe/convert/RuntimeBlockMapping.php | 4 ++--
 src/network/mcpe/serializer/ChunkSerializer.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/block/Block.php b/src/block/Block.php
index d97471555..f77607b46 100644
--- a/src/block/Block.php
+++ b/src/block/Block.php
@@ -111,7 +111,7 @@ class Block{
 	 * @internal
 	 */
 	public function getRuntimeId() : int{
-		return RuntimeBlockMapping::getInstance()->toStaticRuntimeId($this->getId(), $this->getMeta());
+		return RuntimeBlockMapping::getInstance()->toRuntimeId($this->getId(), $this->getMeta());
 	}
 
 	public function getMeta() : int{
diff --git a/src/network/mcpe/convert/RuntimeBlockMapping.php b/src/network/mcpe/convert/RuntimeBlockMapping.php
index 0f0445251..4aef0c543 100644
--- a/src/network/mcpe/convert/RuntimeBlockMapping.php
+++ b/src/network/mcpe/convert/RuntimeBlockMapping.php
@@ -127,7 +127,7 @@ final class RuntimeBlockMapping{
 		return $table;
 	}
 
-	public function toStaticRuntimeId(int $id, int $meta = 0) : int{
+	public function toRuntimeId(int $id, int $meta = 0) : int{
 		/*
 		 * try id+meta first
 		 * if not found, try id+0 (strip meta)
@@ -139,7 +139,7 @@ final class RuntimeBlockMapping{
 	/**
 	 * @return int[] [id, meta]
 	 */
-	public function fromStaticRuntimeId(int $runtimeId) : array{
+	public function fromRuntimeId(int $runtimeId) : array{
 		$v = $this->runtimeToLegacyMap[$runtimeId];
 		return [$v >> 4, $v & 0xf];
 	}
diff --git a/src/network/mcpe/serializer/ChunkSerializer.php b/src/network/mcpe/serializer/ChunkSerializer.php
index 94ce8e89c..54f79222c 100644
--- a/src/network/mcpe/serializer/ChunkSerializer.php
+++ b/src/network/mcpe/serializer/ChunkSerializer.php
@@ -70,7 +70,7 @@ final class ChunkSerializer{
 				//zigzag and just shift directly.
 				$stream->putUnsignedVarInt(count($palette) << 1); //yes, this is intentionally zigzag
 				foreach($palette as $p){
-					$stream->putUnsignedVarInt($blockMapper->toStaticRuntimeId($p >> 4, $p & 0xf) << 1);
+					$stream->putUnsignedVarInt($blockMapper->toRuntimeId($p >> 4, $p & 0xf) << 1);
 				}
 			}
 		}