mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-02-09 19:22:00 +00:00
parent 1a8a04eab8 109312284c
commit 0c89159cf2
20 changed files with 422 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/pocketmine/block/BlockFactory.php
View File

@ -189,7 +189,13 @@ class BlockFactory{
new StoneSlab(Block::STONE_SLAB, Block::DOUBLE_STONE_SLAB, 6, "Quartz"),
new StoneSlab(Block::STONE_SLAB, Block::DOUBLE_STONE_SLAB, 7, "Nether Brick"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 0, "Red Sandstone"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 1, "Purpur")
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 1, "Purpur"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 2, "Prismarine"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 3, "Dark Prismarine"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 4, "Prismarine Bricks"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 5, "Mossy Cobblestone"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 6, "Smooth Sandstone"),
new StoneSlab(Block::STONE_SLAB2, Block::DOUBLE_STONE_SLAB2, 7, "Red Nether Brick")
];
foreach(WoodType::ALL as $woodType){
$slabTypes[] = new WoodenSlab($woodType);
@ -301,8 +307,25 @@ class BlockFactory{
//TODO: COMMAND_BLOCK
//TODO: BEACON
self::registerBlock(new CobblestoneWall(Block::COBBLESTONE_WALL, CobblestoneWall::NONE_MOSSY_WALL, "Cobblestone Wall"));
self::registerBlock(new CobblestoneWall(Block::COBBLESTONE_WALL, CobblestoneWall::MOSSY_WALL, "Mossy Cobblestone Wall"));
static $wallTypes = [
CobblestoneWall::NONE_MOSSY_WALL => "Cobblestone",
CobblestoneWall::MOSSY_WALL => "Mossy Cobblestone",
CobblestoneWall::GRANITE_WALL => "Granite",
CobblestoneWall::DIORITE_WALL => "Diorite",
CobblestoneWall::ANDESITE_WALL => "Andesite",
CobblestoneWall::SANDSTONE_WALL => "Sandstone",
CobblestoneWall::BRICK_WALL => "Brick",
CobblestoneWall::STONE_BRICK_WALL => "Stone Brick",
CobblestoneWall::MOSSY_STONE_BRICK_WALL => "Mossy Stone Brick",
CobblestoneWall::NETHER_BRICK_WALL => "Nether Brick",
CobblestoneWall::END_STONE_BRICK_WALL => "End Stone Brick",
CobblestoneWall::PRISMARINE_WALL => "Prismarine",
CobblestoneWall::RED_SANDSTONE_WALL => "Red Sandstone",
CobblestoneWall::RED_NETHER_BRICK_WALL => "Red Nether Brick"
];
foreach($wallTypes as $magicNumber => $prefix){
self::registerBlock(new CobblestoneWall(Block::COBBLESTONE_WALL, $magicNumber, $prefix . " Wall"));
}
self::registerBlock(new FlowerPot());
self::registerBlock(new Carrot());
@ -562,8 +585,13 @@ class BlockFactory{
public static function registerStaticRuntimeIdMappings() : void{
/** @var mixed[] $runtimeIdMap */
$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
$legacyIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "legacy_id_map.json"), true);
foreach($runtimeIdMap as $k => $obj){
self::registerMapping($k, $obj["id"], $obj["data"]);
//this has to use the json offset to make sure the mapping is consistent with what we send over network, even though we aren't using all the entries
if(!isset($legacyIdMap[$obj["name"]])){
continue;
}
self::registerMapping($k, $legacyIdMap[$obj["name"]], $obj["data"]);
}
}

12
src/pocketmine/block/CobblestoneWall.php
View File

@ -30,6 +30,18 @@ use pocketmine\math\Facing;
class CobblestoneWall extends Transparent{
public const NONE_MOSSY_WALL = 0;
public const MOSSY_WALL = 1;
public const GRANITE_WALL = 2;
public const DIORITE_WALL = 3;
public const ANDESITE_WALL = 4;
public const SANDSTONE_WALL = 5;
public const BRICK_WALL = 6;
public const STONE_BRICK_WALL = 7;
public const MOSSY_STONE_BRICK_WALL = 8;
public const NETHER_BRICK_WALL = 9;
public const END_STONE_BRICK_WALL = 10;
public const PRISMARINE_WALL = 11;
public const RED_SANDSTONE_WALL = 12;
public const RED_NETHER_BRICK_WALL = 13;
/** @var bool[] facing => dummy */
protected $connections = [];