mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-23 00:55:57 +00:00
Code Issues Projects Releases Wiki Activity

Added stripped all-sided-log variants

Browse Source 
again, these should be dynamic; but right now it's not possible.
This commit is contained in:
Dylan K. Taylor 2021-05-22 12:43:07 +01:00
parent ac04911e88
commit f655d262be
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/block/BlockFactory.php
View File

@ -434,6 +434,7 @@ class BlockFactory{
$wood = new Wood(new BID(Ids::WOOD, $magicNumber), $name . " Wood", $logBreakInfo, $treeType, false);
$this->register($wood);
$this->remap($magicNumber >= 4 ? Ids::LOG2 : Ids::LOG, ($magicNumber & 0x03) | 0b1100, $wood);
$this->register(new Wood(new BID(Ids::WOOD, $magicNumber | BlockLegacyMetadata::WOOD_FLAG_STRIPPED), "Stripped $name Wood", $logBreakInfo, $treeType, true));
$this->register(new Log(BlockLegacyIdHelper::getStrippedLogIdentifier($treeType), "Stripped " . $treeType->getDisplayName() . " Log", $logBreakInfo, $treeType, true));
$this->register(new FenceGate(BlockLegacyIdHelper::getWoodenFenceIdentifier($treeType), $treeType->getDisplayName() . " Fence Gate", $planksBreakInfo));

2
src/block/BlockLegacyMetadata.php
View File

@ -289,4 +289,6 @@ final class BlockLegacyMetadata{
public const WALL_PRISMARINE = 11;
public const WALL_RED_SANDSTONE = 12;
public const WALL_RED_NETHER_BRICK = 13;
public const WOOD_FLAG_STRIPPED = 0x8;
}

12
src/block/VanillaBlocks.php
View File

@ -529,11 +529,17 @@ use function assert;
* @method static Slab STONE_SLAB()
* @method static Stair STONE_STAIRS()
* @method static Log STRIPPED_ACACIA_LOG()
* @method static Wood STRIPPED_ACACIA_WOOD()
* @method static Log STRIPPED_BIRCH_LOG()
* @method static Wood STRIPPED_BIRCH_WOOD()
* @method static Log STRIPPED_DARK_OAK_LOG()
* @method static Wood STRIPPED_DARK_OAK_WOOD()
* @method static Log STRIPPED_JUNGLE_LOG()
* @method static Wood STRIPPED_JUNGLE_WOOD()
* @method static Log STRIPPED_OAK_LOG()
* @method static Wood STRIPPED_OAK_WOOD()
* @method static Log STRIPPED_SPRUCE_LOG()
* @method static Wood STRIPPED_SPRUCE_WOOD()
* @method static Sugarcane SUGARCANE()
* @method static DoublePlant SUNFLOWER()
* @method static TallGrass TALL_GRASS()
@ -1082,11 +1088,17 @@ final class VanillaBlocks{
self::register("stone_slab", $factory->get(421, 2));
self::register("stone_stairs", $factory->get(435, 0));
self::register("stripped_acacia_log", $factory->get(263, 0));
self::register("stripped_acacia_wood", $factory->get(467, 12));
self::register("stripped_birch_log", $factory->get(261, 0));
self::register("stripped_birch_wood", $factory->get(467, 10));
self::register("stripped_dark_oak_log", $factory->get(264, 0));
self::register("stripped_dark_oak_wood", $factory->get(467, 13));
self::register("stripped_jungle_log", $factory->get(262, 0));
self::register("stripped_jungle_wood", $factory->get(467, 11));
self::register("stripped_oak_log", $factory->get(265, 0));
self::register("stripped_oak_wood", $factory->get(467, 8));
self::register("stripped_spruce_log", $factory->get(260, 0));
self::register("stripped_spruce_wood", $factory->get(467, 9));
self::register("sugarcane", $factory->get(83, 0));
self::register("sunflower", $factory->get(175, 0));
self::register("tall_grass", $factory->get(31, 1));

2
tests/phpunit/block/block_factory_consistency_check.json
View File

File diff suppressed because one or more lines are too long