2 files changed, 214 insertions, 63 deletions

diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index 4fc1d602c..d902ea4a6 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -14,7 +14,7 @@ cBlockInfo::cBlockInfo()
 	, m_Transparent(false)
 	, m_OneHitDig(false)
 	, m_PistonBreakable(false)
-	, m_IsSnowable(true)
+	, m_IsSnowable(false)
 	, m_RequiresSpecialTool(false)
 	, m_IsSolid(true)
 	, m_FullyOccupiesVoxel(false)
@@ -65,48 +65,117 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	}
 
 	// Emissive blocks
+	a_Info[E_BLOCK_ACTIVE_COMPARATOR   ].m_LightValue = 9;
+	a_Info[E_BLOCK_BEACON              ].m_LightValue = 15;
+	a_Info[E_BLOCK_BREWING_STAND       ].m_LightValue = 1;
+	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_LightValue = 1;
+	a_Info[E_BLOCK_BURNING_FURNACE     ].m_LightValue = 13;
+	a_Info[E_BLOCK_DRAGON_EGG          ].m_LightValue = 1;
+	a_Info[E_BLOCK_END_PORTAL          ].m_LightValue = 15;
+	a_Info[E_BLOCK_END_PORTAL_FRAME    ].m_LightValue = 1;
+	a_Info[E_BLOCK_ENDER_CHEST         ].m_LightValue = 7;
 	a_Info[E_BLOCK_FIRE                ].m_LightValue = 15;
 	a_Info[E_BLOCK_GLOWSTONE           ].m_LightValue = 15;
 	a_Info[E_BLOCK_JACK_O_LANTERN      ].m_LightValue = 15;
 	a_Info[E_BLOCK_LAVA                ].m_LightValue = 15;
-	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_LightValue = 15;
-	a_Info[E_BLOCK_END_PORTAL          ].m_LightValue = 15;
-	a_Info[E_BLOCK_REDSTONE_LAMP_ON    ].m_LightValue = 15;
-	a_Info[E_BLOCK_TORCH               ].m_LightValue = 14;
-	a_Info[E_BLOCK_BURNING_FURNACE     ].m_LightValue = 13;
 	a_Info[E_BLOCK_NETHER_PORTAL       ].m_LightValue = 11;
+	a_Info[E_BLOCK_REDSTONE_LAMP_ON    ].m_LightValue = 15;
 	a_Info[E_BLOCK_REDSTONE_ORE_GLOWING].m_LightValue = 9;
 	a_Info[E_BLOCK_REDSTONE_REPEATER_ON].m_LightValue = 9;
 	a_Info[E_BLOCK_REDSTONE_TORCH_ON   ].m_LightValue = 7;
-	a_Info[E_BLOCK_BREWING_STAND       ].m_LightValue = 1;
-	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_LightValue = 1;
-	a_Info[E_BLOCK_DRAGON_EGG          ].m_LightValue = 1;
+	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_LightValue = 15;
+	a_Info[E_BLOCK_TORCH               ].m_LightValue = 14;
 
 
 	// Spread blocks
+	a_Info[E_BLOCK_ACTIVATOR_RAIL      ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_ACTIVE_COMPARATOR   ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_AIR                 ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_ANVIL               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_BEACON              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_BED                 ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_BIG_FLOWER          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_BREWING_STAND       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_CACTUS              ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_CAKE                ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_CARPET              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_CARROTS             ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_CAULDRON            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_CHEST               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_COBBLESTONE_WALL    ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_COCOA_POD           ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_COBWEB              ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_CROPS               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_DANDELION           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_DAYLIGHT_SENSOR     ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_DEAD_BUSH           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_DETECTOR_RAIL       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_DRAGON_EGG          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_ENCHANTMENT_TABLE   ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_ENDER_CHEST         ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_END_PORTAL          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_END_PORTAL_FRAME    ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_FARMLAND            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_FENCE               ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_FENCE_GATE          ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_FIRE                ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_FLOWER              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_FLOWER_POT          ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_GLASS               ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_GLASS_PANE          ].m_SpreadLightFalloff = 1;
-	a_Info[E_BLOCK_GLOWSTONE           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_HEAD                ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_HOPPER              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_ICE                 ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_IRON_BARS           ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_IRON_DOOR           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_LADDER              ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_LEAVES              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_LEVER               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_LILY_PAD            ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_MELON_STEM          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_MOB_SPAWNER         ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_NETHER_PORTAL       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_NETHER_WART         ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_NEW_LEAVES          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_PISTON              ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_PISTON_EXTENSION    ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_PISTON_MOVED_BLOCK  ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_POTATOES            ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_POWERED_RAIL        ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_PUMPKIN_STEM        ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_RAIL                ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_RED_MUSHROOM        ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_REDSTONE_REPEATER_OFF].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_REDSTONE_REPEATER_ON].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_REDSTONE_TORCH_OFF  ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_REDSTONE_TORCH_ON   ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_REDSTONE_WIRE       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_SAPLING             ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_SIGN_POST           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_SNOW                ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STAINED_GLASS       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STAINED_GLASS_PANE  ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STICKY_PISTON       ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STONE_BUTTON        ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STONE_SLAB          ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_SUGARCANE           ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_TALL_GRASS          ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_TORCH               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_TRAPDOOR            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_TRAPPED_CHEST       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_TRIPWIRE            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_VINES               ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_WALLSIGN            ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_WOODEN_DOOR         ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_WOODEN_PRESSURE_PLATE].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_WOODEN_SLAB         ].m_SpreadLightFalloff = 1;
 
 	// Light in water and lava dissapears faster:
 	a_Info[E_BLOCK_LAVA                ].m_SpreadLightFalloff = 3;
@@ -117,19 +186,34 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 
 	// Transparent blocks
 	a_Info[E_BLOCK_ACTIVATOR_RAIL      ].m_Transparent = true;
+	a_Info[E_BLOCK_ACTIVE_COMPARATOR   ].m_Transparent = true;
 	a_Info[E_BLOCK_AIR                 ].m_Transparent = true;
 	a_Info[E_BLOCK_ANVIL               ].m_Transparent = true;
+	a_Info[E_BLOCK_BEACON              ].m_Transparent = true;
+	a_Info[E_BLOCK_BED                 ].m_Transparent = true;
 	a_Info[E_BLOCK_BIG_FLOWER          ].m_Transparent = true;
 	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_Transparent = true;
+	a_Info[E_BLOCK_BREWING_STAND       ].m_Transparent = true;
+	a_Info[E_BLOCK_CACTUS              ].m_Transparent = true;
 	a_Info[E_BLOCK_CAKE                ].m_Transparent = true;
+	a_Info[E_BLOCK_CARPET              ].m_Transparent = true;
 	a_Info[E_BLOCK_CARROTS             ].m_Transparent = true;
+	a_Info[E_BLOCK_CAULDRON            ].m_Transparent = true;
 	a_Info[E_BLOCK_CHEST               ].m_Transparent = true;
 	a_Info[E_BLOCK_COBBLESTONE_WALL    ].m_Transparent = true;
+	a_Info[E_BLOCK_COCOA_POD           ].m_Transparent = true;
 	a_Info[E_BLOCK_COBWEB              ].m_Transparent = true;
 	a_Info[E_BLOCK_CROPS               ].m_Transparent = true;
 	a_Info[E_BLOCK_DANDELION           ].m_Transparent = true;
+	a_Info[E_BLOCK_DAYLIGHT_SENSOR     ].m_Transparent = true;
+	a_Info[E_BLOCK_DEAD_BUSH           ].m_Transparent = true;
 	a_Info[E_BLOCK_DETECTOR_RAIL       ].m_Transparent = true;
+	a_Info[E_BLOCK_DRAGON_EGG          ].m_Transparent = true;
+	a_Info[E_BLOCK_ENCHANTMENT_TABLE   ].m_Transparent = true;
 	a_Info[E_BLOCK_ENDER_CHEST         ].m_Transparent = true;
+	a_Info[E_BLOCK_END_PORTAL          ].m_Transparent = true;
+	a_Info[E_BLOCK_END_PORTAL_FRAME    ].m_Transparent = true;
+	a_Info[E_BLOCK_FARMLAND            ].m_Transparent = true;
 	a_Info[E_BLOCK_FENCE               ].m_Transparent = true;
 	a_Info[E_BLOCK_FENCE_GATE          ].m_Transparent = true;
 	a_Info[E_BLOCK_FIRE                ].m_Transparent = true;
@@ -139,43 +223,61 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_GLASS_PANE          ].m_Transparent = true;
 	a_Info[E_BLOCK_HEAD                ].m_Transparent = true;
 	a_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_Transparent = true;
+	a_Info[E_BLOCK_HOPPER              ].m_Transparent = true;
 	a_Info[E_BLOCK_ICE                 ].m_Transparent = true;
+	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_Transparent = true;
+	a_Info[E_BLOCK_IRON_BARS           ].m_Transparent = true;
 	a_Info[E_BLOCK_IRON_DOOR           ].m_Transparent = true;
 	a_Info[E_BLOCK_LADDER              ].m_Transparent = true;
 	a_Info[E_BLOCK_LAVA                ].m_Transparent = true;
 	a_Info[E_BLOCK_LEAVES              ].m_Transparent = true;
 	a_Info[E_BLOCK_LEVER               ].m_Transparent = true;
+	a_Info[E_BLOCK_LILY_PAD            ].m_Transparent = true;
 	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_Transparent = true;
 	a_Info[E_BLOCK_MELON_STEM          ].m_Transparent = true;
+	a_Info[E_BLOCK_MOB_SPAWNER         ].m_Transparent = true;
 	a_Info[E_BLOCK_NETHER_BRICK_FENCE  ].m_Transparent = true;
+	a_Info[E_BLOCK_NETHER_PORTAL       ].m_Transparent = true;
+	a_Info[E_BLOCK_NETHER_WART         ].m_Transparent = true;
 	a_Info[E_BLOCK_NEW_LEAVES          ].m_Transparent = true;
+	a_Info[E_BLOCK_PISTON              ].m_Transparent = true;
+	a_Info[E_BLOCK_PISTON_EXTENSION    ].m_Transparent = true;
+	a_Info[E_BLOCK_PISTON_MOVED_BLOCK  ].m_Transparent = true;
 	a_Info[E_BLOCK_POTATOES            ].m_Transparent = true;
 	a_Info[E_BLOCK_POWERED_RAIL        ].m_Transparent = true;
-	a_Info[E_BLOCK_PISTON_EXTENSION    ].m_Transparent = true;
 	a_Info[E_BLOCK_PUMPKIN_STEM        ].m_Transparent = true;
 	a_Info[E_BLOCK_RAIL                ].m_Transparent = true;
 	a_Info[E_BLOCK_RED_MUSHROOM        ].m_Transparent = true;
+	a_Info[E_BLOCK_REDSTONE_REPEATER_OFF].m_Transparent = true;
+	a_Info[E_BLOCK_REDSTONE_REPEATER_ON].m_Transparent = true;
+	a_Info[E_BLOCK_REDSTONE_TORCH_OFF  ].m_Transparent = true;
+	a_Info[E_BLOCK_REDSTONE_TORCH_ON   ].m_Transparent = true;
+	a_Info[E_BLOCK_REDSTONE_WIRE       ].m_Transparent = true;
+	a_Info[E_BLOCK_SAPLING             ].m_Transparent = true;
 	a_Info[E_BLOCK_SIGN_POST           ].m_Transparent = true;
 	a_Info[E_BLOCK_SNOW                ].m_Transparent = true;
 	a_Info[E_BLOCK_STAINED_GLASS       ].m_Transparent = true;
 	a_Info[E_BLOCK_STAINED_GLASS_PANE  ].m_Transparent = true;
 	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_Transparent = true;
 	a_Info[E_BLOCK_STATIONARY_WATER    ].m_Transparent = true;
+	a_Info[E_BLOCK_STICKY_PISTON       ].m_Transparent = true;
 	a_Info[E_BLOCK_STONE_BUTTON        ].m_Transparent = true;
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_Transparent = true;
+	a_Info[E_BLOCK_STONE_SLAB          ].m_Transparent = true;
+	a_Info[E_BLOCK_SUGARCANE           ].m_Transparent = true;
+	a_Info[E_BLOCK_TALL_GRASS          ].m_Transparent = true;
+	a_Info[E_BLOCK_TORCH               ].m_Transparent = true;
+	a_Info[E_BLOCK_TRAPDOOR            ].m_Transparent = true;
 	a_Info[E_BLOCK_TRAPPED_CHEST       ].m_Transparent = true;
 	a_Info[E_BLOCK_TRIPWIRE            ].m_Transparent = true;
 	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_Transparent = true;
-	a_Info[E_BLOCK_TALL_GRASS          ].m_Transparent = true;
-	a_Info[E_BLOCK_TORCH               ].m_Transparent = true;
 	a_Info[E_BLOCK_VINES               ].m_Transparent = true;
 	a_Info[E_BLOCK_WALLSIGN            ].m_Transparent = true;
 	a_Info[E_BLOCK_WATER               ].m_Transparent = true;
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_Transparent = true;
 	a_Info[E_BLOCK_WOODEN_DOOR         ].m_Transparent = true;
 	a_Info[E_BLOCK_WOODEN_PRESSURE_PLATE].m_Transparent = true;
-
-	// TODO: Any other transparent blocks?
+	a_Info[E_BLOCK_WOODEN_SLAB         ].m_Transparent = true;
 
 
 	// One hit break blocks:
@@ -185,10 +287,12 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_CARROTS             ].m_OneHitDig = true;
 	a_Info[E_BLOCK_CROPS               ].m_OneHitDig = true;
 	a_Info[E_BLOCK_DANDELION           ].m_OneHitDig = true;
+	a_Info[E_BLOCK_DEAD_BUSH           ].m_OneHitDig = true;
 	a_Info[E_BLOCK_FIRE                ].m_OneHitDig = true;
 	a_Info[E_BLOCK_FLOWER              ].m_OneHitDig = true;
 	a_Info[E_BLOCK_FLOWER_POT          ].m_OneHitDig = true;
 	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_OneHitDig = true;
+	a_Info[E_BLOCK_LILY_PAD            ].m_OneHitDig = true;
 	a_Info[E_BLOCK_MELON_STEM          ].m_OneHitDig = true;
 	a_Info[E_BLOCK_POTATOES            ].m_OneHitDig = true;
 	a_Info[E_BLOCK_PUMPKIN_STEM        ].m_OneHitDig = true;
@@ -212,24 +316,32 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_BED                 ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_BIG_FLOWER          ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_CACTUS              ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_CAKE                ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_CARROTS             ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_COCOA_POD           ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_COBWEB              ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_CROPS               ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_DANDELION           ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_DEAD_BUSH           ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_DRAGON_EGG          ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_FIRE                ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_FLOWER              ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_FLOWER_POT          ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_HEAD                ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_PistonBreakable = true;
 	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_IRON_DOOR           ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_JACK_O_LANTERN      ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_PistonBreakable = true;
+	a_Info[E_BLOCK_LILY_PAD            ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LADDER              ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LAVA                ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LEVER               ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_MELON               ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_MELON_STEM          ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_NETHER_WART         ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_POTATOES            ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_PUMPKIN             ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_PUMPKIN_STEM        ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_REDSTONE_REPEATER_OFF].m_PistonBreakable = true;
@@ -239,6 +351,8 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_REDSTONE_WIRE       ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_RED_MUSHROOM        ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_REEDS               ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_SAPLING             ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_SIGN_POST           ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_SNOW                ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_STATIONARY_WATER    ].m_PistonBreakable = true;
@@ -246,61 +360,85 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_PistonBreakable = true;
 	a_Info[E_BLOCK_TALL_GRASS          ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_TORCH               ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_TRAPDOOR            ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_TRIPWIRE            ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_VINES               ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_WALLSIGN            ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_WATER               ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_WOODEN_DOOR         ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_WOODEN_PRESSURE_PLATE].m_PistonBreakable = true;
 
 
-	// Blocks that cannot be snowed over:
-	a_Info[E_BLOCK_ACTIVE_COMPARATOR   ].m_IsSnowable = false;
-	a_Info[E_BLOCK_AIR                 ].m_IsSnowable = false;
-	a_Info[E_BLOCK_BIG_FLOWER          ].m_IsSnowable = false;
-	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_IsSnowable = false;
-	a_Info[E_BLOCK_CACTUS              ].m_IsSnowable = false;
-	a_Info[E_BLOCK_CHEST               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_CROPS               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_COBBLESTONE_WALL    ].m_IsSnowable = false;
-	a_Info[E_BLOCK_DANDELION           ].m_IsSnowable = false;
-	a_Info[E_BLOCK_FIRE                ].m_IsSnowable = false;
-	a_Info[E_BLOCK_FLOWER              ].m_IsSnowable = false;
-	a_Info[E_BLOCK_GLASS               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_ICE                 ].m_IsSnowable = false;
-	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_IsSnowable = false;
-	a_Info[E_BLOCK_LAVA                ].m_IsSnowable = false;
-	a_Info[E_BLOCK_LILY_PAD            ].m_IsSnowable = false;
-	a_Info[E_BLOCK_REDSTONE_REPEATER_OFF].m_IsSnowable = false;
-	a_Info[E_BLOCK_REDSTONE_REPEATER_ON].m_IsSnowable = false;
-	a_Info[E_BLOCK_REDSTONE_TORCH_OFF  ].m_IsSnowable = false;
-	a_Info[E_BLOCK_REDSTONE_TORCH_ON   ].m_IsSnowable = false;
-	a_Info[E_BLOCK_REDSTONE_WIRE       ].m_IsSnowable = false;
-	a_Info[E_BLOCK_RED_MUSHROOM        ].m_IsSnowable = false;
-	a_Info[E_BLOCK_REEDS               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_SAPLING             ].m_IsSnowable = false;
-	a_Info[E_BLOCK_SIGN_POST           ].m_IsSnowable = false;
-	a_Info[E_BLOCK_SNOW                ].m_IsSnowable = false;
-	a_Info[E_BLOCK_STAINED_GLASS       ].m_IsSnowable = false;
-	a_Info[E_BLOCK_STAINED_GLASS_PANE  ].m_IsSnowable = false;
-	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_IsSnowable = false;
-	a_Info[E_BLOCK_STATIONARY_WATER    ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TALL_GRASS          ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TNT                 ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TORCH               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TRAPPED_CHEST       ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TRIPWIRE            ].m_IsSnowable = false;
-	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_IsSnowable = false;
-	a_Info[E_BLOCK_VINES               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_WALLSIGN            ].m_IsSnowable = false;
-	a_Info[E_BLOCK_WATER               ].m_IsSnowable = false;
-	a_Info[E_BLOCK_RAIL                ].m_IsSnowable = false;
-	a_Info[E_BLOCK_ACTIVATOR_RAIL      ].m_IsSnowable = false;
-	a_Info[E_BLOCK_POWERED_RAIL        ].m_IsSnowable = false;
-	a_Info[E_BLOCK_DETECTOR_RAIL       ].m_IsSnowable = false;
-	a_Info[E_BLOCK_COBWEB              ].m_IsSnowable = false;
-	a_Info[E_BLOCK_HEAD                ].m_IsSnowable = false;
+	// Blocks that can be snowed over:
+	a_Info[E_BLOCK_BEDROCK             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_BLOCK_OF_COAL       ].m_IsSnowable = true;
+	a_Info[E_BLOCK_BLOCK_OF_REDSTONE   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_BOOKCASE            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_BRICK               ].m_IsSnowable = true;
+	a_Info[E_BLOCK_CLAY                ].m_IsSnowable = true;
+	a_Info[E_BLOCK_CRAFTING_TABLE      ].m_IsSnowable = true;
+	a_Info[E_BLOCK_COAL_ORE            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_COMMAND_BLOCK       ].m_IsSnowable = true;
+	a_Info[E_BLOCK_COBBLESTONE         ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DIAMOND_BLOCK       ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DIAMOND_ORE         ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DIRT                ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DISPENSER           ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DOUBLE_STONE_SLAB   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DOUBLE_WOODEN_SLAB  ].m_IsSnowable = true;
+	a_Info[E_BLOCK_DROPPER             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_EMERALD_BLOCK       ].m_IsSnowable = true;
+	a_Info[E_BLOCK_EMERALD_ORE         ].m_IsSnowable = true;
+	a_Info[E_BLOCK_END_STONE           ].m_IsSnowable = true;
+	a_Info[E_BLOCK_FURNACE             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_GLOWSTONE           ].m_IsSnowable = true;
+	a_Info[E_BLOCK_GOLD_BLOCK          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_GOLD_ORE            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_GRASS               ].m_IsSnowable = true;
+	a_Info[E_BLOCK_GRAVEL              ].m_IsSnowable = true;
+	a_Info[E_BLOCK_HARDENED_CLAY       ].m_IsSnowable = true;
+	a_Info[E_BLOCK_HAY_BALE            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_HUGE_BROWN_MUSHROOM ].m_IsSnowable = true;
+	a_Info[E_BLOCK_HUGE_RED_MUSHROOM   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_IRON_BLOCK          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_IRON_ORE            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_JACK_O_LANTERN      ].m_IsSnowable = true;
+	a_Info[E_BLOCK_JUKEBOX             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_LAPIS_BLOCK         ].m_IsSnowable = true;
+	a_Info[E_BLOCK_LAPIS_ORE           ].m_IsSnowable = true;
+	a_Info[E_BLOCK_LEAVES              ].m_IsSnowable = true;
+	a_Info[E_BLOCK_LIT_FURNACE         ].m_IsSnowable = true;
+	a_Info[E_BLOCK_LOG                 ].m_IsSnowable = true;
+	a_Info[E_BLOCK_MELON               ].m_IsSnowable = true;
+	a_Info[E_BLOCK_MOSSY_COBBLESTONE   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_MYCELIUM            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NETHER_BRICK        ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NETHER_QUARTZ_ORE   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NETHERRACK          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NEW_LEAVES          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NEW_LOG             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_NOTE_BLOCK          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_OBSIDIAN            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_PLANKS              ].m_IsSnowable = true;
+	a_Info[E_BLOCK_PUMPKIN             ].m_IsSnowable = true;
+	a_Info[E_BLOCK_QUARTZ_BLOCK        ].m_IsSnowable = true;
+	a_Info[E_BLOCK_REDSTONE_LAMP_OFF   ].m_IsSnowable = true;
+	a_Info[E_BLOCK_REDSTONE_LAMP_ON    ].m_IsSnowable = true;
+	a_Info[E_BLOCK_REDSTONE_ORE        ].m_IsSnowable = true;
+	a_Info[E_BLOCK_REDSTONE_ORE_GLOWING].m_IsSnowable = true;
+	a_Info[E_BLOCK_SAND                ].m_IsSnowable = true;
+	a_Info[E_BLOCK_SANDSTONE           ].m_IsSnowable = true;
+	a_Info[E_BLOCK_SILVERFISH_EGG      ].m_IsSnowable = true;
+	a_Info[E_BLOCK_SNOW_BLOCK          ].m_IsSnowable = true;
+	a_Info[E_BLOCK_SOULSAND            ].m_IsSnowable = true;
+	a_Info[E_BLOCK_SPONGE              ].m_IsSnowable = true;
+	a_Info[E_BLOCK_STAINED_CLAY        ].m_IsSnowable = true;
+	a_Info[E_BLOCK_STONE               ].m_IsSnowable = true;
+	a_Info[E_BLOCK_STONE_BRICKS        ].m_IsSnowable = true;
+	a_Info[E_BLOCK_TNT                 ].m_IsSnowable = true;
+	a_Info[E_BLOCK_WOOL                ].m_IsSnowable = true;
 
 
 	// Blocks that don't drop without a special tool:
@@ -323,6 +461,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_IRON_ORE            ].m_RequiresSpecialTool = true;
 	a_Info[E_BLOCK_LAPIS_BLOCK         ].m_RequiresSpecialTool = true;
 	a_Info[E_BLOCK_LAPIS_ORE           ].m_RequiresSpecialTool = true;
+	a_Info[E_BLOCK_LEAVES              ].m_RequiresSpecialTool = true;
 	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_RequiresSpecialTool = true;
 	a_Info[E_BLOCK_MOSSY_COBBLESTONE   ].m_RequiresSpecialTool = true;
 	a_Info[E_BLOCK_NETHERRACK          ].m_RequiresSpecialTool = true;
@@ -347,15 +486,21 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 
 
 	// Nonsolid blocks:
+	a_Info[E_BLOCK_ACACIA_WOOD_STAIRS  ].m_IsSolid = false;
 	a_Info[E_BLOCK_ACTIVATOR_RAIL      ].m_IsSolid = false;
 	a_Info[E_BLOCK_AIR                 ].m_IsSolid = false;
 	a_Info[E_BLOCK_BIG_FLOWER          ].m_IsSolid = false;
+	a_Info[E_BLOCK_BIRCH_WOOD_STAIRS   ].m_IsSolid = false;
+	a_Info[E_BLOCK_BRICK_STAIRS        ].m_IsSolid = false;
 	a_Info[E_BLOCK_BROWN_MUSHROOM      ].m_IsSolid = false;
 	a_Info[E_BLOCK_CAKE                ].m_IsSolid = false;
+	a_Info[E_BLOCK_CARPET              ].m_IsSolid = false;
 	a_Info[E_BLOCK_CARROTS             ].m_IsSolid = false;
+	a_Info[E_BLOCK_COBBLESTONE_STAIRS  ].m_IsSolid = false;
 	a_Info[E_BLOCK_COBWEB              ].m_IsSolid = false;
 	a_Info[E_BLOCK_CROPS               ].m_IsSolid = false;
 	a_Info[E_BLOCK_DANDELION           ].m_IsSolid = false;
+	a_Info[E_BLOCK_DARK_OAK_WOOD_STAIRS].m_IsSolid = false;
 	a_Info[E_BLOCK_DETECTOR_RAIL       ].m_IsSolid = false;
 	a_Info[E_BLOCK_END_PORTAL          ].m_IsSolid = false;
 	a_Info[E_BLOCK_FENCE               ].m_IsSolid = false;
@@ -363,24 +508,30 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_FIRE                ].m_IsSolid = false;
 	a_Info[E_BLOCK_FLOWER              ].m_IsSolid = false;
 	a_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_IsSolid = false;
+	a_Info[E_BLOCK_JUNGLE_WOOD_STAIRS  ].m_IsSolid = false;
 	a_Info[E_BLOCK_LAVA                ].m_IsSolid = false;
 	a_Info[E_BLOCK_LEVER               ].m_IsSolid = false;
 	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_IsSolid = false;
 	a_Info[E_BLOCK_MELON_STEM          ].m_IsSolid = false;
+	a_Info[E_BLOCK_NETHER_BRICK_STAIRS ].m_IsSolid = false;
 	a_Info[E_BLOCK_NETHER_PORTAL       ].m_IsSolid = false;
 	a_Info[E_BLOCK_POTATOES            ].m_IsSolid = false;
 	a_Info[E_BLOCK_POWERED_RAIL        ].m_IsSolid = false;
+	a_Info[E_BLOCK_QUARTZ_STAIRS       ].m_IsSolid = false;
 	a_Info[E_BLOCK_RAIL                ].m_IsSolid = false;
 	a_Info[E_BLOCK_REDSTONE_TORCH_OFF  ].m_IsSolid = false;
 	a_Info[E_BLOCK_REDSTONE_TORCH_ON   ].m_IsSolid = false;
 	a_Info[E_BLOCK_REDSTONE_WIRE       ].m_IsSolid = false;
 	a_Info[E_BLOCK_RED_MUSHROOM        ].m_IsSolid = false;
 	a_Info[E_BLOCK_REEDS               ].m_IsSolid = false;
+	a_Info[E_BLOCK_SANDSTONE_STAIRS    ].m_IsSolid = false;
 	a_Info[E_BLOCK_SAPLING             ].m_IsSolid = false;
 	a_Info[E_BLOCK_SIGN_POST           ].m_IsSolid = false;
 	a_Info[E_BLOCK_SNOW                ].m_IsSolid = false;
+	a_Info[E_BLOCK_SPRUCE_WOOD_STAIRS  ].m_IsSolid = false;
 	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_IsSolid = false;
 	a_Info[E_BLOCK_STATIONARY_WATER    ].m_IsSolid = false;
+	a_Info[E_BLOCK_STONE_BRICK_STAIRS  ].m_IsSolid = false;
 	a_Info[E_BLOCK_STONE_BUTTON        ].m_IsSolid = false;
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_IsSolid = false;
 	a_Info[E_BLOCK_TALL_GRASS          ].m_IsSolid = false;
@@ -392,6 +543,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_IsSolid = false;
 	a_Info[E_BLOCK_WOODEN_PRESSURE_PLATE].m_IsSolid = false;
 	a_Info[E_BLOCK_WOODEN_SLAB         ].m_IsSolid = false;
+	a_Info[E_BLOCK_WOODEN_STAIRS       ].m_IsSolid = false;
 
 
 	// Blocks that fully occupy their voxel - used as a guide for torch placeable blocks, amongst other things:
@@ -455,9 +607,9 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_SILVERFISH_EGG      ].m_FullyOccupiesVoxel = true;
 	a_Info[E_BLOCK_SPONGE              ].m_FullyOccupiesVoxel = true;
 	a_Info[E_BLOCK_STAINED_CLAY        ].m_FullyOccupiesVoxel = true;
-	a_Info[E_BLOCK_WOOL                ].m_FullyOccupiesVoxel = true;
 	a_Info[E_BLOCK_STONE               ].m_FullyOccupiesVoxel = true;
 	a_Info[E_BLOCK_STONE_BRICKS        ].m_FullyOccupiesVoxel = true;
+	a_Info[E_BLOCK_WOOL                ].m_FullyOccupiesVoxel = true;
 }
 
 
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 27a44d829..1c8ac6a35 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -94,7 +94,6 @@ private:
 		switch (a_BlockType)
 		{
 			case E_BLOCK_ANVIL:
-			case E_BLOCK_BED:
 			case E_BLOCK_BEDROCK:
 			case E_BLOCK_BREWING_STAND:
 			case E_BLOCK_CHEST: