fix bamboo biomes, add new schematic

mods/MAPGEN/mcl_villages/api.lua

@@ -46,19 +46,16 @@ local function job_count(schem_lua)
 end
 
 local function load_schema(name, mts)
-	local schem_lua = minetest.serialize_schematic(mts, "lua", { lua_use_comments = false, lua_num_indent_spaces = 0 })
-		.. " return schematic"
+	local schem_lua = minetest.serialize_schematic(mts, "lua", { lua_use_comments = false, lua_num_indent_spaces = 0 }) .. " return schematic"
 	-- MCLA node names to VL for import
-	for _, sub in pairs(mcl_villages.mcla_to_vl) do
-		schem_lua = schem_lua:gsub(sub[1], sub[2])
+	if string.find(mts, "new_villages/") then
+		for _, sub in pairs(mcl_villages.mcla_to_vl) do
+			schem_lua = schem_lua:gsub(sub[1], sub[2])
+		end
 	end
 
 	local schematic = loadstring(schem_lua)()
-	return {
-		name = name,
-		size = schematic.size,
-		schem_lua = schem_lua,
-	}
+	return { name = name, size = schematic.size, schem_lua = schem_lua }
 end
 
 local all_optional = { "yadjust", "no_ground_turnip", "no_clearance" }

mods/MAPGEN/mcl_villages/const.lua

@@ -110,6 +110,13 @@ mcl_villages.vl_to_mcla = {
 	{ '"mcl_core:([a-z]*)wood"', '"mcl_trees:wood_%1"'},
 	{ '"mcl_stairs:stair_darkwood"', '"mcl_stairs:stair_dark_oak"'},
 	{ '"mcl_stairs:stair_([a-z]*)wood"', '"mcl_stairs:stair_%1"'},
+	{ '"mcl_bamboo:bamboo_fence', '"mcl_fences:bamboo_fence'},
+	{ '"mcl_bamboo:bamboo_plank', '"mcl_core:bamboowood'},
+	{ '"mcl_bamboo:bamboo_block', '"mcl_core:bambootree'},
+	{ '"mcl_stairs:stair_bamboo_plank', '"mcl_stairs:stair_bamboo'},
+	{ '"mcl_bamboo:pressure_plate_bamboo_wood_', '"mesecons_pressureplates:pressure_plate_bamboo_'},
+	{ '"mcl_bamboo:bamboo_trapdoor', '"mcl_doors:trapdoor_bamboo'},
+	{ '"mcl_bamboo:bamboo_door', '"mcl_doors:door_bamboo'},
 }
 mcl_villages.mcla_to_vl = {
 	-- oneway
@@ -147,7 +154,13 @@ mcl_villages.mcla_to_vl = {
 	{ '"mcl_stairs:stair_dark_oak(["_])', '"mcl_stairs:stair_darkwood%1'},
 	{ '"mcl_stairs:stair_jungle(["_])', '"mcl_stairs:stair_junglewood%1'},
 	{ '"mcl_stairs:stair_acacia(["_])', '"mcl_stairs:stair_acaciawood%1'},
-	{ '"mcl_stairs:stair_bamboo(["_])', '"mcl_stairs:stair_bamboowood%1'},
+	{ '"mcl_fences:bamboo_fence', '"mcl_bamboo:bamboo_fence'},
+	{ '"mcl_core:bamboowood', '"mcl_bamboo:bamboo_plank'},
+	{ '"mcl_core:bambootree', '"mcl_bamboo:bamboo_block'},
+	{ '"mcl_stairs:stair_bamboo', '"mcl_stairs:stair_bamboo_plank'},
+	{ '"mesecons_pressureplates:pressure_plate_bamboo_', '"mcl_bamboo:pressure_plate_bamboo_wood_'},
+	{ '"mcl_doors:trapdoor_bamboo', '"mcl_bamboo:bamboo_trapdoor'},
+	{ '"mcl_doors:door_bamboo', '"mcl_bamboo:bamboo_door'},
 }
 mcl_villages.material_substitions = {
 	desert = {
@@ -178,6 +191,7 @@ mcl_villages.material_substitions = {
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:birch_fence%1"' },
 		{ '"mcl_stairs:stair_oak_bark([^"]*)"', '"mcl_stairs:stair_sandstonesmooth2%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_sandstonesmooth2%1"' }, -- divert from MCLA, no version 1?
+		{ '"mcl_core:leaves"', '"air"' }, -- addition to MCLA
 	},
 	spruce = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_sprucewood%1"' },
@@ -191,6 +205,7 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_spruce" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:spruce_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_spruce%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:spruceleaves"' }, -- addition to MCLA
 	},
 	birch = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_birchwood%1"' },
@@ -204,6 +219,7 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_birch" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:birch_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_birch%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:birchleaves"' }, -- addition to MCLA
 	},
 	acacia = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_acaciawood%1"' },
@@ -217,6 +233,7 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_acacia" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:acacia_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_acacia%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:acacialeaves"' }, -- addition to MCLA
 	},
 	dark_oak = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_darkwood%1"' },
@@ -230,6 +247,7 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_dark_oak" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:dark_oak_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_dark_oak%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:darkleaves"' }, -- addition to MCLA
 	},
 	jungle = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_junglewood%1"' },
@@ -243,9 +261,10 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_jungle" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:jungle_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_jungle%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:jungleleaves"' }, -- addition to MCLA
 	},
 	bamboo = {
-		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_bamboo_block%1"' },
+		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_bamboo_plank%1"' }, -- divert from MCLA
 		{
 			'"mesecons_pressureplates:pressure_plate_oak_([^"]+)"',
 			'"mesecons_pressureplates:pressure_plate_bamboo_%1"',
@@ -261,6 +280,7 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_bamboo" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:bamboo_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_bamboo%1"' },
+		{ '"mcl_core:leaves"', '"air"' }, -- addition to MCLA
 	},
 	cherry = {
 		{ '"mcl_stairs:slab_oak([^"]*)"', '"mcl_stairs:slab_cherry_blossom%1"' },
@@ -274,5 +294,6 @@ mcl_villages.material_substitions = {
 		{ "mcl_trees:wood_oak", "mcl_trees:wood_cherry_blossom" },
 		{ '"mcl_fences:oak_fence([^"]*)"', '"mcl_fences:cherry_blossom_fence%1"' },
 		{ '"mcl_stairs:stair_oak([^"]*)"', '"mcl_stairs:stair_cherry_blossom%1"' },
+		{ '"mcl_core:leaves"', '"mcl_core:leaves"' }, -- addition to MCLA
 	},
 }

mods/MAPGEN/mcl_villages/init.lua

@@ -230,6 +230,14 @@ mcl_villages.register_building({
 	yadjust = 1,
 })
 
+mcl_villages.register_building({
+	name = "house_chimney",
+	mts = schem_path .. "haeuschen2.mts",
+	min_jobs = 2,
+	max_jobs = 99,
+	yadjust = 1,
+})
+
 mcl_villages.register_building({
 	name = "house_small",
 	mts = schem_path .. "new_villages/house_1_bed.mts",
@@ -268,18 +276,28 @@ mcl_villages.register_building({
 
 mcl_villages.register_building({
 	name = "fletcher",
-	mts = schem_path .. "new_villages/fletcher.mts",
+	mts = schem_path .. "bogner.mts",
 	num_others = 8,
-	yadjust = 1,
+	yadjust = 0,
 })
 
 mcl_villages.register_building({
 	name = "library",
 	mts = schem_path .. "new_villages/library.mts",
+	min_jobs = 12,
+	max_jobs = 99,
 	num_others = 15,
 	yadjust = 1,
 })
 
+mcl_villages.register_building({
+	name = "librarian",
+	mts = schem_path .. "schreiber.mts",
+	min_jobs = 1,
+	max_jobs = 11,
+	yadjust = 0,
+})
+
 mcl_villages.register_building({
 	name = "map_shop",
 	mts = schem_path .. "new_villages/cartographer.mts",
@@ -333,11 +351,11 @@ mcl_villages.register_building({
 
 mcl_villages.register_building({
 	name = "church",
-	mts = schem_path .. "new_villages/church.mts",
+	mts = schem_path .. "kirche.mts",
 	num_others = 20,
 	min_jobs = 10,
 	max_jobs = 99,
-	yadjust = 1,
+	yadjust = 0,
 })
 
 mcl_villages.register_building({

mods/MAPGEN/mcl_villages/utils.lua

@@ -1,4 +1,5 @@
 local function is_above_surface(name)
+    -- TODO: use groups
 	return name == "air" or
 		-- note: not dirt_with_grass!
 		string.find(name,"tree") or
@@ -6,7 +7,8 @@ local function is_above_surface(name)
 		string.find(name,"snow") or
 		string.find(name,"fern") or
 		string.find(name,"flower") or -- includes grass decorations
-		string.find(name,"bush")
+		string.find(name,"bush") or
+		name == "mcl_bamboo:bamboo" or name == "mcl_core:vine"
 end
 function mcl_villages.find_surface_down(lvm, pos, surface_node)
 	local p6 = vector.new(pos)