From 7b1a1e5a18dbaaa080a9ffabd63c6eae90f44911 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 8 May 2023 22:16:55 +0100 Subject: [PATCH] BlockStateToObjectDeserializer: remove redundant helper --- .../bedrock/block/convert/BlockStateDeserializerHelper.php | 7 ------- .../block/convert/BlockStateToObjectDeserializer.php | 5 ++++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php index 6384a3e94..9de65a94d 100644 --- a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php +++ b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php @@ -165,13 +165,6 @@ final class BlockStateDeserializerHelper{ ->setRotation($in->readBoundedInt(BlockStateNames::GROUND_SIGN_DIRECTION, 0, 15)); } - /** @throws BlockStateDeserializeException */ - public static function decodeGlazedTerracotta(DyeColor $color, BlockStateReader $in) : GlazedTerracotta{ - return VanillaBlocks::GLAZED_TERRACOTTA() - ->setColor($color) - ->setFacing($in->readHorizontalFacing()); - } - public static function decodeItemFrame(ItemFrame $block, BlockStateReader $in) : ItemFrame{ $in->todo(StateNames::ITEM_FRAME_PHOTO_BIT); //TODO: not sure what the point of this is return $block diff --git a/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php index b839ec43f..2d1fd6090 100644 --- a/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php +++ b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php @@ -194,7 +194,10 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{ Ids::WHITE_GLAZED_TERRACOTTA => DyeColor::WHITE(), Ids::YELLOW_GLAZED_TERRACOTTA => DyeColor::YELLOW(), ] as $id => $color){ - $this->map($id, fn(Reader $in) => Helper::decodeGlazedTerracotta($color, $in)); + $this->map($id, fn(Reader $in) => Blocks::GLAZED_TERRACOTTA() + ->setColor($color) + ->setFacing($in->readHorizontalFacing()) + ); } foreach([