mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 02:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Rename CobblestoneWall -> Wall

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-23 19:50:07 +00:00
parent 2a3e6dcf00
commit d9134f28e4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,23 +453,23 @@ class BlockFactory{
} }
static $wallTypes = [ static $wallTypes = [
CobblestoneWall::ANDESITE_WALL => "Andesite", Wall::ANDESITE_WALL => "Andesite",
CobblestoneWall::BRICK_WALL => "Brick", Wall::BRICK_WALL => "Brick",
CobblestoneWall::DIORITE_WALL => "Diorite", Wall::DIORITE_WALL => "Diorite",
CobblestoneWall::END_STONE_BRICK_WALL => "End Stone Brick", Wall::END_STONE_BRICK_WALL => "End Stone Brick",
CobblestoneWall::GRANITE_WALL => "Granite", Wall::GRANITE_WALL => "Granite",
CobblestoneWall::MOSSY_STONE_BRICK_WALL => "Mossy Stone Brick", Wall::MOSSY_STONE_BRICK_WALL => "Mossy Stone Brick",
CobblestoneWall::MOSSY_WALL => "Mossy Cobblestone", Wall::MOSSY_WALL => "Mossy Cobblestone",
CobblestoneWall::NETHER_BRICK_WALL => "Nether Brick", Wall::NETHER_BRICK_WALL => "Nether Brick",
CobblestoneWall::NONE_MOSSY_WALL => "Cobblestone", Wall::NONE_MOSSY_WALL => "Cobblestone",
CobblestoneWall::PRISMARINE_WALL => "Prismarine", Wall::PRISMARINE_WALL => "Prismarine",
CobblestoneWall::RED_NETHER_BRICK_WALL => "Red Nether Brick", Wall::RED_NETHER_BRICK_WALL => "Red Nether Brick",
CobblestoneWall::RED_SANDSTONE_WALL => "Red Sandstone", Wall::RED_SANDSTONE_WALL => "Red Sandstone",
CobblestoneWall::SANDSTONE_WALL => "Sandstone", Wall::SANDSTONE_WALL => "Sandstone",
CobblestoneWall::STONE_BRICK_WALL => "Stone Brick" Wall::STONE_BRICK_WALL => "Stone Brick"
]; ];
foreach($wallTypes as $magicNumber => $prefix){ foreach($wallTypes as $magicNumber => $prefix){
self::register(new CobblestoneWall(new BID(BlockLegacyIds::COBBLESTONE_WALL, $magicNumber), $prefix . " Wall")); self::register(new Wall(new BID(BlockLegacyIds::COBBLESTONE_WALL, $magicNumber), $prefix . " Wall"));
} }
//TODO: minecraft:andesite_stairs //TODO: minecraft:andesite_stairs

4
src/pocketmine/block/FenceGate.php
View File

@ -73,8 +73,8 @@ class FenceGate extends Transparent{
private function checkInWall() : bool{ private function checkInWall() : bool{
return ( return (
$this->getSide(Facing::rotateY($this->facing, false)) instanceof CobblestoneWall or $this->getSide(Facing::rotateY($this->facing, false)) instanceof Wall or
$this->getSide(Facing::rotateY($this->facing, true)) instanceof CobblestoneWall $this->getSide(Facing::rotateY($this->facing, true)) instanceof Wall
); );
} }

2
src/pocketmine/block/CobblestoneWall.php → src/pocketmine/block/Wall.php
View File

@ -27,7 +27,7 @@ use pocketmine\item\TieredTool;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing; use pocketmine\math\Facing;
class CobblestoneWall extends Transparent{ class Wall extends Transparent{
public const NONE_MOSSY_WALL = 0; public const NONE_MOSSY_WALL = 0;
public const MOSSY_WALL = 1; public const MOSSY_WALL = 1;
public const GRANITE_WALL = 2; public const GRANITE_WALL = 2;