Implemented new cherry-wood blocks

src/block/BlockTypeIds.php

@@ -718,8 +718,23 @@ final class BlockTypeIds{
 	public const REINFORCED_DEEPSLATE = 10688;
 	public const CAVE_VINES = 10689;
 	public const GLOW_LICHEN = 10690;
+	public const CHERRY_BUTTON = 10691;
+	public const CHERRY_DOOR = 10692;
+	public const CHERRY_FENCE = 10693;
+	public const CHERRY_FENCE_GATE = 10694;
+	public const CHERRY_LEAVES = 10695;
+	public const CHERRY_LOG = 10696;
+	public const CHERRY_PLANKS = 10697;
+	public const CHERRY_PRESSURE_PLATE = 10698;
+	public const CHERRY_SAPLING = 10699;
+	public const CHERRY_SIGN = 10700;
+	public const CHERRY_SLAB = 10701;
+	public const CHERRY_STAIRS = 10702;
+	public const CHERRY_TRAPDOOR = 10703;
+	public const CHERRY_WALL_SIGN = 10704;
+	public const CHERRY_WOOD = 10705;
 
-	public const FIRST_UNUSED_BLOCK_ID = 10691;
+	public const FIRST_UNUSED_BLOCK_ID = 10706;
 
 	private static int $nextDynamicId = self::FIRST_UNUSED_BLOCK_ID;
 

src/block/VanillaBlocks.php

@@ -159,6 +159,19 @@ use function mb_strtolower;
  * @method static CaveVines CAVE_VINES()
  * @method static Chain CHAIN()
  * @method static ChemicalHeat CHEMICAL_HEAT()
+ * @method static WoodenButton CHERRY_BUTTON()
+ * @method static WoodenDoor CHERRY_DOOR()
+ * @method static WoodenFence CHERRY_FENCE()
+ * @method static FenceGate CHERRY_FENCE_GATE()
+ * @method static Wood CHERRY_LOG()
+ * @method static Planks CHERRY_PLANKS()
+ * @method static WoodenPressurePlate CHERRY_PRESSURE_PLATE()
+ * @method static FloorSign CHERRY_SIGN()
+ * @method static WoodenSlab CHERRY_SLAB()
+ * @method static WoodenStairs CHERRY_STAIRS()
+ * @method static WoodenTrapdoor CHERRY_TRAPDOOR()
+ * @method static WallSign CHERRY_WALL_SIGN()
+ * @method static Wood CHERRY_WOOD()
  * @method static Chest CHEST()
  * @method static Opaque CHISELED_DEEPSLATE()
  * @method static Opaque CHISELED_NETHER_BRICKS()

src/block/WoodLikeBlockIdHelper.php

@@ -58,6 +58,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_PLANKS,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_PLANKS,
 			WoodType::WARPED()->id() => Ids::WARPED_PLANKS,
+			WoodType::CHERRY()->id() => Ids::CHERRY_PLANKS,
 			default => throw new AssumptionFailedError("All tree types should be covered")
 		});
 	}
@@ -73,6 +74,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_FENCE,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_FENCE,
 			WoodType::WARPED()->id() => Ids::WARPED_FENCE,
+			WoodType::CHERRY()->id() => Ids::CHERRY_FENCE,
 			default => throw new AssumptionFailedError("All tree types should be covered")
 		});
 	}
@@ -88,6 +90,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_SLAB,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_SLAB,
 			WoodType::WARPED()->id() => Ids::WARPED_SLAB,
+			WoodType::CHERRY()->id() => Ids::CHERRY_SLAB,
 			default => throw new AssumptionFailedError("All tree types should be covered")
 		});
 	}
@@ -103,6 +106,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_LOG,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_STEM,
 			WoodType::WARPED()->id() => Ids::WARPED_STEM,
+			WoodType::CHERRY()->id() => Ids::CHERRY_LOG,
 			default => throw new AssumptionFailedError("All tree types should be covered")
 		});
 	}
@@ -118,6 +122,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_WOOD,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_HYPHAE,
 			WoodType::WARPED()->id() => Ids::WARPED_HYPHAE,
+			WoodType::CHERRY()->id() => Ids::CHERRY_WOOD,
 			default => throw new AssumptionFailedError("All tree types should be covered")
 		});
 	}
@@ -209,7 +214,12 @@ final class WoodLikeBlockIdHelper{
 					new BID(Ids::WARPED_WALL_SIGN, TileSign::class),
 					fn() => VanillaItems::WARPED_SIGN()
 				];
-
+			case WoodType::CHERRY()->id():
+				return [
+					new BID(Ids::CHERRY_SIGN, TileSign::class),
+					new BID(Ids::CHERRY_WALL_SIGN, TileSign::class),
+					fn() => VanillaItems::CHERRY_SIGN()
+				];
 		}
 		throw new AssumptionFailedError("Switch should cover all wood types");
 	}
@@ -225,6 +235,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_TRAPDOOR,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_TRAPDOOR,
 			WoodType::WARPED()->id() => Ids::WARPED_TRAPDOOR,
+			WoodType::CHERRY()->id() => Ids::CHERRY_TRAPDOOR,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}
@@ -240,6 +251,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_BUTTON,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_BUTTON,
 			WoodType::WARPED()->id() => Ids::WARPED_BUTTON,
+			WoodType::CHERRY()->id() => Ids::CHERRY_BUTTON,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}
@@ -255,6 +267,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_PRESSURE_PLATE,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_PRESSURE_PLATE,
 			WoodType::WARPED()->id() => Ids::WARPED_PRESSURE_PLATE,
+			WoodType::CHERRY()->id() => Ids::CHERRY_PRESSURE_PLATE,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}
@@ -270,6 +283,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_DOOR,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_DOOR,
 			WoodType::WARPED()->id() => Ids::WARPED_DOOR,
+			WoodType::CHERRY()->id() => Ids::CHERRY_DOOR,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}
@@ -285,6 +299,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_FENCE_GATE,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_FENCE_GATE,
 			WoodType::WARPED()->id() => Ids::WARPED_FENCE_GATE,
+			WoodType::CHERRY()->id() => Ids::CHERRY_FENCE_GATE,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}
@@ -300,6 +315,7 @@ final class WoodLikeBlockIdHelper{
 			WoodType::MANGROVE()->id() => Ids::MANGROVE_STAIRS,
 			WoodType::CRIMSON()->id() => Ids::CRIMSON_STAIRS,
 			WoodType::WARPED()->id() => Ids::WARPED_STAIRS,
+			WoodType::CHERRY()->id() => Ids::CHERRY_STAIRS,
 			default => throw new AssumptionFailedError("All wood types should be covered")
 		});
 	}

src/block/utils/WoodType.php

@@ -33,6 +33,7 @@ use pocketmine\utils\EnumTrait;
  *
  * @method static WoodType ACACIA()
  * @method static WoodType BIRCH()
+ * @method static WoodType CHERRY()
  * @method static WoodType CRIMSON()
  * @method static WoodType DARK_OAK()
  * @method static WoodType JUNGLE()
@@ -56,7 +57,8 @@ final class WoodType{
 			new self("dark_oak", "Dark Oak", true),
 			new self("mangrove", "Mangrove", true),
 			new self("crimson", "Crimson", false, "Stem", "Hyphae"),
-			new self("warped", "Warped", false, "Stem", "Hyphae")
+			new self("warped", "Warped", false, "Stem", "Hyphae"),
+			new self("cherry", "Cherry", true),
 		);
 	}
 

src/data/bedrock/block/convert/BlockObjectToStateSerializer.php

@@ -417,6 +417,30 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		$this->mapStairs(Blocks::BIRCH_STAIRS(), Ids::BIRCH_STAIRS);
 		//wood, planks and slabs still use the old way of storing wood type
 
+		$this->map(Blocks::CHERRY_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::CHERRY_BUTTON)));
+		$this->map(Blocks::CHERRY_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::CHERRY_DOOR)));
+		$this->map(Blocks::CHERRY_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::CHERRY_FENCE_GATE)));
+		$this->map(Blocks::CHERRY_LOG(), fn(Wood $block) => Helper::encodeLog($block, Ids::CHERRY_LOG, Ids::STRIPPED_CHERRY_LOG));
+		$this->map(Blocks::CHERRY_PRESSURE_PLATE(), fn(SimplePressurePlate $block) => Helper::encodeSimplePressurePlate($block, new Writer(Ids::CHERRY_PRESSURE_PLATE)));
+		$this->map(Blocks::CHERRY_SIGN(), fn(FloorSign $block) => Helper::encodeFloorSign($block, new Writer(Ids::CHERRY_STANDING_SIGN)));
+		$this->map(Blocks::CHERRY_TRAPDOOR(), fn(Trapdoor $block) => Helper::encodeTrapdoor($block, new Writer(Ids::CHERRY_TRAPDOOR)));
+		$this->map(Blocks::CHERRY_WALL_SIGN(), fn(WallSign $block) => Helper::encodeWallSign($block, new Writer(Ids::CHERRY_WALL_SIGN)));
+		$this->mapSimple(Blocks::CHERRY_FENCE(), Ids::CHERRY_FENCE);
+		$this->mapSimple(Blocks::CHERRY_PLANKS(), Ids::CHERRY_PLANKS);
+		$this->mapSlab(Blocks::CHERRY_SLAB(), Ids::CHERRY_SLAB, Ids::CHERRY_DOUBLE_SLAB);
+		$this->mapStairs(Blocks::CHERRY_STAIRS(), Ids::CHERRY_STAIRS);
+		$this->map(Blocks::CHERRY_WOOD(), function(Wood $block) : Writer{
+			//we can't use the standard method for this because cherry_wood has a useless property attached to it
+			if(!$block->isStripped()){
+				return Writer::create(Ids::CHERRY_WOOD)
+					->writePillarAxis($block->getAxis())
+					->writeBool(StateNames::STRIPPED_BIT, false); //this is useless, but it has to be written
+			}else{
+				return Writer::create(Ids::STRIPPED_CHERRY_WOOD)
+					->writePillarAxis($block->getAxis());
+			}
+		});
+
 		$this->map(Blocks::CRIMSON_BUTTON(), fn(Button $block) => Helper::encodeButton($block, new Writer(Ids::CRIMSON_BUTTON)));
 		$this->map(Blocks::CRIMSON_DOOR(), fn(Door $block) => Helper::encodeDoor($block, new Writer(Ids::CRIMSON_DOOR)));
 		$this->map(Blocks::CRIMSON_FENCE_GATE(), fn(FenceGate $block) => Helper::encodeFenceGate($block, new Writer(Ids::CRIMSON_FENCE_GATE)));

src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php

@@ -309,6 +309,24 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		$this->mapStairs(Ids::BIRCH_STAIRS, fn() => Blocks::BIRCH_STAIRS());
 		//wood, planks and slabs still use the old way of storing wood type
 
+		$this->map(Ids::CHERRY_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::CHERRY_BUTTON(), $in));
+		$this->map(Ids::CHERRY_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::CHERRY_DOOR(), $in));
+		$this->map(Ids::CHERRY_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::CHERRY_FENCE_GATE(), $in));
+		$this->map(Ids::CHERRY_PRESSURE_PLATE, fn(Reader $in) => Helper::decodeSimplePressurePlate(Blocks::CHERRY_PRESSURE_PLATE(), $in));
+		$this->map(Ids::CHERRY_STANDING_SIGN, fn(Reader $in) => Helper::decodeFloorSign(Blocks::CHERRY_SIGN(), $in));
+		$this->map(Ids::CHERRY_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Blocks::CHERRY_TRAPDOOR(), $in));
+		$this->map(Ids::CHERRY_WALL_SIGN, fn(Reader $in) => Helper::decodeWallSign(Blocks::CHERRY_WALL_SIGN(), $in));
+		$this->mapLog(Ids::CHERRY_LOG, Ids::STRIPPED_CHERRY_LOG, fn() => Blocks::CHERRY_LOG());
+		$this->mapSimple(Ids::CHERRY_FENCE, fn() => Blocks::CHERRY_FENCE());
+		$this->mapSimple(Ids::CHERRY_PLANKS, fn() => Blocks::CHERRY_PLANKS());
+		$this->mapSlab(Ids::CHERRY_SLAB, Ids::CHERRY_DOUBLE_SLAB, fn() => Blocks::CHERRY_SLAB());
+		$this->mapStairs(Ids::CHERRY_STAIRS, fn() => Blocks::CHERRY_STAIRS());
+		$this->map(Ids::CHERRY_WOOD, function(Reader $in){
+			$in->ignored(StateNames::STRIPPED_BIT); //this is also ignored by vanilla
+			return Helper::decodeLog(Blocks::CHERRY_WOOD(), false, $in);
+		});
+		$this->map(Ids::STRIPPED_CHERRY_WOOD, fn(Reader $in) => Helper::decodeLog(Blocks::CHERRY_WOOD(), true, $in));
+
 		$this->map(Ids::CRIMSON_BUTTON, fn(Reader $in) => Helper::decodeButton(Blocks::CRIMSON_BUTTON(), $in));
 		$this->map(Ids::CRIMSON_DOOR, fn(Reader $in) => Helper::decodeDoor(Blocks::CRIMSON_DOOR(), $in));
 		$this->map(Ids::CRIMSON_FENCE_GATE, fn(Reader $in) => Helper::decodeFenceGate(Blocks::CRIMSON_FENCE_GATE(), $in));

src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php

@@ -185,6 +185,7 @@ final class ItemSerializerDeserializerRegistrar{
 		$this->map1to1Item(Ids::CHAINMAIL_HELMET, Items::CHAINMAIL_HELMET());
 		$this->map1to1Item(Ids::CHAINMAIL_LEGGINGS, Items::CHAINMAIL_LEGGINGS());
 		$this->map1to1Item(Ids::CHARCOAL, Items::CHARCOAL());
+		$this->map1to1Item(Ids::CHERRY_SIGN, Items::CHERRY_SIGN());
 		$this->map1to1Item(Ids::CHICKEN, Items::RAW_CHICKEN());
 		$this->map1to1Item(Ids::CHORUS_FRUIT, Items::CHORUS_FRUIT());
 		$this->map1to1Item(Ids::CLAY_BALL, Items::CLAY());

src/item/ItemTypeIds.php

@@ -302,8 +302,9 @@ final class ItemTypeIds{
 	public const MEDICINE = 20263;
 	public const MANGROVE_BOAT = 20264;
 	public const GLOW_BERRIES = 20265;
+	public const CHERRY_SIGN = 20266;
 
-	public const FIRST_UNUSED_ITEM_ID = 20266;
+	public const FIRST_UNUSED_ITEM_ID = 20267;
 
 	private static int $nextDynamicId = self::FIRST_UNUSED_ITEM_ID;
 

src/item/VanillaItems.php

@@ -114,6 +114,7 @@ use pocketmine\world\World;
  * @method static Item CHEMICAL_SULPHATE()
  * @method static Item CHEMICAL_TUNGSTEN_CHLORIDE()
  * @method static Item CHEMICAL_WATER()
+ * @method static ItemBlockWallOrFloor CHERRY_SIGN()
  * @method static ChorusFruit CHORUS_FRUIT()
  * @method static Item CLAY()
  * @method static Clock CLOCK()
@@ -362,6 +363,7 @@ final class VanillaItems{
 		self::register("bucket", new Bucket(new IID(Ids::BUCKET), "Bucket"));
 		self::register("carrot", new Carrot(new IID(Ids::CARROT), "Carrot"));
 		self::register("charcoal", new Coal(new IID(Ids::CHARCOAL), "Charcoal"));
+		self::register("cherry_sign", new ItemBlockWallOrFloor(new IID(Ids::CHERRY_SIGN), Blocks::CHERRY_SIGN(), Blocks::CHERRY_WALL_SIGN()));
 		self::register("chemical_aluminium_oxide", new Item(new IID(Ids::CHEMICAL_ALUMINIUM_OXIDE), "Aluminium Oxide"));
 		self::register("chemical_ammonia", new Item(new IID(Ids::CHEMICAL_AMMONIA), "Ammonia"));
 		self::register("chemical_barium_sulphate", new Item(new IID(Ids::CHEMICAL_BARIUM_SULPHATE), "Barium Sulphate"));