From 561d8e7a398d6dd9b299b380b89e52a3796d5744 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 4 Aug 2017 12:16:44 +0100 Subject: [PATCH] Regenerated block/item id lists and refactored some names for consistency with MCPE --- src/pocketmine/Player.php | 28 +-- src/pocketmine/block/AcaciaWoodStairs.php | 2 +- src/pocketmine/block/BirchWoodStairs.php | 2 +- src/pocketmine/block/Block.php | 14 +- src/pocketmine/block/BlockIds.php | 222 +++++++++++------- src/pocketmine/block/Bricks.php | 4 +- .../{StoneWall.php => CobblestoneWall.php} | 6 +- .../{Workbench.php => CraftingTable.php} | 4 +- src/pocketmine/block/DarkOakWoodStairs.php | 2 +- .../{DoubleSlab.php => DoubleStoneSlab.php} | 6 +- src/pocketmine/block/DoubleWoodSlab.php | 4 +- src/pocketmine/block/FenceGateAcacia.php | 2 +- src/pocketmine/block/FenceGateBirch.php | 2 +- src/pocketmine/block/FenceGateDarkOak.php | 2 +- src/pocketmine/block/FenceGateJungle.php | 2 +- src/pocketmine/block/FenceGateSpruce.php | 2 +- src/pocketmine/block/Glowstone.php | 2 +- src/pocketmine/block/JungleWoodStairs.php | 2 +- src/pocketmine/block/Lava.php | 2 +- .../{MossStone.php => MossyCobblestone.php} | 6 +- src/pocketmine/block/NetherBrick.php | 4 +- src/pocketmine/block/NetherBrickStairs.php | 4 +- .../block/{MobHead.php => Skull.php} | 8 +- src/pocketmine/block/Slab.php | 6 +- src/pocketmine/block/SpruceWoodStairs.php | 2 +- src/pocketmine/block/Torch.php | 4 +- src/pocketmine/block/Water.php | 2 +- .../block/WeightedPressurePlateHeavy.php | 2 +- .../block/WeightedPressurePlateLight.php | 2 +- src/pocketmine/block/Wood.php | 2 - src/pocketmine/block/WoodStairs.php | 4 +- .../block/{WoodDoor.php => WoodenDoor.php} | 6 +- .../block/{WoodSlab.php => WoodenSlab.php} | 4 +- src/pocketmine/inventory/Fuel.php | 18 +- src/pocketmine/item/Camera.php | 32 --- src/pocketmine/item/Item.php | 28 +-- src/pocketmine/item/ItemIds.php | 133 ++++++----- .../item/{MobHead.php => Skull.php} | 4 +- src/pocketmine/level/Level.php | 2 +- 39 files changed, 301 insertions(+), 282 deletions(-) rename src/pocketmine/block/{StoneWall.php => CobblestoneWall.php} (89%) rename src/pocketmine/block/{Workbench.php => CraftingTable.php} (94%) rename src/pocketmine/block/{DoubleSlab.php => DoubleStoneSlab.php} (91%) rename src/pocketmine/block/{MossStone.php => MossyCobblestone.php} (90%) rename src/pocketmine/block/{MobHead.php => Skull.php} (94%) rename src/pocketmine/block/{WoodDoor.php => WoodenDoor.php} (91%) rename src/pocketmine/block/{WoodSlab.php => WoodenSlab.php} (97%) delete mode 100644 src/pocketmine/item/Camera.php rename src/pocketmine/item/{MobHead.php => Skull.php} (90%) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 558356bc95..3043dc34a1 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2234,25 +2234,25 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $item = $this->inventory->getItemInHand(); $damageTable = [ Item::WOODEN_SWORD => 4, - Item::GOLD_SWORD => 4, + Item::GOLDEN_SWORD => 4, Item::STONE_SWORD => 5, Item::IRON_SWORD => 6, Item::DIAMOND_SWORD => 7, Item::WOODEN_AXE => 3, - Item::GOLD_AXE => 3, + Item::GOLDEN_AXE => 3, Item::STONE_AXE => 3, Item::IRON_AXE => 5, Item::DIAMOND_AXE => 6, Item::WOODEN_PICKAXE => 2, - Item::GOLD_PICKAXE => 2, + Item::GOLDEN_PICKAXE => 2, Item::STONE_PICKAXE => 3, Item::IRON_PICKAXE => 4, Item::DIAMOND_PICKAXE => 5, Item::WOODEN_SHOVEL => 1, - Item::GOLD_SHOVEL => 1, + Item::GOLDEN_SHOVEL => 1, Item::STONE_SHOVEL => 2, Item::IRON_SHOVEL => 3, Item::DIAMOND_SHOVEL => 4, @@ -2276,14 +2276,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ Item::LEATHER_TUNIC => 3, Item::LEATHER_PANTS => 2, Item::LEATHER_BOOTS => 1, - Item::CHAIN_HELMET => 1, - Item::CHAIN_CHESTPLATE => 5, - Item::CHAIN_LEGGINGS => 4, - Item::CHAIN_BOOTS => 1, - Item::GOLD_HELMET => 1, - Item::GOLD_CHESTPLATE => 5, - Item::GOLD_LEGGINGS => 3, - Item::GOLD_BOOTS => 1, + Item::CHAINMAIL_HELMET => 1, + Item::CHAINMAIL_CHESTPLATE => 5, + Item::CHAINMAIL_LEGGINGS => 4, + Item::CHAINMAIL_BOOTS => 1, + Item::GOLDEN_HELMET => 1, + Item::GOLDEN_CHESTPLATE => 5, + Item::GOLDEN_LEGGINGS => 3, + Item::GOLDEN_BOOTS => 1, Item::IRON_HELMET => 2, Item::IRON_CHESTPLATE => 6, Item::IRON_LEGGINGS => 5, @@ -2994,7 +2994,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } switch($recipe->getResult()->getId()){ - case Item::WORKBENCH: + case Item::CRAFTING_TABLE: $this->awardAchievement("buildWorkBench"); break; case Item::WOODEN_PICKAXE: @@ -3015,7 +3015,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $this->inventory->addItem(Item::get(Item::BUCKET, 0, 3)); break; case Item::STONE_PICKAXE: - case Item::GOLD_PICKAXE: + case Item::GOLDEN_PICKAXE: case Item::IRON_PICKAXE: case Item::DIAMOND_PICKAXE: $this->awardAchievement("buildBetterPickaxe"); diff --git a/src/pocketmine/block/AcaciaWoodStairs.php b/src/pocketmine/block/AcaciaWoodStairs.php index 27c3d7fb84..60d7f944a2 100644 --- a/src/pocketmine/block/AcaciaWoodStairs.php +++ b/src/pocketmine/block/AcaciaWoodStairs.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class AcaciaWoodStairs extends WoodStairs{ - protected $id = self::ACACIA_WOOD_STAIRS; + protected $id = self::ACACIA_STAIRS; public function getName(){ return "Acacia Wood Stairs"; diff --git a/src/pocketmine/block/BirchWoodStairs.php b/src/pocketmine/block/BirchWoodStairs.php index a7b26aa5b6..83c1960b8d 100644 --- a/src/pocketmine/block/BirchWoodStairs.php +++ b/src/pocketmine/block/BirchWoodStairs.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class BirchWoodStairs extends WoodStairs{ - protected $id = self::BIRCH_WOOD_STAIRS; + protected $id = self::BIRCH_STAIRS; public function getName(){ return "Birch Wood Stairs"; diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index 1c3e40c01e..c76770fa8f 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -124,12 +124,12 @@ class Block extends Position implements BlockIds, Metadatable{ self::registerBlock(new RedMushroom()); self::registerBlock(new Gold()); self::registerBlock(new Iron()); - self::registerBlock(new DoubleSlab()); + self::registerBlock(new DoubleStoneSlab()); self::registerBlock(new Slab()); self::registerBlock(new Bricks()); self::registerBlock(new TNT()); self::registerBlock(new Bookshelf()); - self::registerBlock(new MossStone()); + self::registerBlock(new MossyCobblestone()); self::registerBlock(new Obsidian()); self::registerBlock(new Torch()); self::registerBlock(new Fire()); @@ -139,13 +139,13 @@ class Block extends Position implements BlockIds, Metadatable{ self::registerBlock(new DiamondOre()); self::registerBlock(new Diamond()); - self::registerBlock(new Workbench()); + self::registerBlock(new CraftingTable()); self::registerBlock(new Wheat()); self::registerBlock(new Farmland()); self::registerBlock(new Furnace()); self::registerBlock(new BurningFurnace()); self::registerBlock(new SignPost()); - self::registerBlock(new WoodDoor()); + self::registerBlock(new WoodenDoor()); self::registerBlock(new Ladder()); self::registerBlock(new Rail()); self::registerBlock(new CobblestoneStairs()); @@ -215,12 +215,12 @@ class Block extends Position implements BlockIds, Metadatable{ self::registerBlock(new BirchWoodStairs()); self::registerBlock(new JungleWoodStairs()); - self::registerBlock(new StoneWall()); + self::registerBlock(new CobblestoneWall()); self::registerBlock(new FlowerPot()); self::registerBlock(new Carrot()); self::registerBlock(new Potato()); self::registerBlock(new WoodenButton()); - self::registerBlock(new MobHead()); + self::registerBlock(new Skull()); self::registerBlock(new Anvil()); self::registerBlock(new TrappedChest()); self::registerBlock(new WeightedPressurePlateLight()); @@ -232,7 +232,7 @@ class Block extends Position implements BlockIds, Metadatable{ self::registerBlock(new Quartz()); self::registerBlock(new QuartzStairs()); self::registerBlock(new DoubleWoodSlab()); - self::registerBlock(new WoodSlab()); + self::registerBlock(new WoodenSlab()); self::registerBlock(new StainedClay()); self::registerBlock(new Leaves2()); diff --git a/src/pocketmine/block/BlockIds.php b/src/pocketmine/block/BlockIds.php index 4cf12eb632..db59687ab8 100644 --- a/src/pocketmine/block/BlockIds.php +++ b/src/pocketmine/block/BlockIds.php @@ -29,20 +29,20 @@ interface BlockIds{ const STONE = 1; const GRASS = 2; const DIRT = 3; - const COBBLESTONE = 4, COBBLE = 4; - const PLANK = 5, PLANKS = 5, WOODEN_PLANK = 5, WOODEN_PLANKS = 5; - const SAPLING = 6, SAPLINGS = 6; + const COBBLESTONE = 4; + const PLANKS = 5, WOODEN_PLANKS = 5; + const SAPLING = 6; const BEDROCK = 7; - const WATER = 8; - const STILL_WATER = 9; - const LAVA = 10; - const STILL_LAVA = 11; + const FLOWING_WATER = 8; + const STILL_WATER = 9, WATER = 9; + const FLOWING_LAVA = 10; + const LAVA = 11, STILL_LAVA = 11; const SAND = 12; const GRAVEL = 13; const GOLD_ORE = 14; const IRON_ORE = 15; const COAL_ORE = 16; - const LOG = 17, WOOD = 17, TRUNK = 17; + const LOG = 17, WOOD = 17; const LEAVES = 18; const SPONGE = 19; const GLASS = 20; @@ -50,35 +50,35 @@ interface BlockIds{ const LAPIS_BLOCK = 22; const DISPENSER = 23; const SANDSTONE = 24; - const NOTE_BLOCK = 25, NOTEBLOCK = 25; + const NOTEBLOCK = 25, NOTE_BLOCK = 25; const BED_BLOCK = 26; - const POWERED_RAIL = 27; + const GOLDEN_RAIL = 27, POWERED_RAIL = 27; const DETECTOR_RAIL = 28; const STICKY_PISTON = 29; - const COBWEB = 30; - const TALL_GRASS = 31; - const BUSH = 32, DEAD_BUSH = 32; + const COBWEB = 30, WEB = 30; + const TALLGRASS = 31, TALL_GRASS = 31; + const DEADBUSH = 32, DEAD_BUSH = 32; const PISTON = 33; - const PISTON_HEAD = 34; + const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34; const WOOL = 35; - const DANDELION = 37; - const POPPY = 38, ROSE = 38, RED_FLOWER = 38; + const DANDELION = 37, YELLOW_FLOWER = 37; + const POPPY = 38, RED_FLOWER = 38; const BROWN_MUSHROOM = 39; const RED_MUSHROOM = 40; const GOLD_BLOCK = 41; const IRON_BLOCK = 42; - const DOUBLE_SLAB = 43, DOUBLE_SLABS = 43; - const SLAB = 44, SLABS = 44, STONE_SLAB = 44; - const BRICKS = 45, BRICKS_BLOCK = 45; + const DOUBLE_STONE_SLAB = 43; + const STONE_SLAB = 44; + const BRICK_BLOCK = 45; const TNT = 46; const BOOKSHELF = 47; - const MOSS_STONE = 48, MOSSY_STONE = 48; + const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48; const OBSIDIAN = 49; const TORCH = 50; const FIRE = 51; - const MONSTER_SPAWNER = 52; - const WOOD_STAIRS = 53, WOODEN_STAIRS = 53, OAK_WOOD_STAIRS = 53, OAK_WOODEN_STAIRS = 53; + const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52; + const OAK_STAIRS = 53, WOODEN_STAIRS = 53; const CHEST = 54; const REDSTONE_WIRE = 55; const DIAMOND_ORE = 56; @@ -88,11 +88,11 @@ interface BlockIds{ const FARMLAND = 60; const FURNACE = 61; const BURNING_FURNACE = 62, LIT_FURNACE = 62; - const SIGN_POST = 63; - const DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64, WOOD_DOOR_BLOCK = 64; + const SIGN_POST = 63, STANDING_SIGN = 63; + const WOODEN_DOOR_BLOCK = 64; const LADDER = 65; const RAIL = 66; - const COBBLESTONE_STAIRS = 67, COBBLE_STAIRS = 67; + const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67; const WALL_SIGN = 68; const LEVER = 69; const STONE_PRESSURE_PLATE = 70; @@ -101,117 +101,119 @@ interface BlockIds{ const REDSTONE_ORE = 73; const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74; const UNLIT_REDSTONE_TORCH = 75; - const REDSTONE_TORCH = 76, LIT_REDSTONE_TORCH = 76; + const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76; const STONE_BUTTON = 77; - const SNOW = 78, SNOW_LAYER = 78; + const SNOW_LAYER = 78; const ICE = 79; - const SNOW_BLOCK = 80; + const SNOW = 80, SNOW_BLOCK = 80; const CACTUS = 81; const CLAY_BLOCK = 82; - const REEDS = 83, SUGARCANE_BLOCK = 83; + const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83; const FENCE = 85; const PUMPKIN = 86; const NETHERRACK = 87; const SOUL_SAND = 88; - const GLOWSTONE = 89, GLOWSTONE_BLOCK = 89; - const PORTAL_BLOCK = 90, PORTAL = 90; + const GLOWSTONE = 89; + const PORTAL = 90; const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91; const CAKE_BLOCK = 92; - const REPEATER_BLOCK = 93, UNPOWERED_REPEATER_BLOCK = 93; - const POWERED_REPEATER_BLOCK = 94; - const INVISIBLE_BEDROCK = 95; + const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93; + const POWERED_REPEATER = 94; + const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95; const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96; - const MONSTER_EGG_BLOCK = 97; - const STONE_BRICKS = 98, STONE_BRICK = 98; + const MONSTER_EGG = 97; + const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98; const BROWN_MUSHROOM_BLOCK = 99; const RED_MUSHROOM_BLOCK = 100; - const IRON_BARS = 101, IRON_BAR = 101; - const GLASS_PANE = 102, GLASS_PANEL = 102; + const IRON_BARS = 101; + const GLASS_PANE = 102; const MELON_BLOCK = 103; const PUMPKIN_STEM = 104; const MELON_STEM = 105; - const VINES = 106, VINE = 106; + const VINE = 106, VINES = 106; const FENCE_GATE = 107, OAK_FENCE_GATE = 107; const BRICK_STAIRS = 108; const STONE_BRICK_STAIRS = 109; const MYCELIUM = 110; - const LILY_PAD = 111, WATER_LILY = 111; - const NETHER_BRICKS = 112, NETHER_BRICK_BLOCK = 112; + const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111; + const NETHER_BRICK = 112, NETHER_BRICK_BLOCK = 112; const NETHER_BRICK_FENCE = 113; - const NETHER_BRICK_STAIRS = 114, NETHER_BRICKS_STAIRS = 114; - const NETHER_WART_BLOCK = 115; - const ENCHANTING_TABLE = 116, ENCHANT_TABLE = 116, ENCHANTMENT_TABLE = 116; + const NETHER_BRICK_STAIRS = 114; + const NETHER_WART_PLANT = 115; + const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116; const BREWING_STAND_BLOCK = 117; const CAULDRON_BLOCK = 118; - - const END_PORTAL_FRAME = 120, END_PORTAL = 120; + const END_PORTAL = 119; + const END_PORTAL_FRAME = 120; const END_STONE = 121; - - const REDSTONE_LAMP = 123, INACTIVE_REDSTONE_LAMP = 123; - const LIT_REDSTONE_LAMP = 124, ACTIVE_REDSTONE_LAMP = 124; + const DRAGON_EGG = 122; + const REDSTONE_LAMP = 123; + const LIT_REDSTONE_LAMP = 124; const DROPPER = 125; const ACTIVATOR_RAIL = 126; - const COCOA_BLOCK = 127, COCOA_PODS = 127; + const COCOA = 127, COCOA_BLOCK = 127; const SANDSTONE_STAIRS = 128; const EMERALD_ORE = 129; - + const ENDER_CHEST = 130; const TRIPWIRE_HOOK = 131; - const TRIPWIRE = 132; + const TRIPWIRE = 132, TRIP_WIRE = 132; const EMERALD_BLOCK = 133; - const SPRUCE_WOOD_STAIRS = 134, SPRUCE_WOODEN_STAIRS = 134; - const BIRCH_WOOD_STAIRS = 135, BIRCH_WOODEN_STAIRS = 135; - const JUNGLE_WOOD_STAIRS = 136, JUNGLE_WOODEN_STAIRS = 136; - + const SPRUCE_STAIRS = 134; + const BIRCH_STAIRS = 135; + const JUNGLE_STAIRS = 136; + const COMMAND_BLOCK = 137; const BEACON = 138; - const COBBLESTONE_WALL = 139, COBBLE_WALL = 139, STONE_WALL = 139; + const COBBLESTONE_WALL = 139, STONE_WALL = 139; const FLOWER_POT_BLOCK = 140; - const CARROT_BLOCK = 141; - const POTATO_BLOCK = 142; + const CARROTS = 141, CARROT_BLOCK = 141; + const POTATOES = 142, POTATO_BLOCK = 142; const WOODEN_BUTTON = 143; const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144; const ANVIL = 145; const TRAPPED_CHEST = 146; - const WEIGHTED_PRESSURE_PLATE_LIGHT = 147, LIGHT_WEIGHTED_PRESSURE_PLATE = 147, GOLD_PRESSURE_PLATE = 147; - const WEIGHTED_PRESSURE_PLATE_HEAVY = 148, HEAVY_WEIGHTED_PRESSURE_PLATE = 148, IRON_PRESSURE_PLATE = 148; - const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR_BLOCK = 149; - const POWERED_COMPARATOR_BLOCK = 150; - const DAYLIGHT_SENSOR = 151; + const LIGHT_WEIGHTED_PRESSURE_PLATE = 147; + const HEAVY_WEIGHTED_PRESSURE_PLATE = 148; + const COMPATATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149; + const POWERED_COMPARATOR = 150; + const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151; const REDSTONE_BLOCK = 152; - const NETHER_QUARTZ_ORE = 153; + const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153; const HOPPER_BLOCK = 154; const QUARTZ_BLOCK = 155; const QUARTZ_STAIRS = 156; - const DOUBLE_WOOD_SLAB = 157, DOUBLE_WOODEN_SLAB = 157, DOUBLE_WOOD_SLABS = 157, DOUBLE_WOODEN_SLABS = 157; - const WOOD_SLAB = 158, WOODEN_SLAB = 158, WOOD_SLABS = 158, WOODEN_SLABS = 158; - const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159; - + const DOUBLE_WOODEN_SLAB = 157; + const WOODEN_SLAB = 158; + const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159; + const STAINED_GLASS_PANE = 160; const LEAVES2 = 161; - const WOOD2 = 162, TRUNK2 = 162, LOG2 = 162; - const ACACIA_WOOD_STAIRS = 163, ACACIA_WOODEN_STAIRS = 163; - const DARK_OAK_WOOD_STAIRS = 164, DARK_OAK_WOODEN_STAIRS = 164; - const SLIME_BLOCK = 165; + const LOG2 = 162, WOOD2 = 162; + const ACACIA_STAIRS = 163; + const DARK_OAK_STAIRS = 164; + const SLIME = 165, SLIME_BLOCK = 165; const IRON_TRAPDOOR = 167; const PRISMARINE = 168; - const SEA_LANTERN = 169; - const HAY_BALE = 170; + const SEALANTERN = 169, SEA_LANTERN = 169; + const HAY_BALE = 170, HAY_BLOCK = 170; const CARPET = 171; const HARDENED_CLAY = 172; const COAL_BLOCK = 173; const PACKED_ICE = 174; const DOUBLE_PLANT = 175; - const INVERTED_DAYLIGHT_SENSOR = 178, DAYLIGHT_SENSOR_INVERTED = 178; + const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178; const RED_SANDSTONE = 179; const RED_SANDSTONE_STAIRS = 180; - const DOUBLE_RED_SANDSTONE_SLAB = 181; - const RED_SANDSTONE_SLAB = 182; - const SPRUCE_FENCE_GATE = 183, FENCE_GATE_SPRUCE = 183; - const BIRCH_FENCE_GATE = 184, FENCE_GATE_BIRCH = 184; - const JUNGLE_FENCE_GATE = 185, FENCE_GATE_JUNGLE = 185; - const DARK_OAK_FENCE_GATE = 186, FENCE_GATE_DARK_OAK = 186; - const ACACIA_FENCE_GATE = 187, FENCE_GATE_ACACIA = 187; + const DOUBLE_STONE_SLAB2 = 181; + const STONE_SLAB2 = 182; + const SPRUCE_FENCE_GATE = 183; + const BIRCH_FENCE_GATE = 184; + const JUNGLE_FENCE_GATE = 185; + const DARK_OAK_FENCE_GATE = 186; + const ACACIA_FENCE_GATE = 187; + const REPEATING_COMMAND_BLOCK = 188; + const CHAIN_COMMAND_BLOCK = 189; const SPRUCE_DOOR_BLOCK = 193; const BIRCH_DOOR_BLOCK = 194; @@ -219,16 +221,56 @@ interface BlockIds{ const ACACIA_DOOR_BLOCK = 196; const DARK_OAK_DOOR_BLOCK = 197; const GRASS_PATH = 198; - const ITEM_FRAME_BLOCK = 199; + const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199; + const CHORUS_FLOWER = 200; + const PURPUR_BLOCK = 201; + + const PURPUR_STAIRS = 203; + + const END_BRICKS = 206; + const FROSTED_ICE = 207; + const END_ROD = 208; + const END_GATEWAY = 209; + + const MAGMA = 213; + const NETHER_WART_BLOCK = 214; + const RED_NETHER_BRICK = 215; + const BONE_BLOCK = 216; + + const SHULKER_BOX = 218; + const PURPLE_GLAZED_TERRACOTTA = 219; + const WHITE_GLAZED_TERRACOTTA = 220; + const ORANGE_GLAZED_TERRACOTTA = 221; + const MAGENTA_GLAZED_TERRACOTTA = 222; + const LIGHT_BLUE_GLAZED_TERRACOTTA = 223; + const YELLOW_GLAZED_TERRACOTTA = 224; + const LIME_GLAZED_TERRACOTTA = 225; + const PINK_GLAZED_TERRACOTTA = 226; + const GRAY_GLAZED_TERRACOTTA = 227; + const SILVER_GLAZED_TERRACOTTA = 228; + const CYAN_GLAZED_TERRACOTTA = 229; + + const BLUE_GLAZED_TERRACOTTA = 231; + const BROWN_GLAZED_TERRACOTTA = 232; + const GREEN_GLAZED_TERRACOTTA = 233; + const RED_GLAZED_TERRACOTTA = 234; + const BLACK_GLAZED_TERRACOTTA = 235; + const CONCRETE = 236; + const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237; + + const CHORUS_PLANT = 240; + const STAINED_GLASS = 241; const PODZOL = 243; const BEETROOT_BLOCK = 244; const STONECUTTER = 245; - const GLOWING_OBSIDIAN = 246; - const NETHER_REACTOR = 247; - const UPDATE_BLOCK = 248; - const ATEUPD_BLOCK = 249; - const BLOCK_MOVED_BY_PISTON = 250; + const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246; + const NETHERREACTOR = 247, NETHER_REACTOR = 247; + const INFO_UPDATE = 248; + const INFO_UPDATE2 = 249; + const MOVINGBLOCK = 250, MOVING_BLOCK = 250; const OBSERVER = 251; - const INFO_RESERVED6 = 255; + + const RESERVED6 = 255; + } diff --git a/src/pocketmine/block/Bricks.php b/src/pocketmine/block/Bricks.php index edb45b897b..4eb22d9282 100644 --- a/src/pocketmine/block/Bricks.php +++ b/src/pocketmine/block/Bricks.php @@ -28,7 +28,7 @@ use pocketmine\item\Tool; class Bricks extends Solid{ - protected $id = self::BRICKS_BLOCK; + protected $id = self::BRICK_BLOCK; public function __construct($meta = 0){ $this->meta = $meta; @@ -53,7 +53,7 @@ class Bricks extends Solid{ public function getDrops(Item $item){ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - [Item::BRICKS_BLOCK, 0, 1], + [Item::BRICK_BLOCK, 0, 1], ]; }else{ return []; diff --git a/src/pocketmine/block/StoneWall.php b/src/pocketmine/block/CobblestoneWall.php similarity index 89% rename from src/pocketmine/block/StoneWall.php rename to src/pocketmine/block/CobblestoneWall.php index f7ebd5290a..ff918482dc 100644 --- a/src/pocketmine/block/StoneWall.php +++ b/src/pocketmine/block/CobblestoneWall.php @@ -27,11 +27,11 @@ use pocketmine\item\Tool; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; -class StoneWall extends Transparent{ +class CobblestoneWall extends Transparent{ const NONE_MOSSY_WALL = 0; const MOSSY_WALL = 1; - protected $id = self::STONE_WALL; + protected $id = self::COBBLESTONE_WALL; public function __construct($meta = 0){ $this->meta = $meta; @@ -88,7 +88,7 @@ class StoneWall extends Transparent{ } public function canConnect(Block $block){ - return ($block->getId() !== self::COBBLE_WALL and $block->getId() !== self::FENCE_GATE) ? $block->isSolid() and !$block->isTransparent() : true; + return ($block->getId() !== self::COBBLESTONE_WALL and $block->getId() !== self::FENCE_GATE) ? $block->isSolid() and !$block->isTransparent() : true; } } diff --git a/src/pocketmine/block/Workbench.php b/src/pocketmine/block/CraftingTable.php similarity index 94% rename from src/pocketmine/block/Workbench.php rename to src/pocketmine/block/CraftingTable.php index fab2ee388d..fea3307e00 100644 --- a/src/pocketmine/block/Workbench.php +++ b/src/pocketmine/block/CraftingTable.php @@ -27,9 +27,9 @@ use pocketmine\item\Item; use pocketmine\item\Tool; use pocketmine\Player; -class Workbench extends Solid{ +class CraftingTable extends Solid{ - protected $id = self::WORKBENCH; + protected $id = self::CRAFTING_TABLE; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/DarkOakWoodStairs.php b/src/pocketmine/block/DarkOakWoodStairs.php index b126d7af92..b41fd0ba1a 100644 --- a/src/pocketmine/block/DarkOakWoodStairs.php +++ b/src/pocketmine/block/DarkOakWoodStairs.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class DarkOakWoodStairs extends WoodStairs{ - protected $id = self::DARK_OAK_WOOD_STAIRS; + protected $id = self::DARK_OAK_STAIRS; public function getName(){ return "Dark Oak Wood Stairs"; diff --git a/src/pocketmine/block/DoubleSlab.php b/src/pocketmine/block/DoubleStoneSlab.php similarity index 91% rename from src/pocketmine/block/DoubleSlab.php rename to src/pocketmine/block/DoubleStoneSlab.php index 021038bceb..84fb76b049 100644 --- a/src/pocketmine/block/DoubleSlab.php +++ b/src/pocketmine/block/DoubleStoneSlab.php @@ -26,9 +26,9 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\item\Tool; -class DoubleSlab extends Solid{ +class DoubleStoneSlab extends Solid{ - protected $id = self::DOUBLE_SLAB; + protected $id = self::DOUBLE_STONE_SLAB; public function __construct($meta = 0){ $this->meta = $meta; @@ -59,7 +59,7 @@ class DoubleSlab extends Solid{ public function getDrops(Item $item){ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - [Item::SLAB, $this->meta & 0x07, 2], + [Item::STONE_SLAB, $this->meta & 0x07, 2], ]; }else{ return []; diff --git a/src/pocketmine/block/DoubleWoodSlab.php b/src/pocketmine/block/DoubleWoodSlab.php index 16c95678a2..51ea6501c7 100644 --- a/src/pocketmine/block/DoubleWoodSlab.php +++ b/src/pocketmine/block/DoubleWoodSlab.php @@ -28,7 +28,7 @@ use pocketmine\item\Tool; class DoubleWoodSlab extends Solid{ - protected $id = self::DOUBLE_WOOD_SLAB; + protected $id = self::DOUBLE_WOODEN_SLAB; public function __construct($meta = 0){ $this->meta = $meta; @@ -58,7 +58,7 @@ class DoubleWoodSlab extends Solid{ public function getDrops(Item $item){ return [ - [Item::WOOD_SLAB, $this->meta & 0x07, 2], + [Item::WOODEN_SLAB, $this->meta & 0x07, 2], ]; } diff --git a/src/pocketmine/block/FenceGateAcacia.php b/src/pocketmine/block/FenceGateAcacia.php index 03b1bc0c21..5d38d18220 100644 --- a/src/pocketmine/block/FenceGateAcacia.php +++ b/src/pocketmine/block/FenceGateAcacia.php @@ -26,7 +26,7 @@ namespace pocketmine\block; class FenceGateAcacia extends FenceGate{ - protected $id = self::FENCE_GATE_ACACIA; + protected $id = self::ACACIA_FENCE_GATE; public function getName(){ return "Acacia Fence Gate"; diff --git a/src/pocketmine/block/FenceGateBirch.php b/src/pocketmine/block/FenceGateBirch.php index 7a524702d5..539dcec7be 100644 --- a/src/pocketmine/block/FenceGateBirch.php +++ b/src/pocketmine/block/FenceGateBirch.php @@ -26,7 +26,7 @@ namespace pocketmine\block; class FenceGateBirch extends FenceGate{ - protected $id = self::FENCE_GATE_BIRCH; + protected $id = self::BIRCH_FENCE_GATE; public function getName(){ return "Birch Fence Gate"; diff --git a/src/pocketmine/block/FenceGateDarkOak.php b/src/pocketmine/block/FenceGateDarkOak.php index 44e2d8cc37..77cd1c2fbd 100644 --- a/src/pocketmine/block/FenceGateDarkOak.php +++ b/src/pocketmine/block/FenceGateDarkOak.php @@ -26,7 +26,7 @@ namespace pocketmine\block; class FenceGateDarkOak extends FenceGate{ - protected $id = self::FENCE_GATE_DARK_OAK; + protected $id = self::DARK_OAK_FENCE_GATE; public function getName(){ return "Dark Oak Fence Gate"; diff --git a/src/pocketmine/block/FenceGateJungle.php b/src/pocketmine/block/FenceGateJungle.php index a0831f213c..88badf201a 100644 --- a/src/pocketmine/block/FenceGateJungle.php +++ b/src/pocketmine/block/FenceGateJungle.php @@ -26,7 +26,7 @@ namespace pocketmine\block; class FenceGateJungle extends FenceGate{ - protected $id = self::FENCE_GATE_JUNGLE; + protected $id = self::JUNGLE_FENCE_GATE; public function getName(){ return "Jungle Fence Gate"; diff --git a/src/pocketmine/block/FenceGateSpruce.php b/src/pocketmine/block/FenceGateSpruce.php index 3c243dde33..cd5f4854b8 100644 --- a/src/pocketmine/block/FenceGateSpruce.php +++ b/src/pocketmine/block/FenceGateSpruce.php @@ -26,7 +26,7 @@ namespace pocketmine\block; class FenceGateSpruce extends FenceGate{ - protected $id = self::FENCE_GATE_SPRUCE; + protected $id = self::SPRUCE_FENCE_GATE; public function getName(){ return "Spruce Fence Gate"; diff --git a/src/pocketmine/block/Glowstone.php b/src/pocketmine/block/Glowstone.php index c581806f98..592acbeb30 100644 --- a/src/pocketmine/block/Glowstone.php +++ b/src/pocketmine/block/Glowstone.php @@ -28,7 +28,7 @@ use pocketmine\item\Tool; class Glowstone extends Transparent{ - protected $id = self::GLOWSTONE_BLOCK; + protected $id = self::GLOWSTONE; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/JungleWoodStairs.php b/src/pocketmine/block/JungleWoodStairs.php index 523cf4995a..4f14c39e5f 100644 --- a/src/pocketmine/block/JungleWoodStairs.php +++ b/src/pocketmine/block/JungleWoodStairs.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class JungleWoodStairs extends WoodStairs{ - protected $id = self::JUNGLE_WOOD_STAIRS; + protected $id = self::JUNGLE_STAIRS; public function getName(){ return "Jungle Wood Stairs"; diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php index 8ed5c6b470..88cc81f6ae 100644 --- a/src/pocketmine/block/Lava.php +++ b/src/pocketmine/block/Lava.php @@ -34,7 +34,7 @@ use pocketmine\Server; class Lava extends Liquid{ - protected $id = self::LAVA; + protected $id = self::FLOWING_LAVA; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/MossStone.php b/src/pocketmine/block/MossyCobblestone.php similarity index 90% rename from src/pocketmine/block/MossStone.php rename to src/pocketmine/block/MossyCobblestone.php index 00dc7ef7d5..3eec116642 100644 --- a/src/pocketmine/block/MossStone.php +++ b/src/pocketmine/block/MossyCobblestone.php @@ -26,9 +26,9 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\item\Tool; -class MossStone extends Solid{ +class MossyCobblestone extends Solid{ - protected $id = self::MOSS_STONE; + protected $id = self::MOSSY_COBBLESTONE; public function __construct($meta = 0){ $this->meta = $meta; @@ -49,7 +49,7 @@ class MossStone extends Solid{ public function getDrops(Item $item){ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - [Item::MOSS_STONE, $this->meta, 1], + [Item::MOSSY_COBBLESTONE, $this->meta, 1], ]; }else{ return []; diff --git a/src/pocketmine/block/NetherBrick.php b/src/pocketmine/block/NetherBrick.php index 33e70f9be0..17d35c5f4e 100644 --- a/src/pocketmine/block/NetherBrick.php +++ b/src/pocketmine/block/NetherBrick.php @@ -28,7 +28,7 @@ use pocketmine\item\Tool; class NetherBrick extends Solid{ - protected $id = self::NETHER_BRICKS; + protected $id = self::NETHER_BRICK; public function __construct($meta = 0){ $this->meta = $meta; @@ -49,7 +49,7 @@ class NetherBrick extends Solid{ public function getDrops(Item $item){ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - [Item::NETHER_BRICKS, 0, 1], + [Item::NETHER_BRICK, 0, 1], ]; }else{ return []; diff --git a/src/pocketmine/block/NetherBrickStairs.php b/src/pocketmine/block/NetherBrickStairs.php index 1b935f1ea5..6c56002994 100644 --- a/src/pocketmine/block/NetherBrickStairs.php +++ b/src/pocketmine/block/NetherBrickStairs.php @@ -27,10 +27,10 @@ use pocketmine\item\Tool; class NetherBrickStairs extends Stair{ - protected $id = self::NETHER_BRICKS_STAIRS; + protected $id = self::NETHER_BRICK_STAIRS; public function getName(){ - return "Nether Bricks Stairs"; + return "Nether Brick Stairs"; } public function getHardness(){ diff --git a/src/pocketmine/block/MobHead.php b/src/pocketmine/block/Skull.php similarity index 94% rename from src/pocketmine/block/MobHead.php rename to src/pocketmine/block/Skull.php index c9a0abe87d..93254aa1e0 100644 --- a/src/pocketmine/block/MobHead.php +++ b/src/pocketmine/block/Skull.php @@ -35,9 +35,9 @@ use pocketmine\tile\Skull as SkullTile; use pocketmine\tile\Spawnable; use pocketmine\tile\Tile; -class MobHead extends Flowable{ +class Skull extends Flowable{ - protected $id = self::MOB_HEAD_BLOCK; + protected $id = self::SKULL_BLOCK; public function __construct($meta = 0){ $this->meta = $meta; @@ -48,7 +48,7 @@ class MobHead extends Flowable{ } public function getName(){ - return "Mob Head"; + return "Mob Head Block"; } protected function recalculateBoundingBox(){ @@ -94,7 +94,7 @@ class MobHead extends Flowable{ $tile = $this->level->getTile($this); if($tile instanceof SkullTile){ return [ - [Item::MOB_HEAD, $tile->getType(), 1] + [Item::SKULL, $tile->getType(), 1] ]; } diff --git a/src/pocketmine/block/Slab.php b/src/pocketmine/block/Slab.php index 62fbbc47e9..5bcdf2c770 100644 --- a/src/pocketmine/block/Slab.php +++ b/src/pocketmine/block/Slab.php @@ -28,7 +28,7 @@ use pocketmine\item\Tool; use pocketmine\math\AxisAlignedBB; use pocketmine\Player; -class Slab extends WoodSlab{ +class Slab extends WoodenSlab{ const STONE = 0; const SANDSTONE = 1; const WOODEN = 2; @@ -38,9 +38,9 @@ class Slab extends WoodSlab{ const QUARTZ = 6; const NETHER_BRICK = 7; - protected $id = self::SLAB; + protected $id = self::STONE_SLAB; - protected $doubleId = self::DOUBLE_SLAB; + protected $doubleId = self::DOUBLE_STONE_SLAB; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/SpruceWoodStairs.php b/src/pocketmine/block/SpruceWoodStairs.php index 7d46245a83..42fcbe018c 100644 --- a/src/pocketmine/block/SpruceWoodStairs.php +++ b/src/pocketmine/block/SpruceWoodStairs.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class SpruceWoodStairs extends WoodStairs{ - protected $id = self::SPRUCE_WOOD_STAIRS; + protected $id = self::SPRUCE_STAIRS; public function getName(){ return "Spruce Wood Stairs"; diff --git a/src/pocketmine/block/Torch.php b/src/pocketmine/block/Torch.php index 841d6a4b00..ee6fe43341 100644 --- a/src/pocketmine/block/Torch.php +++ b/src/pocketmine/block/Torch.php @@ -57,7 +57,7 @@ class Torch extends Flowable{ 5 => 0 ]; - if($this->getSide($faces[$side])->isTransparent() === true and !($side === 0 and ($below->getId() === self::FENCE or $below->getId() === self::COBBLE_WALL))){ + if($this->getSide($faces[$side])->isTransparent() === true and !($side === 0 and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; @@ -82,7 +82,7 @@ class Torch extends Flowable{ $this->getLevel()->setBlock($block, $this, true, true); return true; - }elseif($below->isTransparent() === false or $below->getId() === self::FENCE or $below->getId() === self::COBBLE_WALL){ + }elseif($below->isTransparent() === false or $below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL){ $this->meta = 0; $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Water.php b/src/pocketmine/block/Water.php index ae3503cbaa..e12cb62f12 100644 --- a/src/pocketmine/block/Water.php +++ b/src/pocketmine/block/Water.php @@ -29,7 +29,7 @@ use pocketmine\Player; class Water extends Liquid{ - protected $id = self::WATER; + protected $id = self::FLOWING_WATER; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/WeightedPressurePlateHeavy.php b/src/pocketmine/block/WeightedPressurePlateHeavy.php index 844b4f4c8b..caeb76af06 100644 --- a/src/pocketmine/block/WeightedPressurePlateHeavy.php +++ b/src/pocketmine/block/WeightedPressurePlateHeavy.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class WeightedPressurePlateHeavy extends WeightedPressurePlateLight{ - protected $id = self::WEIGHTED_PRESSURE_PLATE_HEAVY; + protected $id = self::HEAVY_WEIGHTED_PRESSURE_PLATE; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/WeightedPressurePlateLight.php b/src/pocketmine/block/WeightedPressurePlateLight.php index 5fca5f0319..4e7dcbbac1 100644 --- a/src/pocketmine/block/WeightedPressurePlateLight.php +++ b/src/pocketmine/block/WeightedPressurePlateLight.php @@ -25,7 +25,7 @@ namespace pocketmine\block; class WeightedPressurePlateLight extends Transparent{ - protected $id = self::WEIGHTED_PRESSURE_PLATE_LIGHT; + protected $id = self::LIGHT_WEIGHTED_PRESSURE_PLATE; public function __construct($meta = 0){ $this->meta = $meta; diff --git a/src/pocketmine/block/Wood.php b/src/pocketmine/block/Wood.php index 5701906330..5d9e1b6052 100644 --- a/src/pocketmine/block/Wood.php +++ b/src/pocketmine/block/Wood.php @@ -32,8 +32,6 @@ class Wood extends Solid{ const SPRUCE = 1; const BIRCH = 2; const JUNGLE = 3; - //const ACACIA = 4; - //const DARK_OAK = 5; protected $id = self::WOOD; diff --git a/src/pocketmine/block/WoodStairs.php b/src/pocketmine/block/WoodStairs.php index 79819902a8..7d4207a3e0 100644 --- a/src/pocketmine/block/WoodStairs.php +++ b/src/pocketmine/block/WoodStairs.php @@ -28,14 +28,14 @@ use pocketmine\item\Tool; class WoodStairs extends Stair{ - protected $id = self::WOOD_STAIRS; + protected $id = self::OAK_STAIRS; public function __construct($meta = 0){ $this->meta = $meta; } public function getName(){ - return "Wood Stairs"; + return "Oak Wood Stairs"; } public function getHardness(){ diff --git a/src/pocketmine/block/WoodDoor.php b/src/pocketmine/block/WoodenDoor.php similarity index 91% rename from src/pocketmine/block/WoodDoor.php rename to src/pocketmine/block/WoodenDoor.php index 64ceea5eab..444205fbdc 100644 --- a/src/pocketmine/block/WoodDoor.php +++ b/src/pocketmine/block/WoodenDoor.php @@ -26,16 +26,16 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\item\Tool; -class WoodDoor extends Door{ +class WoodenDoor extends Door{ - protected $id = self::WOOD_DOOR_BLOCK; + protected $id = self::WOODEN_DOOR_BLOCK; public function __construct($meta = 0){ $this->meta = $meta; } public function getName(){ - return "Wood Door Block"; + return "Wooden Door Block"; } public function getHardness(){ diff --git a/src/pocketmine/block/WoodSlab.php b/src/pocketmine/block/WoodenSlab.php similarity index 97% rename from src/pocketmine/block/WoodSlab.php rename to src/pocketmine/block/WoodenSlab.php index 268297dc22..cd7227a597 100644 --- a/src/pocketmine/block/WoodSlab.php +++ b/src/pocketmine/block/WoodenSlab.php @@ -28,9 +28,9 @@ use pocketmine\item\Tool; use pocketmine\math\AxisAlignedBB; use pocketmine\Player; -class WoodSlab extends Transparent{ +class WoodenSlab extends Transparent{ - protected $id = self::WOOD_SLAB; + protected $id = self::WOODEN_SLAB; protected $doubleId = self::DOUBLE_WOODEN_SLAB; diff --git a/src/pocketmine/inventory/Fuel.php b/src/pocketmine/inventory/Fuel.php index ef9586ee40..d7862b4c9a 100644 --- a/src/pocketmine/inventory/Fuel.php +++ b/src/pocketmine/inventory/Fuel.php @@ -30,7 +30,7 @@ abstract class Fuel{ public static $duration = [ Item::COAL => 1600, Item::COAL_BLOCK => 16000, - Item::TRUNK => 300, + Item::WOOD => 300, Item::WOODEN_PLANKS => 300, Item::SAPLING => 100, Item::WOODEN_AXE => 200, @@ -41,15 +41,15 @@ abstract class Fuel{ Item::STICK => 100, Item::FENCE => 300, Item::FENCE_GATE => 300, - Item::FENCE_GATE_SPRUCE => 300, - Item::FENCE_GATE_BIRCH => 300, - Item::FENCE_GATE_JUNGLE => 300, - Item::FENCE_GATE_ACACIA => 300, - Item::FENCE_GATE_DARK_OAK => 300, + Item::SPRUCE_FENCE_GATE => 300, + Item::BIRCH_FENCE_GATE => 300, + Item::JUNGLE_FENCE_GATE => 300, + Item::ACACIA_FENCE_GATE => 300, + Item::DARK_OAK_FENCE_GATE => 300, Item::WOODEN_STAIRS => 300, - Item::SPRUCE_WOOD_STAIRS => 300, - Item::BIRCH_WOOD_STAIRS => 300, - Item::JUNGLE_WOOD_STAIRS => 300, + Item::SPRUCE_STAIRS => 300, + Item::BIRCH_STAIRS => 300, + Item::JUNGLE_STAIRS => 300, Item::TRAPDOOR => 300, Item::WORKBENCH => 300, Item::BOOKSHELF => 300, diff --git a/src/pocketmine/item/Camera.php b/src/pocketmine/item/Camera.php deleted file mode 100644 index 7179a8ecb0..0000000000 --- a/src/pocketmine/item/Camera.php +++ /dev/null @@ -1,32 +0,0 @@ -block = Block::get(Item::SKULL_BLOCK); - parent::__construct(self::MOB_HEAD, $meta, $count, "Mob Head"); + parent::__construct(self::SKULL, $meta, $count, "Mob Head"); } } \ No newline at end of file diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 574f71f30a..91784c3ae5 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -1782,7 +1782,7 @@ class Level implements ChunkManager, Metadatable{ return false; } - if(!($block->canBeReplaced() === true or ($hand->getId() === Item::WOOD_SLAB and $block->getId() === Item::WOOD_SLAB) or ($hand->getId() === Item::SLAB and $block->getId() === Item::SLAB))){ + if(!($block->canBeReplaced() === true or ($hand->getId() === Item::WOODEN_SLAB and $block->getId() === Item::WOODEN_SLAB) or ($hand->getId() === Item::STONE_SLAB and $block->getId() === Item::STONE_SLAB))){ return false; }