From 5fa6c5962e0fbe825a7a549c4c30e9413b5751d5 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sat, 23 Nov 2013 15:51:09 +0100 Subject: [PATCH] Added more Wood stairs, and planks --- src/constants/BlockIDs.php | 7 ++++ src/material/Block.php | 4 +++ .../block/nonfull/stairs/BirchWoodStairs.php | 32 +++++++++++++++++++ .../block/nonfull/stairs/JungleWoodStairs.php | 32 +++++++++++++++++++ .../block/nonfull/stairs/SpruceWoodStairs.php | 32 +++++++++++++++++++ src/material/block/solid/Planks.php | 7 ++++ src/material/block/solid/Wood.php | 4 ++- src/recipes/CraftingRecipes.php | 15 +++++++-- src/recipes/FuelData.php | 3 ++ 9 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 src/material/block/nonfull/stairs/BirchWoodStairs.php create mode 100644 src/material/block/nonfull/stairs/JungleWoodStairs.php create mode 100644 src/material/block/nonfull/stairs/SpruceWoodStairs.php diff --git a/src/constants/BlockIDs.php b/src/constants/BlockIDs.php index eab6e62e5..0bac016c9 100644 --- a/src/constants/BlockIDs.php +++ b/src/constants/BlockIDs.php @@ -150,6 +150,13 @@ define("NETHER_BRICKS_STAIRS", 114); define("SANDSTONE_STAIRS", 128); +define("SPRUCE_WOOD_STAIRS", 134); +define("SPRUCE_WOODEN_STAIRS", 134); +define("BIRCH_WOOD_STAIRS", 135); +define("BIRCH_WOODEN_STAIRS", 135); +define("JUNGLE_WOOD_STAIRS", 136); +define("JUNGLE_WOODEN_STAIRS", 136); + define("QUARTZ_BLOCK", 155); define("QUARTZ_STAIRS", 156); diff --git a/src/material/Block.php b/src/material/Block.php index 2bd7b3f9b..1b4cf80e6 100644 --- a/src/material/Block.php +++ b/src/material/Block.php @@ -120,6 +120,10 @@ abstract class Block extends Position{ NETHER_BRICKS_STAIRS => "NetherBricksStairsBlock", SANDSTONE_STAIRS => "SandstoneStairsBlock", + + SPRUCE_WOOD_STAIRS => "SpruceWoodStairsBlock", + BIRCH_WOOD_STAIRS => "BirchWoodStairsBlock", + JUNGLE_WOOD_STAIRS => "JungleWoodStairsBlock", QUARTZ_BLOCK => "QuartzBlock", QUARTZ_STAIRS => "QuartzStairsBlock", diff --git a/src/material/block/nonfull/stairs/BirchWoodStairs.php b/src/material/block/nonfull/stairs/BirchWoodStairs.php new file mode 100644 index 000000000..8fc35f56a --- /dev/null +++ b/src/material/block/nonfull/stairs/BirchWoodStairs.php @@ -0,0 +1,32 @@ +id, 0, 1), + ); + } +} \ No newline at end of file diff --git a/src/material/block/nonfull/stairs/JungleWoodStairs.php b/src/material/block/nonfull/stairs/JungleWoodStairs.php new file mode 100644 index 000000000..868f51b43 --- /dev/null +++ b/src/material/block/nonfull/stairs/JungleWoodStairs.php @@ -0,0 +1,32 @@ +id, 0, 1), + ); + } +} \ No newline at end of file diff --git a/src/material/block/nonfull/stairs/SpruceWoodStairs.php b/src/material/block/nonfull/stairs/SpruceWoodStairs.php new file mode 100644 index 000000000..581620c92 --- /dev/null +++ b/src/material/block/nonfull/stairs/SpruceWoodStairs.php @@ -0,0 +1,32 @@ +id, 0, 1), + ); + } +} \ No newline at end of file diff --git a/src/material/block/solid/Planks.php b/src/material/block/solid/Planks.php index 4d00e8324..30a4cde61 100644 --- a/src/material/block/solid/Planks.php +++ b/src/material/block/solid/Planks.php @@ -22,6 +22,13 @@ class PlanksBlock extends SolidBlock{ public function __construct($meta = 0){ parent::__construct(PLANKS, $meta, "Wooden Planks"); + $names = array( + WoodBlock::OAK => "Oak Wooden Planks", + WoodBlock::SPRUCE => "Spruce Wooden Planks", + WoodBlock::BIRCH => "Birch Wooden Planks", + WoodBlock::JUNGLE => "Jungle Wooden Planks", + ); + $this->name = $names[$this->meta & 0x03]; $this->hardness = 15; } diff --git a/src/material/block/solid/Wood.php b/src/material/block/solid/Wood.php index 40a71f019..bedab61c9 100644 --- a/src/material/block/solid/Wood.php +++ b/src/material/block/solid/Wood.php @@ -23,13 +23,15 @@ class WoodBlock extends SolidBlock{ const OAK = 0; const SPRUCE = 1; const BIRCH = 2; + const JUNGLE = 3; + public function __construct($meta = 0){ parent::__construct(WOOD, $meta, "Wood"); $names = array( WoodBlock::OAK => "Oak Wood", WoodBlock::SPRUCE => "Spruce Wood", WoodBlock::BIRCH => "Birch Wood", - 3 => "Jungle Wood", + WoodBlock::JUNGLE => "Jungle Wood", ); $this->name = $names[$this->meta & 0x03]; $this->hardness = 10; diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index cfb03118b..62e7395a9 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -28,7 +28,10 @@ class CraftingRecipes{ "SNOWBALL:?x4=>SNOW_BLOCK:0x1", "WOODEN_PLANKS:?x2=>STICK:0x4", "COBBLESTONE:?x4=>STONECUTTER:0x1", - "WOOD:?x1=>WOODEN_PLANKS:0x4", + "WOOD:0x1=>WOODEN_PLANKS:0x4", + "WOOD:1x1=>WOODEN_PLANKS:1x4", + "WOOD:2x1=>WOODEN_PLANKS:2x4", + "WOOD:3x1=>WOODEN_PLANKS:3x4", "WOOL:0x1,DYE:0x1=>WOOL:15x1", "WOOL:0x1,DYE:1x1=>WOOL:14x1", "WOOL:0x1,DYE:2x1=>WOOL:13x1", @@ -90,8 +93,14 @@ class CraftingRecipes{ "DIAMOND:?x3,IRON_INGOT:?x6=>NETHER_REACTOR:0x1", "WOODEN_PLANKS:?x6=>TRAPDOOR:0x2", "WOODEN_PLANKS:?x6=>WOODEN_DOOR:0x1", - "WOODEN_PLANKS:?x6=>WOODEN_STAIRS:0x4", - "WOODEN_PLANKS:?x3=>SLAB:2x6", + "WOODEN_PLANKS:0x6=>WOODEN_STAIRS:0x4", + "WOODEN_PLANKS:0x3=>SLAB:2x6", + "WOODEN_PLANKS:1x6=>SPRUCE_WOOD_STAIRS:0x4", + //"WOODEN_PLANKS:1x3=>SPRUCE_WOOD_SLAB:2x6", + "WOODEN_PLANKS:2x6=>BIRCH_WOOD_STAIRS:0x4", + //"WOODEN_PLANKS:2x3=>BIRCH_WOOD_SLAB:2x6", + "WOODEN_PLANKS:3x6=>JUNGLE_WOOD_STAIRS:0x4", + //"WOODEN_PLANKS:3x3=>JUNGLE_WOOD_SLAB:2x6", //Tools "STICK:?x1,FEATHER:?x1,FLINT:?x1=>ARROW:0x4", diff --git a/src/recipes/FuelData.php b/src/recipes/FuelData.php index b158476c6..eaba877c2 100644 --- a/src/recipes/FuelData.php +++ b/src/recipes/FuelData.php @@ -35,6 +35,9 @@ class FuelData{ FENCE => 15, FENCE_GATE => 15, WOODEN_STAIRS => 15, + SPRUCE_WOOD_STAIRS => 15, + BIRCH_WOOD_STAIRS => 15, + JUNGLE_WOOD_STAIRS => 15, TRAPDOOR => 15, WORKBENCH => 15, BOOKSHELF => 15,