Merge pull request #853 from Howaner/Slabs

Grass now grows under up-side-down slabs

MCServer/Plugins/Core

@@ -1 +1 @@
-Subproject commit 013a32a7fb3c8a6cfe0aef892d4c7394d4e1be59
+Subproject commit 5c8557d4fdfa580c100510cde07a1a778ea2e244

src/BlockInfo.cpp

@@ -110,10 +110,13 @@ void cBlockInfo::Initialize(void)
 	// Transparent blocks
 	ms_Info[E_BLOCK_ACTIVATOR_RAIL      ].m_Transparent = true;
 	ms_Info[E_BLOCK_AIR                 ].m_Transparent = true;
+	ms_Info[E_BLOCK_ANVIL               ].m_Transparent = true;
 	ms_Info[E_BLOCK_BIG_FLOWER          ].m_Transparent = true;
 	ms_Info[E_BLOCK_BROWN_MUSHROOM      ].m_Transparent = true;
+	ms_Info[E_BLOCK_CAKE                ].m_Transparent = true;
 	ms_Info[E_BLOCK_CARROTS             ].m_Transparent = true;
 	ms_Info[E_BLOCK_CHEST               ].m_Transparent = true;
+	ms_Info[E_BLOCK_COBBLESTONE_WALL    ].m_Transparent = true;
 	ms_Info[E_BLOCK_COBWEB              ].m_Transparent = true;
 	ms_Info[E_BLOCK_CROPS               ].m_Transparent = true;
 	ms_Info[E_BLOCK_DANDELION           ].m_Transparent = true;
@@ -126,6 +129,7 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_FLOWER_POT          ].m_Transparent = true;
 	ms_Info[E_BLOCK_GLASS               ].m_Transparent = true;
 	ms_Info[E_BLOCK_GLASS_PANE          ].m_Transparent = true;
+	ms_Info[E_BLOCK_HEAD                ].m_Transparent = true;
 	ms_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_Transparent = true;
 	ms_Info[E_BLOCK_ICE                 ].m_Transparent = true;
 	ms_Info[E_BLOCK_IRON_DOOR           ].m_Transparent = true;
@@ -196,12 +200,14 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_BED                 ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_BIG_FLOWER          ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_BROWN_MUSHROOM      ].m_PistonBreakable = true;
+	ms_Info[E_BLOCK_CAKE                ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_COBWEB              ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_CROPS               ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_DANDELION           ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_DEAD_BUSH           ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_FIRE                ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_FLOWER              ].m_PistonBreakable = true;
+	ms_Info[E_BLOCK_HEAD                ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_PistonBreakable = true;
 	ms_Info[E_BLOCK_IRON_DOOR           ].m_PistonBreakable = true;
@@ -243,6 +249,7 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_CACTUS              ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_CHEST               ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_CROPS               ].m_IsSnowable = false;
+	ms_Info[E_BLOCK_COBBLESTONE_WALL    ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_DANDELION           ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_FIRE                ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_FLOWER              ].m_IsSnowable = false;
@@ -276,6 +283,7 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_POWERED_RAIL        ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_DETECTOR_RAIL       ].m_IsSnowable = false;
 	ms_Info[E_BLOCK_COBWEB              ].m_IsSnowable = false;
+	ms_Info[E_BLOCK_HEAD                ].m_IsSnowable = false;
 
 
 	// Blocks that don't drop without a special tool:
@@ -283,6 +291,7 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_CAULDRON            ].m_RequiresSpecialTool = true;
 	ms_Info[E_BLOCK_COAL_ORE            ].m_RequiresSpecialTool = true;
 	ms_Info[E_BLOCK_COBBLESTONE         ].m_RequiresSpecialTool = true;
+	ms_Info[E_BLOCK_COBBLESTONE_WALL    ].m_RequiresSpecialTool = true;
 	ms_Info[E_BLOCK_COBBLESTONE_STAIRS  ].m_RequiresSpecialTool = true;
 	ms_Info[E_BLOCK_COBWEB              ].m_RequiresSpecialTool = true;
 	ms_Info[E_BLOCK_DIAMOND_BLOCK       ].m_RequiresSpecialTool = true;
@@ -325,6 +334,7 @@ void cBlockInfo::Initialize(void)
 	ms_Info[E_BLOCK_AIR                 ].m_IsSolid = false;
 	ms_Info[E_BLOCK_BIG_FLOWER          ].m_IsSolid = false;
 	ms_Info[E_BLOCK_BROWN_MUSHROOM      ].m_IsSolid = false;
+	ms_Info[E_BLOCK_CAKE                ].m_IsSolid = false;
 	ms_Info[E_BLOCK_CARROTS             ].m_IsSolid = false;
 	ms_Info[E_BLOCK_COBWEB              ].m_IsSolid = false;
 	ms_Info[E_BLOCK_CROPS               ].m_IsSolid = false;

src/Blocks/BlockBed.h

@@ -39,6 +39,13 @@ public:
 	}
 
 
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
+	{
+		return true;
+	}
+
+
+
 	// Bed specific helper functions
 	static NIBBLETYPE RotationToMetaData(double a_Rotation)
 	{

src/Blocks/BlockDirt.h

@@ -35,8 +35,10 @@ public:
 		// Grass becomes dirt if there is something on top of it:
 		if (a_RelY < cChunkDef::Height - 1)
 		{
-			BLOCKTYPE Above = a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ);
-			if ((!cBlockInfo::IsTransparent(Above) && !cBlockInfo::IsOneHitDig(Above)) || IsBlockWater(Above))
+			BLOCKTYPE Above;
+			NIBBLETYPE AboveMeta;
+			a_Chunk.GetBlockTypeMeta(a_RelX, a_RelY + 1, a_RelZ, Above, AboveMeta);
+			if (!cBlockInfo::GetHandler(Above)->CanDirtGrowGrass(AboveMeta))
 			{
 				a_Chunk.FastSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_DIRT, E_META_DIRT_NORMAL);
 				return;
@@ -77,7 +79,7 @@ public:
 			BLOCKTYPE AboveDest;
 			NIBBLETYPE AboveMeta;
 			Chunk->GetBlockTypeMeta(BlockX, BlockY + 1, BlockZ, AboveDest, AboveMeta);
-			if ((cBlockInfo::IsOneHitDig(AboveDest) || cBlockInfo::IsTransparent(AboveDest)) && !IsBlockWater(AboveDest))
+			if (cBlockInfo::GetHandler(AboveDest)->CanDirtGrowGrass(AboveMeta))
 			{
 				if (!cRoot::Get()->GetPluginManager()->CallHookBlockSpread((cWorld*) &a_WorldInterface, BlockX * cChunkDef::Width, BlockY, BlockZ * cChunkDef::Width, ssGrassSpread))
 				{

src/Blocks/BlockFluid.h

@@ -49,6 +49,12 @@ public:
 		}
 		super::Check(a_ChunkInterface, a_PluginInterface, a_RelX, a_RelY, a_RelZ, a_Chunk);
 	}
+
+
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
+	{
+		return false;
+	}
 } ;
 
 

src/Blocks/BlockHandler.cpp

@@ -400,6 +400,15 @@ bool cBlockHandler::CanBeAt(cChunkInterface & a_ChunkInterface, int a_BlockX, in
 
 
 
+bool cBlockHandler::CanDirtGrowGrass(NIBBLETYPE a_Meta)
+{
+	return ((cBlockInfo::IsTransparent(m_BlockType)) || (cBlockInfo::IsOneHitDig(m_BlockType)));
+}
+
+
+
+
+
 bool cBlockHandler::IsUseable()
 {
 	return false;

src/Blocks/BlockHandler.h

@@ -85,6 +85,9 @@ public:
 	
 	/// Checks if the block can stay at the specified relative coords in the chunk
 	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk);
+
+	/** Can the dirt under this block grow to grass? */
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta);
 	
 	/** Checks if the block can be placed at this point.
 	Default: CanBeAt(...) 

src/Blocks/BlockSlab.h

@@ -97,6 +97,12 @@ public:
 		return "";
 	}
 
+
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
+	{
+		return (a_Meta & 0x8);
+	}
+
 	
 	/// Returns true if the specified blocktype is one of the slabs handled by this handler
 	static bool IsAnySlabType(BLOCKTYPE a_BlockType)

src/Blocks/BlockStairs.h

@@ -77,6 +77,11 @@ public:
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
+
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
+	{
+		return true;
+	}
 	
 	static NIBBLETYPE RotationToMetaData(double a_Rotation)
 	{

src/Items/ItemMinecart.h

@@ -78,7 +78,7 @@ public:
 		}
 		return true;
 	}
-	
+
 } ;
 
 

src/Items/ItemPickaxe.h

@@ -76,6 +76,7 @@ public:
 			case E_BLOCK_STONE_PRESSURE_PLATE:
 			case E_BLOCK_BRICK:
 			case E_BLOCK_COBBLESTONE_STAIRS:
+			case E_BLOCK_COBBLESTONE_WALL:
 			case E_BLOCK_STONE_BRICK_STAIRS:
 			case E_BLOCK_NETHER_BRICK_STAIRS:
 			case E_BLOCK_CAULDRON: