Namespace rename

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;

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;

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{
 

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

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{
 

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{
 

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.

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{
 

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.

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{
 

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{
 

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{
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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{
 

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;

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 */

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;