1 files changed, 88 insertions, 1 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index cedb9aeb7..2f575fe27 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -387,6 +387,28 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 
 			m_FinishGens.push_back(new cFinishGenSingleTopBlock(Seed, E_BLOCK_LILY_PAD, AllowedBiomes, 4, AllowedBlocks));
 		}
+		else if (NoCaseCompare(*itr, "NaturalPatches") == 0)
+		{
+			cStructGenOreNests::OreList Ores;
+
+			// Dirt vein
+			cStructGenOreNests::OreInfo DirtVein;
+			DirtVein.BlockType = E_BLOCK_DIRT;
+			DirtVein.MaxHeight = 127;
+			DirtVein.NumNests = 20;
+			DirtVein.NestSize = 32;
+			Ores.push_back(DirtVein);
+
+			// Gravel vein
+			cStructGenOreNests::OreInfo GravelVein;
+			GravelVein.BlockType = E_BLOCK_DIRT;
+			GravelVein.MaxHeight = 127;
+			GravelVein.NumNests = 20;
+			GravelVein.NestSize = 32;
+			Ores.push_back(GravelVein);
+
+			m_FinishGens.push_back(new cStructGenOreNests(Seed, Ores, E_BLOCK_STONE));
+		}
 		else if (NoCaseCompare(*itr, "NetherClumpFoliage") == 0)
 		{
 			m_FinishGens.push_back(new cFinishGenNetherClumpFoliage(Seed));
@@ -398,9 +420,74 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 			int MaxDepth  = a_IniFile.GetValueSetI("Generator", "NetherFortsMaxDepth", 12);
 			m_FinishGens.push_back(new cNetherFortGen(Seed, GridSize, MaxOffset, MaxDepth));
 		}
+		else if (NoCaseCompare(*itr, "NetherOreNests") == 0)
+		{
+			cStructGenOreNests::OreList Ores;
+
+			// Quartz vein
+			cStructGenOreNests::OreInfo QuartzVein;
+			QuartzVein.BlockType = E_BLOCK_NETHER_QUARTZ_ORE;
+			QuartzVein.MaxHeight = 255;
+			QuartzVein.NumNests = 80;
+			QuartzVein.NestSize = 8;
+			Ores.push_back(QuartzVein);
+
+			m_FinishGens.push_back(new cStructGenOreNests(Seed, Ores, E_BLOCK_NETHERRACK));
+
+		}
 		else if (NoCaseCompare(*itr, "OreNests") == 0)
 		{
-			m_FinishGens.push_back(new cStructGenOreNests(Seed));
+			cStructGenOreNests::OreList Ores;
+
+			// Coal vein
+			cStructGenOreNests::OreInfo CoalVein;
+			CoalVein.BlockType = E_BLOCK_COAL_ORE;
+			CoalVein.MaxHeight = 127;
+			CoalVein.NumNests  = 50;
+			CoalVein.NestSize  = 10;
+			Ores.push_back(CoalVein);
+
+			// Iron vein
+			cStructGenOreNests::OreInfo IronVein;
+			IronVein.BlockType = E_BLOCK_IRON_ORE;
+			IronVein.MaxHeight = 64;
+			IronVein.NumNests  = 14;
+			IronVein.NestSize  = 6;
+			Ores.push_back(IronVein);
+
+			// Gold vein
+			cStructGenOreNests::OreInfo GoldVein;
+			GoldVein.BlockType = E_BLOCK_GOLD_ORE;
+			GoldVein.MaxHeight = 32;
+			GoldVein.NumNests = 2;
+			GoldVein.NestSize = 6;
+			Ores.push_back(GoldVein);
+
+			// Redstone vein
+			cStructGenOreNests::OreInfo RedstoneVein;
+			RedstoneVein.BlockType = E_BLOCK_REDSTONE_ORE;
+			RedstoneVein.MaxHeight = 16;
+			RedstoneVein.NumNests = 4;
+			RedstoneVein.NestSize = 6;
+			Ores.push_back(RedstoneVein);
+
+			// Lapis vein
+			cStructGenOreNests::OreInfo LapisVein;
+			LapisVein.BlockType = E_BLOCK_LAPIS_ORE;
+			LapisVein.MaxHeight = 30;
+			LapisVein.NumNests = 2;
+			LapisVein.NestSize = 5;
+			Ores.push_back(LapisVein);
+
+			// Diamond vein
+			cStructGenOreNests::OreInfo DiamondVein;
+			DiamondVein.BlockType = E_BLOCK_DIAMOND_ORE;
+			DiamondVein.MaxHeight = 15;
+			DiamondVein.NumNests = 1;
+			DiamondVein.NestSize = 4;
+			Ores.push_back(DiamondVein);
+
+			m_FinishGens.push_back(new cStructGenOreNests(Seed, Ores, E_BLOCK_STONE));
 		}
 		else if (NoCaseCompare(*itr, "POCPieces") == 0)
 		{