From d69644fd4724d1cfda8ddb50064f3f867f4e92c3 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Tue, 5 Sep 2017 22:47:48 +0200
Subject: [PATCH] Don't generate lava and bedrock in singlenode

---
 mods/MAPGEN/mcl_biomes/init.lua      | 35 +++++++++++++-----------
 mods/MAPGEN/mcl_mapgen_core/init.lua | 40 +++++++++++++++++-----------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index a011a451..e868a92a 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -1956,24 +1956,27 @@ end
 --
 -- Detect mapgen to select functions
 --
-minetest.clear_registered_biomes()
-minetest.clear_registered_decorations()
-minetest.clear_registered_schematics()
-if mg_name ~= "v6" and mg_name ~= "flat" then
-	register_biomes()
-	register_biomelike_ores()
-	register_decorations()
-elseif mg_name == "flat" then
-	-- Implementation of Minecraft's Superflat mapgen, classic style
+if mg_name ~= "singlenode" then
 	minetest.clear_registered_biomes()
 	minetest.clear_registered_decorations()
 	minetest.clear_registered_schematics()
-	register_classic_superflat_biome()
+	if mg_name ~= "v6" and mg_name ~= "flat" then
+		register_biomes()
+		register_biomelike_ores()
+		register_decorations()
+	elseif mg_name == "flat" then
+		-- Implementation of Minecraft's Superflat mapgen, classic style
+		minetest.clear_registered_biomes()
+		minetest.clear_registered_decorations()
+		minetest.clear_registered_schematics()
+		register_classic_superflat_biome()
+	end
+
+	-- Non-overworld stuff is registered independently
+	register_dimension_biomes()
+	register_dimension_ores()
+	register_dimension_decorations()
+
+	-- Overworld decorations for v6 are handled in mcl_mapgen_core
 end
 
--- Non-overworld stuff is registered independently
-register_dimension_biomes()
-register_dimension_ores()
-register_dimension_decorations()
-
--- Overworld decorations for v6 are handled in mcl_mapgen_core
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index efb7ce3d..fd5f35fc 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -1285,7 +1285,8 @@ minetest.register_on_generated(function(minp, maxp)
 	local area = VoxelArea:new({MinEdge=emin, MaxEdge=emax})
 	local lvm_used = false
 
-	-- Generate bedrock and lava layers
+	-- Generate basic layer-based nodes: void, bedrock, realm barrier, lava seas, etc.
+	-- Also perform some basic node replacements.
 	if minp.y <= GEN_MAX then
 		local max_y = math.min(maxp.y, GEN_MAX)
 
@@ -1293,8 +1294,20 @@ minetest.register_on_generated(function(minp, maxp)
 			for x = minp.x, maxp.x do
 				for z = minp.z, maxp.z do
 					local p_pos = area:index(x, y, z)
-					local setdata = nil
-					if mcl_vars.mg_bedrock_is_rough then
+
+					-- The void
+					if mcl_util.is_in_void({x=x,y=y,z=z}) then
+						data[p_pos] = c_void
+						lvm_used = true
+					-- Realm barrier between the Overworld void and the End
+					elseif y >= mcl_vars.mg_realm_barrier_overworld_end_min and y <= mcl_vars.mg_realm_barrier_overworld_end_max then
+						data[p_pos] = c_realm_barrier
+						lvm_used = true
+					end
+
+					-- Bedrock layer checking (skip in singlenode)
+					local bedrock = false
+					if mg_name ~= "singlenode" and mcl_vars.mg_bedrock_is_rough then
 						local is_bedrock = function(y)
 							-- Bedrock layers with increasing levels of roughness, until a perfecly flat bedrock later at the bottom layer
 							-- This code assumes a bedrock height of 5 layers.
@@ -1327,28 +1340,23 @@ minetest.register_on_generated(function(minp, maxp)
 							return math.random(1, top) <= top-1
 						end
 						if is_bedrock(y) then
-							setdata = c_bedrock
+							bedrock = true
 						end
-					else
+					elseif mg_name ~= "singlenode" then
 						-- Perfectly flat bedrock layer(s)
 						if (y >= mcl_vars.mg_bedrock_overworld_min and y <= mcl_vars.mg_bedrock_overworld_max) or
 								(y >= mcl_vars.mg_bedrock_nether_bottom_min and y <= mcl_vars.mg_bedrock_nether_bottom_max) or
 								(y >= mcl_vars.mg_bedrock_nether_top_min and y <= mcl_vars.mg_bedrock_nether_top_max) then
-							setdata = c_bedrock
+							bedrock = true
 						end
 					end
 
+					-- No more transformations in singlenode
+					if mg_name == "singlenode" then
+						-- do nothing
 					-- Bedrock, defined above
-					if setdata then
-						data[p_pos] = setdata
-						lvm_used = true
-					-- The void
-					elseif mcl_util.is_in_void({x=x,y=y,z=z}) then
-						data[p_pos] = c_void
-						lvm_used = true
-					-- Realm barrier between the Overworld void and the End
-					elseif y >= mcl_vars.mg_realm_barrier_overworld_end_min and y <= mcl_vars.mg_realm_barrier_overworld_end_max then
-						data[p_pos] = c_realm_barrier
+					elseif bedrock then
+						data[p_pos] = c_bedrock
 						lvm_used = true
 					-- Flat Nether
 					elseif mg_name == "flat" and y >= mcl_vars.mg_bedrock_nether_bottom_max + 4 and y <= mcl_vars.mg_bedrock_nether_bottom_max + 52 then