From 680615eed8440b5259d86edbf4dfc9d2b6a78919 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 8 Jun 2022 15:54:45 +0100 Subject: [PATCH] Namespace rename --- src/block/tile/FlowerPot.php | 2 +- .../{blockstate => block}/BlockStateData.php | 2 +- .../BlockStateDeserializeException.php | 2 +- .../BlockStateDeserializer.php | 2 +- .../{blockstate => block}/BlockStateNames.php | 2 +- .../BlockStateSerializeException.php | 2 +- .../BlockStateSerializer.php | 2 +- .../BlockStateStringValues.php | 2 +- .../{blockstate => block}/BlockTypeNames.php | 2 +- .../CachingBlockStateDeserializer.php | 2 +- .../CachingBlockStateSerializer.php | 2 +- .../UpgradingBlockStateDeserializer.php | 4 ++-- .../BlockObjectToBlockStateSerializer.php | 18 +++++++------- .../convert/BlockStateDeserializerHelper.php | 8 +++---- .../convert/BlockStateReader.php | 10 ++++---- .../convert/BlockStateSerializerHelper.php | 8 +++---- .../BlockStateToBlockObjectDeserializer.php | 18 +++++++------- .../convert/BlockStateWriter.php | 10 ++++---- .../upgrade/BlockStateUpgradeSchema.php | 4 ++-- .../BlockStateUpgradeSchemaBlockRemap.php | 2 +- .../upgrade/BlockStateUpgradeSchemaUtils.php | 10 ++++---- .../BlockStateUpgradeSchemaValueRemap.php | 2 +- .../upgrade/BlockStateUpgrader.php | 4 ++-- .../upgrade/LegacyBlockStateMapper.php | 4 ++-- .../model/BlockStateUpgradeSchemaModel.php | 2 +- ...BlockStateUpgradeSchemaModelBlockRemap.php | 2 +- .../model/BlockStateUpgradeSchemaModelTag.php | 2 +- ...BlockStateUpgradeSchemaModelValueRemap.php | 2 +- src/data/bedrock/item/ItemDeserializer.php | 2 +- src/data/bedrock/item/ItemSerializer.php | 2 +- src/data/bedrock/item/SavedItemData.php | 4 ++-- src/entity/object/FallingBlock.php | 2 +- .../mcpe/convert/BlockStateDictionary.php | 2 +- .../mcpe/convert/BlockStateLookupCache.php | 2 +- .../mcpe/convert/RuntimeBlockMapping.php | 8 +++---- src/world/format/io/BaseWorldProvider.php | 4 ++-- .../format/io/GlobalBlockStateHandlers.php | 24 +++++++++---------- src/world/format/io/leveldb/LevelDB.php | 6 ++--- .../BlockSerializerDeserializerTest.php | 6 ++--- .../upgrade/BlockStateUpgraderTest.php | 4 ++-- tools/generate-blockstate-upgrade-schema.php | 10 ++++---- 41 files changed, 104 insertions(+), 104 deletions(-) rename src/data/bedrock/{blockstate => block}/BlockStateData.php (98%) rename src/data/bedrock/{blockstate => block}/BlockStateDeserializeException.php (94%) rename src/data/bedrock/{blockstate => block}/BlockStateDeserializer.php (96%) rename src/data/bedrock/{blockstate => block}/BlockStateNames.php (99%) rename src/data/bedrock/{blockstate => block}/BlockStateSerializeException.php (94%) rename src/data/bedrock/{blockstate => block}/BlockStateSerializer.php (96%) rename src/data/bedrock/{blockstate => block}/BlockStateStringValues.php (99%) rename src/data/bedrock/{blockstate => block}/BlockTypeNames.php (99%) rename src/data/bedrock/{blockstate => block}/CachingBlockStateDeserializer.php (97%) rename src/data/bedrock/{blockstate => block}/CachingBlockStateSerializer.php (96%) rename src/data/bedrock/{blockstate => block}/UpgradingBlockStateDeserializer.php (91%) rename src/data/bedrock/{blockstate => block}/convert/BlockObjectToBlockStateSerializer.php (99%) rename src/data/bedrock/{blockstate => block}/convert/BlockStateDeserializerHelper.php (98%) rename src/data/bedrock/{blockstate => block}/convert/BlockStateReader.php (97%) rename src/data/bedrock/{blockstate => block}/convert/BlockStateSerializerHelper.php (98%) rename src/data/bedrock/{blockstate => block}/convert/BlockStateToBlockObjectDeserializer.php (99%) rename src/data/bedrock/{blockstate => block}/convert/BlockStateWriter.php (96%) rename src/data/bedrock/{blockstate => block}/upgrade/BlockStateUpgradeSchema.php (93%) rename src/data/bedrock/{blockstate => block}/upgrade/BlockStateUpgradeSchemaBlockRemap.php (96%) rename src/data/bedrock/{blockstate => block}/upgrade/BlockStateUpgradeSchemaUtils.php (96%) rename src/data/bedrock/{blockstate => block}/upgrade/BlockStateUpgradeSchemaValueRemap.php (94%) rename src/data/bedrock/{blockstate => block}/upgrade/BlockStateUpgrader.php (98%) rename src/data/bedrock/{blockstate => block}/upgrade/LegacyBlockStateMapper.php (95%) rename src/data/bedrock/{blockstate => block}/upgrade/model/BlockStateUpgradeSchemaModel.php (97%) rename src/data/bedrock/{blockstate => block}/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php (96%) rename src/data/bedrock/{blockstate => block}/upgrade/model/BlockStateUpgradeSchemaModelTag.php (93%) rename src/data/bedrock/{blockstate => block}/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php (94%) diff --git a/src/block/tile/FlowerPot.php b/src/block/tile/FlowerPot.php index 4a8920ade..499101bb1 100644 --- a/src/block/tile/FlowerPot.php +++ b/src/block/tile/FlowerPot.php @@ -26,7 +26,7 @@ namespace pocketmine\block\tile; use pocketmine\block\Air; use pocketmine\block\Block; use pocketmine\block\BlockFactory; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; use pocketmine\data\SavedDataLoadingException; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; diff --git a/src/data/bedrock/blockstate/BlockStateData.php b/src/data/bedrock/block/BlockStateData.php similarity index 98% rename from src/data/bedrock/blockstate/BlockStateData.php rename to src/data/bedrock/block/BlockStateData.php index 0315a7f41..a5d066298 100644 --- a/src/data/bedrock/blockstate/BlockStateData.php +++ b/src/data/bedrock/block/BlockStateData.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; use pocketmine\nbt\NbtException; use pocketmine\nbt\tag\CompoundTag; diff --git a/src/data/bedrock/blockstate/BlockStateDeserializeException.php b/src/data/bedrock/block/BlockStateDeserializeException.php similarity index 94% rename from src/data/bedrock/blockstate/BlockStateDeserializeException.php rename to src/data/bedrock/block/BlockStateDeserializeException.php index 2f0701b92..fbe0186ef 100644 --- a/src/data/bedrock/blockstate/BlockStateDeserializeException.php +++ b/src/data/bedrock/block/BlockStateDeserializeException.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class BlockStateDeserializeException extends \RuntimeException{ diff --git a/src/data/bedrock/blockstate/BlockStateDeserializer.php b/src/data/bedrock/block/BlockStateDeserializer.php similarity index 96% rename from src/data/bedrock/blockstate/BlockStateDeserializer.php rename to src/data/bedrock/block/BlockStateDeserializer.php index a9af9c078..48bc5ce9f 100644 --- a/src/data/bedrock/blockstate/BlockStateDeserializer.php +++ b/src/data/bedrock/block/BlockStateDeserializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; /** * Implementors of this interface decide how a block should be deserialized and represented at runtime. This is used by diff --git a/src/data/bedrock/blockstate/BlockStateNames.php b/src/data/bedrock/block/BlockStateNames.php similarity index 99% rename from src/data/bedrock/blockstate/BlockStateNames.php rename to src/data/bedrock/block/BlockStateNames.php index e902df92d..cfd90f1c3 100644 --- a/src/data/bedrock/blockstate/BlockStateNames.php +++ b/src/data/bedrock/block/BlockStateNames.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class BlockStateNames{ diff --git a/src/data/bedrock/blockstate/BlockStateSerializeException.php b/src/data/bedrock/block/BlockStateSerializeException.php similarity index 94% rename from src/data/bedrock/blockstate/BlockStateSerializeException.php rename to src/data/bedrock/block/BlockStateSerializeException.php index 818b3cf6e..8ae1385ac 100644 --- a/src/data/bedrock/blockstate/BlockStateSerializeException.php +++ b/src/data/bedrock/block/BlockStateSerializeException.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class BlockStateSerializeException extends \LogicException{ diff --git a/src/data/bedrock/blockstate/BlockStateSerializer.php b/src/data/bedrock/block/BlockStateSerializer.php similarity index 96% rename from src/data/bedrock/blockstate/BlockStateSerializer.php rename to src/data/bedrock/block/BlockStateSerializer.php index 8f979c069..226c11794 100644 --- a/src/data/bedrock/blockstate/BlockStateSerializer.php +++ b/src/data/bedrock/block/BlockStateSerializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; /** * Implementors of this interface decide how blockstate IDs will be represented as NBT. diff --git a/src/data/bedrock/blockstate/BlockStateStringValues.php b/src/data/bedrock/block/BlockStateStringValues.php similarity index 99% rename from src/data/bedrock/blockstate/BlockStateStringValues.php rename to src/data/bedrock/block/BlockStateStringValues.php index 334f315d0..711bd58fa 100644 --- a/src/data/bedrock/blockstate/BlockStateStringValues.php +++ b/src/data/bedrock/block/BlockStateStringValues.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class BlockStateStringValues{ diff --git a/src/data/bedrock/blockstate/BlockTypeNames.php b/src/data/bedrock/block/BlockTypeNames.php similarity index 99% rename from src/data/bedrock/blockstate/BlockTypeNames.php rename to src/data/bedrock/block/BlockTypeNames.php index dcfb2e71f..9eee5d134 100644 --- a/src/data/bedrock/blockstate/BlockTypeNames.php +++ b/src/data/bedrock/block/BlockTypeNames.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; /** * This class is generated automatically from the block palette for the current version. Do not edit it manually. diff --git a/src/data/bedrock/blockstate/CachingBlockStateDeserializer.php b/src/data/bedrock/block/CachingBlockStateDeserializer.php similarity index 97% rename from src/data/bedrock/blockstate/CachingBlockStateDeserializer.php rename to src/data/bedrock/block/CachingBlockStateDeserializer.php index 977b09320..84edcff2f 100644 --- a/src/data/bedrock/blockstate/CachingBlockStateDeserializer.php +++ b/src/data/bedrock/block/CachingBlockStateDeserializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class CachingBlockStateDeserializer implements BlockStateDeserializer{ diff --git a/src/data/bedrock/blockstate/CachingBlockStateSerializer.php b/src/data/bedrock/block/CachingBlockStateSerializer.php similarity index 96% rename from src/data/bedrock/blockstate/CachingBlockStateSerializer.php rename to src/data/bedrock/block/CachingBlockStateSerializer.php index b310c7bb2..18003b086 100644 --- a/src/data/bedrock/blockstate/CachingBlockStateSerializer.php +++ b/src/data/bedrock/block/CachingBlockStateSerializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; final class CachingBlockStateSerializer implements BlockStateSerializer{ diff --git a/src/data/bedrock/blockstate/UpgradingBlockStateDeserializer.php b/src/data/bedrock/block/UpgradingBlockStateDeserializer.php similarity index 91% rename from src/data/bedrock/blockstate/UpgradingBlockStateDeserializer.php rename to src/data/bedrock/block/UpgradingBlockStateDeserializer.php index 50dd21d73..273669b46 100644 --- a/src/data/bedrock/blockstate/UpgradingBlockStateDeserializer.php +++ b/src/data/bedrock/block/UpgradingBlockStateDeserializer.php @@ -21,9 +21,9 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate; +namespace pocketmine\data\bedrock\block; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgrader; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader; final class UpgradingBlockStateDeserializer implements BlockStateDeserializer{ diff --git a/src/data/bedrock/blockstate/convert/BlockObjectToBlockStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php similarity index 99% rename from src/data/bedrock/blockstate/convert/BlockObjectToBlockStateSerializer.php rename to src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php index 42de62dca..c70b61d59 100644 --- a/src/data/bedrock/blockstate/convert/BlockObjectToBlockStateSerializer.php +++ b/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\ActivatorRail; use pocketmine\block\Anvil; @@ -139,14 +139,14 @@ use pocketmine\block\WoodenPressurePlate; use pocketmine\block\WoodenStairs; use pocketmine\block\WoodenTrapdoor; use pocketmine\block\Wool; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateNames as StateNames; -use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; -use pocketmine\data\bedrock\blockstate\BlockStateSerializer; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues; -use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids; -use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializerHelper as Helper; -use pocketmine\data\bedrock\blockstate\convert\BlockStateWriter as Writer; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateNames as StateNames; +use pocketmine\data\bedrock\block\BlockStateSerializeException; +use pocketmine\data\bedrock\block\BlockStateSerializer; +use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues; +use pocketmine\data\bedrock\block\BlockTypeNames as Ids; +use pocketmine\data\bedrock\block\convert\BlockStateSerializerHelper as Helper; +use pocketmine\data\bedrock\block\convert\BlockStateWriter as Writer; use pocketmine\math\Axis; use pocketmine\math\Facing; use pocketmine\utils\AssumptionFailedError; diff --git a/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php similarity index 98% rename from src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php rename to src/data/bedrock/block/convert/BlockStateDeserializerHelper.php index 4503edffb..b5a76394d 100644 --- a/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php +++ b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\Block; use pocketmine\block\BlockLegacyMetadata; @@ -47,9 +47,9 @@ use pocketmine\block\Wall; use pocketmine\block\WallCoralFan; use pocketmine\block\WallSign; use pocketmine\block\WeightedPressurePlate; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; -use pocketmine\data\bedrock\blockstate\BlockStateNames; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateNames; +use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues; use pocketmine\data\bedrock\MushroomBlockTypeIdMap; use pocketmine\math\Axis; use pocketmine\math\Facing; diff --git a/src/data/bedrock/blockstate/convert/BlockStateReader.php b/src/data/bedrock/block/convert/BlockStateReader.php similarity index 97% rename from src/data/bedrock/blockstate/convert/BlockStateReader.php rename to src/data/bedrock/block/convert/BlockStateReader.php index a93c1c1bd..3380721f5 100644 --- a/src/data/bedrock/blockstate/convert/BlockStateReader.php +++ b/src/data/bedrock/block/convert/BlockStateReader.php @@ -21,16 +21,16 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\utils\BellAttachmentType; use pocketmine\block\utils\CoralType; use pocketmine\block\utils\DyeColor; use pocketmine\block\utils\SlabType; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; -use pocketmine\data\bedrock\blockstate\BlockStateNames; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateNames; +use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues; use pocketmine\math\Axis; use pocketmine\math\Facing; use pocketmine\nbt\tag\ByteTag; diff --git a/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php b/src/data/bedrock/block/convert/BlockStateSerializerHelper.php similarity index 98% rename from src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php rename to src/data/bedrock/block/convert/BlockStateSerializerHelper.php index 9fc53c20e..1abe7059a 100644 --- a/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php +++ b/src/data/bedrock/block/convert/BlockStateSerializerHelper.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\Button; use pocketmine\block\ChemistryTable; @@ -47,9 +47,9 @@ use pocketmine\block\utils\SlabType; use pocketmine\block\Wall; use pocketmine\block\WallSign; use pocketmine\block\Wood; -use pocketmine\data\bedrock\blockstate\BlockStateNames; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues; -use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids; +use pocketmine\data\bedrock\block\BlockStateNames; +use pocketmine\data\bedrock\block\BlockStateStringValues; +use pocketmine\data\bedrock\block\BlockTypeNames as Ids; use pocketmine\data\bedrock\MushroomBlockTypeIdMap; use pocketmine\math\Axis; use pocketmine\math\Facing; diff --git a/src/data/bedrock/blockstate/convert/BlockStateToBlockObjectDeserializer.php b/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php similarity index 99% rename from src/data/bedrock/blockstate/convert/BlockStateToBlockObjectDeserializer.php rename to src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php index 95f755e81..967a71412 100644 --- a/src/data/bedrock/blockstate/convert/BlockStateToBlockObjectDeserializer.php +++ b/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\Bamboo; use pocketmine\block\Block; @@ -32,14 +32,14 @@ use pocketmine\block\utils\CoralType; use pocketmine\block\utils\LeverFacing; use pocketmine\block\utils\SlabType; use pocketmine\block\VanillaBlocks as Blocks; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializer; -use pocketmine\data\bedrock\blockstate\BlockStateNames as StateNames; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues; -use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids; -use pocketmine\data\bedrock\blockstate\convert\BlockStateDeserializerHelper as Helper; -use pocketmine\data\bedrock\blockstate\convert\BlockStateReader as Reader; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateDeserializer; +use pocketmine\data\bedrock\block\BlockStateNames as StateNames; +use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues; +use pocketmine\data\bedrock\block\BlockTypeNames as Ids; +use pocketmine\data\bedrock\block\convert\BlockStateDeserializerHelper as Helper; +use pocketmine\data\bedrock\block\convert\BlockStateReader as Reader; use pocketmine\math\Axis; use pocketmine\math\Facing; use function array_key_exists; diff --git a/src/data/bedrock/blockstate/convert/BlockStateWriter.php b/src/data/bedrock/block/convert/BlockStateWriter.php similarity index 96% rename from src/data/bedrock/blockstate/convert/BlockStateWriter.php rename to src/data/bedrock/block/convert/BlockStateWriter.php index 527a7040e..294c0c015 100644 --- a/src/data/bedrock/blockstate/convert/BlockStateWriter.php +++ b/src/data/bedrock/block/convert/BlockStateWriter.php @@ -21,17 +21,17 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use pocketmine\block\utils\BellAttachmentType; use pocketmine\block\utils\CoralType; use pocketmine\block\utils\DyeColor; use pocketmine\block\utils\SlabType; use pocketmine\block\utils\TreeType; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateNames; -use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; -use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateNames; +use pocketmine\data\bedrock\block\BlockStateSerializeException; +use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues; use pocketmine\math\Axis; use pocketmine\math\Facing; use pocketmine\nbt\tag\CompoundTag; diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php similarity index 93% rename from src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php rename to src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php index 59c342ca2..44c56e6ca 100644 --- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php +++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchema.php @@ -21,9 +21,9 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchemaValueRemap as ValueRemap; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaValueRemap as ValueRemap; use pocketmine\nbt\tag\Tag; use function count; diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php similarity index 96% rename from src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php rename to src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php index 90415bbda..f3ef4ec92 100644 --- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php +++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaBlockRemap.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\Tag; diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaUtils.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php similarity index 96% rename from src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaUtils.php rename to src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php index 09c215e0e..525c1c3bf 100644 --- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaUtils.php +++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php @@ -21,12 +21,12 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; -use pocketmine\data\bedrock\blockstate\upgrade\model\BlockStateUpgradeSchemaModel; -use pocketmine\data\bedrock\blockstate\upgrade\model\BlockStateUpgradeSchemaModelBlockRemap; -use pocketmine\data\bedrock\blockstate\upgrade\model\BlockStateUpgradeSchemaModelTag; -use pocketmine\data\bedrock\blockstate\upgrade\model\BlockStateUpgradeSchemaModelValueRemap; +use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModel; +use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelBlockRemap; +use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelTag; +use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelValueRemap; use pocketmine\errorhandler\ErrorToExceptionHandler; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\IntTag; diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaValueRemap.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php similarity index 94% rename from src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaValueRemap.php rename to src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php index 832cff212..80e451de9 100644 --- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaValueRemap.php +++ b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaValueRemap.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; use pocketmine\nbt\tag\Tag; diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgrader.php b/src/data/bedrock/block/upgrade/BlockStateUpgrader.php similarity index 98% rename from src/data/bedrock/blockstate/upgrade/BlockStateUpgrader.php rename to src/data/bedrock/block/upgrade/BlockStateUpgrader.php index 85dd3cecf..89a6d7b85 100644 --- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgrader.php +++ b/src/data/bedrock/block/upgrade/BlockStateUpgrader.php @@ -21,9 +21,9 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; -use pocketmine\data\bedrock\blockstate\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateData; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\Tag; use pocketmine\utils\Utils; diff --git a/src/data/bedrock/blockstate/upgrade/LegacyBlockStateMapper.php b/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php similarity index 95% rename from src/data/bedrock/blockstate/upgrade/LegacyBlockStateMapper.php rename to src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php index 8e5d7849f..f13bd1426 100644 --- a/src/data/bedrock/blockstate/upgrade/LegacyBlockStateMapper.php +++ b/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php @@ -21,9 +21,9 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; -use pocketmine\data\bedrock\blockstate\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateData; use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap; use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer; use pocketmine\utils\BinaryStream; diff --git a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModel.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php similarity index 97% rename from src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModel.php rename to src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php index d5338ba19..1a4a14c87 100644 --- a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModel.php +++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModel.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade\model; +namespace pocketmine\data\bedrock\block\upgrade\model; use function count; use function is_array; diff --git a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php similarity index 96% rename from src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php rename to src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php index 6f5ea8d01..be601d51b 100644 --- a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php +++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade\model; +namespace pocketmine\data\bedrock\block\upgrade\model; final class BlockStateUpgradeSchemaModelBlockRemap{ diff --git a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelTag.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php similarity index 93% rename from src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelTag.php rename to src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php index 95a9aae9b..f7eaa9d8a 100644 --- a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelTag.php +++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelTag.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade\model; +namespace pocketmine\data\bedrock\block\upgrade\model; final class BlockStateUpgradeSchemaModelTag{ public int $byte; diff --git a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php similarity index 94% rename from src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php rename to src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php index e163655d4..eeda33509 100644 --- a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php +++ b/src/data/bedrock/block/upgrade/model/BlockStateUpgradeSchemaModelValueRemap.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade\model; +namespace pocketmine\data\bedrock\block\upgrade\model; final class BlockStateUpgradeSchemaModelValueRemap{ /** @required */ diff --git a/src/data/bedrock/item/ItemDeserializer.php b/src/data/bedrock/item/ItemDeserializer.php index 8e09cbd2e..6bbef3246 100644 --- a/src/data/bedrock/item/ItemDeserializer.php +++ b/src/data/bedrock/item/ItemDeserializer.php @@ -28,7 +28,7 @@ use pocketmine\block\utils\DyeColor; use pocketmine\block\utils\SkullType; use pocketmine\block\utils\TreeType; use pocketmine\block\VanillaBlocks as Blocks; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; use pocketmine\data\bedrock\CompoundTypeIds; use pocketmine\data\bedrock\DyeColorIdMap; use pocketmine\data\bedrock\EntityLegacyIds; diff --git a/src/data/bedrock/item/ItemSerializer.php b/src/data/bedrock/item/ItemSerializer.php index 4b6b701ff..e90b8849e 100644 --- a/src/data/bedrock/item/ItemSerializer.php +++ b/src/data/bedrock/item/ItemSerializer.php @@ -28,7 +28,7 @@ use pocketmine\block\utils\DyeColor; use pocketmine\block\utils\SkullType; use pocketmine\block\VanillaBlocks as Blocks; use pocketmine\data\bedrock\BlockItemIdMap; -use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; +use pocketmine\data\bedrock\block\BlockStateSerializeException; use pocketmine\data\bedrock\CompoundTypeIds; use pocketmine\data\bedrock\DyeColorIdMap; use pocketmine\data\bedrock\item\ItemTypeIds as Ids; diff --git a/src/data/bedrock/item/SavedItemData.php b/src/data/bedrock/item/SavedItemData.php index 22ae550a0..031c5e242 100644 --- a/src/data/bedrock/item/SavedItemData.php +++ b/src/data/bedrock/item/SavedItemData.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\data\bedrock\item; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; use pocketmine\data\SavedDataLoadingException; use pocketmine\nbt\NbtException; use pocketmine\nbt\tag\CompoundTag; diff --git a/src/entity/object/FallingBlock.php b/src/entity/object/FallingBlock.php index ccd293121..5642889b9 100644 --- a/src/entity/object/FallingBlock.php +++ b/src/entity/object/FallingBlock.php @@ -26,7 +26,7 @@ namespace pocketmine\entity\object; use pocketmine\block\Block; use pocketmine\block\BlockFactory; use pocketmine\block\utils\Fallable; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; use pocketmine\data\SavedDataLoadingException; use pocketmine\entity\Entity; use pocketmine\entity\EntitySizeInfo; diff --git a/src/network/mcpe/convert/BlockStateDictionary.php b/src/network/mcpe/convert/BlockStateDictionary.php index bfb18e933..48b31e67f 100644 --- a/src/network/mcpe/convert/BlockStateDictionary.php +++ b/src/network/mcpe/convert/BlockStateDictionary.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\convert; -use pocketmine\data\bedrock\blockstate\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateData; use pocketmine\nbt\TreeRoot; use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer; use function array_map; diff --git a/src/network/mcpe/convert/BlockStateLookupCache.php b/src/network/mcpe/convert/BlockStateLookupCache.php index 37d58fad6..2bc5744fb 100644 --- a/src/network/mcpe/convert/BlockStateLookupCache.php +++ b/src/network/mcpe/convert/BlockStateLookupCache.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\convert; -use pocketmine\data\bedrock\blockstate\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateData; use pocketmine\utils\Utils; use function array_key_first; use function count; diff --git a/src/network/mcpe/convert/RuntimeBlockMapping.php b/src/network/mcpe/convert/RuntimeBlockMapping.php index e30499968..c0373de11 100644 --- a/src/network/mcpe/convert/RuntimeBlockMapping.php +++ b/src/network/mcpe/convert/RuntimeBlockMapping.php @@ -23,10 +23,10 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\convert; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; -use pocketmine\data\bedrock\blockstate\BlockStateSerializer; -use pocketmine\data\bedrock\blockstate\BlockTypeNames; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateSerializeException; +use pocketmine\data\bedrock\block\BlockStateSerializer; +use pocketmine\data\bedrock\block\BlockTypeNames; use pocketmine\nbt\tag\CompoundTag; use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\SingletonTrait; diff --git a/src/world/format/io/BaseWorldProvider.php b/src/world/format/io/BaseWorldProvider.php index af0fe0e54..17c6a6ac7 100644 --- a/src/world/format/io/BaseWorldProvider.php +++ b/src/world/format/io/BaseWorldProvider.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\world\format\io; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockTypeNames; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockTypeNames; use pocketmine\nbt\tag\CompoundTag; use pocketmine\world\format\io\exception\CorruptedWorldException; use pocketmine\world\format\io\exception\UnsupportedWorldFormatException; diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php index bbf4d7bfd..c1bd76d56 100644 --- a/src/world/format/io/GlobalBlockStateHandlers.php +++ b/src/world/format/io/GlobalBlockStateHandlers.php @@ -23,18 +23,18 @@ declare(strict_types=1); namespace pocketmine\world\format\io; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializer; -use pocketmine\data\bedrock\blockstate\BlockStateSerializer; -use pocketmine\data\bedrock\blockstate\BlockTypeNames; -use pocketmine\data\bedrock\blockstate\CachingBlockStateDeserializer; -use pocketmine\data\bedrock\blockstate\CachingBlockStateSerializer; -use pocketmine\data\bedrock\blockstate\convert\BlockObjectToBlockStateSerializer; -use pocketmine\data\bedrock\blockstate\convert\BlockStateToBlockObjectDeserializer; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgrader; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchemaUtils; -use pocketmine\data\bedrock\blockstate\upgrade\LegacyBlockStateMapper; -use pocketmine\data\bedrock\blockstate\UpgradingBlockStateDeserializer; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateDeserializer; +use pocketmine\data\bedrock\block\BlockStateSerializer; +use pocketmine\data\bedrock\block\BlockTypeNames; +use pocketmine\data\bedrock\block\CachingBlockStateDeserializer; +use pocketmine\data\bedrock\block\CachingBlockStateSerializer; +use pocketmine\data\bedrock\block\convert\BlockObjectToBlockStateSerializer; +use pocketmine\data\bedrock\block\convert\BlockStateToBlockObjectDeserializer; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils; +use pocketmine\data\bedrock\block\upgrade\LegacyBlockStateMapper; +use pocketmine\data\bedrock\block\UpgradingBlockStateDeserializer; use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap; use pocketmine\errorhandler\ErrorToExceptionHandler; use pocketmine\nbt\tag\CompoundTag; diff --git a/src/world/format/io/leveldb/LevelDB.php b/src/world/format/io/leveldb/LevelDB.php index 3e3095518..0814655fb 100644 --- a/src/world/format/io/leveldb/LevelDB.php +++ b/src/world/format/io/leveldb/LevelDB.php @@ -26,9 +26,9 @@ namespace pocketmine\world\format\io\leveldb; use pocketmine\block\Block; use pocketmine\block\BlockLegacyIds; use pocketmine\data\bedrock\BiomeIds; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; -use pocketmine\data\bedrock\blockstate\BlockTypeNames; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockTypeNames; use pocketmine\nbt\LittleEndianNbtSerializer; use pocketmine\nbt\NbtDataException; use pocketmine\nbt\NbtException; diff --git a/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php b/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php index 2fafb8d94..3d171bd04 100644 --- a/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php +++ b/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php @@ -21,12 +21,12 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\convert; +namespace pocketmine\data\bedrock\block\convert; use PHPUnit\Framework\TestCase; use pocketmine\block\BlockFactory; -use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException; -use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; +use pocketmine\data\bedrock\block\BlockStateDeserializeException; +use pocketmine\data\bedrock\block\BlockStateSerializeException; final class BlockSerializerDeserializerTest extends TestCase{ private BlockStateToBlockObjectDeserializer $deserializer; diff --git a/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php b/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php index 79b08895d..14d3994e3 100644 --- a/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php +++ b/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php @@ -21,10 +21,10 @@ declare(strict_types=1); -namespace pocketmine\data\bedrock\blockstate\upgrade; +namespace pocketmine\data\bedrock\block\upgrade; use PHPUnit\Framework\TestCase; -use pocketmine\data\bedrock\blockstate\BlockStateData; +use pocketmine\data\bedrock\block\BlockStateData; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use const PHP_INT_MAX; diff --git a/tools/generate-blockstate-upgrade-schema.php b/tools/generate-blockstate-upgrade-schema.php index b6075abfd..03b768323 100644 --- a/tools/generate-blockstate-upgrade-schema.php +++ b/tools/generate-blockstate-upgrade-schema.php @@ -23,11 +23,11 @@ declare(strict_types=1); namespace pocketmine\tools\generate_blockstate_upgrade_schema; -use pocketmine\data\bedrock\blockstate\BlockStateData; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchema; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchemaBlockRemap; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchemaUtils; -use pocketmine\data\bedrock\blockstate\upgrade\BlockStateUpgradeSchemaValueRemap; +use pocketmine\data\bedrock\block\BlockStateData; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchema; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaBlockRemap; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils; +use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaValueRemap; use pocketmine\errorhandler\ErrorToExceptionHandler; use pocketmine\nbt\tag\Tag; use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;