diff options
author | Tiger Wang <ziwei.tiger@outlook.com> | 2022-01-02 15:47:48 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@outlook.com> | 2022-01-02 15:47:48 +0100 |
commit | 9245ab7e053ae166d07f5bac3869094eb1264431 (patch) | |
tree | e87ec929b4924644e817791089c40e8aad7a9ed3 /src/BlockInfo.cpp | |
parent | ClientHandle: improve right-click robustness (#5372) (diff) | |
download | cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar.gz cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar.bz2 cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar.lz cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar.xz cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.tar.zst cuberite-9245ab7e053ae166d07f5bac3869094eb1264431.zip |
Diffstat (limited to 'src/BlockInfo.cpp')
-rw-r--r-- | src/BlockInfo.cpp | 304 |
1 files changed, 152 insertions, 152 deletions
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp index c5590649d..4f2513928 100644 --- a/src/BlockInfo.cpp +++ b/src/BlockInfo.cpp @@ -20,9 +20,9 @@ bool IsBlockIce(BLOCKTYPE a_BlockType) { switch (a_BlockType) { + case E_BLOCK_FROSTED_ICE: case E_BLOCK_ICE: case E_BLOCK_PACKED_ICE: - case E_BLOCK_FROSTED_ICE: { return true; } @@ -68,10 +68,10 @@ bool IsBlockRail(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_RAIL: case E_BLOCK_ACTIVATOR_RAIL: case E_BLOCK_DETECTOR_RAIL: case E_BLOCK_POWERED_RAIL: + case E_BLOCK_RAIL: { return true; } @@ -88,8 +88,8 @@ bool IsBlockTypeOfDirt(BLOCKTYPE a_BlockType) switch (a_BlockType) { case E_BLOCK_DIRT: - case E_BLOCK_GRASS: case E_BLOCK_FARMLAND: + case E_BLOCK_GRASS: case E_BLOCK_GRASS_PATH: { return true; @@ -147,51 +147,51 @@ bool IsBlockMaterialWood(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_PLANKS: - case E_BLOCK_LOG: - case E_BLOCK_NOTE_BLOCK: + case E_BLOCK_ACACIA_DOOR: + case E_BLOCK_ACACIA_FENCE: + case E_BLOCK_ACACIA_FENCE_GATE: + case E_BLOCK_ACACIA_WOOD_STAIRS: + case E_BLOCK_BIRCH_DOOR: + case E_BLOCK_BIRCH_FENCE: + case E_BLOCK_BIRCH_FENCE_GATE: + case E_BLOCK_BIRCH_WOOD_STAIRS: case E_BLOCK_BOOKCASE: - case E_BLOCK_OAK_WOOD_STAIRS: case E_BLOCK_CHEST: case E_BLOCK_CRAFTING_TABLE: - case E_BLOCK_SIGN_POST: - case E_BLOCK_OAK_DOOR: - case E_BLOCK_WALLSIGN: - case E_BLOCK_WOODEN_PRESSURE_PLATE: - case E_BLOCK_JUKEBOX: + case E_BLOCK_DARK_OAK_DOOR: + case E_BLOCK_DARK_OAK_FENCE: + case E_BLOCK_DARK_OAK_FENCE_GATE: + case E_BLOCK_DARK_OAK_WOOD_STAIRS: + case E_BLOCK_DAYLIGHT_SENSOR: + case E_BLOCK_DOUBLE_WOODEN_SLAB: case E_BLOCK_FENCE: - case E_BLOCK_TRAPDOOR: case E_BLOCK_HUGE_BROWN_MUSHROOM: case E_BLOCK_HUGE_RED_MUSHROOM: - case E_BLOCK_OAK_FENCE_GATE: - case E_BLOCK_DOUBLE_WOODEN_SLAB: - case E_BLOCK_WOODEN_SLAB: - case E_BLOCK_SPRUCE_WOOD_STAIRS: - case E_BLOCK_BIRCH_WOOD_STAIRS: + case E_BLOCK_INVERTED_DAYLIGHT_SENSOR: + case E_BLOCK_JUKEBOX: + case E_BLOCK_JUNGLE_DOOR: + case E_BLOCK_JUNGLE_FENCE: + case E_BLOCK_JUNGLE_FENCE_GATE: case E_BLOCK_JUNGLE_WOOD_STAIRS: - case E_BLOCK_TRAPPED_CHEST: - case E_BLOCK_DAYLIGHT_SENSOR: + case E_BLOCK_LOG: case E_BLOCK_NEW_LOG: - case E_BLOCK_ACACIA_WOOD_STAIRS: - case E_BLOCK_DARK_OAK_WOOD_STAIRS: + case E_BLOCK_NOTE_BLOCK: + case E_BLOCK_OAK_DOOR: + case E_BLOCK_OAK_FENCE_GATE: + case E_BLOCK_OAK_WOOD_STAIRS: + case E_BLOCK_PLANKS: + case E_BLOCK_SIGN_POST: + case E_BLOCK_SPRUCE_DOOR: + case E_BLOCK_SPRUCE_FENCE: + case E_BLOCK_SPRUCE_FENCE_GATE: + case E_BLOCK_SPRUCE_WOOD_STAIRS: case E_BLOCK_STANDING_BANNER: + case E_BLOCK_TRAPDOOR: + case E_BLOCK_TRAPPED_CHEST: + case E_BLOCK_WALLSIGN: case E_BLOCK_WALL_BANNER: - case E_BLOCK_INVERTED_DAYLIGHT_SENSOR: - case E_BLOCK_SPRUCE_FENCE_GATE: - case E_BLOCK_BIRCH_FENCE_GATE: - case E_BLOCK_JUNGLE_FENCE_GATE: - case E_BLOCK_DARK_OAK_FENCE_GATE: - case E_BLOCK_ACACIA_FENCE_GATE: - case E_BLOCK_SPRUCE_FENCE: - case E_BLOCK_BIRCH_FENCE: - case E_BLOCK_JUNGLE_FENCE: - case E_BLOCK_DARK_OAK_FENCE: - case E_BLOCK_ACACIA_FENCE: - case E_BLOCK_SPRUCE_DOOR: - case E_BLOCK_BIRCH_DOOR: - case E_BLOCK_JUNGLE_DOOR: - case E_BLOCK_ACACIA_DOOR: - case E_BLOCK_DARK_OAK_DOOR: + case E_BLOCK_WOODEN_PRESSURE_PLATE: + case E_BLOCK_WOODEN_SLAB: { return true; } @@ -210,23 +210,23 @@ bool IsBlockMaterialPlants(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_SAPLING: - case E_BLOCK_DANDELION: - case E_BLOCK_FLOWER: + case E_BLOCK_BEETROOTS: case E_BLOCK_BROWN_MUSHROOM: - case E_BLOCK_RED_MUSHROOM: + case E_BLOCK_CARROTS: + case E_BLOCK_CHORUS_FLOWER: + case E_BLOCK_CHORUS_PLANT: + case E_BLOCK_COCOA_POD: case E_BLOCK_CROPS: - case E_BLOCK_REEDS: - case E_BLOCK_PUMPKIN_STEM: - case E_BLOCK_MELON_STEM: + case E_BLOCK_DANDELION: + case E_BLOCK_FLOWER: case E_BLOCK_LILY_PAD: + case E_BLOCK_MELON_STEM: case E_BLOCK_NETHER_WART: - case E_BLOCK_COCOA_POD: - case E_BLOCK_CARROTS: case E_BLOCK_POTATOES: - case E_BLOCK_CHORUS_PLANT: - case E_BLOCK_CHORUS_FLOWER: - case E_BLOCK_BEETROOTS: + case E_BLOCK_PUMPKIN_STEM: + case E_BLOCK_RED_MUSHROOM: + case E_BLOCK_REEDS: + case E_BLOCK_SAPLING: { return true; } @@ -245,10 +245,10 @@ bool IsBlockMaterialVine(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_TALL_GRASS: + case E_BLOCK_BIG_FLOWER: case E_BLOCK_DEAD_BUSH: + case E_BLOCK_TALL_GRASS: case E_BLOCK_VINES: - case E_BLOCK_BIG_FLOWER: { return true; } @@ -267,23 +267,23 @@ bool IsBlockMaterialIron(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_LAPIS_BLOCK: - case E_BLOCK_GOLD_BLOCK: - case E_BLOCK_IRON_BLOCK: - case E_BLOCK_DIAMOND_BLOCK: - case E_BLOCK_IRON_DOOR: - case E_BLOCK_IRON_BARS: + case E_BLOCK_BLOCK_OF_REDSTONE: case E_BLOCK_BREWING_STAND: case E_BLOCK_CAULDRON: - case E_BLOCK_EMERALD_BLOCK: + case E_BLOCK_CHAIN_COMMAND_BLOCK: case E_BLOCK_COMMAND_BLOCK: - case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: + case E_BLOCK_DIAMOND_BLOCK: + case E_BLOCK_EMERALD_BLOCK: + case E_BLOCK_GOLD_BLOCK: case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE: - case E_BLOCK_BLOCK_OF_REDSTONE: case E_BLOCK_HOPPER: + case E_BLOCK_IRON_BARS: + case E_BLOCK_IRON_BLOCK: + case E_BLOCK_IRON_DOOR: case E_BLOCK_IRON_TRAPDOOR: + case E_BLOCK_LAPIS_BLOCK: + case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: case E_BLOCK_REPEATING_COMMAND_BLOCK: - case E_BLOCK_CHAIN_COMMAND_BLOCK: case E_BLOCK_STRUCTURE_BLOCK: { return true; @@ -312,9 +312,9 @@ bool IsBlockMaterialGourd(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_PUMPKIN: case E_BLOCK_JACK_O_LANTERN: case E_BLOCK_MELON: + case E_BLOCK_PUMPKIN: { return true; } @@ -333,64 +333,64 @@ bool IsBlockMaterialRock(BLOCKTYPE a_BlockType) { switch (a_BlockType) { - case E_BLOCK_STONE: - case E_BLOCK_COBBLESTONE: case E_BLOCK_BEDROCK: - case E_BLOCK_GOLD_ORE: - case E_BLOCK_IRON_ORE: + case E_BLOCK_BLOCK_OF_COAL: + case E_BLOCK_BONE_BLOCK: + case E_BLOCK_BRICK: + case E_BLOCK_BRICK_STAIRS: case E_BLOCK_COAL_ORE: - case E_BLOCK_LAPIS_ORE: + case E_BLOCK_COBBLESTONE: + case E_BLOCK_COBBLESTONE_STAIRS: + case E_BLOCK_COBBLESTONE_WALL: + case E_BLOCK_DIAMOND_ORE: case E_BLOCK_DISPENSER: - case E_BLOCK_SANDSTONE: + case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB: case E_BLOCK_DOUBLE_STONE_SLAB: - case E_BLOCK_STONE_SLAB: - case E_BLOCK_BRICK: - case E_BLOCK_MOSSY_COBBLESTONE: - case E_BLOCK_OBSIDIAN: - case E_BLOCK_MOB_SPAWNER: - case E_BLOCK_DIAMOND_ORE: + case E_BLOCK_DROPPER: + case E_BLOCK_EMERALD_ORE: + case E_BLOCK_ENCHANTMENT_TABLE: + case E_BLOCK_ENDER_CHEST: + case E_BLOCK_END_BRICKS: + case E_BLOCK_END_PORTAL_FRAME: + case E_BLOCK_END_STONE: case E_BLOCK_FURNACE: + case E_BLOCK_GOLD_ORE: + case E_BLOCK_HARDENED_CLAY: + case E_BLOCK_IRON_ORE: + case E_BLOCK_LAPIS_ORE: case E_BLOCK_LIT_FURNACE: - case E_BLOCK_COBBLESTONE_STAIRS: - case E_BLOCK_STONE_PRESSURE_PLATE: - case E_BLOCK_REDSTONE_ORE: - case E_BLOCK_REDSTONE_ORE_GLOWING: + case E_BLOCK_MAGMA: + case E_BLOCK_MOB_SPAWNER: + case E_BLOCK_MOSSY_COBBLESTONE: case E_BLOCK_NETHERRACK: - case E_BLOCK_STONE_BRICKS: - case E_BLOCK_BRICK_STAIRS: - case E_BLOCK_STONE_BRICK_STAIRS: case E_BLOCK_NETHER_BRICK: case E_BLOCK_NETHER_BRICK_FENCE: case E_BLOCK_NETHER_BRICK_STAIRS: - case E_BLOCK_ENCHANTMENT_TABLE: - case E_BLOCK_END_PORTAL_FRAME: - case E_BLOCK_END_STONE: - case E_BLOCK_SANDSTONE_STAIRS: - case E_BLOCK_EMERALD_ORE: - case E_BLOCK_ENDER_CHEST: - case E_BLOCK_COBBLESTONE_WALL: case E_BLOCK_NETHER_QUARTZ_ORE: - case E_BLOCK_QUARTZ_BLOCK: - case E_BLOCK_QUARTZ_STAIRS: - case E_BLOCK_DROPPER: - case E_BLOCK_STAINED_CLAY: + case E_BLOCK_OBSERVER: + case E_BLOCK_OBSIDIAN: case E_BLOCK_PRISMARINE_BLOCK: - case E_BLOCK_HARDENED_CLAY: - case E_BLOCK_BLOCK_OF_COAL: - case E_BLOCK_RED_SANDSTONE: - case E_BLOCK_RED_SANDSTONE_STAIRS: - case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB: - case E_BLOCK_RED_SANDSTONE_SLAB: case E_BLOCK_PURPUR_BLOCK: - case E_BLOCK_PURPUR_PILLAR: - case E_BLOCK_PURPUR_STAIRS: case E_BLOCK_PURPUR_DOUBLE_SLAB: + case E_BLOCK_PURPUR_PILLAR: case E_BLOCK_PURPUR_SLAB: - case E_BLOCK_END_BRICKS: - case E_BLOCK_MAGMA: + case E_BLOCK_PURPUR_STAIRS: + case E_BLOCK_QUARTZ_BLOCK: + case E_BLOCK_QUARTZ_STAIRS: + case E_BLOCK_REDSTONE_ORE: + case E_BLOCK_REDSTONE_ORE_GLOWING: case E_BLOCK_RED_NETHER_BRICK: - case E_BLOCK_BONE_BLOCK: - case E_BLOCK_OBSERVER: + case E_BLOCK_RED_SANDSTONE: + case E_BLOCK_RED_SANDSTONE_SLAB: + case E_BLOCK_RED_SANDSTONE_STAIRS: + case E_BLOCK_SANDSTONE: + case E_BLOCK_SANDSTONE_STAIRS: + case E_BLOCK_STAINED_CLAY: + case E_BLOCK_STONE: + case E_BLOCK_STONE_BRICKS: + case E_BLOCK_STONE_BRICK_STAIRS: + case E_BLOCK_STONE_PRESSURE_PLATE: + case E_BLOCK_STONE_SLAB: { return true; } @@ -419,10 +419,10 @@ NIBBLETYPE cBlockInfo::GetLightValue(const BLOCKTYPE Block) case E_BLOCK_BROWN_MUSHROOM: return 1; case E_BLOCK_BURNING_FURNACE: return 13; case E_BLOCK_DRAGON_EGG: return 1; + case E_BLOCK_ENDER_CHEST: return 7; case E_BLOCK_END_PORTAL: return 15; case E_BLOCK_END_PORTAL_FRAME: return 1; case E_BLOCK_END_ROD: return 14; - case E_BLOCK_ENDER_CHEST: return 7; case E_BLOCK_FIRE: return 15; case E_BLOCK_GLOWSTONE: return 15; case E_BLOCK_JACK_O_LANTERN: return 15; @@ -464,19 +464,19 @@ NIBBLETYPE cBlockInfo::GetSpreadLightFalloff(const BLOCKTYPE Block) case E_BLOCK_BIRCH_DOOR: case E_BLOCK_BIRCH_FENCE: case E_BLOCK_BIRCH_FENCE_GATE: - case E_BLOCK_BROWN_MUSHROOM: case E_BLOCK_BREWING_STAND: + case E_BLOCK_BROWN_MUSHROOM: case E_BLOCK_CACTUS: case E_BLOCK_CAKE: case E_BLOCK_CARPET: case E_BLOCK_CARROTS: case E_BLOCK_CAULDRON: + case E_BLOCK_CHEST: case E_BLOCK_CHORUS_FLOWER: case E_BLOCK_CHORUS_PLANT: - case E_BLOCK_CHEST: case E_BLOCK_COBBLESTONE_WALL: - case E_BLOCK_COCOA_POD: case E_BLOCK_COBWEB: + case E_BLOCK_COCOA_POD: case E_BLOCK_CROPS: case E_BLOCK_DANDELION: case E_BLOCK_DARK_OAK_DOOR: @@ -492,7 +492,6 @@ NIBBLETYPE cBlockInfo::GetSpreadLightFalloff(const BLOCKTYPE Block) case E_BLOCK_END_PORTAL_FRAME: case E_BLOCK_END_ROD: case E_BLOCK_FENCE: - case E_BLOCK_OAK_FENCE_GATE: case E_BLOCK_FIRE: case E_BLOCK_FLOWER: case E_BLOCK_FLOWER_POT: @@ -512,13 +511,15 @@ NIBBLETYPE cBlockInfo::GetSpreadLightFalloff(const BLOCKTYPE Block) case E_BLOCK_LADDER: case E_BLOCK_LEAVES: case E_BLOCK_LEVER: - case E_BLOCK_LILY_PAD: case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: + case E_BLOCK_LILY_PAD: case E_BLOCK_MELON_STEM: case E_BLOCK_MOB_SPAWNER: case E_BLOCK_NETHER_PORTAL: case E_BLOCK_NETHER_WART: case E_BLOCK_NEW_LEAVES: + case E_BLOCK_OAK_DOOR: + case E_BLOCK_OAK_FENCE_GATE: case E_BLOCK_PISTON: case E_BLOCK_PISTON_EXTENSION: case E_BLOCK_PISTON_MOVED_BLOCK: @@ -526,12 +527,12 @@ NIBBLETYPE cBlockInfo::GetSpreadLightFalloff(const BLOCKTYPE Block) case E_BLOCK_POWERED_RAIL: case E_BLOCK_PUMPKIN_STEM: case E_BLOCK_RAIL: - case E_BLOCK_RED_MUSHROOM: case E_BLOCK_REDSTONE_REPEATER_OFF: case E_BLOCK_REDSTONE_REPEATER_ON: case E_BLOCK_REDSTONE_TORCH_OFF: case E_BLOCK_REDSTONE_TORCH_ON: case E_BLOCK_REDSTONE_WIRE: + case E_BLOCK_RED_MUSHROOM: case E_BLOCK_SAPLING: case E_BLOCK_SIGN_POST: case E_BLOCK_SNOW: @@ -552,10 +553,9 @@ NIBBLETYPE cBlockInfo::GetSpreadLightFalloff(const BLOCKTYPE Block) case E_BLOCK_TRIPWIRE: case E_BLOCK_TRIPWIRE_HOOK: case E_BLOCK_VINES: - case E_BLOCK_WALL_BANNER: case E_BLOCK_WALLSIGN: + case E_BLOCK_WALL_BANNER: case E_BLOCK_WOODEN_BUTTON: - case E_BLOCK_OAK_DOOR: case E_BLOCK_WOODEN_PRESSURE_PLATE: return 1; // Light in ice and water disappears faster: @@ -610,11 +610,14 @@ bool cBlockInfo::FullyOccupiesVoxel(const BLOCKTYPE Block) { case E_BLOCK_BARRIER: case E_BLOCK_BEDROCK: + case E_BLOCK_BLACK_GLAZED_TERRACOTTA: case E_BLOCK_BLOCK_OF_COAL: case E_BLOCK_BLOCK_OF_REDSTONE: + case E_BLOCK_BLUE_GLAZED_TERRACOTTA: case E_BLOCK_BONE_BLOCK: case E_BLOCK_BOOKCASE: case E_BLOCK_BRICK: + case E_BLOCK_BROWN_GLAZED_TERRACOTTA: case E_BLOCK_CHAIN_COMMAND_BLOCK: case E_BLOCK_CLAY: case E_BLOCK_COAL_ORE: @@ -623,6 +626,7 @@ bool cBlockInfo::FullyOccupiesVoxel(const BLOCKTYPE Block) case E_BLOCK_CONCRETE: case E_BLOCK_CONCRETE_POWDER: case E_BLOCK_CRAFTING_TABLE: + case E_BLOCK_CYAN_GLAZED_TERRACOTTA: case E_BLOCK_DIAMOND_BLOCK: case E_BLOCK_DIAMOND_ORE: case E_BLOCK_DIRT: @@ -637,29 +641,14 @@ bool cBlockInfo::FullyOccupiesVoxel(const BLOCKTYPE Block) case E_BLOCK_END_STONE: case E_BLOCK_FROSTED_ICE: case E_BLOCK_FURNACE: + case E_BLOCK_GLASS: case E_BLOCK_GLOWSTONE: case E_BLOCK_GOLD_BLOCK: case E_BLOCK_GOLD_ORE: - case E_BLOCK_WHITE_GLAZED_TERRACOTTA: - case E_BLOCK_ORANGE_GLAZED_TERRACOTTA: - case E_BLOCK_MAGENTA_GLAZED_TERRACOTTA: - case E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA: - case E_BLOCK_YELLOW_GLAZED_TERRACOTTA: - case E_BLOCK_LIME_GLAZED_TERRACOTTA: - case E_BLOCK_PINK_GLAZED_TERRACOTTA: - case E_BLOCK_GRAY_GLAZED_TERRACOTTA: - case E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA: - case E_BLOCK_CYAN_GLAZED_TERRACOTTA: - case E_BLOCK_PURPLE_GLAZED_TERRACOTTA: - case E_BLOCK_BLUE_GLAZED_TERRACOTTA: - case E_BLOCK_BROWN_GLAZED_TERRACOTTA: - case E_BLOCK_GREEN_GLAZED_TERRACOTTA: - case E_BLOCK_BLACK_GLAZED_TERRACOTTA: - case E_BLOCK_RED_GLAZED_TERRACOTTA: - case E_BLOCK_GLASS: - case E_BLOCK_STAINED_GLASS: case E_BLOCK_GRASS: case E_BLOCK_GRAVEL: + case E_BLOCK_GRAY_GLAZED_TERRACOTTA: + case E_BLOCK_GREEN_GLAZED_TERRACOTTA: case E_BLOCK_HARDENED_CLAY: case E_BLOCK_HAY_BALE: case E_BLOCK_HUGE_BROWN_MUSHROOM: @@ -671,7 +660,11 @@ bool cBlockInfo::FullyOccupiesVoxel(const BLOCKTYPE Block) case E_BLOCK_JUKEBOX: case E_BLOCK_LAPIS_BLOCK: case E_BLOCK_LAPIS_ORE: + case E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA: + case E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA: + case E_BLOCK_LIME_GLAZED_TERRACOTTA: case E_BLOCK_LOG: + case E_BLOCK_MAGENTA_GLAZED_TERRACOTTA: case E_BLOCK_MAGMA: case E_BLOCK_MELON: case E_BLOCK_MOB_SPAWNER: @@ -685,30 +678,37 @@ bool cBlockInfo::FullyOccupiesVoxel(const BLOCKTYPE Block) case E_BLOCK_NOTE_BLOCK: case E_BLOCK_OBSERVER: case E_BLOCK_OBSIDIAN: + case E_BLOCK_ORANGE_GLAZED_TERRACOTTA: case E_BLOCK_PACKED_ICE: + case E_BLOCK_PINK_GLAZED_TERRACOTTA: case E_BLOCK_PLANKS: case E_BLOCK_PRISMARINE_BLOCK: case E_BLOCK_PUMPKIN: + case E_BLOCK_PURPLE_GLAZED_TERRACOTTA: case E_BLOCK_PURPUR_BLOCK: - case E_BLOCK_PURPUR_PILLAR: case E_BLOCK_PURPUR_DOUBLE_SLAB: + case E_BLOCK_PURPUR_PILLAR: case E_BLOCK_QUARTZ_BLOCK: - case E_BLOCK_RED_NETHER_BRICK: - case E_BLOCK_RED_SANDSTONE: case E_BLOCK_REDSTONE_LAMP_OFF: case E_BLOCK_REDSTONE_LAMP_ON: case E_BLOCK_REDSTONE_ORE: case E_BLOCK_REDSTONE_ORE_GLOWING: + case E_BLOCK_RED_GLAZED_TERRACOTTA: + case E_BLOCK_RED_NETHER_BRICK: + case E_BLOCK_RED_SANDSTONE: case E_BLOCK_REPEATING_COMMAND_BLOCK: - case E_BLOCK_SANDSTONE: case E_BLOCK_SAND: + case E_BLOCK_SANDSTONE: case E_BLOCK_SILVERFISH_EGG: case E_BLOCK_SPONGE: case E_BLOCK_STAINED_CLAY: + case E_BLOCK_STAINED_GLASS: case E_BLOCK_STONE: case E_BLOCK_STONE_BRICKS: case E_BLOCK_STRUCTURE_BLOCK: - case E_BLOCK_WOOL: return true; + case E_BLOCK_WHITE_GLAZED_TERRACOTTA: + case E_BLOCK_WOOL: + case E_BLOCK_YELLOW_GLAZED_TERRACOTTA: return true; default: return false; } } @@ -768,8 +768,8 @@ bool cBlockInfo::IsPistonBreakable(const BLOCKTYPE Block) case E_BLOCK_CARROTS: case E_BLOCK_CHORUS_FLOWER: case E_BLOCK_CHORUS_PLANT: - case E_BLOCK_COCOA_POD: case E_BLOCK_COBWEB: + case E_BLOCK_COCOA_POD: case E_BLOCK_CROPS: case E_BLOCK_CYAN_SHULKER_BOX: case E_BLOCK_DANDELION: @@ -788,15 +788,15 @@ bool cBlockInfo::IsPistonBreakable(const BLOCKTYPE Block) case E_BLOCK_IRON_TRAPDOOR: case E_BLOCK_JACK_O_LANTERN: case E_BLOCK_JUNGLE_DOOR: + case E_BLOCK_LADDER: + case E_BLOCK_LAVA: + case E_BLOCK_LEAVES: + case E_BLOCK_LEVER: case E_BLOCK_LIGHT_BLUE_SHULKER_BOX: case E_BLOCK_LIGHT_GRAY_SHULKER_BOX: case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: case E_BLOCK_LILY_PAD: case E_BLOCK_LIME_SHULKER_BOX: - case E_BLOCK_LADDER: - case E_BLOCK_LAVA: - case E_BLOCK_LEAVES: - case E_BLOCK_LEVER: case E_BLOCK_MAGENTA_SHULKER_BOX: case E_BLOCK_MELON: case E_BLOCK_MELON_STEM: @@ -850,9 +850,9 @@ bool cBlockInfo::IsRainBlocker(const BLOCKTYPE Block) switch (Block) { case E_BLOCK_SIGN_POST: + case E_BLOCK_STANDING_BANNER: case E_BLOCK_WALLSIGN: - case E_BLOCK_WALL_BANNER: - case E_BLOCK_STANDING_BANNER: return true; + case E_BLOCK_WALL_BANNER: return true; default: return IsSolid(Block); } } @@ -925,12 +925,12 @@ bool cBlockInfo::IsSolid(const BLOCKTYPE Block) case E_BLOCK_POTATOES: case E_BLOCK_POWERED_RAIL: case E_BLOCK_RAIL: - case E_BLOCK_RED_MUSHROOM: case E_BLOCK_REDSTONE_REPEATER_OFF: case E_BLOCK_REDSTONE_REPEATER_ON: case E_BLOCK_REDSTONE_TORCH_OFF: case E_BLOCK_REDSTONE_TORCH_ON: case E_BLOCK_REDSTONE_WIRE: + case E_BLOCK_RED_MUSHROOM: case E_BLOCK_SAPLING: case E_BLOCK_SIGN_POST: case E_BLOCK_SNOW: @@ -945,8 +945,8 @@ bool cBlockInfo::IsSolid(const BLOCKTYPE Block) case E_BLOCK_TRIPWIRE: case E_BLOCK_TRIPWIRE_HOOK: case E_BLOCK_VINES: - case E_BLOCK_WALL_BANNER: case E_BLOCK_WALLSIGN: + case E_BLOCK_WALL_BANNER: case E_BLOCK_WATER: case E_BLOCK_WOODEN_BUTTON: case E_BLOCK_WOODEN_PRESSURE_PLATE: return false; @@ -1011,11 +1011,11 @@ bool cBlockInfo::IsTransparent(const BLOCKTYPE Block) case E_BLOCK_DETECTOR_RAIL: case E_BLOCK_DRAGON_EGG: case E_BLOCK_ENCHANTMENT_TABLE: + case E_BLOCK_ENDER_CHEST: case E_BLOCK_END_GATEWAY: case E_BLOCK_END_PORTAL: case E_BLOCK_END_PORTAL_FRAME: case E_BLOCK_END_ROD: - case E_BLOCK_ENDER_CHEST: case E_BLOCK_FARMLAND: case E_BLOCK_FENCE: case E_BLOCK_FIRE: @@ -1077,16 +1077,16 @@ bool cBlockInfo::IsTransparent(const BLOCKTYPE Block) case E_BLOCK_PURPUR_STAIRS: case E_BLOCK_QUARTZ_STAIRS: case E_BLOCK_RAIL: - case E_BLOCK_RED_MUSHROOM: - case E_BLOCK_RED_SANDSTONE_SLAB: - case E_BLOCK_RED_SANDSTONE_STAIRS: - case E_BLOCK_RED_SHULKER_BOX: case E_BLOCK_REDSTONE_ORE_GLOWING: case E_BLOCK_REDSTONE_REPEATER_OFF: case E_BLOCK_REDSTONE_REPEATER_ON: case E_BLOCK_REDSTONE_TORCH_OFF: case E_BLOCK_REDSTONE_TORCH_ON: case E_BLOCK_REDSTONE_WIRE: + case E_BLOCK_RED_MUSHROOM: + case E_BLOCK_RED_SANDSTONE_SLAB: + case E_BLOCK_RED_SANDSTONE_STAIRS: + case E_BLOCK_RED_SHULKER_BOX: case E_BLOCK_SANDSTONE_STAIRS: case E_BLOCK_SAPLING: case E_BLOCK_SEA_LANTERN: @@ -1115,8 +1115,8 @@ bool cBlockInfo::IsTransparent(const BLOCKTYPE Block) case E_BLOCK_TRIPWIRE: case E_BLOCK_TRIPWIRE_HOOK: case E_BLOCK_VINES: - case E_BLOCK_WALL_BANNER: case E_BLOCK_WALLSIGN: + case E_BLOCK_WALL_BANNER: case E_BLOCK_WATER: case E_BLOCK_WHITE_SHULKER_BOX: case E_BLOCK_WOODEN_BUTTON: |