mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-21 10:54:05 +00:00
De-duplicate code used by legacy <-> string ID mapping classes
This commit is contained in:
parent
dbd51610c3
commit
218f32f5b8
@ -31,39 +31,10 @@ use function is_int;
|
|||||||
use function is_string;
|
use function is_string;
|
||||||
use function json_decode;
|
use function json_decode;
|
||||||
|
|
||||||
final class LegacyBlockIdToStringIdMap{
|
final class LegacyBlockIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
|
||||||
use SingletonTrait;
|
use SingletonTrait;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var string[]
|
|
||||||
* @phpstan-var array<int, string>
|
|
||||||
*/
|
|
||||||
private $legacyToString = [];
|
|
||||||
/**
|
|
||||||
* @var int[]
|
|
||||||
* @phpstan-var array<string, int>
|
|
||||||
*/
|
|
||||||
private $stringToLegacy = [];
|
|
||||||
|
|
||||||
public function __construct(){
|
public function __construct(){
|
||||||
$stringToLegacyId = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . 'vanilla/block_id_map.json'), true);
|
parent::__construct(\pocketmine\RESOURCE_PATH . 'vanilla/block_id_map.json');
|
||||||
if(!is_array($stringToLegacyId)){
|
|
||||||
throw new AssumptionFailedError("Invalid format of block_id_map");
|
|
||||||
}
|
|
||||||
foreach($stringToLegacyId as $stringId => $legacyId){
|
|
||||||
if(!is_string($stringId) or !is_int($legacyId)){
|
|
||||||
throw new AssumptionFailedError("Block ID map should have string keys and int values");
|
|
||||||
}
|
|
||||||
$this->legacyToString[$legacyId] = $stringId;
|
|
||||||
$this->stringToLegacy[$stringId] = $legacyId;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function legacyToString(int $legacy) : ?string{
|
|
||||||
return $this->legacyToString[$legacy] ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function stringToLegacy(string $string) : ?int{
|
|
||||||
return $this->stringToLegacy[$string] ?? null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -31,39 +31,10 @@ use function is_int;
|
|||||||
use function is_string;
|
use function is_string;
|
||||||
use function json_decode;
|
use function json_decode;
|
||||||
|
|
||||||
final class LegacyEntityIdToStringIdMap{
|
final class LegacyEntityIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
|
||||||
use SingletonTrait;
|
use SingletonTrait;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var string[]
|
|
||||||
* @phpstan-var array<int, string>
|
|
||||||
*/
|
|
||||||
private $legacyToString = [];
|
|
||||||
/**
|
|
||||||
* @var int[]
|
|
||||||
* @phpstan-var array<string, int>
|
|
||||||
*/
|
|
||||||
private $stringToLegacy = [];
|
|
||||||
|
|
||||||
public function __construct(){
|
public function __construct(){
|
||||||
$rawJson = @file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/entity_id_map.json');
|
parent::__construct(\pocketmine\RESOURCE_PATH . '/vanilla/entity_id_map.json');
|
||||||
if($rawJson === false) throw new AssumptionFailedError("Missing required resource file");
|
|
||||||
$mapping = json_decode($rawJson, true);
|
|
||||||
if(!is_array($mapping)) throw new AssumptionFailedError("Entity ID map should be a JSON object");
|
|
||||||
foreach($mapping as $stringId => $legacyId){
|
|
||||||
if(!is_string($stringId) or !is_int($legacyId)){
|
|
||||||
throw new AssumptionFailedError("Block ID map should have string keys and int values");
|
|
||||||
}
|
|
||||||
$this->legacyToString[$legacyId] = $stringId;
|
|
||||||
$this->stringToLegacy[$stringId] = $legacyId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function legacyToString(int $legacy) : ?string{
|
|
||||||
return $this->legacyToString[$legacy] ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function stringToLegacy(string $string) : ?int{
|
|
||||||
return $this->stringToLegacy[$string] ?? null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
78
src/data/bedrock/LegacyToStringBidirectionalIdMap.php
Normal file
78
src/data/bedrock/LegacyToStringBidirectionalIdMap.php
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
<?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\data\bedrock;
|
||||||
|
|
||||||
|
use pocketmine\utils\AssumptionFailedError;
|
||||||
|
|
||||||
|
abstract class LegacyToStringBidirectionalIdMap{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string[]
|
||||||
|
* @phpstan-var array<int, string>
|
||||||
|
*/
|
||||||
|
private $legacyToString = [];
|
||||||
|
/**
|
||||||
|
* @var int[]
|
||||||
|
* @phpstan-var array<string, int>
|
||||||
|
*/
|
||||||
|
private $stringToLegacy = [];
|
||||||
|
|
||||||
|
public function __construct(string $file){
|
||||||
|
$stringToLegacyId = json_decode(file_get_contents($file), true);
|
||||||
|
if(!is_array($stringToLegacyId)){
|
||||||
|
throw new AssumptionFailedError("Invalid format of ID map");
|
||||||
|
}
|
||||||
|
foreach($stringToLegacyId as $stringId => $legacyId){
|
||||||
|
if(!is_string($stringId) or !is_int($legacyId)){
|
||||||
|
throw new AssumptionFailedError("ID map should have string keys and int values");
|
||||||
|
}
|
||||||
|
$this->legacyToString[$legacyId] = $stringId;
|
||||||
|
$this->stringToLegacy[$stringId] = $legacyId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function legacyToString(int $legacy) : ?string{
|
||||||
|
return $this->legacyToString[$legacy] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function stringToLegacy(string $string) : ?int{
|
||||||
|
return $this->stringToLegacy[$string] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string[]
|
||||||
|
* @phpstan-return array<int, string>
|
||||||
|
*/
|
||||||
|
public function getLegacyToStringMap() : array{
|
||||||
|
return $this->legacyToString;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return int[]
|
||||||
|
* @phpstan-return array<string, int>
|
||||||
|
*/
|
||||||
|
public function getStringToLegacyMap() : array{
|
||||||
|
return $this->stringToLegacy;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user