]> git.lizzy.rs Git - minetest.git/blobdiff - src/mapgen.cpp
Add clouds API
[minetest.git] / src / mapgen.cpp
index 72757f4fac6f13f24ddd2eb5698d2128c71eabdb..bd0e94ac7c0e79886f8fd142600de2a201f5c663 100644 (file)
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,460 +21,238 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
-#include "biome.h"
+#include "gamedef.h"
+#include "mg_biome.h"
 #include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
-//#include "serverobject.h"
 #include "content_sao.h"
 #include "nodedef.h"
-#include "content_mapnode.h" // For content_mapnode_get_new_name
+#include "emerge.h"
 #include "voxelalgorithms.h"
+#include "porting.h"
 #include "profiler.h"
-#include "settings.h" // For g_settings
-#include "main.h" // For g_profiler
+#include "settings.h"
 #include "treegen.h"
+#include "serialization.h"
+#include "util/serialize.h"
+#include "util/numeric.h"
+#include "filesys.h"
+#include "log.h"
+#include "mapgen_flat.h"
+#include "mapgen_fractal.h"
+#include "mapgen_v5.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
+#include "mapgen_valleys.h"
+#include "mapgen_singlenode.h"
+#include "cavegen.h"
+#include "dungeongen.h"
 
 FlagDesc flagdesc_mapgen[] = {
-       {"trees",          MG_TREES},
-       {"caves",          MG_CAVES},
-       {"dungeons",       MG_DUNGEONS},
-       {"v6_jungles",     MGV6_JUNGLES},
-       {"v6_biome_blend", MGV6_BIOME_BLEND},
-       {"flat",           MG_FLAT},
-       {NULL,             0}
+       {"caves",       MG_CAVES},
+       {"dungeons",    MG_DUNGEONS},
+       {"light",       MG_LIGHT},
+       {"decorations", MG_DECORATIONS},
+       {NULL,       0}
 };
 
-FlagDesc flagdesc_ore[] = {
-       {"absheight",            OREFLAG_ABSHEIGHT},
-       {"scatter_noisedensity", OREFLAG_DENSITY},
-       {"claylike_nodeisnt",    OREFLAG_NODEISNT},
-       {NULL,                   0}
+FlagDesc flagdesc_gennotify[] = {
+       {"dungeon",          1 << GENNOTIFY_DUNGEON},
+       {"temple",           1 << GENNOTIFY_TEMPLE},
+       {"cave_begin",       1 << GENNOTIFY_CAVE_BEGIN},
+       {"cave_end",         1 << GENNOTIFY_CAVE_END},
+       {"large_cave_begin", 1 << GENNOTIFY_LARGECAVE_BEGIN},
+       {"large_cave_end",   1 << GENNOTIFY_LARGECAVE_END},
+       {"decoration",       1 << GENNOTIFY_DECORATION},
+       {NULL,               0}
 };
 
+struct MapgenDesc {
+       const char *name;
+       bool is_user_visible;
+};
 
-///////////////////////////////////////////////////////////////////////////////
-
+////
+//// Built-in mapgens
+////
+
+static MapgenDesc g_reg_mapgens[] = {
+       {"v5",         true},
+       {"v6",         true},
+       {"v7",         true},
+       {"flat",       true},
+       {"fractal",    true},
+       {"valleys",    true},
+       {"singlenode", false},
+};
 
-Ore *createOre(OreType type) {
-       switch (type) {
-               case ORE_SCATTER:
-                       return new OreScatter;
-               case ORE_SHEET:
-                       return new OreSheet;
-               //case ORE_CLAYLIKE: //TODO: implement this!
-               //      return new OreClaylike;
-               default:
-                       return NULL;
-       }
+STATIC_ASSERT(
+       ARRLEN(g_reg_mapgens) == MAPGEN_INVALID,
+       registered_mapgens_is_wrong_size);
+
+////
+//// Mapgen
+////
+
+Mapgen::Mapgen()
+{
+       generating   = false;
+       id           = -1;
+       seed         = 0;
+       water_level  = 0;
+       mapgen_limit = 0;
+       flags        = 0;
+
+       vm        = NULL;
+       ndef      = NULL;
+       biomegen  = NULL;
+       biomemap  = NULL;
+       heightmap = NULL;
 }
 
 
-Ore::~Ore() {
-       delete np;
-       delete noise;
+Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge) :
+       gennotify(emerge->gen_notify_on, &emerge->gen_notify_on_deco_ids)
+{
+       generating   = false;
+       id           = mapgenid;
+       water_level  = params->water_level;
+       mapgen_limit = params->mapgen_limit;
+       flags        = params->flags;
+       csize        = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
+
+       /*
+               We are losing half our entropy by doing this, but it is necessary to
+               preserve reverse compatibility.  If the top half of our current 64 bit
+               seeds ever starts getting used, existing worlds will break due to a
+               different hash outcome and no way to differentiate between versions.
+
+               A solution could be to add a new bit to designate that the top half of
+               the seed value should be used, essentially a 1-bit version code, but
+               this would require increasing the total size of a seed to 9 bytes (yuck)
+
+               It's probably okay if this never gets fixed.  4.2 billion possibilities
+               ought to be enough for anyone.
+       */
+       seed = (s32)params->seed;
+
+       vm        = NULL;
+       ndef      = emerge->ndef;
+       biomegen  = NULL;
+       biomemap  = NULL;
+       heightmap = NULL;
 }
 
 
-void Ore::resolveNodeNames(INodeDefManager *ndef) {
-       if (ore == CONTENT_IGNORE) {
-               ore = ndef->getId(ore_name);
-               if (ore == CONTENT_IGNORE) {
-                       errorstream << "Ore::resolveNodeNames: ore node '"
-                               << ore_name << "' not defined";
-                       ore     = CONTENT_AIR;
-                       wherein = CONTENT_AIR;
-               }
-       }
-
-       if (wherein == CONTENT_IGNORE) {
-               wherein = ndef->getId(wherein_name);
-               if (wherein == CONTENT_IGNORE) {
-                       errorstream << "Ore::resolveNodeNames: wherein node '"
-                               << wherein_name << "' not defined";
-                       ore     = CONTENT_AIR;
-                       wherein = CONTENT_AIR;
-               }
-       }
+Mapgen::~Mapgen()
+{
 }
 
 
-void Ore::placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
-       int in_range = 0;
-
-       in_range |= (nmin.Y <= height_max && nmax.Y >= height_min);
-       if (flags & OREFLAG_ABSHEIGHT)
-               in_range |= (nmin.Y >= -height_max && nmax.Y <= -height_min) << 1;
-       if (!in_range)
-               return;
-
-       int ymin, ymax;
-       if (in_range & ORE_RANGE_MIRROR) {
-               ymin = MYMAX(nmin.Y, -height_max);
-               ymax = MYMIN(nmax.Y, -height_min);
-       } else {
-               ymin = MYMAX(nmin.Y, height_min);
-               ymax = MYMIN(nmax.Y, height_max);
+MapgenType Mapgen::getMapgenType(const std::string &mgname)
+{
+       for (size_t i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+               if (mgname == g_reg_mapgens[i].name)
+                       return (MapgenType)i;
        }
-       if (clust_size >= ymax - ymin + 1)
-               return;
 
-       nmin.Y = ymin;
-       nmax.Y = ymax;
-       generate(mg->vm, mg->seed, blockseed, nmin, nmax);
+       return MAPGEN_INVALID;
 }
 
 
-void OreScatter::generate(ManualMapVoxelManipulator *vm, int seed,
-                                                 u32 blockseed, v3s16 nmin, v3s16 nmax) {
-       PseudoRandom pr(blockseed);
-       MapNode n_ore(ore, 0, ore_param2);
-
-       int volume = (nmax.X - nmin.X + 1) *
-                                (nmax.Y - nmin.Y + 1) *
-                                (nmax.Z - nmin.Z + 1);
-       int csize     = clust_size;
-       int orechance = (csize * csize * csize) / clust_num_ores;
-       int nclusters = volume / clust_scarcity;
-
-       for (int i = 0; i != nclusters; i++) {
-               int x0 = pr.range(nmin.X, nmax.X - csize + 1);
-               int y0 = pr.range(nmin.Y, nmax.Y - csize + 1);
-               int z0 = pr.range(nmin.Z, nmax.Z - csize + 1);
-               if (np && (NoisePerlin3D(np, x0, y0, z0, seed) < nthresh))
-                       continue;
+const char *Mapgen::getMapgenName(MapgenType mgtype)
+{
+       size_t index = (size_t)mgtype;
+       if (index == MAPGEN_INVALID || index >= ARRLEN(g_reg_mapgens))
+               return "invalid";
 
-               for (int z1 = 0; z1 != csize; z1++)
-               for (int y1 = 0; y1 != csize; y1++)
-               for (int x1 = 0; x1 != csize; x1++) {
-                       if (pr.range(1, orechance) != 1)
-                               continue;
-
-                       u32 i = vm->m_area.index(x0 + x1, y0 + y1, z0 + z1);
-                       if (vm->m_data[i].getContent() == wherein)
-                               vm->m_data[i] = n_ore;
-               }
-       }
+       return g_reg_mapgens[index].name;
 }
 
 
-void OreSheet::generate(ManualMapVoxelManipulator *vm, int seed,
-                                               u32 blockseed, v3s16 nmin, v3s16 nmax) {
-       PseudoRandom pr(blockseed + 4234);
-       MapNode n_ore(ore, 0, ore_param2);
-
-       int max_height = clust_size;
-       int y_start = pr.range(nmin.Y, nmax.Y - max_height);
-
-       if (!noise) {
-               int sx = nmax.X - nmin.X + 1;
-               int sz = nmax.Z - nmin.Z + 1;
-               noise = new Noise(np, 0, sx, sz);
-       }
-       noise->seed = seed + y_start;
-       noise->perlinMap2D(nmin.X, nmin.Z);
-
-       int index = 0;
-       for (int z = nmin.Z; z <= nmax.Z; z++)
-       for (int x = nmin.X; x <= nmax.X; x++) {
-               float noiseval = noise->result[index++];
-               if (noiseval < nthresh)
-                       continue;
-
-               int height = max_height * (1. / pr.range(1, 3));
-               int y0 = y_start + np->scale * noiseval; //pr.range(1, 3) - 1;
-               int y1 = y0 + height;
-               for (int y = y0; y != y1; y++) {
-                       u32 i = vm->m_area.index(x, y, z);
-                       if (!vm->m_area.contains(i))
-                               continue;
-
-                       if (vm->m_data[i].getContent() == wherein)
-                               vm->m_data[i] = n_ore;
-               }
-       }
-}
-
-
-Decoration *createDecoration(DecorationType type) {
-       switch (type) {
-               case DECO_SIMPLE:
-                       return new DecoSimple;
-               //case DECO_SCHEMATIC:
-               //      return new DecoSchematic;
-               //case DECO_LSYSTEM:
-               //      return new DecoLSystem;
-               default:
-                       return NULL;
-       }
-}
-
-
-Decoration::~Decoration() {
-       delete np;
-}
-
-
-void Decoration::resolveNodeNames(INodeDefManager *ndef) {
-       if (c_place_on == CONTENT_IGNORE)
-               c_place_on = ndef->getId(place_on_name);
-}
-
-
-void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
-       PseudoRandom ps(blockseed + 53);
-       int carea_size = nmax.X - nmin.X + 1;
-
-       // Divide area into parts
-       if (carea_size % sidelen) {
-               errorstream << "Decoration::placeDeco: chunk size is not divisible by "
-                       "sidelen; setting sidelen to " << carea_size << std::endl;
-               sidelen = carea_size;
-       }
-       
-       s16 divlen = carea_size / sidelen;
-       int area = sidelen * sidelen;
-
-       for (s16 z0 = 0; z0 < divlen; z0++)
-       for (s16 x0 = 0; x0 < divlen; x0++) {
-               v2s16 p2d_center( // Center position of part of division
-                       nmin.X + sidelen / 2 + sidelen * x0,
-                       nmin.Z + sidelen / 2 + sidelen * z0
-               );
-               v2s16 p2d_min( // Minimum edge of part of division
-                       nmin.X + sidelen * x0,
-                       nmin.Z + sidelen * z0
-               );
-               v2s16 p2d_max( // Maximum edge of part of division
-                       nmin.X + sidelen + sidelen * x0 - 1,
-                       nmin.Z + sidelen + sidelen * z0 - 1
-               );
-
-               // Amount of decorations
-               float nval = np ?
-                       NoisePerlin2D(np, p2d_center.X, p2d_center.Y, mapseed) :
-                       fill_ratio;
-               u32 deco_count = area * MYMAX(nval, 0.f);
-
-               for (u32 i = 0; i < deco_count; i++) {
-                       s16 x = ps.range(p2d_min.X, p2d_max.X);
-                       s16 z = ps.range(p2d_min.Y, p2d_max.Y);
-
-                       int mapindex = carea_size * (z - nmin.Z) + (x - nmin.X);
-                       
-                       s16 y = mg->heightmap ? 
-                                       mg->heightmap[mapindex] :
-                                       mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
-                                       
-                       if (y < nmin.Y || y > nmax.Y)
-                               continue;
-
-                       int height = getHeight();
-                       int max_y = nmax.Y + MAP_BLOCKSIZE;
-                       if (y + 1 + height > max_y) {
-                               continue;
-#if 0
-                               printf("Decoration at (%d %d %d) cut off\n", x, y, z);
-                               //add to queue
-                               JMutexAutoLock cutofflock(cutoff_mutex);
-                               cutoffs.push_back(CutoffData(x, y, z, height));
-#endif
-                       }
-
-                       if (mg->biomemap) {
-                               std::set<u8>::iterator iter;
-                               
-                               if (biomes.size()) {
-                                       iter = biomes.find(mg->biomemap[mapindex]);
-                                       if (iter == biomes.end())
-                                               continue;
-                               }
-                       }
-
-                       generate(mg, &ps, max_y, 0, v3s16(x, y, z));
-               }
-       }
-}
-
-
-#if 0
-void Decoration::placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
-       PseudoRandom pr(blockseed + 53);
-       std::vector<CutoffData> handled_cutoffs;
-       
-       // Copy over the cutoffs we're interested in so we don't needlessly hold a lock
-       {
-               JMutexAutoLock cutofflock(cutoff_mutex);
-               for (std::list<CutoffData>::iterator i = cutoffs.begin();
-                       i != cutoffs.end(); ++i) {
-                       CutoffData cutoff = *i;
-                       v3s16 p    = cutoff.p;
-                       s16 height = cutoff.height;
-                       if (p.X < nmin.X || p.X > nmax.X ||
-                               p.Z < nmin.Z || p.Z > nmax.Z)
-                               continue;
-                       if (p.Y + height < nmin.Y || p.Y > nmax.Y)
-                               continue;
-                       
-                       handled_cutoffs.push_back(cutoff);
-               }
-       }
-       
-       // Generate the cutoffs
-       for (size_t i = 0; i != handled_cutoffs.size(); i++) {
-               v3s16 p    = handled_cutoffs[i].p;
-               s16 height = handled_cutoffs[i].height;
-               
-               if (p.Y + height > nmax.Y) {
-                       //printf("Decoration at (%d %d %d) cut off again!\n", p.X, p.Y, p.Z);
-                       cuttoffs.push_back(v3s16(p.X, p.Y, p.Z));
-               }
-               
-               generate(mg, &pr, nmax.Y, nmin.Y - p.Y, v3s16(p.X, nmin.Y, p.Z));
+Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
+       MapgenParams *params, EmergeManager *emerge)
+{
+       switch (mgtype) {
+       case MAPGEN_FLAT:
+               return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
+       case MAPGEN_FRACTAL:
+               return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
+       case MAPGEN_SINGLENODE:
+               return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
+       case MAPGEN_V5:
+               return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
+       case MAPGEN_V6:
+               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
+       case MAPGEN_V7:
+               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+       case MAPGEN_VALLEYS:
+               return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
+       default:
+               return NULL;
        }
-       
-       // Remove cutoffs that were handled from the cutoff list
-       {
-               JMutexAutoLock cutofflock(cutoff_mutex);
-               for (std::list<CutoffData>::iterator i = cutoffs.begin();
-                       i != cutoffs.end(); ++i) {
-                       
-                       for (size_t j = 0; j != handled_cutoffs.size(); j++) {
-                               CutoffData coff = *i;
-                               if (coff.p == handled_cutoffs[j].p)
-                                       i = cutoffs.erase(i);
-                       }
-               }
-       }       
 }
-#endif
 
 
-void DecoSimple::resolveNodeNames(INodeDefManager *ndef) {
-       Decoration::resolveNodeNames(ndef);
-       
-       if (c_deco == CONTENT_IGNORE) {
-               c_deco = ndef->getId(deco_name);
-               if (c_deco == CONTENT_IGNORE) {
-                       errorstream << "DecoSimple::resolveNodeNames: decoration node '"
-                               << deco_name << "' not defined";
-                       c_deco = CONTENT_AIR;
-               }
-       }
-       if (c_spawnby == CONTENT_IGNORE) {
-               c_spawnby = ndef->getId(spawnby_name);
-               if (c_spawnby == CONTENT_IGNORE) {
-                       errorstream << "DecoSimple::resolveNodeNames: spawnby node '"
-                               << deco_name << "' not defined";
-                       nspawnby = -1;
-                       c_spawnby = CONTENT_AIR;
-               }
-       }
-       
-       if (c_decolist.size())
-               return;
-       
-       for (size_t i = 0; i != decolist_names.size(); i++) {           
-               content_t c = ndef->getId(decolist_names[i]);
-               if (c == CONTENT_IGNORE) {
-                       errorstream << "DecoSimple::resolveNodeNames: decolist node '"
-                               << decolist_names[i] << "' not defined";
-                       c = CONTENT_AIR;
-               }
-               c_decolist.push_back(c);
+MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
+{
+       switch (mgtype) {
+       case MAPGEN_FLAT:
+               return new MapgenFlatParams;
+       case MAPGEN_FRACTAL:
+               return new MapgenFractalParams;
+       case MAPGEN_SINGLENODE:
+               return new MapgenSinglenodeParams;
+       case MAPGEN_V5:
+               return new MapgenV5Params;
+       case MAPGEN_V6:
+               return new MapgenV6Params;
+       case MAPGEN_V7:
+               return new MapgenV7Params;
+       case MAPGEN_VALLEYS:
+               return new MapgenValleysParams;
+       default:
+               return NULL;
        }
 }
 
 
-void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, s16 start_y, v3s16 p) {
-       ManualMapVoxelManipulator *vm = mg->vm;
-
-       u32 vi = vm->m_area.index(p);
-       if (vm->m_data[vi].getContent() != c_place_on &&
-               c_place_on != CONTENT_IGNORE)
-               return;
-               
-       if (nspawnby != -1) {
-               int nneighs = 0;
-               v3s16 dirs[8] = { // a Moore neighborhood
-                       v3s16( 0, 0,  1),
-                       v3s16( 0, 0, -1),
-                       v3s16( 1, 0,  0),
-                       v3s16(-1, 0,  0),
-                       v3s16( 1, 0,  1),
-                       v3s16(-1, 0,  1),
-                       v3s16(-1, 0, -1),
-                       v3s16( 1, 0, -1)
-               };
-               
-               for (int i = 0; i != 8; i++) {
-                       u32 index = vm->m_area.index(p + dirs[i]);
-                       if (vm->m_area.contains(index) &&
-                               vm->m_data[index].getContent() == c_spawnby)
-                               nneighs++;
-               }
-               
-               if (nneighs < nspawnby)
-                       return;
-       }
-       
-       size_t ndecos = c_decolist.size();
-       content_t c_place = ndecos ? c_decolist[pr->range(0, ndecos - 1)] : c_deco;
-
-       s16 height = (deco_height_max > 0) ?
-               pr->range(deco_height, deco_height_max) : deco_height;
-
-       height = MYMIN(height, max_y - p.Y);
-       
-       v3s16 em = vm->m_area.getExtent();
-       for (int i = start_y; i < height; i++) {
-               vm->m_area.add_y(em, vi, 1);
-               
-               content_t c = vm->m_data[vi].getContent();
-               if (c != CONTENT_AIR && c != CONTENT_IGNORE)
-                       break;
-               
-               vm->m_data[vi] = MapNode(c_place);
+void Mapgen::getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden)
+{
+       for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+               if (include_hidden || g_reg_mapgens[i].is_user_visible)
+                       mgnames->push_back(g_reg_mapgens[i].name);
        }
 }
 
 
-int DecoSimple::getHeight() {
-       return (deco_height_max > 0) ? deco_height_max : deco_height;
+u32 Mapgen::getBlockSeed(v3s16 p, s32 seed)
+{
+       return (u32)seed   +
+               p.Z * 38134234 +
+               p.Y * 42123    +
+               p.X * 23;
 }
 
 
-std::string DecoSimple::getName() {
-       return deco_name;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-Mapgen::Mapgen() {
-       seed        = 0;
-       water_level = 0;
-       generating  = false;
-       id          = -1;
-       vm          = NULL;
-       ndef        = NULL;
-       heightmap   = NULL;
-       biomemap    = NULL;
+u32 Mapgen::getBlockSeed2(v3s16 p, s32 seed)
+{
+       u32 n = 1619 * p.X + 31337 * p.Y + 52591 * p.Z + 1013 * seed;
+       n = (n >> 13) ^ n;
+       return (n * (n * n * 60493 + 19990303) + 1376312589);
 }
 
 
 // Returns Y one under area minimum if not found
-s16 Mapgen::findGroundLevelFull(v2s16 p2d) {
+s16 Mapgen::findGroundLevelFull(v2s16 p2d)
+{
        v3s16 em = vm->m_area.getExtent();
        s16 y_nodes_max = vm->m_area.MaxEdge.Y;
        s16 y_nodes_min = vm->m_area.MinEdge.Y;
        u32 i = vm->m_area.index(p2d.X, y_nodes_max, p2d.Y);
        s16 y;
-       
+
        for (y = y_nodes_max; y >= y_nodes_min; y--) {
                MapNode &n = vm->m_data[i];
                if (ndef->get(n).walkable)
@@ -485,11 +264,13 @@ s16 Mapgen::findGroundLevelFull(v2s16 p2d) {
 }
 
 
-s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax) {
+// Returns -MAX_MAP_GENERATION_LIMIT if not found
+s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
+{
        v3s16 em = vm->m_area.getExtent();
        u32 i = vm->m_area.index(p2d.X, ymax, p2d.Y);
        s16 y;
-       
+
        for (y = ymax; y >= ymin; y--) {
                MapNode &n = vm->m_data[i];
                if (ndef->get(n).walkable)
@@ -497,51 +278,134 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax) {
 
                vm->m_area.add_y(em, i, -1);
        }
-       return y;
+       return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT;
 }
 
 
-void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax) {
+// Returns -MAX_MAP_GENERATION_LIMIT if not found or if ground is found first
+s16 Mapgen::findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax)
+{
+       v3s16 em = vm->m_area.getExtent();
+       u32 i = vm->m_area.index(p2d.X, ymax, p2d.Y);
+       s16 y;
+
+       for (y = ymax; y >= ymin; y--) {
+               MapNode &n = vm->m_data[i];
+               if (ndef->get(n).walkable)
+                       return -MAX_MAP_GENERATION_LIMIT;
+               else if (ndef->get(n).isLiquid())
+                       break;
+
+               vm->m_area.add_y(em, i, -1);
+       }
+       return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT;
+}
+
+
+void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
+{
        if (!heightmap)
                return;
-       
+
        //TimeTaker t("Mapgen::updateHeightmap", NULL, PRECISION_MICRO);
        int index = 0;
        for (s16 z = nmin.Z; z <= nmax.Z; z++) {
-               for (s16 x = nmin.X; x <= nmax.X; x++) {
+               for (s16 x = nmin.X; x <= nmax.X; x++, index++) {
                        s16 y = findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
-                       heightmap[index++] = y;
+
+                       heightmap[index] = y;
                }
        }
        //printf("updateHeightmap: %dus\n", t.stop());
 }
 
+inline bool Mapgen::isLiquidHorizontallyFlowable(u32 vi, v3s16 em)
+{
+       u32 vi_neg_x = vi;
+       vm->m_area.add_x(em, vi_neg_x, -1);
+       if (vm->m_data[vi_neg_x].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_nx = ndef->get(vm->m_data[vi_neg_x]);
+               if (c_nx.floodable && !c_nx.isLiquid())
+                       return true;
+       }
+       u32 vi_pos_x = vi;
+       vm->m_area.add_x(em, vi_pos_x, +1);
+       if (vm->m_data[vi_pos_x].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_px = ndef->get(vm->m_data[vi_pos_x]);
+               if (c_px.floodable && !c_px.isLiquid())
+                       return true;
+       }
+       u32 vi_neg_z = vi;
+       vm->m_area.add_z(em, vi_neg_z, -1);
+       if (vm->m_data[vi_neg_z].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_nz = ndef->get(vm->m_data[vi_neg_z]);
+               if (c_nz.floodable && !c_nz.isLiquid())
+                       return true;
+       }
+       u32 vi_pos_z = vi;
+       vm->m_area.add_z(em, vi_pos_z, +1);
+       if (vm->m_data[vi_pos_z].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_pz = ndef->get(vm->m_data[vi_pos_z]);
+               if (c_pz.floodable && !c_pz.isLiquid())
+                       return true;
+       }
+       return false;
+}
 
-void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax) {
-       bool isliquid, wasliquid;
+void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax)
+{
+       bool isignored, isliquid, wasignored, wasliquid, waschecked, waspushed;
        v3s16 em  = vm->m_area.getExtent();
 
-       for (s16 z = nmin.Z; z <= nmax.Z; z++) {
-               for (s16 x = nmin.X; x <= nmax.X; x++) {
-                       wasliquid = true;
-
-                       u32 i = vm->m_area.index(x, nmax.Y, z);
-                       for (s16 y = nmax.Y; y >= nmin.Y; y--) {
-                               isliquid = ndef->get(vm->m_data[i]).isLiquid();
-
-                               // there was a change between liquid and nonliquid, add to queue
-                               if (isliquid != wasliquid)
+       for (s16 z = nmin.Z + 1; z <= nmax.Z - 1; z++)
+       for (s16 x = nmin.X + 1; x <= nmax.X - 1; x++) {
+               wasignored = true;
+               wasliquid = false;
+               waschecked = false;
+               waspushed = false;
+
+               u32 vi = vm->m_area.index(x, nmax.Y, z);
+               for (s16 y = nmax.Y; y >= nmin.Y; y--) {
+                       isignored = vm->m_data[vi].getContent() == CONTENT_IGNORE;
+                       isliquid = ndef->get(vm->m_data[vi]).isLiquid();
+
+                       if (isignored || wasignored || isliquid == wasliquid) {
+                               // Neither topmost node of liquid column nor topmost node below column
+                               waschecked = false;
+                               waspushed = false;
+                       } else if (isliquid) {
+                               // This is the topmost node in the column
+                               bool ispushed = false;
+                               if (isLiquidHorizontallyFlowable(vi, em)) {
                                        trans_liquid->push_back(v3s16(x, y, z));
-
-                               wasliquid = isliquid;
-                               vm->m_area.add_y(em, i, -1);
+                                       ispushed = true;
+                               }
+                               // Remember waschecked and waspushed to avoid repeated
+                               // checks/pushes in case the column consists of only this node
+                               waschecked = true;
+                               waspushed = ispushed;
+                       } else {
+                               // This is the topmost node below a liquid column
+                               u32 vi_above = vi;
+                               vm->m_area.add_y(em, vi_above, 1);
+                               if (!waspushed && (ndef->get(vm->m_data[vi]).floodable ||
+                                               (!waschecked && isLiquidHorizontallyFlowable(vi_above, em)))) {
+                                       // Push back the lowest node in the column which is one
+                                       // node above this one
+                                       trans_liquid->push_back(v3s16(x, y + 1, z));
+                               }
                        }
+
+                       wasliquid = isliquid;
+                       wasignored = isignored;
+                       vm->m_area.add_y(em, vi, -1);
                }
        }
 }
 
 
-void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light) {
+void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax)
+{
        ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
        VoxelArea a(nmin, nmax);
 
@@ -555,19 +419,37 @@ void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light) {
 }
 
 
-void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) {
+void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light)
+{
        if (light <= 1 || !a.contains(p))
                return;
 
        u32 vi = vm->m_area.index(p);
-       MapNode &nn = vm->m_data[vi];
-
-       light--;
-       // should probably compare masked, but doesn't seem to make a difference
-       if (light <= nn.param1 || !ndef->get(nn).light_propagates)
+       MapNode &n = vm->m_data[vi];
+
+       // Decay light in each of the banks separately
+       u8 light_day = light & 0x0F;
+       if (light_day > 0)
+               light_day -= 0x01;
+
+       u8 light_night = light & 0xF0;
+       if (light_night > 0)
+               light_night -= 0x10;
+
+       // Bail out only if we have no more light from either bank to propogate, or
+       // we hit a solid block that light cannot pass through.
+       if ((light_day  <= (n.param1 & 0x0F) &&
+               light_night <= (n.param1 & 0xF0)) ||
+               !ndef->get(n).light_propagates)
                return;
 
-       nn.param1 = light;
+       // Since this recursive function only terminates when there is no light from
+       // either bank left, we need to take the max of both banks into account for
+       // the case where spreading has stopped for one light bank but not the other.
+       light = MYMAX(light_day, n.param1 & 0x0F) |
+                       MYMAX(light_night, n.param1 & 0xF0);
+
+       n.param1 = light;
 
        lightSpread(a, p + v3s16(0, 0, 1), light);
        lightSpread(a, p + v3s16(0, 1, 0), light);
@@ -578,15 +460,29 @@ void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) {
 }
 
 
-void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
-       VoxelArea a(nmin, nmax);
-       bool block_is_underground = (water_level >= nmax.Y);
-
+void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax,
+       bool propagate_shadow)
+{
        ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
        //TimeTaker t("updateLighting");
 
-       // first, send vertical rays of sunshine downward
+       propagateSunlight(nmin, nmax, propagate_shadow);
+       spreadLight(full_nmin, full_nmax);
+
+       //printf("updateLighting: %dms\n", t.stop());
+}
+
+
+void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow)
+{
+       //TimeTaker t("propagateSunlight");
+       VoxelArea a(nmin, nmax);
+       bool block_is_underground = (water_level >= nmax.Y);
        v3s16 em = vm->m_area.getExtent();
+
+       // NOTE: Direct access to the low 4 bits of param1 is okay here because,
+       // by definition, sunlight will never be in the night lightbank.
+
        for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
                for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++) {
                        // see if we can get a light value from the overtop
@@ -594,11 +490,12 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
                        if (vm->m_data[i].getContent() == CONTENT_IGNORE) {
                                if (block_is_underground)
                                        continue;
-                       } else if ((vm->m_data[i].param1 & 0x0F) != LIGHT_SUN) {
+                       } else if ((vm->m_data[i].param1 & 0x0F) != LIGHT_SUN &&
+                                       propagate_shadow) {
                                continue;
                        }
                        vm->m_area.add_y(em, i, -1);
+
                        for (int y = a.MaxEdge.Y; y >= a.MinEdge.Y; y--) {
                                MapNode &n = vm->m_data[i];
                                if (!ndef->get(n).sunlight_propagates)
@@ -608,22 +505,35 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
                        }
                }
        }
+       //printf("propagateSunlight: %dms\n", t.stop());
+}
+
+
+void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
+{
+       //TimeTaker t("spreadLight");
+       VoxelArea a(nmin, nmax);
 
-       // now spread the sunlight and light up any sources
        for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
                for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) {
                        u32 i = vm->m_area.index(a.MinEdge.X, y, z);
                        for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++, i++) {
                                MapNode &n = vm->m_data[i];
-                               if (n.getContent() == CONTENT_IGNORE ||
-                                       !ndef->get(n).light_propagates)
+                               if (n.getContent() == CONTENT_IGNORE)
                                        continue;
 
-                               u8 light_produced = ndef->get(n).light_source & 0x0F;
+                               const ContentFeatures &cf = ndef->get(n);
+                               if (!cf.light_propagates)
+                                       continue;
+
+                               // TODO(hmmmmm): Abstract away direct param1 accesses with a
+                               // wrapper, but something lighter than MapNode::get/setLight
+
+                               u8 light_produced = cf.light_source;
                                if (light_produced)
-                                       n.param1 = light_produced;
+                                       n.param1 = light_produced | (light_produced << 4);
 
-                               u8 light = n.param1 & 0x0F;
+                               u8 light = n.param1;
                                if (light) {
                                        lightSpread(a, v3s16(x,     y,     z + 1), light);
                                        lightSpread(a, v3s16(x,     y + 1, z    ), light);
@@ -636,120 +546,505 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
                }
        }
 
-       //printf("updateLighting: %dms\n", t.stop());
+       //printf("spreadLight: %dms\n", t.stop());
 }
 
 
-void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax) {
-       enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
-       VoxelArea a(nmin, nmax);
-       bool block_is_underground = (water_level > nmax.Y);
-       bool sunlight = !block_is_underground;
+////
+//// MapgenBasic
+////
+
+MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+       : Mapgen(mapgenid, params, emerge)
+{
+       this->m_emerge = emerge;
+       this->m_bmgr   = emerge->biomemgr;
+
+       //// Here, 'stride' refers to the number of elements needed to skip to index
+       //// an adjacent element for that coordinate in noise/height/biome maps
+       //// (*not* vmanip content map!)
+
+       // Note there is no X stride explicitly defined.  Items adjacent in the X
+       // coordinate are assumed to be adjacent in memory as well (i.e. stride of 1).
+
+       // Number of elements to skip to get to the next Y coordinate
+       this->ystride = csize.X;
+
+       // Number of elements to skip to get to the next Z coordinate
+       this->zstride = csize.X * csize.Y;
+
+       // Z-stride value for maps oversized for 1-down overgeneration
+       this->zstride_1d = csize.X * (csize.Y + 1);
+
+       // Z-stride value for maps oversized for 1-up 1-down overgeneration
+       this->zstride_1u1d = csize.X * (csize.Y + 2);
+
+       //// Allocate heightmap
+       this->heightmap = new s16[csize.X * csize.Z];
+
+       //// Initialize biome generator
+       // TODO(hmmmm): should we have a way to disable biomemanager biomes?
+       biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
+       biomemap = biomegen->biomemap;
+
+       //// Look up some commonly used content
+       c_stone              = ndef->getId("mapgen_stone");
+       c_desert_stone       = ndef->getId("mapgen_desert_stone");
+       c_sandstone          = ndef->getId("mapgen_sandstone");
+       c_water_source       = ndef->getId("mapgen_water_source");
+       c_river_water_source = ndef->getId("mapgen_river_water_source");
+       c_lava_source        = ndef->getId("mapgen_lava_source");
+
+       // Fall back to more basic content if not defined
+       // river_water_source cannot fallback to water_source because river water
+       // needs to be non-renewable and have a short flow range.
+       if (c_desert_stone == CONTENT_IGNORE)
+               c_desert_stone = c_stone;
+       if (c_sandstone == CONTENT_IGNORE)
+               c_sandstone = c_stone;
+
+       //// Content used for dungeon generation
+       c_cobble                = ndef->getId("mapgen_cobble");
+       c_mossycobble           = ndef->getId("mapgen_mossycobble");
+       c_stair_cobble          = ndef->getId("mapgen_stair_cobble");
+       c_stair_desert_stone    = ndef->getId("mapgen_stair_desert_stone");
+       c_sandstonebrick        = ndef->getId("mapgen_sandstonebrick");
+       c_stair_sandstone_block = ndef->getId("mapgen_stair_sandstone_block");
+
+       // Fall back to more basic content if not defined
+       if (c_mossycobble == CONTENT_IGNORE)
+               c_mossycobble = c_cobble;
+       if (c_stair_cobble == CONTENT_IGNORE)
+               c_stair_cobble = c_cobble;
+       if (c_stair_desert_stone == CONTENT_IGNORE)
+               c_stair_desert_stone = c_desert_stone;
+       if (c_sandstonebrick == CONTENT_IGNORE)
+               c_sandstonebrick = c_sandstone;
+       if (c_stair_sandstone_block == CONTENT_IGNORE)
+               c_stair_sandstone_block = c_sandstonebrick;
+}
+
+
+MapgenBasic::~MapgenBasic()
+{
+       delete biomegen;
+       delete []heightmap;
+}
+
+
+MgStoneType MapgenBasic::generateBiomes()
+{
+       // can't generate biomes without a biome generator!
+       assert(biomegen);
+       assert(biomemap);
+
+       v3s16 em = vm->m_area.getExtent();
+       u32 index = 0;
+       MgStoneType stone_type = MGSTONE_STONE;
+
+       noise_filler_depth->perlinMap2D(node_min.X, node_min.Z);
+
+       for (s16 z = node_min.Z; z <= node_max.Z; z++)
+       for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
+               Biome *biome = NULL;
+               u16 depth_top = 0;
+               u16 base_filler = 0;
+               u16 depth_water_top = 0;
+               u16 depth_riverbed = 0;
+               u32 vi = vm->m_area.index(x, node_max.Y, z);
+
+               // Check node at base of mapchunk above, either a node of a previously
+               // generated mapchunk or if not, a node of overgenerated base terrain.
+               content_t c_above = vm->m_data[vi + em.X].getContent();
+               bool air_above = c_above == CONTENT_AIR;
+               bool river_water_above = c_above == c_river_water_source;
+               bool water_above = c_above == c_water_source || river_water_above;
+
+               biomemap[index] = BIOME_NONE;
+
+               // If there is air or water above enable top/filler placement, otherwise force
+               // nplaced to stone level by setting a number exceeding any possible filler depth.
+               u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
+
+               for (s16 y = node_max.Y; y >= node_min.Y; y--) {
+                       content_t c = vm->m_data[vi].getContent();
+
+                       // Biome is recalculated each time an upper surface is detected while
+                       // working down a column. The selected biome then remains in effect for
+                       // all nodes below until the next surface and biome recalculation.
+                       // Biome is recalculated:
+                       // 1. At the surface of stone below air or water.
+                       // 2. At the surface of water below air.
+                       // 3. When stone or water is detected but biome has not yet been calculated.
+                       bool is_stone_surface = (c == c_stone) &&
+                               (air_above || water_above || !biome);
+
+                       bool is_water_surface =
+                               (c == c_water_source || c == c_river_water_source) &&
+                               (air_above || !biome);
+
+                       if (is_stone_surface || is_water_surface) {
+                               biome = biomegen->getBiomeAtIndex(index, y);
+
+                               if (biomemap[index] == BIOME_NONE && is_stone_surface)
+                                       biomemap[index] = biome->index;
+
+                               depth_top = biome->depth_top;
+                               base_filler = MYMAX(depth_top +
+                                       biome->depth_filler +
+                                       noise_filler_depth->result[index], 0.f);
+                               depth_water_top = biome->depth_water_top;
+                               depth_riverbed = biome->depth_riverbed;
+
+                               // Detect stone type for dungeons during every biome calculation.
+                               // This is more efficient than detecting per-node and will not
+                               // miss any desert stone or sandstone biomes.
+                               if (biome->c_stone == c_desert_stone)
+                                       stone_type = MGSTONE_DESERT_STONE;
+                               else if (biome->c_stone == c_sandstone)
+                                       stone_type = MGSTONE_SANDSTONE;
+                       }
+
+                       if (c == c_stone) {
+                               content_t c_below = vm->m_data[vi - em.X].getContent();
+
+                               // If the node below isn't solid, make this node stone, so that
+                               // any top/filler nodes above are structurally supported.
+                               // This is done by aborting the cycle of top/filler placement
+                               // immediately by forcing nplaced to stone level.
+                               if (c_below == CONTENT_AIR
+                                               || c_below == c_water_source
+                                               || c_below == c_river_water_source)
+                                       nplaced = U16_MAX;
+
+                               if (river_water_above) {
+                                       if (nplaced < depth_riverbed) {
+                                               vm->m_data[vi] = MapNode(biome->c_riverbed);
+                                               nplaced++;
+                                       } else {
+                                               nplaced = U16_MAX;  // Disable top/filler placement
+                                               river_water_above = false;
+                                       }
+                               } else if (nplaced < depth_top) {
+                                       vm->m_data[vi] = MapNode(biome->c_top);
+                                       nplaced++;
+                               } else if (nplaced < base_filler) {
+                                       vm->m_data[vi] = MapNode(biome->c_filler);
+                                       nplaced++;
+                               } else {
+                                       vm->m_data[vi] = MapNode(biome->c_stone);
+                               }
+
+                               air_above = false;
+                               water_above = false;
+                       } else if (c == c_water_source) {
+                               vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top))
+                                               ? biome->c_water_top : biome->c_water);
+                               nplaced = 0;  // Enable top/filler placement for next surface
+                               air_above = false;
+                               water_above = true;
+                       } else if (c == c_river_water_source) {
+                               vm->m_data[vi] = MapNode(biome->c_river_water);
+                               nplaced = 0;  // Enable riverbed placement for next surface
+                               air_above = false;
+                               water_above = true;
+                               river_water_above = true;
+                       } else if (c == CONTENT_AIR) {
+                               nplaced = 0;  // Enable top/filler placement for next surface
+                               air_above = true;
+                               water_above = false;
+                       } else {  // Possible various nodes overgenerated from neighbouring mapchunks
+                               nplaced = U16_MAX;  // Disable top/filler placement
+                               air_above = false;
+                               water_above = false;
+                       }
+
+                       vm->m_area.add_y(em, vi, -1);
+               }
+       }
+
+       return stone_type;
+}
+
+
+void MapgenBasic::dustTopNodes()
+{
+       if (node_max.Y < water_level)
+               return;
+
+       v3s16 em = vm->m_area.getExtent();
+       u32 index = 0;
+
+       for (s16 z = node_min.Z; z <= node_max.Z; z++)
+       for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
+               Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index]);
+
+               if (biome->c_dust == CONTENT_IGNORE)
+                       continue;
+
+               u32 vi = vm->m_area.index(x, full_node_max.Y, z);
+               content_t c_full_max = vm->m_data[vi].getContent();
+               s16 y_start;
+
+               if (c_full_max == CONTENT_AIR) {
+                       y_start = full_node_max.Y - 1;
+               } else if (c_full_max == CONTENT_IGNORE) {
+                       vi = vm->m_area.index(x, node_max.Y + 1, z);
+                       content_t c_max = vm->m_data[vi].getContent();
+
+                       if (c_max == CONTENT_AIR)
+                               y_start = node_max.Y;
+                       else
+                               continue;
+               } else {
+                       continue;
+               }
+
+               vi = vm->m_area.index(x, y_start, z);
+               for (s16 y = y_start; y >= node_min.Y - 1; y--) {
+                       if (vm->m_data[vi].getContent() != CONTENT_AIR)
+                               break;
+
+                       vm->m_area.add_y(em, vi, -1);
+               }
+
+               content_t c = vm->m_data[vi].getContent();
+               if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
+                       vm->m_area.add_y(em, vi, 1);
+                       vm->m_data[vi] = MapNode(biome->c_dust);
+               }
+       }
+}
 
-       ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
 
-       for (int i = 0; i < 2; i++) {
-               enum LightBank bank = banks[i];
-               std::set<v3s16> light_sources;
-               std::map<v3s16, u8> unlight_from;
+void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
+{
+       if (max_stone_y < node_min.Y)
+               return;
+
+       CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize,
+               &np_cave1, &np_cave2, seed, cave_width);
+
+       caves_noise.generateCaves(vm, node_min, node_max, biomemap);
+
+       if (node_max.Y > large_cave_depth)
+               return;
 
-               voxalgo::clearLightAndCollectSources(*vm, a, bank, ndef,
-                                                                                        light_sources, unlight_from);
-               voxalgo::propagateSunlight(*vm, a, sunlight, light_sources, ndef);
+       PseudoRandom ps(blockseed + 21343);
+       u32 bruises_count = ps.range(0, 2);
+       for (u32 i = 0; i < bruises_count; i++) {
+               CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
+                       c_water_source, CONTENT_IGNORE);
 
-               vm->unspreadLight(bank, unlight_from, light_sources, ndef);
-               vm->spreadLight(bank, light_sources, ndef);
+               cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, heightmap);
        }
 }
-//////////////////////// Mapgen V6 parameter read/write
-bool MapgenV6Params::readParams(Settings *settings) {
-       freq_desert = settings->getFloat("mgv6_freq_desert");
-       freq_beach  = settings->getFloat("mgv6_freq_beach");
-
-       bool success = 
-               settings->getNoiseParams("mgv6_np_terrain_base",   np_terrain_base)   &&
-               settings->getNoiseParams("mgv6_np_terrain_higher", np_terrain_higher) &&
-               settings->getNoiseParams("mgv6_np_steepness",      np_steepness)      &&
-               settings->getNoiseParams("mgv6_np_height_select",  np_height_select)  &&
-               settings->getNoiseParams("mgv6_np_mud",            np_mud)            &&
-               settings->getNoiseParams("mgv6_np_beach",          np_beach)          &&
-               settings->getNoiseParams("mgv6_np_biome",          np_biome)          &&
-               settings->getNoiseParams("mgv6_np_cave",           np_cave)           &&
-               settings->getNoiseParams("mgv6_np_humidity",       np_humidity)       &&
-               settings->getNoiseParams("mgv6_np_trees",          np_trees)          &&
-               settings->getNoiseParams("mgv6_np_apple_trees",    np_apple_trees);
-       return success;
-}
-void MapgenV6Params::writeParams(Settings *settings) {
-       settings->setFloat("mgv6_freq_desert", freq_desert);
-       settings->setFloat("mgv6_freq_beach",  freq_beach);
-       settings->setNoiseParams("mgv6_np_terrain_base",   np_terrain_base);
-       settings->setNoiseParams("mgv6_np_terrain_higher", np_terrain_higher);
-       settings->setNoiseParams("mgv6_np_steepness",      np_steepness);
-       settings->setNoiseParams("mgv6_np_height_select",  np_height_select);
-       settings->setNoiseParams("mgv6_np_mud",            np_mud);
-       settings->setNoiseParams("mgv6_np_beach",          np_beach);
-       settings->setNoiseParams("mgv6_np_biome",          np_biome);
-       settings->setNoiseParams("mgv6_np_cave",           np_cave);
-       settings->setNoiseParams("mgv6_np_humidity",       np_humidity);
-       settings->setNoiseParams("mgv6_np_trees",          np_trees);
-       settings->setNoiseParams("mgv6_np_apple_trees",    np_apple_trees);
-}
-
-
-bool MapgenV7Params::readParams(Settings *settings) {
-       bool success = 
-               settings->getNoiseParams("mgv7_np_terrain_base",    np_terrain_base)    &&
-               settings->getNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt)     &&
-               settings->getNoiseParams("mgv7_np_terrain_mod",     np_terrain_mod)     &&
-               settings->getNoiseParams("mgv7_np_terrain_persist", np_terrain_persist) &&
-               settings->getNoiseParams("mgv7_np_height_select",   np_height_select)   &&
-               settings->getNoiseParams("mgv7_np_ridge",           np_ridge);
-       return success;
-}
-
-
-void MapgenV7Params::writeParams(Settings *settings) {
-       settings->setNoiseParams("mgv7_np_terrain_base",    np_terrain_base);
-       settings->setNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt);
-       settings->setNoiseParams("mgv7_np_terrain_mod",     np_terrain_mod);
-       settings->setNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
-       settings->setNoiseParams("mgv7_np_height_select",   np_height_select);
-       settings->setNoiseParams("mgv7_np_ridge",           np_ridge);
-}
-
-
-/////////////////////////////////// legacy static functions for farmesh
-
-s16 Mapgen::find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision) {
-       //just need to return something
-       s16 level = 5;
-       return level;
-}
-
-
-bool Mapgen::get_have_beach(u64 seed, v2s16 p2d) {
-       double sandnoise = noise2d_perlin(
-                               0.2+(float)p2d.X/250, 0.7+(float)p2d.Y/250,
-                               seed+59420, 3, 0.50);
-       return (sandnoise > 0.15);
-}
-
-
-double Mapgen::tree_amount_2d(u64 seed, v2s16 p) {
-       double noise = noise2d_perlin(
-                       0.5+(float)p.X/125, 0.5+(float)p.Y/125,
-                       seed+2, 4, 0.66);
-       double zeroval = -0.39;
-       if(noise < zeroval)
-               return 0;
-       else
-               return 0.04 * (noise-zeroval) / (1.0-zeroval);
+
+
+bool MapgenBasic::generateCaverns(s16 max_stone_y)
+{
+       if (node_min.Y > max_stone_y || node_min.Y > cavern_limit)
+               return false;
+
+       CavernsNoise caverns_noise(ndef, csize, &np_cavern,
+               seed, cavern_limit, cavern_taper, cavern_threshold);
+
+       return caverns_noise.generateCaverns(vm, node_min, node_max);
+}
+
+
+void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
+{
+       if (max_stone_y < node_min.Y)
+               return;
+
+       DungeonParams dp;
+
+       dp.seed             = seed;
+       dp.c_water          = c_water_source;
+       dp.c_river_water    = c_river_water_source;
+
+       dp.only_in_ground   = true;
+       dp.corridor_len_min = 1;
+       dp.corridor_len_max = 13;
+       dp.rooms_min        = 2;
+       dp.rooms_max        = 16;
+       dp.y_min            = -MAX_MAP_GENERATION_LIMIT;
+       dp.y_max            = MAX_MAP_GENERATION_LIMIT;
+
+       dp.np_density       = nparams_dungeon_density;
+       dp.np_alt_wall      = nparams_dungeon_alt_wall;
+
+       switch (stone_type) {
+       default:
+       case MGSTONE_STONE:
+               dp.c_wall              = c_cobble;
+               dp.c_alt_wall          = c_mossycobble;
+               dp.c_stair             = c_stair_cobble;
+
+               dp.diagonal_dirs       = false;
+               dp.holesize            = v3s16(1, 2, 1);
+               dp.room_size_min       = v3s16(4, 4, 4);
+               dp.room_size_max       = v3s16(8, 6, 8);
+               dp.room_size_large_min = v3s16(8, 8, 8);
+               dp.room_size_large_max = v3s16(16, 16, 16);
+               dp.notifytype          = GENNOTIFY_DUNGEON;
+               break;
+       case MGSTONE_DESERT_STONE:
+               dp.c_wall              = c_desert_stone;
+               dp.c_alt_wall          = CONTENT_IGNORE;
+               dp.c_stair             = c_stair_desert_stone;
+
+               dp.diagonal_dirs       = true;
+               dp.holesize            = v3s16(2, 3, 2);
+               dp.room_size_min       = v3s16(6, 9, 6);
+               dp.room_size_max       = v3s16(10, 11, 10);
+               dp.room_size_large_min = v3s16(10, 13, 10);
+               dp.room_size_large_max = v3s16(18, 21, 18);
+               dp.notifytype          = GENNOTIFY_TEMPLE;
+               break;
+       case MGSTONE_SANDSTONE:
+               dp.c_wall              = c_sandstonebrick;
+               dp.c_alt_wall          = CONTENT_IGNORE;
+               dp.c_stair             = c_stair_sandstone_block;
+
+               dp.diagonal_dirs       = false;
+               dp.holesize            = v3s16(2, 2, 2);
+               dp.room_size_min       = v3s16(6, 4, 6);
+               dp.room_size_max       = v3s16(10, 6, 10);
+               dp.room_size_large_min = v3s16(10, 8, 10);
+               dp.room_size_large_max = v3s16(18, 16, 18);
+               dp.notifytype          = GENNOTIFY_DUNGEON;
+               break;
+       }
+
+       DungeonGen dgen(ndef, &gennotify, &dp);
+       dgen.generate(vm, blockseed, full_node_min, full_node_max);
+}
+
+
+////
+//// GenerateNotifier
+////
+
+GenerateNotifier::GenerateNotifier()
+{
+       m_notify_on = 0;
+}
+
+
+GenerateNotifier::GenerateNotifier(u32 notify_on,
+       std::set<u32> *notify_on_deco_ids)
+{
+       m_notify_on = notify_on;
+       m_notify_on_deco_ids = notify_on_deco_ids;
+}
+
+
+void GenerateNotifier::setNotifyOn(u32 notify_on)
+{
+       m_notify_on = notify_on;
+}
+
+
+void GenerateNotifier::setNotifyOnDecoIds(std::set<u32> *notify_on_deco_ids)
+{
+       m_notify_on_deco_ids = notify_on_deco_ids;
+}
+
+
+bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos, u32 id)
+{
+       if (!(m_notify_on & (1 << type)))
+               return false;
+
+       if (type == GENNOTIFY_DECORATION &&
+               m_notify_on_deco_ids->find(id) == m_notify_on_deco_ids->end())
+               return false;
+
+       GenNotifyEvent gne;
+       gne.type = type;
+       gne.pos  = pos;
+       gne.id   = id;
+       m_notify_events.push_back(gne);
+
+       return true;
+}
+
+
+void GenerateNotifier::getEvents(
+       std::map<std::string, std::vector<v3s16> > &event_map,
+       bool peek_events)
+{
+       std::list<GenNotifyEvent>::iterator it;
+
+       for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) {
+               GenNotifyEvent &gn = *it;
+               std::string name = (gn.type == GENNOTIFY_DECORATION) ?
+                       "decoration#"+ itos(gn.id) :
+                       flagdesc_gennotify[gn.type].name;
+
+               event_map[name].push_back(gn.pos);
+       }
+
+       if (!peek_events)
+               m_notify_events.clear();
+}
+
+
+////
+//// MapgenParams
+////
+
+
+MapgenParams::~MapgenParams()
+{
+       delete bparams;
+}
+
+
+void MapgenParams::readParams(const Settings *settings)
+{
+       std::string seed_str;
+       const char *seed_name = (settings == g_settings) ? "fixed_map_seed" : "seed";
+
+       if (settings->getNoEx(seed_name, seed_str)) {
+               if (!seed_str.empty())
+                       seed = read_seed(seed_str.c_str());
+               else
+                       myrand_bytes(&seed, sizeof(seed));
+       }
+
+       std::string mg_name;
+       if (settings->getNoEx("mg_name", mg_name)) {
+               mgtype = Mapgen::getMapgenType(mg_name);
+               if (mgtype == MAPGEN_INVALID)
+                       mgtype = MAPGEN_DEFAULT;
+       }
+
+       settings->getS16NoEx("water_level", water_level);
+       settings->getS16NoEx("mapgen_limit", mapgen_limit);
+       settings->getS16NoEx("chunksize", chunksize);
+       settings->getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
+
+       delete bparams;
+       bparams = BiomeManager::createBiomeParams(BIOMEGEN_ORIGINAL);
+       if (bparams) {
+               bparams->readParams(settings);
+               bparams->seed = seed;
+       }
+}
+
+
+void MapgenParams::writeParams(Settings *settings) const
+{
+       settings->set("mg_name", Mapgen::getMapgenName(mgtype));
+       settings->setU64("seed", seed);
+       settings->setS16("water_level", water_level);
+       settings->setS16("mapgen_limit", mapgen_limit);
+       settings->setS16("chunksize", chunksize);
+       settings->setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
+
+       if (bparams)
+               bparams->writeParams(settings);
 }