Fix conflict with most recent master

mods/MAPGEN/mcl_biomes/init.lua

@@ -128,6 +128,10 @@ local function register_biomes()
 		"MesaPlateauF",
 		"MesaPlateauFM",
 		"MangroveSwamp",
+		"BambooJungle",
+		"BambooJungleM",
+		"BambooJungleEdge",
+		"BambooJungleEdgeM",
 	}
 
 local beach_skycolor = "#78A7FF" -- This is the case for all beach biomes except for the snowy ones! Those beaches will have their own colour instead of this one.
@@ -1062,8 +1066,6 @@ local end_skycolor = "#000000"
 		_mcl_fogcolor = overworld_fogcolor
 	})
 
-
-
 	-- Mesa Plateau F
 	-- Identical to Mesa below Y=30. At Y=30 and above there is a "dry" oak forest
 	minetest.register_biome({
@@ -1664,6 +1666,191 @@ local end_skycolor = "#000000"
 		_mcl_fogcolor = overworld_fogcolor
 	})
 
+	-- Bamboo Jungle areas are like the Jungle areas, but warmer and more humid.
+	-- Bamboo Jungle
+	minetest.register_biome({
+		name = "BambooJungle",
+		node_top = "mcl_core:dirt_with_grass",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		humidity_point = 90,
+		heat_point = 95,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 24,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungle_shore",
+		node_top = "mcl_core:dirt",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = -2,
+		y_max = 0,
+		humidity_point = 90,
+		heat_point = 95,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 24,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungle_ocean",
+		node_top = "mcl_core:sand",
+		depth_top = 1,
+		node_filler = "mcl_core:sand",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = OCEAN_MIN,
+		y_max = -3,
+		vertical_blend = 1,
+		humidity_point = 95,
+		heat_point = 90,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 24,
+		_mcl_skycolor = ocean_skycolor,
+		_mcl_fogcolor = overworld_fogcolor
+	})
+
+	-- Bamboo Jungle M
+	-- Like Bamboo Jungle but with even more dense vegetation
+	minetest.register_biome({
+		name = "BambooJungleM",
+		node_top = "mcl_core:dirt_with_grass",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		humidity_point = 95,
+		heat_point = 95,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 25,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungleM_shore",
+		node_top = "mcl_core:dirt",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = -2,
+		y_max = 0,
+		humidity_point = 95,
+		heat_point = 90,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 25,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungleM_ocean",
+		node_top = "mcl_core:sand",
+		depth_top = 1,
+		node_filler = "mcl_core:sand",
+		depth_filler = 3,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = OCEAN_MIN,
+		y_max = -3,
+		vertical_blend = 1,
+		humidity_point = 95,
+		heat_point = 95,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 25,
+		_mcl_skycolor = ocean_skycolor,
+		_mcl_fogcolor = overworld_fogcolor
+	})
+
+	-- Bamboo Jungle Edge
+	minetest.register_biome({
+		name = "BambooJungleEdge",
+		node_top = "mcl_core:dirt_with_grass",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 2,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		humidity_point = 92,
+		heat_point = 90,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 26,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungleEdge_ocean",
+		node_top = "mcl_core:sand",
+		depth_top = 1,
+		node_filler = "mcl_core:sand",
+		depth_filler = 2,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = OCEAN_MIN,
+		y_max = 0,
+		humidity_point = 95,
+		heat_point = 88,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 26,
+		_mcl_skycolor = ocean_skycolor,
+		_mcl_fogcolor = overworld_fogcolor
+	})
+
+	-- Jungle Edge M (very rare).
+	-- Almost identical to Jungle Edge. Has deeper dirt. Melons spawn here a lot.
+	-- This biome occours directly between Jungle M and Jungle Edge but also has a small border to Jungle.
+	-- This biome is very small in general.
+	minetest.register_biome({
+		name = "BambooJungleEdgeM",
+		node_top = "mcl_core:dirt_with_grass",
+		depth_top = 1,
+		node_filler = "mcl_core:dirt",
+		depth_filler = 4,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		humidity_point = 95,
+		heat_point = 95,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 27,
+		_mcl_skycolor = "#77A8FF",
+		_mcl_fogcolor = overworld_fogcolor
+	})
+	minetest.register_biome({
+		name = "BambooJungleEdgeM_ocean",
+		node_top = "mcl_core:sand",
+		depth_top = 1,
+		node_filler = "mcl_core:sand",
+		depth_filler = 4,
+		node_riverbed = "mcl_core:sand",
+		depth_riverbed = 2,
+		y_min = OCEAN_MIN,
+		y_max = 0,
+		humidity_point = 97,
+		heat_point = 90,
+		_mcl_biome_type = "medium",
+		_mcl_grass_palette_index = 27,
+		_mcl_skycolor = ocean_skycolor,
+		_mcl_fogcolor = overworld_fogcolor
+	})
+
 	-- Add deep ocean and underground biomes automatically.
 	for i = 1, #overworld_biomes do
 		local biome = overworld_biomes[i]
@@ -1738,7 +1925,6 @@ local function register_dimension_biomes()
 		param2 = 0,
 	})
 
-
 	minetest.register_biome({
 		name = "Nether",
 		node_filler = "mcl_nether:netherrack",
@@ -3359,7 +3545,7 @@ local function register_decorations()
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
 		fill_ratio = 0.004,
-		biomes = {"Jungle", "JungleM"},
+		biomes = {"Jungle", "JungleM","BambooJungle", "BambooJungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_oak_classic.mts",
@@ -3687,7 +3873,7 @@ local function register_decorations()
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
 		fill_ratio = 0.025,
-		biomes = {"Jungle"},
+		biomes = {"Jungle","BambooJungle"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_tree.mts",
@@ -3699,7 +3885,7 @@ local function register_decorations()
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
 		fill_ratio = 0.0045,
-		biomes = {"JungleEdge", "JungleEdgeM"},
+		biomes = {"JungleEdge", "JungleEdgeM", "BambooJungleEdge", "BambooJungleEdgeM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_tree.mts",
@@ -3712,7 +3898,7 @@ local function register_decorations()
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
 		fill_ratio = 0.09,
-		biomes = {"JungleM"},
+		biomes = {"JungleM", "BambooJungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_tree_2.mts",
@@ -3952,7 +4138,6 @@ local function register_decorations()
 		rotation = "random",
 	})
 
-
 	local ratio_mushroom = 0.0001
 	local ratio_mushroom_huge = ratio_mushroom * (11 / 12)
 	local ratio_mushroom_giant = ratio_mushroom * (1 / 12)
@@ -4273,8 +4458,8 @@ local function register_decorations()
 		end
 	end
 
-	register_double_fern(0.01, 0.03, { "Jungle", "JungleM", "JungleEdge", "JungleEdgeM", "Taiga", "ColdTaiga", "MegaTaiga", "MegaSpruceTaiga" })
+	register_double_fern(0.01, 0.03, {"Jungle", "JungleM", "JungleEdge", "JungleEdgeM", "Taiga", "ColdTaiga", "MegaTaiga", "MegaSpruceTaiga", "BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", })
-	register_double_fern(0.15, 0.1, { "JungleM" })
+	register_double_fern(0.15, 0.1, {"JungleM", "BambooJungleM"})
 
 	-- Large flowers
 	local function register_large_flower(name, biomes, seed, offset, flower_forest_offset)
@@ -4360,7 +4545,7 @@ local function register_decorations()
 			octaves = 4,
 			persist = 0.6,
 		},
-		biomes = {"Jungle"},
+		biomes = {"Jungle", "BambooJungle"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves_2.mts",
@@ -4378,7 +4563,7 @@ local function register_decorations()
 			octaves = 4,
 			persist = 0.6,
 		},
-		biomes = {"JungleM"},
+		biomes = {"JungleM","BambooJungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves.mts",
@@ -4396,13 +4581,84 @@ local function register_decorations()
 			octaves = 4,
 			persist = 0.6,
 		},
-		biomes = {"JungleEdge", "JungleEdgeM"},
+		biomes = {"JungleEdge", "JungleEdgeM","BambooJungleEdge", "BambooJungleEdgeM"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves.mts",
 		flags = "place_center_x, place_center_z",
 	})
 
+	-- Bamboo
+	minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt", },
+		sidelen = 80,
+		fill_ratio = 0.0043,
+		biomes = {"Jungle", "JungleM", "JungleEdge", "JungleEdgeM"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		decoration = "mcl_bamboo:bamboo",
+		height = 9,
+		max_height = 11,
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+
+	minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt", "mcl_core:podzol"},
+		sidelen = 80,
+		fill_ratio = 0.095,
+		biomes = {"BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		decoration = "mcl_bamboo:bamboo",
+		height = 9,
+		max_height = 12,
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+	--[[
+	-- commenting out this section because with the new grow code, bamboo creates its own height, and therefore places it's own top.
+		minetest.register_decoration({
+			deco_type = "simple",
+			place_on = {"mcl_bamboo:bamboo"},
+			sidelen = 80,
+			fill_ratio = 1,
+			biomes = {"BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", "Jungle", "JungleM", "JungleEdge", "JungleEdgeM"},
+			y_min = 1,
+			y_max = mcl_vars.mg_overworld_max,
+			decoration = "mcl_bamboo:bamboo_endcap",
+			height = 1,
+			max_height = 4,
+			flags = "all_floors",
+		})
+	]]
+
+	minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"group:grass_block_no_snow"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0,
+			scale = 0.012,
+			spread = {x = 100, y = 100, z = 100},
+			seed = 354,
+			octaves = 1,
+			persist = 0.5,
+			lacunarity = 1.0,
+			flags = "absvalue"
+		},
+		biomes = {"BambooJungle", "BambooJungleEdge","BambooJungleM", "BambooJungleEdge"},
+		y_max = mcl_vars.mg_overworld_max,
+		y_min = 1,
+		decoration = "mcl_flowers:tallgrass"
+	})
+
+	register_doubletall_grass(-0.0005, -0.3, {"BambooJungle", "BambooJungleM", "BambooJungleEdge"})
+	register_grass_decoration("tallgrass", -0.03, 1, {"BambooJungle", "BambooJungleM", "BambooJungleEdge"})
+
+	-----------------
 	-- Fallen logs
 	-- These fallen logs are not really good yet. They must be longer and also have one upright block.
 	-- Note the decortion API does not like wide schematics, they are likely to overhang.
@@ -5449,6 +5705,7 @@ local function register_dimension_decorations()
 end
 
 
+
 --
 -- Detect mapgen to select functions
 --
@@ -5522,7 +5779,9 @@ if mg_name ~= "singlenode" then
 					end
 				end
 			end
-			if minp.y > -26900 then return end
+			if minp.y > -26900 then
+				return
+			end
 			for _, pos in ipairs(gennotify["decoration#" .. deco_id_chorus_plant] or {}) do
 				local x, y, z = pos.x, pos.y, pos.z
 				if x < -10 or x > 10 or z < -10 or z > 10 then
@@ -5533,7 +5792,9 @@ if mg_name ~= "singlenode" then
 					end
 				end
 			end
-			if minp.y > mcl_vars.mg_nether_max then return end
+			if minp.y > mcl_vars.mg_nether_max then
+				return
+			end
 			for _, f in pairs(deco_ids_fungus) do
 				for _, pos in ipairs(gennotify["decoration#" .. f] or {}) do
 					minetest.fix_light(vector.offset(pos, -8, -8, -8), vector.offset(pos, 8, 8, 8))