Merge remote-tracking branch 'upstream/master'

* Permet de les dropper quand on récolte le bloc où ils sont attachés.

bushes/init.lua

@@ -6,15 +6,19 @@
 -- (Leaf texture created by RealBadAngel or VanessaE)
 -- Branch textures created by Neuromancer.
 
+local random = math.random
+
 -- support for i18n
 local S = minetest.get_translator("bushes")
 abstract_bushes = {}
 
 local bushes_bush_rarity = tonumber(minetest.settings:get("bushes_bush_rarity")) or 99.9
 local bushes_bush_rarity_fertility = tonumber(minetest.settings:get("bushes_bush_rarity_fertility")) or 1.5
+local bushes_bush_fertility = tonumber(minetest.settings:get("bushes_bush_fertility")) or -1
 
 local bushes_youngtrees_rarity = tonumber(minetest.settings:get("bushes_youngtrees_rarity")) or 100
 local bushes_youngtrees_rarity_fertility = tonumber(minetest.settings:get("bushes_youngtrees_rarity_fertility")) or 0.6
+local bushes_youngtrees_fertility = tonumber(minetest.settings:get("bushes_youngtrees_fertility")) or -0.5
 
 
 minetest.register_node("bushes:youngtree2_bottom", {
@@ -142,33 +146,22 @@ for i in pairs(BushLeafNode) do
 end
 
 abstract_bushes.grow_bush = function(pos)
-	local leaf_type = math.random(1,2)
-	local bush_side_height = math.random(0,1)
-		local chance_of_bush_node_right = math.random(1,10)
-		if chance_of_bush_node_right> 5 then
-			local right_pos = {x=pos.x+1, y=pos.y+bush_side_height, z=pos.z}
-			abstract_bushes.grow_bush_node(right_pos,3,leaf_type)
+	local leaf_type = random(1,2)
+	for _, pos_dir in ipairs({
+		{ pos = {x=pos.x+1, y=pos.y+random(0,1), z=pos.z},
+		  dir = 3},
+		{ pos = {x=pos.x-1, y=pos.y+random(0,1), z=pos.z},
+		  dir = 1},
+		{ pos = {x=pos.x, y=pos.y+random(0,1), z=pos.z+1},
+		  dir = 2},
+		{ pos = {x=pos.x, y=pos.y+random(0,1), z=pos.z-1},
+		  dir = 0}
+	}) do
+		if random(1,10) > 5 then
+			abstract_bushes.grow_bush_node(pos_dir.pos, pos_dir.dir, leaf_type)
 		end
-		local chance_of_bush_node_left = math.random(1,10)
-		if chance_of_bush_node_left> 5 then
-			bush_side_height = math.random(0,1)
-			local left_pos = {x=pos.x-1, y=pos.y+bush_side_height, z=pos.z}
-			abstract_bushes.grow_bush_node(left_pos,1,leaf_type)
-		end
-		local chance_of_bush_node_front = math.random(1,10)
-		if chance_of_bush_node_front> 5 then
-			bush_side_height = math.random(0,1)
-			local front_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z+1}
-			abstract_bushes.grow_bush_node(front_pos,2,leaf_type)
-		end
-		local chance_of_bush_node_back = math.random(1,10)
-		if chance_of_bush_node_back> 5 then
-			bush_side_height = math.random(0,1)
-			local back_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z-1}
-			abstract_bushes.grow_bush_node(back_pos,0,leaf_type)
-		end
-
-abstract_bushes.grow_bush_node(pos,5,leaf_type)
+	end
+	abstract_bushes.grow_bush_node(pos,5,leaf_type)
 end
 
 
@@ -199,33 +192,31 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type)
 		minetest.swap_node(right_here, {name="bushes:bushbranches"..bush_branch_type , param2=dir})
 						--minetest.chat_send_all("leaf_type: (" .. leaf_type .. ")")
 		minetest.swap_node(above_right_here, {name="bushes:BushLeaves"..leaf_type})
-		local chance_of_high_leaves = math.random(1,10)
-		if chance_of_high_leaves> 5 then
-			local two_above_right_here = {x=pos.x, y=pos.y+3, z=pos.z}
+		if random(1,10) > 5 then
 							--minetest.chat_send_all("leaf_type: (" .. leaf_type .. ")")
-			minetest.swap_node(two_above_right_here, {name="bushes:BushLeaves"..leaf_type})
+			minetest.swap_node({x=pos.x, y=pos.y+3, z=pos.z}, {name="bushes:BushLeaves"..leaf_type})
 		end
 	end
 end
 
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
 		surface = {
 			"default:dirt_with_grass",
 			"stoneage:grass_with_silex",
 			"sumpf:peat",
 			"sumpf:sumpf"
 		},
-		noise_params = pl.generate_noise_params({rarity = bushes_bush_rarity, rarity_fertility = bushes_bush_rarity_fertility}),
+		rarity = bushes_bush_rarity,
+		rarity_fertility = bushes_bush_rarity_fertility,
+		plantlife_limit = bushes_bush_fertility,
 		min_elevation = 1, -- above sea level
 	},
-	"bushes:bushes",
 	abstract_bushes.grow_bush
 )
 
 abstract_bushes.grow_youngtree2 = function(pos)
-	local height = math.random(4,5)
-	abstract_bushes.grow_youngtree_node2(pos,height)
+	abstract_bushes.grow_youngtree_node2(pos, random(4,5))
 end
 
 
@@ -251,16 +242,19 @@ abstract_bushes.grow_youngtree_node2 = function(pos, height)
 end
 
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
 		surface = {
 			"default:dirt_with_grass",
 			"stoneage:grass_with_silex",
 			"sumpf:peat",
 			"sumpf:sumpf"
 		},
-		noise_params = pl.generate_noise_params({rarity = bushes_youngtrees_rarity, rarity_fertility = bushes_youngtrees_rarity_fertility}),
+		rarity = bushes_youngtrees_rarity,
+		rarity_fertility = bushes_youngtrees_rarity_fertility,
+		plantlife_limit = bushes_youngtrees_fertility,
 		min_elevation = 1, -- above sea level
 	},
-	"bushes:youngtrees",
 	abstract_bushes.grow_youngtree2
 )
+
+minetest.log("action", "[bushes] loaded.")

bushes_classic/nodes.lua

@@ -4,6 +4,8 @@ local S = minetest.get_translator("bushes_classic")
 plantlife_bushes = {}
 
 -- TODO: add support for nodebreakers? those dig like mese picks
+local random = math.random
+
 plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	if not (digger and pos and oldnode) then
 		return
@@ -63,7 +65,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 
 		-- with a chance of 1/3, return 2 bushes
 		local amount
-		if can_harvest and math.random(1,3) == 1 then
+		if can_harvest and random(1,3) == 1 then
 			amount = "2"
 		else
 			amount = "1"
@@ -75,7 +77,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	elseif groupcaps.choppy then
 
 		-- the amount of sticks may vary
-		local amount = math.random(4, 20)
+		local amount = random(4, 20)
 		-- return some sticks
 		harvested = "default:stick " .. amount
 
@@ -136,7 +138,7 @@ minetest.register_abm({
 			local dirt = minetest.get_node(dirtpos)
 			local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil")
 
-			if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then
+			if is_soil and (dirt.name == "farming:soil_wet" or random(1,3) == 1) then
 				minetest.swap_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
 			end
 		end

cavestuff/mapgen.lua

@@ -1,65 +1,39 @@
 --Map Generation Stuff
 
-minetest.register_decoration({
-	decoration = {
+biome_lib.register_on_generate(
+	{
+		surface = {
+			"default:dirt_with_grass",
+			"default:gravel",
+			"default:stone",
+			"default:permafrost_with_stones"
+		},
+		max_count = 50,
+		rarity = 0,
+		plantlife_limit = -1,
+		check_air = true,
+		random_facedir = {0, 3}
+	},
+	{
 		"cavestuff:pebble_1",
 		"cavestuff:pebble_2"
-	},
-	place_on = {
-		"default:dirt_with_grass",
-		"default:gravel",
-		"default:stone",
-		"default:permafrost_with_stones"
-	},
-	noise_params = {
-		offset = 0,
-		scale = 0.0078125,
-		spread = {
-			y = 100,
-			z = 100,
-			x = 100
-		},
-		seed = 0,
-		octaves = 3,
-		persist = 0.6,
-		flags = "absvalue",
-		lacunarity = 2
-	},
-	param2 = 0,
-	flags = "all_floors",
-	deco_type = "simple",
-	param2_max = 3,
-	y_min = -16,
-	y_max = 48
-})
+	}
+)
 
-minetest.register_decoration({
-	decoration = {
+biome_lib.register_on_generate(
+	{
+		surface = {
+			"default:desert_sand",
+			"default:desert_stone"
+		},
+		max_count = 50,
+		rarity = 0,
+		plantlife_limit = -1,
+		check_air = true,
+		random_facedir = {0, 3}
+	},
+	{
 		"cavestuff:desert_pebble_1",
 		"cavestuff:desert_pebble_2"
-	},
-	place_on = {
-		"default:desert_sand",
-		"default:desert_stone"
-	},
-	noise_params = {
-		offset = 0,
-		scale = 0.0078125,
-		spread = {
-				y = 100,
-				z = 100,
-				x = 100
-		},
-		seed = 0,
-		octaves = 3,
-		persist = 0.6,
-		flags = "absvalue",
-		lacunarity = 2
-	},
-	param2 = 0,
-	flags = "all_floors",
-	deco_type = "simple",
-	param2_max = 3,
-	y_min = -16,
-	y_max = 48
-})
+	}
+)

cavestuff/nodes.lua

@@ -1,6 +1,8 @@
 -- support for i18n
 local S = minetest.get_translator("cavestuff")
 
+local random = math.random
+
 --Rocks
 
 local cbox = {
@@ -20,7 +22,7 @@ minetest.register_node("cavestuff:pebble_1",{
 	 collision_box = cbox,
 	 on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,
@@ -53,7 +55,7 @@ minetest.register_node("cavestuff:desert_pebble_1",{
 	collision_box = cbox,
 	 on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:desert_pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:desert_pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:desert_pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,

dryplants/juncus.lua

@@ -11,8 +11,11 @@
 -- support for i18n
 local S = minetest.get_translator("dryplants")
 
+local random = math.random
+local sqrt = math.sqrt
+
 abstract_dryplants.grow_juncus = function(pos)
-	local juncus_type = math.random(2,3)
+	local juncus_type = random(2,3)
 	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
 	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
 	or minetest.get_node(right_here).name == "default:junglegrass" then
@@ -27,7 +30,7 @@ end
 minetest.register_node("dryplants:juncus", {
 	description = S("Juncus"),
 	drawtype = "plantlike",
-	visual_scale = math.sqrt(8),
+	visual_scale = sqrt(8),
 	paramtype = "light",
 	tiles = {"dryplants_juncus_03.png"},
 	inventory_image = "dryplants_juncus_inv.png",
@@ -53,7 +56,7 @@ minetest.register_node("dryplants:juncus", {
 			return
 		end
 		local pos = pointed_thing.under
-		local juncus_type = math.random(2,3)
+		local juncus_type = random(2,3)
 		local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
 		if juncus_type == 2 then
 			minetest.swap_node(right_here, {name="dryplants:juncus_02"})
@@ -69,7 +72,7 @@ minetest.register_node("dryplants:juncus", {
 minetest.register_node("dryplants:juncus_02", {
 	description = S("Juncus"),
 	drawtype = "plantlike",
-	visual_scale = math.sqrt(8),
+	visual_scale = sqrt(8),
 	paramtype = "light",
 	tiles = {"dryplants_juncus_02.png"},
 	walkable = false,
@@ -92,42 +95,44 @@ minetest.register_node("dryplants:juncus_02", {
 -- GENERATE SMALL JUNCUS
 -----------------------------------------------------------------------------------------------
 -- near water or swamp
-pl.register_on_generate({
-		surface = {
-			"default:dirt_with_grass",
-			--"default:desert_sand",
-			--"default:sand",
-			"stoneage:grass_with_silex",
-			"sumpf:peat",
-			"sumpf:sumpf"
-		},
-		noise_params = pl.generate_noise_params({max_count = JUNCUS_NEAR_WATER_PER_MAPBLOCK, rarity = 101 - JUNCUS_NEAR_WATER_RARITY}),
-		min_elevation = 1, -- above sea level
-		near_nodes = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
-		near_nodes_size = 2,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
+biome_lib.register_on_generate({
+    surface = {
+		"default:dirt_with_grass",
+		--"default:desert_sand",
+		--"default:sand",
+		"stoneage:grass_with_silex",
+		"sumpf:peat",
+		"sumpf:sumpf"
 	},
-	"dryplants:juncus_near_water",
-	abstract_dryplants.grow_juncus
+    max_count = JUNCUS_NEAR_WATER_PER_MAPBLOCK,
+    rarity = 101 - JUNCUS_NEAR_WATER_RARITY,
+    min_elevation = 1, -- above sea level
+	near_nodes = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
+	near_nodes_size = 2,
+	near_nodes_vertical = 1,
+	near_nodes_count = 1,
+    plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_juncus
 )
 -- at dunes/beach
-pl.register_on_generate({
-		surface = {
-			--"default:dirt_with_grass",
-			--"default:desert_sand",
-			"default:sand",
-			--"stoneage:grass_with_silex",
-			--"sumpf:peat",
-			--"sumpf:sumpf"
-		},
-		noise_params = pl.generate_noise_params({max_count = JUNCUS_AT_BEACH_PER_MAPBLOCK, rarity = 101 - JUNCUS_AT_BEACH_RARITY}),
-		min_elevation = 1, -- above sea level
-		near_nodes = {"default:dirt_with_grass"},
-		near_nodes_size = 2,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
+biome_lib.register_on_generate({
+    surface = {
+		--"default:dirt_with_grass",
+		--"default:desert_sand",
+		"default:sand",
+		--"stoneage:grass_with_silex",
+		--"sumpf:peat",
+		--"sumpf:sumpf"
 	},
-	"dryplants:junces_at_beach",
-	abstract_dryplants.grow_juncus
+    max_count = JUNCUS_AT_BEACH_PER_MAPBLOCK,
+    rarity = 101 - JUNCUS_AT_BEACH_RARITY,
+    min_elevation = 1, -- above sea level
+	near_nodes = {"default:dirt_with_grass"},
+	near_nodes_size = 2,
+	near_nodes_vertical = 1,
+	near_nodes_count = 1,
+    plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_juncus
 )

dryplants/meadowvariation.lua

@@ -8,17 +8,17 @@
 -----------------------------------------------------------------------------------------------
 
 abstract_dryplants.grow_grass_variation = function(pos)
-	local right_here = {x=pos.x, y=pos.y, z=pos.z}
-	minetest.swap_node(right_here, {name="dryplants:grass_short"})
+	minetest.swap_node(pos, {name="dryplants:grass_short"})
 end
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {
-      "default:dirt_with_grass",
-    },
-    noise_params = pl.generate_noise_params({max_count = 4800, rarity = 25}),
+		"default:dirt_with_grass",
+	},
+    max_count = 4800,
+    rarity = 25,
     min_elevation = 1, -- above sea level
+	plantlife_limit = -0.9,
   },
-  "dryplants:grass",
   abstract_dryplants.grow_grass_variation
 )

dryplants/moregrass.lua

@@ -7,23 +7,24 @@
 -- Looked at code from:		default
 -----------------------------------------------------------------------------------------------
 
-minetest.register_decoration({
-	decoration = {
-		"default:grass_1",
+biome_lib.register_on_generate(
+	{
+		surface = {
+			"default:dirt_with_grass",
+			"stoneage:grass_with_silex",
+			"sumpf:peat",
+			"sumpf:sumpf"
+		},
+		max_count = TALL_GRASS_PER_MAPBLOCK,
+		rarity = 101 - TALL_GRASS_RARITY,
+		min_elevation = 1, -- above sea level
+		plantlife_limit = -0.9,
+		check_air = true,
+	},
+	{	"default:grass_1",
 		"default:grass_2",
 		"default:grass_3",
 		"default:grass_4",
 		"default:grass_5"
-	},
-	place_on = {
-		"default:dirt_with_grass",
-		"stoneage:grass_with_silex",
-		"sumpf:peat",
-		"sumpf:sumpf"
-	},
-	noise_params = pl.generate_noise_params({max_count = TALL_GRASS_PER_MAPBLOCK, rarity = 101 - TALL_GRASS_RARITY}),
-	flags = "all_floors",
-	deco_type = "simple",
-	y_min = 1,
-	y_max = 48
-})
+	}
+)

dryplants/reedmace.lua

@@ -20,13 +20,16 @@
 -- support for i18n
 local S = minetest.get_translator("dryplants")
 
+local random = math.random
+local sqrt = math.sqrt
+
 -----------------------------------------------------------------------------------------------
 -- REEDMACE SHAPES
 -----------------------------------------------------------------------------------------------
 
 abstract_dryplants.grow_reedmace = function(pos)
-	local size = math.random(1,3)
-	local spikes = math.random(1,3)
+	local size = random(1,3)
+	local spikes = random(1,3)
 	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
 	local pos_02 = {x = pos.x, y = pos.y + 2, z = pos.z}
 	local pos_03 = {x = pos.x, y = pos.y + 3, z = pos.z}
@@ -51,8 +54,8 @@ abstract_dryplants.grow_reedmace = function(pos)
 end
 
 abstract_dryplants.grow_reedmace_water = function(pos)
-	local size = math.random(1,3)
-	local spikes = math.random(1,3)
+	local size = random(1,3)
+	local spikes = random(1,3)
 	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
 	local pos_02 = {x = pos.x, y = pos.y + 2, z = pos.z}
 	local pos_03 = {x = pos.x, y = pos.y + 3, z = pos.z}
@@ -127,7 +130,7 @@ minetest.register_node("dryplants:reedmace_top", {
 minetest.register_node("dryplants:reedmace_height_2", {
 	description = S("Reedmace, height: 2"),
 	drawtype = "plantlike",
-	visual_scale = math.sqrt(8),
+	visual_scale = sqrt(8),
 	paramtype = "light",
 	tiles = {"dryplants_reedmace_height_2.png"},
 	inventory_image = "dryplants_reedmace_top.png",
@@ -150,7 +153,7 @@ minetest.register_node("dryplants:reedmace_height_2", {
 minetest.register_node("dryplants:reedmace_height_3", {
 	description = S("Reedmace, height: 3"),
 	drawtype = "plantlike",
-	visual_scale = math.sqrt(8),
+	visual_scale = sqrt(8),
 	paramtype = "light",
 	tiles = {"dryplants_reedmace_height_3.png"},
 	inventory_image = "dryplants_reedmace_top.png",
@@ -173,7 +176,7 @@ minetest.register_node("dryplants:reedmace_height_3", {
 minetest.register_node("dryplants:reedmace_height_3_spikes", {
 	description = S("Reedmace, height: 3 & Spikes"),
 	drawtype = "plantlike",
-	visual_scale = math.sqrt(8),
+	visual_scale = sqrt(8),
 	paramtype = "light",
 	tiles = {"dryplants_reedmace_height_3_spikes.png"},
 	inventory_image = "dryplants_reedmace_top.png",
@@ -349,63 +352,66 @@ minetest.register_entity("dryplants:reedmace_water_entity",{
 -- GENERATE REEDMACE
 -----------------------------------------------------------------------------------------------
 -- near water or swamp
-pl.register_on_generate({
-		surface = {
-			"default:dirt_with_grass",
-			"default:desert_sand",
-			"stoneage:grass_with_silex",
-			"sumpf:peat",
-			"sumpf:sumpf"
-		},
-		noise_params = pl.generate_noise_params({max_count = REEDMACE_NEAR_WATER_PER_MAPBLOCK, rarity = 101 - REEDMACE_NEAR_WATER_RARITY}),
-		--rarity = 60,
-		min_elevation = 1, -- above sea level
-		near_nodes = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
-		near_nodes_size = 2,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
+biome_lib.register_on_generate({
+    surface = {
+		"default:dirt_with_grass",
+		"default:desert_sand",
+		"stoneage:grass_with_silex",
+		"sumpf:peat",
+		"sumpf:sumpf"
 	},
-	"dryplants:reedmace_near_water",
-	abstract_dryplants.grow_reedmace
+    max_count = REEDMACE_NEAR_WATER_PER_MAPBLOCK,
+    rarity = 101 - REEDMACE_NEAR_WATER_RARITY,
+	--rarity = 60,
+    min_elevation = 1, -- above sea level
+	near_nodes = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
+	near_nodes_size = 2,
+	near_nodes_vertical = 1,
+	near_nodes_count = 1,
+    plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_reedmace
 )
 -- in water
-pl.register_on_generate({
-		surface = {
-			"default:dirt",
-			"default:dirt_with_grass",
-			--"default:desert_sand",
-			--"stoneage:grass_with_silex",
-			"stoneage:sand_with_silex",
-			"sumpf:peat",
-			"sumpf:sumpf"
-		},
-		noise_params = pl.generate_noise_params({max_count = REEDMACE_IN_WATER_PER_MAPBLOCK, rarity = 101 - REEDMACE_IN_WATER_RARITY}),
-		--rarity = 35,
-		min_elevation = 0, -- a bit below sea level
-		max_elevation = 0, -- ""
-		near_nodes = {"default:water_source","sumpf:dirtywater_source"},
-		near_nodes_size = 1,
-		near_nodes_count = 1,
+biome_lib.register_on_generate({
+    surface = {
+		"default:dirt",
+		"default:dirt_with_grass",
+		--"default:desert_sand",
+		--"stoneage:grass_with_silex",
+		"stoneage:sand_with_silex",
+		"sumpf:peat",
+		"sumpf:sumpf"
 	},
-	"dryplants:reedmace_in_water",
-	abstract_dryplants.grow_reedmace_water
+    max_count = REEDMACE_IN_WATER_PER_MAPBLOCK,
+	rarity = 101 - REEDMACE_IN_WATER_RARITY,
+    --rarity = 35,
+    min_elevation = 0, -- a bit below sea level
+	max_elevation = 0, -- ""
+	near_nodes = {"default:water_source","sumpf:dirtywater_source"},
+	near_nodes_size = 1,
+	near_nodes_count = 1,
+    plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_reedmace_water
 )
 -- for oases & tropical beaches & tropical swamps
-pl.register_on_generate({
-		surface = {
-			"default:sand",
-			"sumpf:sumpf"
-		},
-		noise_params = pl.generate_noise_params({max_count = REEDMACE_FOR_OASES_PER_MAPBLOCK, 101 - REEDMACE_FOR_OASES_RARITY}),
-		--rarity = 10,
-		neighbors = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
-		ncount = 1,
-		min_elevation = 1, -- above sea level
-		near_nodes = {"default:desert_sand","sumpf:sumpf"},
-		near_nodes_size = 2,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
+biome_lib.register_on_generate({
+    surface = {
+		"default:sand",
+		"sumpf:sumpf"
 	},
-	"dryplants:reemace_oases",
-	abstract_dryplants.grow_reedmace
+    max_count = REEDMACE_FOR_OASES_PER_MAPBLOCK,
+    rarity = 101 - REEDMACE_FOR_OASES_RARITY,
+	--rarity = 10,
+    neighbors = {"default:water_source","sumpf:dirtywater_source","sumpf:sumpf"},
+	ncount = 1,
+    min_elevation = 1, -- above sea level
+	near_nodes = {"default:desert_sand","sumpf:sumpf"},
+	near_nodes_size = 2,
+	near_nodes_vertical = 1,
+	near_nodes_count = 1,
+    plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_reedmace
 )

dryplants/settings.txt

@@ -48,5 +48,5 @@ HAY_DRYING_TIME 					= 	3600 	-- seconds
 REED_WILL_DRY 						= 	false	-- wet reed nodes will become dry reed nodes
 REED_DRYING_TIME 					= 	3600 	-- seconds
 
-AUTO_ROOF_CORNER 					= 	true
+AUTO_ROOF_CORNER 					= 	false
 	

ferns/gianttreefern.lua

@@ -282,13 +282,16 @@ minetest.register_node("ferns:fern_trunk_big", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk_big")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		if digger == nil then return end
+		local np = {x=pos.x,y=pos.y+1,z=pos.z}
+		local nn = minetest.get_node(np)
+		if nn.name == "ferns:fern_trunk_big" or
+			nn.name == "ferns:fern_trunk_big_top"
+		then
+			minetest.node_dig(np, nn, digger)
+		end
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

ferns/treefern.lua

@@ -11,6 +11,8 @@ local S = minetest.get_translator("ferns")
 
 assert(abstract_ferns.config.enable_treefern == true)
 
+local random = math.random
+
 function abstract_ferns.can_grow_tree_fern(pos)
 	local node_name = minetest.get_node(pos).name
 	if node_name ~= "air" and node_name ~= "ferns:sapling_tree_fern" and node_name ~= "default:junglegrass" then
@@ -39,12 +41,12 @@ abstract_ferns.grow_tree_fern = function(pos)
 		return
 	end
 
-	local size = math.random(1, 4) + math.random(1, 4)
+	local size = random(1, 4) + random(1, 4)
 	if (size > 5) then
 		size = 10 - size
 	end
 	size = size + 1
-	local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[math.random(1, 2)]
+	local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[random(1, 2)]
 
 	local i = 1
 	local brk = false
@@ -158,13 +160,9 @@ minetest.register_node("ferns:fern_trunk", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		default.dig_up(pos, node, digger)
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

molehills/init.lua

@@ -62,14 +62,15 @@ abstract_molehills.place_molehill = function(pos)
 	end
 end
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
 		surface = {"default:dirt_with_grass"},
-		noise_params = pl.generate_noise_params({rarity = molehills_rarity, rarity_fertility = molehills_rarity_fertility}),
+		rarity = molehills_rarity,
+		rarity_fertility = molehills_rarity_fertility,
+		plantlife_limit = molehills_fertility,
 		min_elevation = 1,
 		max_elevation = 40,
-		avoid_nodes = {"group:tree","group:liquid","group:stone","group:falling_node"},
+		avoid_nodes = {"group:tree","group:liquid","group:stone","group:falling_node"--[[,"air"]]},
 		avoid_radius = 4,
 	},
-	"molehills:molehills",
 	abstract_molehills.place_molehill
 )

nature_classic/blossom.lua

@@ -2,6 +2,8 @@
 local S = minetest.get_translator("nature_classic")
 -- Blossoms and such
 
+local random = math.random
+
 local function spawn_apple_under(pos)
     local below = {
 		x = pos.x,
@@ -46,7 +48,7 @@ minetest.register_abm({
     chance = nature.leaves_blossom_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-			if math.random(nature.leaves_blossom_chance) == 1 then
+			if random(nature.leaves_blossom_chance) == 1 then
 				nature.enqueue_node(pos, node, nature.blossom_node)
 			end
     end
@@ -61,7 +63,7 @@ minetest.register_abm({
     chance = nature.blossom_leaves_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-			if math.random(nature.blossom_leaves_chance) == 1 then
+			if random(nature.blossom_leaves_chance) == 1 then
 				nature.enqueue_node(pos, node, nature.blossom_leaves)
 			end
     end
@@ -76,7 +78,7 @@ minetest.register_abm({
     chance = nature.apple_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-		if math.random(4) == 1 and nature.dtime < 0.2 and not minetest.find_node_near(pos, nature.apple_spread, { "default:apple" }) then
+		if random(4) == 1 and nature.dtime < 0.2 and not minetest.find_node_near(pos, nature.apple_spread, { "default:apple" }) then
 			spawn_apple_under(pos)
 		end
     end

nature_classic/init.lua

@@ -47,4 +47,4 @@ dofile(minetest.get_modpath(current_mod_name) .. "/config.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/global_function.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/blossom.lua")
 
-minetest.log("info", S("[Nature Classic] loaded!"))
+minetest.log("action", S("[Nature Classic] loaded!"))

pl_seaweed/init.lua

@@ -56,16 +56,16 @@ for i in ipairs(algae_list) do
 			local above_node = minetest.get_node(pt.above)
 			local top_node	 = minetest.get_node(top_pos)
 
-			if pl.get_nodedef_field(under_node.name, "buildable_to") then
+			if biome_lib.get_nodedef_field(under_node.name, "buildable_to") then
 				if under_node.name ~= "default:water_source" then
 					place_pos = pt.under
 				elseif top_node.name ~= "default:water_source"
-							 and pl.get_nodedef_field(top_node.name, "buildable_to") then
+							 and biome_lib.get_nodedef_field(top_node.name, "buildable_to") then
 					place_pos = top_pos
 				else
 					return
 				end
-			elseif pl.get_nodedef_field(above_node.name, "buildable_to") then
+			elseif biome_lib.get_nodedef_field(above_node.name, "buildable_to") then
 				place_pos = pt.above
 			end
 			if not place_pos then return end -- something went wrong :P
@@ -92,7 +92,7 @@ for i in ipairs(algae_list) do
 					minetest.swap_node(place_pos, {name = "flowers:seaweed", param2 = fdir})
 				end
 
-				if not pl.expect_infinite_stacks then
+				if not biome_lib.expect_infinite_stacks then
 					itemstack:take_item()
 				end
 				return itemstack

plantlife_lib/init.lua

@@ -1,167 +0,0 @@
-pl = {}
-local deco = {}
-
-dofile(minetest.get_modpath("plantlife_lib") .. DIR_DELIM .. "util.lua")
-
-function pl.get_def_from_id(id)
-	for i, _ in ipairs(deco) do
-		if deco[i][1].id and deco[i][1].id == id then
-			return deco[i]
-		end
-	end
-end
-
-function pl.register_on_generate(def, plantname, func)
-	local deco_def = {
-		name = plantname,
-		deco_type = "simple",
-		place_on = def.place_on or def.surface,
-		sidelen = 16,
-		fill_ratio = def.fill_ratio or 0.02,
-		noise_params = def.noise_params,
-		y_min = def.min_elevation,
-		y_max = def.max_elevation,
-		flags = def.flags,
-		decoration = "air", -- spawn the decoration later
-	}
-	-- handle avoid_nodes (no engine support :\)
-	if def.avoid_nodes then
-		deco_def.avoid_nodes = def.avoid_nodes
-		if def.avoid_radius then
-			deco_def.avoid_radius = def.avoid_radius
-		end
-	end
-	-- handle near_nodes (we can't use the engine function for that)
-	if def.near_nodes then
-		deco_def.near_nodes = def.near_nodes
-		if def.near_nodes_size then
-			deco_def.near_nodes_size = def.near_nodes_size
-			if def.near_nodes_vertical then
-				deco_def.near_nodes_vertical = def.near_nodes_vertical
-			end
-		end
-		deco_def.near_nodes_count = def.near_nodes_count or 1
-	end
-	-- handle ncount/neighbors
-	if def.ncount and def.neighbors then
-		deco_def.ncount = def.ncount
-		deco_def.neighbors = def.neighbors
-	end
-	-- save def
-	local next = #deco + 1
-	deco[next] = {}
-	deco[next][1] = deco_def
-	deco[next][2] = func or nil
-	minetest.register_decoration(deco_def)
-	-- print(dump(deco))
-end
-
-local ids = {}
-minetest.register_on_mods_loaded(function()
-    -- print(dump(deco))
-    for k, v in ipairs(deco) do
-		local id = minetest.get_decoration_id(deco[k][1].name)
-        deco[k][1].id = id
-		table.insert(ids, id)
-    end
-	print(dump2(ids))
-    minetest.set_gen_notify("decoration", ids)
-	-- print(dump(deco))
-end)
-
-local function place_handler(t)
-	local def = pl.get_def_from_id(t.id)
-
-	-- ncount/neighbors handler
-	if def.ncount and
-		#minetest.find_nodes_in_area(
-			{x = t.pos.x-1, y = t.pos.y, z = t.pos.z-1},
-			{x = t.pos.x+1, y = t.pos.y, z = t.pos.z+1},
-			def.neighbors
-		) <= def.ncount then
-			print("return due ncount")
-		return -- Not enough similar biome nodes around
-	end
-
-	-- near nodes handler
-	if def.near_nodes and
-		#minetest.find_nodes_in_area(
-			{x = t.pos.x-def.near_nodes_size, y = t.pos.y-def.near_nodes_vertical, z = t.pos.z-def.near_nodes_size},
-			{x = t.pos.x+def.near_nodes_size, y = t.pos.y+def.near_nodes_vertical, z = t.pos.z+def.near_nodes_size},
-			def.near_nodes
-		) < def.near_nodes_count then
-		return -- Long distance neighbors do not match
-	end
-
-	-- avoid nodes handler
-	if def.avoid_nodes and def.avoid_radius then
-		local p_top = {x = t.pos.x, y = t.pos.y + 1, z = t.pos.z}
-		if minetest.find_node_near(p_top, def.avoid_radius + math.random(-1.5,2), def.avoid_nodes) then
-			return
-		end
-	end
-
-	-- run spawn function
-	local spawn_func = def[2]
-	spawn_func(t.pos)
-
-	-- some fun
-	local player = minetest.get_player_by_name("Niklp")
-	-- player:set_pos(t.pos)
-	t.pos.y = t.pos.y + 3
-	minetest.add_particle({
-		pos = t.pos,
-		expirationtime = 15,
-		playername = player:get_player_name(),
-		glow = minetest.LIGHT_MAX,
-		texture = "default_mese_crystal.png",
-		size = 15,
-	})
-end
-
-minetest.register_on_generated(function(minp, maxp, blockseed)
-	local t0 = minetest.get_us_time()
-    local g = minetest.get_mapgen_object("gennotify")
-    local locations = {}
-	for _, id in ipairs(ids) do
-		local deco_locations = g["decoration#" .. id] or {}
-		-- print("dl: " .. dump2(deco_locations))
-		for k, pos in pairs(deco_locations) do
-			-- print(id)
-			local next = #locations + 1
-			locations[next] = {}
-			locations[next].pos = pos
-			locations[next].id = id
-			-- dbg()             ^ - This must be ID!
-		end
-	end
-    if #locations == 0 then return end
-	-- print("locations: " .. dump2(locations))
-    for _, t in ipairs(locations) do
-		place_handler(t)
-    end
-	local t1 = minetest.get_us_time()
-	print((t1 - t0) / 1000 .. " ms")
-end)
-
---[[ Example plant
-{
-	{
-		y_min = 1,
-		decoration = "air",
-		deco_type = "simple",
-		id = 45,
-		name = "bushes:bushes_1",
-		place_on = {
-			"default:dirt_with_grass",
-			"stoneage:grass_with_silex",
-			"sumpf:peat",
-			"sumpf:sumpf"
-		},
-		sidelen = 16,
-		fill_ratio = 0.001
-	},
-	^ - decoration def; object ID
-	<function>
-},	^ - spawn function
-]]--

plantlife_lib/mod.conf

@@ -1,2 +0,0 @@
-name = plantlife_lib
-optional_depends = dbg

plantlife_lib/util.lua

@@ -1,42 +0,0 @@
--- Biome lib util functions
-
-function pl.get_nodedef_field(nodename, fieldname)
-	if not minetest.registered_nodes[nodename] then
-		return nil
-	end
-	return minetest.registered_nodes[nodename][fieldname]
-end
-
-if minetest.get_modpath("unified_inventory") or not minetest.settings:get_bool("creative_mode") then
-	pl.expect_infinite_stacks = false
-else
-	pl.expect_infinite_stacks = true
-end
-
--- Noise param helper
-local function set_defaults(biome)
-	biome.seed_diff = biome.seed_diff or 0
-	biome.rarity = biome.rarity or 50
-	biome.rarity_fertility = biome.rarity_fertility or 0
-	biome.max_count = biome.max_count or 125
-
-	return biome
-end
-
-function pl.generate_noise_params(b)
-	local biome = set_defaults(b)
-	local r = (100-biome.rarity)/100
-	local mc = math.min(biome.max_count, 6400)/6400
-
-	local noise_params = {
-		octaves = biome_lib.fertile_perlin_octaves,
-		persist = biome_lib.fertile_perlin_persistence * (100/biome_lib.fertile_perlin_scale),
-		scale = math.min(r, mc),
-		seed = biome.seed_diff,
-		offset = 0,
-		spread = {x = 100, y = 100, z = 100},
-		lacunarity = 2,
-		flags = "absvalue"
-	}
-	return noise_params
-end

trunks/generating.lua

@@ -31,6 +31,8 @@ abstract_trunks.place_twig = function(pos)
 	end
 --	big twigs
 	if Big_Twigs == true then
+		local n1, n2
+		local r1, r2
 --	big twig 1
 	if twig_size == 17 then
 		if not (check_node_buildable_to({x=pos.x+1,y=pos.y,z=pos.z+1})
@@ -45,6 +47,89 @@ abstract_trunks.place_twig = function(pos)
 			if check_node_buildable_to(east) then
 				minetest.swap_node(east,		  {name="trunks:twig_8"})
 			end
+		elseif twig_size == 20 then
+			n1 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1})
+			n2 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_5", param2=3})
+				end
+				if minetest.registered_nodes[node_n_w.name].buildable_to then
+					minetest.swap_node(north_west, {name="trunks:twig_7", param2=3})
+				end
+				if minetest.registered_nodes[node_north.name].buildable_to then
+					minetest.swap_node(north,	  {name="trunks:twig_8", param2=3})
+				end
+			end
+			--	big twig 2
+		elseif twig_size == 21 then
+			n1 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1})
+			n2 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9"})
+				end
+				if minetest.registered_nodes[node_north.name].buildable_to then
+					minetest.swap_node(north,	  {name="trunks:twig_10"})
+				end
+				if minetest.registered_nodes[node_n_e.name].buildable_to then
+					minetest.swap_node(north_east, {name="trunks:twig_11"})
+				end
+			end
+		elseif twig_size == 22 then
+			n1 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z})
+			n2 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z-1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=1})
+				end
+				if minetest.registered_nodes[node_east.name].buildable_to then
+					minetest.swap_node(east,		  {name="trunks:twig_10", param2=1})
+				end
+				if minetest.registered_nodes[node_s_e.name].buildable_to then
+					minetest.swap_node(south_east, {name="trunks:twig_11", param2=1})
+				end
+			end
+		elseif twig_size == 23 then
+			n1 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z-1})
+			n2 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z-1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=2})
+				end
+				if minetest.registered_nodes[node_south.name].buildable_to then
+					minetest.swap_node(south,	  {name="trunks:twig_10", param2=2})
+				end
+				if minetest.registered_nodes[node_s_w.name].buildable_to then
+					minetest.swap_node(south_west, {name="trunks:twig_11", param2=2})
+				end
+			end
+		elseif twig_size == 24 then
+			n1 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z})
+			n2 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=3})
+				end
+				if minetest.registered_nodes[node_west.name].buildable_to then
+					minetest.swap_node(west,		  {name="trunks:twig_10", param2=3})
+				end
+				if minetest.registered_nodes[node_n_w.name].buildable_to then
+					minetest.swap_node(north_west, {name="trunks:twig_11", param2=3})
+				end
+			end
+		elseif twig_size <= 25 then
+			minetest.swap_node(right_here, {name="trunks:twig_"..math.random(12,13), param2=math.random(0,3)})
 		end
 	elseif twig_size == 18 then
 		if not (check_node_buildable_to({x=pos.x+1,y=pos.y,z=pos.z-1})
@@ -152,33 +237,35 @@ abstract_trunks.place_twig = function(pos)
 end
 
 if Twigs_on_ground == true then
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {"default:dirt_with_grass"},
-	noise_params = pl.generate_noise_params({max_count = Twigs_on_ground_Max_Count, rarity = Twigs_on_ground_Rarity}),
+    max_count = Twigs_on_ground_Max_Count,
+    rarity = Twigs_on_ground_Rarity,
     min_elevation = 1,
 	max_elevation = 40,
 	near_nodes = {"group:tree","ferns:fern_03","ferns:fern_02","ferns:fern_01"},
 	near_nodes_size = 3,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
+    plantlife_limit = -0.9,
   },
-  "trunks:on_grass",
   abstract_trunks.place_twig
 )
 end
 
 if Twigs_on_water == true then
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {"default:water_source"},
-	noise_params = pl.generate_noise_params({max_count = Twigs_on_water_Max_Count, rarity = Twigs_on_water_Rarity}),
+    max_count = Twigs_on_water_Max_Count,
+    rarity = Twigs_on_water_Rarity,
     min_elevation = 1,
 	max_elevation = 40,
 	near_nodes = {"group:tree"},
 	near_nodes_size = 3,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
+    plantlife_limit = -0.9,
   },
-  "trunks:on_water",
   abstract_trunks.place_twig
 )
 end
@@ -320,9 +407,10 @@ abstract_trunks.place_trunk = function(pos)
 	end
 end
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {"default:dirt_with_grass"},
-	noise_params = pl.generate_noise_params({max_count = Trunks_Max_Count, rarity = Trunks_Rarity}),
+    max_count = Trunks_Max_Count, -- 320,
+    rarity = Trunks_Rarity, -- 99,
     min_elevation = 1,
 	max_elevation = 40,
 	avoid_nodes = {"group:tree"},
@@ -331,8 +419,8 @@ pl.register_on_generate({
 	near_nodes_size = 3,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
+    plantlife_limit = -0.9,
   },
-  "trunks:on_grass_2",
   abstract_trunks.place_trunk
 )
 
@@ -353,9 +441,10 @@ abstract_trunks.grow_moss_on_ground = function(pos)
 
 end
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {"default:dirt_with_grass"},
-	noise_params = pl.generate_noise_params({max_count = Moss_on_ground_Max_Count, rarity = Moss_on_ground_Rarity}),
+    max_count = Moss_on_ground_Max_Count,
+    rarity = Moss_on_ground_Rarity,
     min_elevation = 1,
 	max_elevation = 40,
 	near_nodes = {
@@ -367,8 +456,8 @@ pl.register_on_generate({
 	near_nodes_size = 2,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
+    plantlife_limit = -0.9,
   },
-  "trunks:on_grass_3",
   abstract_trunks.grow_moss_on_ground
 )
 end
@@ -433,8 +522,8 @@ abstract_trunks.grow_moss_on_trunk = function(pos)
 	--end
 end
 
-pl.register_on_generate({
-	surface = {
+biome_lib.register_on_generate({
+    surface = {
 		"default:tree",
 		"default:jungletree",
 		"default:pine_tree",
@@ -454,12 +543,14 @@ pl.register_on_generate({
 		"moretrees:willow_trunk",
 		"default:mossycobble"
 	},
-	noise_params = pl.generate_noise_params({max_count = Moss_on_trunk_Max_Count, rarity = Moss_on_trunk_Rarity}),
+    max_count = Moss_on_trunk_Max_Count,
+    rarity = Moss_on_trunk_Rarity,
     min_elevation = 1,
 	max_elevation = 40,
+    plantlife_limit = -0.9,
+	check_air = false,
   },
-  "trunks:moss_on_trunk",
-  abstract_trunks.grow_moss_on_trunk
+  "abstract_trunks.grow_moss_on_trunk"
 )
 end
 
@@ -504,18 +595,20 @@ abstract_trunks.grow_roots = function(pos)
 	end
 end
 
-pl.register_on_generate({
+biome_lib.register_on_generate({
     surface = {"group:tree"},
-	noise_params = pl.generate_noise_params({max_count = 1000, rarity = 1,}),
+    max_count = 1000,
+    rarity = 1,
     min_elevation = 1,
 	max_elevation = 40,
 	near_nodes = {"default:dirt_with_grass"},
 	near_nodes_size = 1,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
+    plantlife_limit = -1,
+    check_air = false,
   },
-  "trunks:grow_roots",
-  abstract_trunks.grow_roots
+  "abstract_trunks.grow_roots"
 )
 
 end

trunks/nodes.lua

@@ -1,6 +1,8 @@
 -- Code by Mossmanikin & Neuromancer
 -- support for i18n
 local S = minetest.get_translator("trunks")
+
+local random = math.random
 -----------------------------------------------------------------------------------------------
 -- TWiGS
 -----------------------------------------------------------------------------------------------
@@ -66,7 +68,6 @@ end
 -----------------------------------------------------------------------------------------------
 -- MoSS
 -----------------------------------------------------------------------------------------------
-
 --			wall_top    = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125},
 --			wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
 --			wall_side   = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375},

trunks/trunks_settings.txt

@@ -64,7 +64,7 @@ Moss_on_trunk_Max_Count		= 640 -- absolute maximum number in an area of 80x80x80
 Moss_on_trunk_Rarity		= 24 -- larger values makes moss more rare (100 means chance of 0 %)
 
 
-Auto_Roof_Corner 		= true -- behavior is similar (not the same!) to the one of minecraft stairs
+Auto_Roof_Corner 		= false -- behavior is similar (not the same!) to the one of minecraft stairs
 
 
-Roots					= true
+Roots					= true

vines/init.lua

@@ -36,6 +36,8 @@ end
 
 -- FUNCTIONS
 
+local random = math.random
+
 local function on_dig(pos, node, player)
 	local vine_name_end = node.name:gsub("_middle", "_end")
 	local drop_item = "vines:vines"
@@ -136,7 +138,7 @@ vines.register_vine = function( name, defs, biome )
 		on_construct = function(pos)
 
 			local timer = minetest.get_node_timer(pos)
-			timer:start(math.random(growth_min, growth_max))
+			timer:start(random(growth_min, growth_max))
 		end,
 
 		on_timer = function(pos)
@@ -146,7 +148,7 @@ vines.register_vine = function( name, defs, biome )
 			local bottom_node = minetest.get_node( bottom )
 			if bottom_node.name == "air" then
 
-				if math.random(defs.average_length) ~= 1 then
+				if random(defs.average_length) ~= 1 then
 
 					minetest.swap_node(pos, {
 							name = vine_name_middle, param2 = node.param2})
@@ -156,7 +158,7 @@ vines.register_vine = function( name, defs, biome )
 
 					local timer = minetest.get_node_timer(bottom_node)
 
-					timer:start(math.random(growth_min, growth_max))
+					timer:start(random(growth_min, growth_max))
 				end
 			end
 		end,

youngtrees/init.lua

@@ -1,5 +1,8 @@
 -- support for i18n
 local S = minetest.get_translator("youngtrees")
+
+local random = math.random
+
 abstract_youngtrees = {}
 
 local youngtrees_youngtrees_rarity = tonumber(minetest.settings:get("youngtrees_youngtrees_rarity")) or 100
@@ -106,8 +109,7 @@ minetest.register_node("youngtrees:youngtree_bottom", {
 
 
 abstract_youngtrees.grow_youngtree = function(pos)
-	local height = math.random(1,3)
-	abstract_youngtrees.grow_youngtree_node(pos,height)
+	abstract_youngtrees.grow_youngtree_node(pos, random(1,3))
 end
 
 
@@ -148,3 +150,5 @@ biome_lib.register_on_generate({
 	},
 	abstract_youngtrees.grow_youngtree
 )
+
+minetest.log("action", "[youngtrees] loaded.")