Drop string ID -> legacy ID conversion tables

these are not used for anything anymore
This commit is contained in:
Dylan K. Taylor 2022-07-07 20:00:25 +01:00
parent 419b21281d
commit d894c5e97f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 7 additions and 29 deletions

View File

@ -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(){

View File

@ -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(){

View File

@ -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<int, string>
*/
private array $legacyToString = [];
/**
* @var int[]
* @phpstan-var array<string, int>
*/
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<int, string>
@ -74,22 +64,10 @@ abstract class LegacyToStringBidirectionalIdMap{
return $this->legacyToString;
}
/**
* @return int[]
* @phpstan-return array<string, int>
*/
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;
}
}

View File

@ -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(){

View File

@ -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(){