diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php index 0892b00f..fec5f9df 100755 --- a/src/API/BlockAPI.php +++ b/src/API/BlockAPI.php @@ -16,13 +16,16 @@ class BlockAPI{ [WOODEN_PLANKS, 2], [WOODEN_PLANKS, 3], [BRICKS, 0], - + [EMERALD_BLOCK, 0], + [EMERALD_ORE, 0], [DIRT, 0], [GRASS, 0], [CLAY_BLOCK, 0], [SANDSTONE, 0], [SANDSTONE, 1], [SANDSTONE, 2], + [LOG2, 0], + [LOG2, 1], [SAND, 0], [SAND, 1], [GRAVEL, 0], @@ -38,6 +41,8 @@ class BlockAPI{ [SPRUCE_WOODEN_STAIRS, 0], [BIRCH_WOODEN_STAIRS, 0], [JUNGLE_WOODEN_STAIRS, 0], + [ACACIA_WOOD_STAIRS, 0], + [DARK_OAK_WOOD_STAIRS, 0], [BRICK_STAIRS, 0], [SANDSTONE_STAIRS, 0], [STONE_BRICK_STAIRS, 0], @@ -111,6 +116,14 @@ class BlockAPI{ [FURNACE, 0], [DANDELION, 0], [CYAN_FLOWER, 0], + [CYAN_FLOWER, 1], + [CYAN_FLOWER, 2], + [CYAN_FLOWER, 3], + [CYAN_FLOWER, 4], + [CYAN_FLOWER, 5], + [CYAN_FLOWER, 6], + [CYAN_FLOWER, 7], + [CYAN_FLOWER, 8], [BROWN_MUSHROOM, 0], [RED_MUSHROOM, 0], [CACTUS, 0], @@ -126,10 +139,14 @@ class BlockAPI{ [SAPLING, 1], [SAPLING, 2], [SAPLING, 3], + [SAPLING, 4], + [SAPLING, 5], [LEAVES, 0], [LEAVES, 1], [LEAVES, 2], [LEAVES, 3], + [LEAVES2, 0], + [LEAVES2, 0], [CAKE, 0], [SIGN, 0], [CARPET, 0], diff --git a/src/constants/BlockIDs.php b/src/constants/BlockIDs.php index d0ccd5c4..493ce5b8 100755 --- a/src/constants/BlockIDs.php +++ b/src/constants/BlockIDs.php @@ -230,7 +230,7 @@ define("LEAVES2", 161); define("ACACIA_LEAVES", 161); define("DARK_OAK_LEAVES", "161:1"); define("LOG2", 162); -define("ACACIA_WOOD", 162); +define("ACACIA_WOOD", "162:0"); define("DARK_OAK_WOOD", "162:1"); define("ACACIA_WOOD_STAIRS", 163); define("DARK_OAK_WOOD_STAIRS", 164); diff --git a/src/material/block/plant/CyanFlowerBlock.php b/src/material/block/plant/CyanFlowerBlock.php index 05ea6f6e..29c17505 100644 --- a/src/material/block/plant/CyanFlowerBlock.php +++ b/src/material/block/plant/CyanFlowerBlock.php @@ -1,20 +1,20 @@ "Poppy", + 1 => "Blue Orchid", + 2 => "Allium", + 3 => "Azure Bluet", + 4 => "Red Tulip", + 5 => "Orange Tulip", + 6 => "White Tulip", + 7 => "Pink Tulip", + 8 => "Oxeye Daisy", + ]; public function __construct($meta = 0){ - parent::__construct(CYAN_FLOWER, $meta, "Poppy"); + parent::__construct(CYAN_FLOWER, $meta, nullsafe(self::$names[$meta], "Poppy")); $this->hardness = 0; - $names = array( - 0 => "Poppy", - 1 => "Blue Orchid", - 2 => "Allium", - 3 => "Azure Bluet", - 4 => "Red Tulip", - 5 => "Orange Tulip", - 6 => "White Tulip", - 7 => "Pink Tulip", - 8 => "Oxeye Daisy", - ); } public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index 631c9569..46dad758 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -68,7 +68,23 @@ class CraftingRecipes{ "DYE:0x1,DYE:15x1=>DYE:8x2",//Gray Dye "DYE:0x1,DYE:15x2=>DYE:7x3",//Light Gray Dye "DYE:0x1,DYE:8x1=>DYE:7x2",//Light Gray Dye + "WOOL:0x2=>CARPET:0x3", + "WOOL:1x2=>CARPET:1x3", + "WOOL:2x2=>CARPET:2x3", + "WOOL:3x2=>CARPET:3x3", + "WOOL:4x2=>CARPET:4x3", + "WOOL:5x2=>CARPET:5x3", + "WOOL:6x2=>CARPET:6x3", + "WOOL:7x2=>CARPET:7x3", + "WOOL:8x2=>CARPET:8x3", + "WOOL:9x2=>CARPET:9x3", + "WOOL:10x2=>CARPET:10x3", + "WOOL:11x2=>CARPET:11x3", + "WOOL:12x2=>CARPET:12x3", + "WOOL:13x2=>CARPET:13x3", "WOOL:14x2=>CARPET:14x3", + "WOOL:15x2=>CARPET:15x3", + ]; private static $big = [//Probably means only craftable on crafting bench. Name it better! diff --git a/src/world/generator/SuperflatGenerator.php b/src/world/generator/SuperflatGenerator.php index 587b90a8..bec529ed 100644 --- a/src/world/generator/SuperflatGenerator.php +++ b/src/world/generator/SuperflatGenerator.php @@ -27,6 +27,7 @@ class SuperflatGenerator implements LevelGenerator{ new OreType(new DiamondOreBlock(), 1, 7, 0, 16), new OreType(new DirtBlock(), 20, 32, 0, 128), new OreType(new GravelBlock(), 10, 16, 0, 128), + new OreType(new EmeraldOreBlock(), 1, 7, 0, 16), //TODO ]); $this->populators[] = $ores; }