From bf5da596f73be3471f3ca47a7daa48c4ca5283da Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 5 Jul 2020 18:27:10 +0100 Subject: [PATCH] Get rid of WALL metadata mapping --- src/block/BlockFactory.php | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/block/BlockFactory.php b/src/block/BlockFactory.php index a13120a7a4..1864f5dd96 100644 --- a/src/block/BlockFactory.php +++ b/src/block/BlockFactory.php @@ -464,25 +464,20 @@ class BlockFactory{ $this->register(new Wool(new BID(Ids::WOOL, $color->getMagicNumber()), $color->getDisplayName() . " Wool")); } - static $wallTypes = [ - Meta::WALL_ANDESITE => "Andesite", - Meta::WALL_BRICK => "Brick", - Meta::WALL_DIORITE => "Diorite", - Meta::WALL_END_STONE_BRICK => "End Stone Brick", - Meta::WALL_GRANITE => "Granite", - Meta::WALL_MOSSY_STONE_BRICK => "Mossy Stone Brick", - Meta::WALL_MOSSY_COBBLESTONE => "Mossy Cobblestone", - Meta::WALL_NETHER_BRICK => "Nether Brick", - Meta::WALL_COBBLESTONE => "Cobblestone", - Meta::WALL_PRISMARINE => "Prismarine", - Meta::WALL_RED_NETHER_BRICK => "Red Nether Brick", - Meta::WALL_RED_SANDSTONE => "Red Sandstone", - Meta::WALL_SANDSTONE => "Sandstone", - Meta::WALL_STONE_BRICK => "Stone Brick" - ]; - foreach($wallTypes as $magicNumber => $prefix){ - $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, $magicNumber), $prefix . " Wall")); - } + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_ANDESITE), "Andesite Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_BRICK), "Brick Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_DIORITE), "Diorite Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_END_STONE_BRICK), "End Stone Brick Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_GRANITE), "Granite Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_MOSSY_STONE_BRICK), "Mossy Stone Brick Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_MOSSY_COBBLESTONE), "Mossy Cobblestone Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_NETHER_BRICK), "Nether Brick Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_COBBLESTONE), "Cobblestone Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_PRISMARINE), "Prismarine Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_RED_NETHER_BRICK), "Red Nether Brick Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_RED_SANDSTONE), "Red Sandstone Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_SANDSTONE), "Sandstone Wall")); + $this->register(new Wall(new BID(Ids::COBBLESTONE_WALL, Meta::WALL_STONE_BRICK), "Stone Brick Wall")); $this->registerElements();