diff --git a/src/data/bedrock/LegacyBiomeIdToStringIdMap.php b/src/data/bedrock/LegacyBiomeIdToStringIdMap.php index 974792eba..b82dcf2f2 100644 --- a/src/data/bedrock/LegacyBiomeIdToStringIdMap.php +++ b/src/data/bedrock/LegacyBiomeIdToStringIdMap.php @@ -26,7 +26,7 @@ namespace pocketmine\data\bedrock; use pocketmine\utils\SingletonTrait; use Webmozart\PathUtil\Path; -final class LegacyBiomeIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ +final class LegacyBiomeIdToStringIdMap extends LegacyToStringIdMap{ use SingletonTrait; public function __construct(){ diff --git a/src/data/bedrock/LegacyEntityIdToStringIdMap.php b/src/data/bedrock/LegacyEntityIdToStringIdMap.php index 2e3e4aecc..6ba3b64de 100644 --- a/src/data/bedrock/LegacyEntityIdToStringIdMap.php +++ b/src/data/bedrock/LegacyEntityIdToStringIdMap.php @@ -26,7 +26,7 @@ namespace pocketmine\data\bedrock; use pocketmine\utils\SingletonTrait; use Webmozart\PathUtil\Path; -final class LegacyEntityIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ +final class LegacyEntityIdToStringIdMap extends LegacyToStringIdMap{ use SingletonTrait; public function __construct(){ diff --git a/src/data/bedrock/LegacyToStringBidirectionalIdMap.php b/src/data/bedrock/LegacyToStringIdMap.php similarity index 76% rename from src/data/bedrock/LegacyToStringBidirectionalIdMap.php rename to src/data/bedrock/LegacyToStringIdMap.php index e39df6ad9..d808b35df 100644 --- a/src/data/bedrock/LegacyToStringBidirectionalIdMap.php +++ b/src/data/bedrock/LegacyToStringIdMap.php @@ -31,18 +31,13 @@ use function is_int; use function is_string; use function json_decode; -abstract class LegacyToStringBidirectionalIdMap{ +abstract class LegacyToStringIdMap{ /** * @var string[] * @phpstan-var array */ private array $legacyToString = []; - /** - * @var int[] - * @phpstan-var array - */ - private array $stringToLegacy = []; public function __construct(string $file){ $stringToLegacyId = json_decode(Utils::assumeNotFalse(file_get_contents($file), "Missing required resource file"), true); @@ -54,7 +49,6 @@ abstract class LegacyToStringBidirectionalIdMap{ throw new AssumptionFailedError("ID map should have string keys and int values"); } $this->legacyToString[$legacyId] = $stringId; - $this->stringToLegacy[$stringId] = $legacyId; } } @@ -62,10 +56,6 @@ abstract class LegacyToStringBidirectionalIdMap{ return $this->legacyToString[$legacy] ?? null; } - public function stringToLegacy(string $string) : ?int{ - return $this->stringToLegacy[$string] ?? null; - } - /** * @return string[] * @phpstan-return array @@ -74,22 +64,10 @@ abstract class LegacyToStringBidirectionalIdMap{ return $this->legacyToString; } - /** - * @return int[] - * @phpstan-return array - */ - public function getStringToLegacyMap() : array{ - return $this->stringToLegacy; - } - public function add(string $string, int $legacy) : void{ if(isset($this->legacyToString[$legacy])){ throw new \InvalidArgumentException("Legacy ID $legacy is already mapped to string " . $this->legacyToString[$legacy]); } - if(isset($this->stringToLegacy[$string])){ - throw new \InvalidArgumentException("String ID $string is already mapped to legacy ID " . $this->stringToLegacy[$string]); - } $this->legacyToString[$legacy] = $string; - $this->stringToLegacy[$string] = $legacy; } } diff --git a/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php index 0ced6361f..bd0a14c79 100644 --- a/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php +++ b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php @@ -23,11 +23,11 @@ declare(strict_types=1); namespace pocketmine\data\bedrock\block\upgrade; -use pocketmine\data\bedrock\LegacyToStringBidirectionalIdMap; +use pocketmine\data\bedrock\LegacyToStringIdMap; use pocketmine\utils\SingletonTrait; use Webmozart\PathUtil\Path; -final class LegacyBlockIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ +final class LegacyBlockIdToStringIdMap extends LegacyToStringIdMap{ use SingletonTrait; public function __construct(){ diff --git a/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php b/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php index 49b1a2271..62627d7f4 100644 --- a/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php +++ b/src/data/bedrock/item/upgrade/LegacyItemIdToStringIdMap.php @@ -23,11 +23,11 @@ declare(strict_types=1); namespace pocketmine\data\bedrock\item\upgrade; -use pocketmine\data\bedrock\LegacyToStringBidirectionalIdMap; +use pocketmine\data\bedrock\LegacyToStringIdMap; use pocketmine\utils\SingletonTrait; use Webmozart\PathUtil\Path; -final class LegacyItemIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ +final class LegacyItemIdToStringIdMap extends LegacyToStringIdMap{ use SingletonTrait; public function __construct(){