diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php index a54769d5f..f8a91a1b9 100644 --- a/src/pocketmine/block/BlockFactory.php +++ b/src/pocketmine/block/BlockFactory.php @@ -123,7 +123,6 @@ class BlockFactory{ self::registerBlock(new Glass(Block::GLASS, 0, "Glass")); self::registerBlock(new LapisOre()); self::registerBlock(new Lapis()); - //TODO: DISPENSER static $sandstoneTypes = [ Sandstone::NORMAL => "", @@ -139,7 +138,7 @@ class BlockFactory{ self::registerBlock(new Bed()); self::registerBlock(new PoweredRail()); self::registerBlock(new DetectorRail()); - //TODO: STICKY_PISTON + self::registerBlock(new Cobweb()); self::registerBlock(new TallGrass(Block::TALL_GRASS, 0, "Fern")); @@ -148,8 +147,6 @@ class BlockFactory{ self::registerBlock(new TallGrass(Block::TALL_GRASS, 3, "Fern")); self::registerBlock(new DeadBush()); - //TODO: PISTON - //TODO: PISTONARMCOLLISION foreach(DyeColor::getAll() as $color){ self::registerBlock(new Wool(Block::WOOL, $color->getMagicNumber(), $color->getDisplayName() . " Wool")); @@ -246,20 +243,18 @@ class BlockFactory{ self::registerBlock(new Cactus()); self::registerBlock(new Clay()); self::registerBlock(new Sugarcane()); - //TODO: JUKEBOX self::registerBlock(new Pumpkin()); self::registerBlock(new Netherrack()); self::registerBlock(new SoulSand()); self::registerBlock(new Glowstone()); - //TODO: PORTAL + self::registerBlock(new LitPumpkin()); self::registerBlock(new Cake()); self::registerBlock(new RedstoneRepeater()); self::registerBlock((new RedstoneRepeater())->setPowered()); self::registerBlock(new InvisibleBedrock()); self::registerBlock(new Trapdoor()); - //TODO: MONSTER_EGG self::registerBlock(new StoneBricks(Block::STONE_BRICKS, StoneBricks::NORMAL, "Stone Bricks")); self::registerBlock(new StoneBricks(Block::STONE_BRICKS, StoneBricks::MOSSY, "Mossy Stone Bricks")); @@ -285,14 +280,13 @@ class BlockFactory{ self::registerBlock(new NetherWartPlant()); self::registerBlock(new EnchantingTable()); self::registerBlock(new BrewingStand()); - //TODO: CAULDRON_BLOCK - //TODO: END_PORTAL + self::registerBlock(new EndPortalFrame()); self::registerBlock(new EndStone()); - //TODO: DRAGON_EGG + self::registerBlock(new RedstoneLamp()); self::registerBlock((new RedstoneLamp())->setLit()); //flattening hack - //TODO: DROPPER + self::registerBlock(new ActivatorRail()); self::registerBlock(new CocoaBlock()); self::registerBlock(new SandstoneStairs()); @@ -304,8 +298,6 @@ class BlockFactory{ self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs")); self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs")); self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs")); - //TODO: COMMAND_BLOCK - //TODO: BEACON static $wallTypes = [ CobblestoneWall::NONE_MOSSY_WALL => "Cobblestone", @@ -340,14 +332,12 @@ class BlockFactory{ self::registerBlock(new TrappedChest()); self::registerBlock(new WeightedPressurePlateLight()); self::registerBlock(new WeightedPressurePlateHeavy()); - //TODO: COMPARATOR_BLOCK - //TODO: POWERED_COMPARATOR + self::registerBlock(new DaylightSensor()); self::registerBlock((new DaylightSensor())->setInverted()); //flattening hack self::registerBlock(new Redstone()); self::registerBlock(new NetherQuartzOre()); - //TODO: HOPPER_BLOCK self::registerBlock(new Quartz(Block::QUARTZ_BLOCK, Quartz::NORMAL, "Quartz Block")); self::registerBlock(new class(Block::QUARTZ_BLOCK, Quartz::CHISELED, "Chiseled Quartz Block") extends Quartz{ @@ -366,7 +356,6 @@ class BlockFactory{ self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs")); self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs")); - //TODO: SLIME self::registerBlock(new IronTrapdoor()); @@ -397,8 +386,6 @@ class BlockFactory{ self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate")); self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate")); self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate")); - //TODO: REPEATING_COMMAND_BLOCK - //TODO: CHAIN_COMMAND_BLOCK self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR)); self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR)); @@ -407,22 +394,17 @@ class BlockFactory{ self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR)); self::registerBlock(new GrassPath()); self::registerBlock(new ItemFrame()); - //TODO: CHORUS_FLOWER self::registerBlock(new PurpurStairs()); - //TODO: UNDYED_SHULKER_BOX self::registerBlock(new EndStoneBricks()); - //TODO: FROSTED_ICE self::registerBlock(new EndRod()); - //TODO: END_GATEWAY self::registerBlock(new Magma()); self::registerBlock(new NetherWartBlock()); self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks")); self::registerBlock(new BoneBlock()); - //TODO: SHULKER_BOX self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta")); self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta")); self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta")); @@ -441,8 +423,6 @@ class BlockFactory{ self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta")); self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta")); - //TODO: CHORUS_PLANT - self::registerBlock(new Podzol()); self::registerBlock(new Beetroot()); self::registerBlock(new Stonecutter()); @@ -450,11 +430,130 @@ class BlockFactory{ self::registerBlock(new NetherReactor()); self::registerBlock(new InfoUpdate(Block::INFO_UPDATE, 0, "update!")); self::registerBlock(new InfoUpdate(Block::INFO_UPDATE2, 0, "ate!upd")); - //TODO: MOVINGBLOCK - //TODO: OBSERVER - //TODO: STRUCTURE_BLOCK self::registerBlock(new Reserved6(Block::RESERVED6, 0, "reserved6")); + + //TODO: minecraft:acacia_button + //TODO: minecraft:acacia_pressure_plate + //TODO: minecraft:acacia_standing_sign + //TODO: minecraft:acacia_trapdoor + //TODO: minecraft:acacia_wall_sign + //TODO: minecraft:andesite_stairs + //TODO: minecraft:bamboo + //TODO: minecraft:bamboo_sapling + //TODO: minecraft:barrel + //TODO: minecraft:barrier + //TODO: minecraft:beacon + //TODO: minecraft:bell + //TODO: minecraft:birch_button + //TODO: minecraft:birch_pressure_plate + //TODO: minecraft:birch_standing_sign + //TODO: minecraft:birch_trapdoor + //TODO: minecraft:birch_wall_sign + //TODO: minecraft:blast_furnace + //TODO: minecraft:blue_ice + //TODO: minecraft:bubble_column + //TODO: minecraft:cartography_table + //TODO: minecraft:carved_pumpkin + //TODO: minecraft:cauldron + //TODO: minecraft:chain_command_block + //TODO: minecraft:chemical_heat + //TODO: minecraft:chemistry_table + //TODO: minecraft:chorus_flower + //TODO: minecraft:chorus_plant + //TODO: minecraft:colored_torch_bp + //TODO: minecraft:colored_torch_rg + //TODO: minecraft:command_block + //TODO: minecraft:conduit + //TODO: minecraft:coral + //TODO: minecraft:coral_block + //TODO: minecraft:coral_fan + //TODO: minecraft:coral_fan_dead + //TODO: minecraft:coral_fan_hang + //TODO: minecraft:coral_fan_hang2 + //TODO: minecraft:coral_fan_hang3 + //TODO: minecraft:dark_oak_button + //TODO: minecraft:dark_oak_pressure_plate + //TODO: minecraft:dark_oak_trapdoor + //TODO: minecraft:dark_prismarine_stairs + //TODO: minecraft:darkoak_standing_sign + //TODO: minecraft:darkoak_wall_sign + //TODO: minecraft:diorite_stairs + //TODO: minecraft:dispenser + //TODO: minecraft:double_stone_slab3 + //TODO: minecraft:double_stone_slab4 + //TODO: minecraft:dragon_egg + //TODO: minecraft:dried_kelp_block + //TODO: minecraft:dropper + //TODO: minecraft:element_0 + //TODO: minecraft:end_brick_stairs + //TODO: minecraft:end_gateway + //TODO: minecraft:end_portal + //TODO: minecraft:fletching_table + //TODO: minecraft:frosted_ice + //TODO: minecraft:granite_stairs + //TODO: minecraft:grindstone + //TODO: minecraft:hard_glass + //TODO: minecraft:hard_glass_pane + //TODO: minecraft:hard_stained_glass + //TODO: minecraft:hard_stained_glass_pane + //TODO: minecraft:hopper + //TODO: minecraft:jukebox + //TODO: minecraft:jungle_button + //TODO: minecraft:jungle_pressure_plate + //TODO: minecraft:jungle_standing_sign + //TODO: minecraft:jungle_trapdoor + //TODO: minecraft:jungle_wall_sign + //TODO: minecraft:kelp + //TODO: minecraft:lantern + //TODO: minecraft:lava_cauldron + //TODO: minecraft:monster_egg + //TODO: minecraft:mossy_cobblestone_stairs + //TODO: minecraft:mossy_stone_brick_stairs + //TODO: minecraft:movingBlock + //TODO: minecraft:normal_stone_stairs + //TODO: minecraft:observer + //TODO: minecraft:piston + //TODO: minecraft:pistonArmCollision + //TODO: minecraft:polished_andesite_stairs + //TODO: minecraft:polished_diorite_stairs + //TODO: minecraft:polished_granite_stairs + //TODO: minecraft:portal + //TODO: minecraft:powered_comparator + //TODO: minecraft:prismarine_bricks_stairs + //TODO: minecraft:prismarine_stairs + //TODO: minecraft:red_nether_brick_stairs + //TODO: minecraft:repeating_command_block + //TODO: minecraft:scaffolding + //TODO: minecraft:sea_pickle + //TODO: minecraft:seagrass + //TODO: minecraft:shulker_box + //TODO: minecraft:slime + //TODO: minecraft:smithing_table + //TODO: minecraft:smoker + //TODO: minecraft:smooth_quartz_stairs + //TODO: minecraft:smooth_red_sandstone_stairs + //TODO: minecraft:smooth_sandstone_stairs + //TODO: minecraft:smooth_stone + //TODO: minecraft:spruce_button + //TODO: minecraft:spruce_pressure_plate + //TODO: minecraft:spruce_standing_sign + //TODO: minecraft:spruce_trapdoor + //TODO: minecraft:spruce_wall_sign + //TODO: minecraft:sticky_piston + //TODO: minecraft:stone_slab3 + //TODO: minecraft:stone_slab4 + //TODO: minecraft:stripped_acacia_log + //TODO: minecraft:stripped_birch_log + //TODO: minecraft:stripped_dark_oak_log + //TODO: minecraft:stripped_jungle_log + //TODO: minecraft:stripped_oak_log + //TODO: minecraft:stripped_spruce_log + //TODO: minecraft:structure_block + //TODO: minecraft:turtle_egg + //TODO: minecraft:underwater_torch + //TODO: minecraft:undyed_shulker_box + //TODO: minecraft:unpowered_comparator } public static function isInit() : bool{ diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 92118db5a..3b671d65f 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -129,21 +129,20 @@ class ItemFactory{ self::registerItem(new LiquidBucket(Item::BUCKET, 10, "Lava Bucket", Block::FLOWING_LAVA)); self::registerItem(new Minecart()); - //TODO: SADDLE + self::registerItem(new ItemBlock(Block::IRON_DOOR_BLOCK, 0, Item::IRON_DOOR)); self::registerItem(new Redstone()); self::registerItem(new Snowball()); self::registerItem(new Boat()); self::registerItem(new Item(Item::LEATHER, 0, "Leather")); - //TODO: KELP + self::registerItem(new Item(Item::BRICK, 0, "Brick")); self::registerItem(new Item(Item::CLAY_BALL, 0, "Clay")); self::registerItem(new ItemBlock(Block::SUGARCANE_BLOCK, 0, Item::SUGARCANE)); self::registerItem(new Item(Item::PAPER, 0, "Paper")); self::registerItem(new Book()); self::registerItem(new Item(Item::SLIME_BALL, 0, "Slimeball")); - //TODO: CHEST_MINECART self::registerItem(new Egg()); self::registerItem(new Compass()); @@ -166,7 +165,7 @@ class ItemFactory{ self::registerItem(new ItemBlock(Block::REPEATER_BLOCK, 0, Item::REPEATER)); self::registerItem(new Cookie()); - //TODO: FILLED_MAP + self::registerItem(new Shears()); self::registerItem(new Melon()); self::registerItem(new PumpkinSeeds()); @@ -185,7 +184,6 @@ class ItemFactory{ foreach(Potion::ALL as $type){ self::registerItem(new Potion($type)); self::registerItem(new SplashPotion($type)); - //TODO: LINGERING_POTION } self::registerItem(new GlassBottle()); self::registerItem(new SpiderEye()); @@ -194,7 +192,7 @@ class ItemFactory{ self::registerItem(new Item(Item::MAGMA_CREAM, 0, "Magma Cream")); self::registerItem(new ItemBlock(Block::BREWING_STAND_BLOCK, 0, Item::BREWING_STAND)); self::registerItem(new ItemBlock(Block::CAULDRON_BLOCK, 0, Item::CAULDRON)); - //TODO: ENDER_EYE + self::registerItem(new Item(Item::GLISTERING_MELON, 0, "Glistering Melon")); foreach(EntityFactory::getKnownTypes() as $className){ @@ -205,7 +203,7 @@ class ItemFactory{ } self::registerItem(new ExperienceBottle()); - //TODO: FIREBALL + self::registerItem(new WritableBook()); self::registerItem(new WrittenBook()); self::registerItem(new Item(Item::EMERALD, 0, "Emerald")); @@ -215,7 +213,7 @@ class ItemFactory{ self::registerItem(new Potato()); self::registerItem(new BakedPotato()); self::registerItem(new PoisonousPotato()); - //TODO: EMPTYMAP + self::registerItem(new GoldenCarrot()); self::registerItem(new ItemBlock(Block::SKULL_BLOCK, Skull::TYPE_SKELETON, Item::SKULL)); @@ -225,17 +223,13 @@ class ItemFactory{ self::registerItem(new ItemBlock(Block::SKULL_BLOCK, Skull::TYPE_CREEPER, Item::SKULL)); self::registerItem(new ItemBlock(Block::SKULL_BLOCK, Skull::TYPE_DRAGON, Item::SKULL)); - //TODO: CARROTONASTICK self::registerItem(new Item(Item::NETHER_STAR, 0, "Nether Star")); self::registerItem(new PumpkinPie()); - //TODO: FIREWORKS - //TODO: FIREWORKSCHARGE - //TODO: ENCHANTED_BOOK + self::registerItem(new ItemBlock(Block::COMPARATOR_BLOCK, 0, Item::COMPARATOR)); self::registerItem(new Item(Item::NETHER_BRICK, 0, "Nether Brick")); self::registerItem(new Item(Item::NETHER_QUARTZ, 0, "Nether Quartz")); - //TODO: MINECART_WITH_TNT - //TODO: HOPPER_MINECART + self::registerItem(new Item(Item::PRISMARINE_SHARD, 0, "Prismarine Shard")); self::registerItem(new ItemBlock(Block::HOPPER_BLOCK, 0, Item::HOPPER)); self::registerItem(new RawRabbit()); @@ -243,17 +237,11 @@ class ItemFactory{ self::registerItem(new RabbitStew()); self::registerItem(new Item(Item::RABBIT_FOOT, 0, "Rabbit's Foot")); self::registerItem(new Item(Item::RABBIT_HIDE, 0, "Rabbit Hide")); - //TODO: HORSEARMORLEATHER - //TODO: HORSEARMORIRON - //TODO: GOLD_HORSE_ARMOR - //TODO: DIAMOND_HORSE_ARMOR - //TODO: LEAD - //TODO: NAMETAG + self::registerItem(new Item(Item::PRISMARINE_CRYSTALS, 0, "Prismarine Crystals")); self::registerItem(new RawMutton()); self::registerItem(new CookedMutton()); - //TODO: ARMOR_STAND - //TODO: END_CRYSTAL + self::registerItem(new ItemBlock(Block::SPRUCE_DOOR_BLOCK, 0, Item::SPRUCE_DOOR)); self::registerItem(new ItemBlock(Block::BIRCH_DOOR_BLOCK, 0, Item::BIRCH_DOOR)); self::registerItem(new ItemBlock(Block::JUNGLE_DOOR_BLOCK, 0, Item::JUNGLE_DOOR)); @@ -264,20 +252,11 @@ class ItemFactory{ self::registerItem(new Item(Item::DRAGON_BREATH, 0, "Dragon's Breath")); - //TODO: SPARKLER - //TODO: COMMAND_BLOCK_MINECART - //TODO: ELYTRA self::registerItem(new Item(Item::SHULKER_SHELL, 0, "Shulker Shell")); - //TODO: MEDICINE - //TODO: BALLOON - //TODO: RAPID_FERTILIZER self::registerItem(new Totem()); self::registerItem(new Item(Item::BLEACH, 0, "Bleach")); //EDU self::registerItem(new Item(Item::IRON_NUGGET, 0, "Iron Nugget")); - //TODO: ICE_BOMB - - //TODO: TRIDENT self::registerItem(new Beetroot()); self::registerItem(new BeetrootSeeds()); @@ -291,21 +270,60 @@ class ItemFactory{ self::registerItem(new GoldenAppleEnchanted()); self::registerItem(new Item(Item::HEART_OF_THE_SEA, 0, "Heart of the Sea")); self::registerItem(new Item(Item::TURTLE_SHELL_PIECE, 0, "Scute")); - //TODO: TURTLE_HELMET - //TODO: COMPOUND - //TODO: RECORD_13 - //TODO: RECORD_CAT - //TODO: RECORD_BLOCKS - //TODO: RECORD_CHIRP - //TODO: RECORD_FAR - //TODO: RECORD_MALL - //TODO: RECORD_MELLOHI - //TODO: RECORD_STAL - //TODO: RECORD_STRAD - //TODO: RECORD_WARD - //TODO: RECORD_11 - //TODO: RECORD_WAIT + //TODO: minecraft:acacia_sign + //TODO: minecraft:armor_stand + //TODO: minecraft:balloon + //TODO: minecraft:birch_sign + //TODO: minecraft:carrotOnAStick + //TODO: minecraft:chest_minecart + //TODO: minecraft:command_block_minecart + //TODO: minecraft:compound + //TODO: minecraft:crossbow + //TODO: minecraft:darkoak_sign + //TODO: minecraft:elytra + //TODO: minecraft:emptyMap + //TODO: minecraft:enchanted_book + //TODO: minecraft:end_crystal + //TODO: minecraft:ender_eye + //TODO: minecraft:fireball + //TODO: minecraft:fireworks + //TODO: minecraft:fireworksCharge + //TODO: minecraft:glow_stick + //TODO: minecraft:hopper_minecart + //TODO: minecraft:horsearmordiamond + //TODO: minecraft:horsearmorgold + //TODO: minecraft:horsearmoriron + //TODO: minecraft:horsearmorleather + //TODO: minecraft:ice_bomb + //TODO: minecraft:jungle_sign + //TODO: minecraft:kelp + //TODO: minecraft:lead + //TODO: minecraft:lingering_potion + //TODO: minecraft:map + //TODO: minecraft:medicine + //TODO: minecraft:name_tag + //TODO: minecraft:phantom_membrane + //TODO: minecraft:rapid_fertilizer + //TODO: minecraft:record_11 + //TODO: minecraft:record_13 + //TODO: minecraft:record_blocks + //TODO: minecraft:record_cat + //TODO: minecraft:record_chirp + //TODO: minecraft:record_far + //TODO: minecraft:record_mall + //TODO: minecraft:record_mellohi + //TODO: minecraft:record_stal + //TODO: minecraft:record_strad + //TODO: minecraft:record_wait + //TODO: minecraft:record_ward + //TODO: minecraft:saddle + //TODO: minecraft:sparkler + //TODO: minecraft:spawn_egg + //TODO: minecraft:spruce_sign + //TODO: minecraft:tnt_minecart + //TODO: minecraft:trident + //TODO: minecraft:turtle_helmet } /**