diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index adfa67baa..1320154e0 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1660,75 +1660,75 @@
Name="Generating"
>
diff --git a/source/BioGen.cpp b/source/Generating/BioGen.cpp
similarity index 100%
rename from source/BioGen.cpp
rename to source/Generating/BioGen.cpp
diff --git a/source/BioGen.h b/source/Generating/BioGen.h
similarity index 98%
rename from source/BioGen.h
rename to source/Generating/BioGen.h
index 8aaaeff4a..6cd78b7e0 100644
--- a/source/BioGen.h
+++ b/source/Generating/BioGen.h
@@ -14,8 +14,8 @@ Interfaces to the various biome generators:
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/Caves.cpp b/source/Generating/Caves.cpp
similarity index 100%
rename from source/Caves.cpp
rename to source/Generating/Caves.cpp
diff --git a/source/Caves.h b/source/Generating/Caves.h
similarity index 94%
rename from source/Caves.h
rename to source/Generating/Caves.h
index 8af9974fe..cc3f00a52 100644
--- a/source/Caves.h
+++ b/source/Generating/Caves.h
@@ -12,8 +12,8 @@
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/cChunkGenerator.cpp b/source/Generating/ChunkGenerator.cpp
similarity index 99%
rename from source/cChunkGenerator.cpp
rename to source/Generating/ChunkGenerator.cpp
index be2544541..5862c0f5f 100644
--- a/source/cChunkGenerator.cpp
+++ b/source/Generating/ChunkGenerator.cpp
@@ -1,17 +1,17 @@
#include "Globals.h"
-#include "cChunkGenerator.h"
-#include "cWorld.h"
-#include "../iniFile/iniFile.h"
+#include "ChunkGenerator.h"
+#include "../cWorld.h"
+#include "../../iniFile/iniFile.h"
#include "BioGen.h"
#include "HeiGen.h"
#include "CompoGen.h"
#include "StructGen.h"
#include "FinishGen.h"
-#include "cRoot.h"
-#include "cPluginManager.h"
-#include "cLuaChunk.h"
+#include "../cRoot.h"
+#include "../cPluginManager.h"
+#include "../cLuaChunk.h"
#include "Ravines.h"
#include "Caves.h"
diff --git a/source/cChunkGenerator.h b/source/Generating/ChunkGenerator.h
similarity index 99%
rename from source/cChunkGenerator.h
rename to source/Generating/ChunkGenerator.h
index 2faacfd47..23cf76751 100644
--- a/source/cChunkGenerator.h
+++ b/source/Generating/ChunkGenerator.h
@@ -24,8 +24,8 @@ See http://forum.mc-server.org/showthread.php?tid=409 for details.
#pragma once
-#include "cIsThread.h"
-#include "ChunkDef.h"
+#include "../cIsThread.h"
+#include "../ChunkDef.h"
diff --git a/source/CompoGen.cpp b/source/Generating/CompoGen.cpp
similarity index 99%
rename from source/CompoGen.cpp
rename to source/Generating/CompoGen.cpp
index e5f519611..046310d91 100644
--- a/source/CompoGen.cpp
+++ b/source/Generating/CompoGen.cpp
@@ -9,7 +9,7 @@
#include "Globals.h"
#include "CompoGen.h"
-#include "BlockID.h"
+#include "../BlockID.h"
diff --git a/source/CompoGen.h b/source/Generating/CompoGen.h
similarity index 98%
rename from source/CompoGen.h
rename to source/Generating/CompoGen.h
index a7939e68d..235b9dafd 100644
--- a/source/CompoGen.h
+++ b/source/Generating/CompoGen.h
@@ -14,8 +14,8 @@
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/FinishGen.cpp b/source/Generating/FinishGen.cpp
similarity index 99%
rename from source/FinishGen.cpp
rename to source/Generating/FinishGen.cpp
index 26c3a70f1..c3aedd1a0 100644
--- a/source/FinishGen.cpp
+++ b/source/Generating/FinishGen.cpp
@@ -10,8 +10,8 @@
#include "Globals.h"
#include "FinishGen.h"
-#include "cNoise.h"
-#include "BlockID.h"
+#include "../cNoise.h"
+#include "../BlockID.h"
diff --git a/source/FinishGen.h b/source/Generating/FinishGen.h
similarity index 98%
rename from source/FinishGen.h
rename to source/Generating/FinishGen.h
index afa570fdf..f9a539572 100644
--- a/source/FinishGen.h
+++ b/source/Generating/FinishGen.h
@@ -13,8 +13,8 @@
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/HeiGen.cpp b/source/Generating/HeiGen.cpp
similarity index 100%
rename from source/HeiGen.cpp
rename to source/Generating/HeiGen.cpp
diff --git a/source/HeiGen.h b/source/Generating/HeiGen.h
similarity index 98%
rename from source/HeiGen.h
rename to source/Generating/HeiGen.h
index e5b20c334..42e70f2a5 100644
--- a/source/HeiGen.h
+++ b/source/Generating/HeiGen.h
@@ -14,8 +14,8 @@ Interfaces to the various height generators:
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/Ravines.cpp b/source/Generating/Ravines.cpp
similarity index 100%
rename from source/Ravines.cpp
rename to source/Generating/Ravines.cpp
diff --git a/source/Ravines.h b/source/Generating/Ravines.h
similarity index 92%
rename from source/Ravines.h
rename to source/Generating/Ravines.h
index 2f32e3edc..623986f29 100644
--- a/source/Ravines.h
+++ b/source/Generating/Ravines.h
@@ -9,8 +9,8 @@
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/StructGen.cpp b/source/Generating/StructGen.cpp
similarity index 95%
rename from source/StructGen.cpp
rename to source/Generating/StructGen.cpp
index ba70aa2c5..037aa46f8 100644
--- a/source/StructGen.cpp
+++ b/source/Generating/StructGen.cpp
@@ -3,7 +3,7 @@
#include "Globals.h"
#include "StructGen.h"
-#include "BlockID.h"
+#include "../BlockID.h"
#include "Trees.h"
@@ -37,6 +37,14 @@ const int MAX_HEIGHT_LAPIS = 30;
const int NUM_NESTS_LAPIS = 3;
const int NEST_SIZE_LAPIS = 5;
+const int MAX_HEIGHT_DIRT = 127;
+const int NUM_NESTS_DIRT = 20;
+const int NEST_SIZE_DIRT = 32;
+
+const int MAX_HEIGHT_GRAVEL = 70;
+const int NUM_NESTS_GRAVEL = 15;
+const int NEST_SIZE_GRAVEL = 32;
+
@@ -313,6 +321,8 @@ void cStructGenOreNests::GenStructures(
GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_GOLD_ORE, MAX_HEIGHT_GOLD, NUM_NESTS_GOLD, NEST_SIZE_GOLD, a_BlockTypes, 4);
GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_DIAMOND_ORE, MAX_HEIGHT_DIAMOND, NUM_NESTS_DIAMOND, NEST_SIZE_DIAMOND, a_BlockTypes, 5);
GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_LAPIS_ORE, MAX_HEIGHT_LAPIS, NUM_NESTS_LAPIS, NEST_SIZE_LAPIS, a_BlockTypes, 6);
+ GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_DIRT, MAX_HEIGHT_DIRT, NUM_NESTS_DIRT, NEST_SIZE_DIRT, a_BlockTypes, 10);
+ GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_GRAVEL, MAX_HEIGHT_GRAVEL, NUM_NESTS_GRAVEL, NEST_SIZE_GRAVEL, a_BlockTypes, 11);
}
diff --git a/source/StructGen.h b/source/Generating/StructGen.h
similarity index 98%
rename from source/StructGen.h
rename to source/Generating/StructGen.h
index 0a28d84a3..8ddfdadba 100644
--- a/source/StructGen.h
+++ b/source/Generating/StructGen.h
@@ -13,8 +13,8 @@
#pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/Trees.cpp b/source/Generating/Trees.cpp
similarity index 99%
rename from source/Trees.cpp
rename to source/Generating/Trees.cpp
index ed10a47b7..487d3e065 100644
--- a/source/Trees.cpp
+++ b/source/Generating/Trees.cpp
@@ -5,7 +5,7 @@
#include "Globals.h"
#include "Trees.h"
-#include "BlockID.h"
+#include "../BlockID.h"
diff --git a/source/Trees.h b/source/Generating/Trees.h
similarity index 98%
rename from source/Trees.h
rename to source/Generating/Trees.h
index 714736013..d3e76a78c 100644
--- a/source/Trees.h
+++ b/source/Generating/Trees.h
@@ -17,8 +17,8 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
#pragma once
-#include "ChunkDef.h"
-#include "cNoise.h"
+#include "../ChunkDef.h"
+#include "../cNoise.h"
diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp
index b75520448..fda0a75da 100644
--- a/source/WorldStorage.cpp
+++ b/source/WorldStorage.cpp
@@ -10,7 +10,7 @@
#include "WSSCompact.h"
#include "WSSAnvil.h"
#include "cWorld.h"
-#include "cChunkGenerator.h"
+#include "Generating/ChunkGenerator.h"
#include "cEntity.h"
#include "cBlockEntity.h"
#include "BlockID.h"
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp
index d88a82b0f..7c85e5994 100644
--- a/source/cChunkMap.cpp
+++ b/source/cChunkMap.cpp
@@ -10,7 +10,7 @@
#include "cItem.h"
#include "cPickup.h"
#include "cChunk.h"
-#include "Trees.h" // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
+#include "Generating/Trees.h" // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
#ifndef _WIN32
#include // abs
diff --git a/source/cWorld.cpp b/source/cWorld.cpp
index ba54ef961..fecda733a 100644
--- a/source/cWorld.cpp
+++ b/source/cWorld.cpp
@@ -37,10 +37,9 @@
#include "cGhast.h" //Ghast
#include "cZombiepigman.h" //Zombiepigman
#include "cMakeDir.h"
-#include "cChunkGenerator.h"
#include "MersenneTwister.h"
#include "cTracer.h"
-#include "Trees.h"
+#include "Generating/Trees.h"
#include "cPluginManager.h"
#include "blocks/Block.h"
#include "Vector3d.h"
diff --git a/source/cWorld.h b/source/cWorld.h
index 37577fcde..71a854621 100644
--- a/source/cWorld.h
+++ b/source/cWorld.h
@@ -13,7 +13,7 @@
#include "MersenneTwister.h"
#include "cChunkMap.h"
#include "WorldStorage.h"
-#include "cChunkGenerator.h"
+#include "Generating/ChunkGenerator.h"
#include "Vector3i.h"
#include "Vector3f.h"
#include "ChunkSender.h"