3 files changed, 74 insertions, 0 deletions

diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 7b6234161..21626e76b 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -338,6 +338,10 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 			float Threshold = (float)a_IniFile.GetValueSetF("Generator", "DualRidgeCavesThreshold", 0.3);
 			m_FinishGens.push_back(new cStructGenDualRidgeCaves(Seed, Threshold));
 		}
+		else if (NoCaseCompare(*itr, "Foliage") == 0)
+		{
+			m_FinishGens.push_back(new cFinishGenFoliage(Seed));
+		}
 		else if (NoCaseCompare(*itr, "Ice") == 0)
 		{
 			m_FinishGens.push_back(new cFinishGenIce);
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index f2d66af70..06c1dcbbe 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -160,6 +160,38 @@ void cFinishGenNetherClumpFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFinishGenFoliage:
+
+void cFinishGenFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
+{
+	for (int x = 1; x < cChunkDef::Width; x++)
+	{
+		int xx = x + a_ChunkDesc.GetChunkX();
+		for (int z = 1; z < cChunkDef::Width; z++)
+		{
+			int zz = z + a_ChunkDesc.GetChunkZ();
+			//if (true)
+			if (m_Noise.CubicNoise2D((float) xx + m_Noise.CubicNoise1D(xx), zz + m_Noise.CubicNoise1D(zz)) < GetBiomeDensity(a_ChunkDesc.GetBiome(x, z)))
+			{
+				for (int y = a_ChunkDesc.GetHeight(x, z) + 1; y >= 1; y--)
+				{
+					if (
+						(a_ChunkDesc.GetBlockType(x, y, z) == E_BLOCK_AIR) &&
+						(a_ChunkDesc.GetBlockType(x, y - 1, z) == E_BLOCK_GRASS)
+					)
+					{
+						a_ChunkDesc.SetBlockTypeMeta(x, y, z, E_BLOCK_TALL_GRASS, m_Noise.CubicNoise2D(xx * 100, zz * 100) > -0.2 ? 1 : 2);
+					}
+				}
+			}
+		}
+	}
+}
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cFinishGenSprinkleFoliage:
 
 bool cFinishGenSprinkleFoliage::TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ)
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index 2e5732929..ea322c7ae 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -69,6 +69,44 @@ protected:
 
 
 
+class cFinishGenFoliage :
+	public cFinishGen
+{
+public:
+	cFinishGenFoliage(int a_Seed) : m_Noise(a_Seed), m_Seed(a_Seed) {}
+
+protected:
+	cNoise m_Noise;
+	int m_Seed;
+
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+
+	float GetBiomeDensity(EMCSBiome a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biSavanna:
+			case biSavannaM:
+			case biSavannaPlateau:
+			case biSavannaPlateauM:
+			case biPlains:
+			{
+				return 0.0;
+			}
+			default:
+			{
+				return -0.4;
+			}
+		}
+		return -0.3;
+	}
+};
+
+
+
+
+
 class cFinishGenSprinkleFoliage :
 	public cFinishGen
 {