Add crash guards against corrupt map data in mcl_core/functions.lua, update fire spread algorithm to limit spread while still burning things down, make burn spread dependent on area's humidity (more humid areas have less spread)

game.conf

@@ -1,4 +1,4 @@
-title = TheDarkProject
+title = VoxeLibre
 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
 disallowed_mapgens = v6
 version=0.88.0-SNAPSHOT

mods/CORE/mcl_util/init.lua

@@ -1131,25 +1131,3 @@ if not vector.in_area then
 		       (pos.z >= min.z) and (pos.z <= max.z)
 	end
 end
-
--- Traces along a line of nodes vertically to find the next possition that isn't an allowed node
----@param pos The position to start tracing from
----@param dir The direction to trace in. 1 is up, -1 is down, all other values are not allowed.
----@param allowed_nodes A set of node names to trace along.
----@param limit The maximum number of steps to make. Defaults to 16 if nil or missing
----@return Three return values:
----   the position of the next node that isn't allowed or nil if no such node was found,
----   the distance from the start where that node was found,
----   the node table if a node was found
-function mcl_util.trace_nodes(pos, dir, allowed_nodes, limit)
-	if (dir ~= -1) and (dir ~= 1) then return nil, 0, nil end
-	limit = limit or 16
-
-	for i = 1,limit do
-		pos = vector.offset(pos, 0, dir, 0)
-		local node = minetest.get_node(pos)
-		if not allowed_nodes[node.name] then return pos, i, node end
-	end
-
-	return nil, limit, nil
-end

mods/ENTITIES/mcl_mobs/api.lua

@@ -388,7 +388,7 @@ end
 
 
 
-local function on_step_work(self, dtime, moveresult)
+local function on_step_work (self, dtime)
 	local pos = self.object:get_pos()
 	if not pos then return end
 
@@ -402,7 +402,7 @@ local function on_step_work(self, dtime, moveresult)
 		-- Do we abandon out of here now?
 	end
 
-	if self:falling(pos, moveresult) then return end
+	if self:falling(pos) then return end
 	if self:step_damage (dtime, pos) then return end
 
 	if self.state == "die" then return end
@@ -502,11 +502,11 @@ end
 
 
 -- main mob function
-function mob_class:on_step(dtime, moveresult)
+function mob_class:on_step(dtime)
 	if not DEVELOPMENT then
 		-- Removed as bundled Lua (5.1 doesn't support xpcall)
 		--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
-		local status, retVal = pcall(on_step_work, self, dtime, moveresult)
+		local status, retVal = pcall(on_step_work, self, dtime)
 		if status then
 			return retVal
 		else
@@ -521,7 +521,7 @@ function mob_class:on_step(dtime, moveresult)
 			log_error (dump(retVal), dump(pos), dump(self))
 		end
 	else
-		return on_step_work (self, dtime, moveresult)
+		return on_step_work (self, dtime)
 	end
 end
 

mods/ENTITIES/mcl_mobs/breeding.lua

@@ -105,7 +105,7 @@ end
 
 -- Spawn a child
 function mcl_mobs.spawn_child(pos, mob_type)
-	local child = minetest.add_entity(pos, mob_type)
+	local child = mcl_mobs.spawn(pos, mob_type)
 	if not child then
 		return
 	end

mods/ENTITIES/mcl_mobs/effects.lua

@@ -5,7 +5,6 @@ local validate_vector = mcl_util.validate_vector
 local active_particlespawners = {}
 local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
 local DEFAULT_FALL_SPEED = -9.81*1.5
-local PI_THIRD = math.pi / 3 -- 60 degrees
 
 local PATHFINDING = "gowp"
 
@@ -295,66 +294,86 @@ function mcl_mobs:set_animation(self, anim)
 	self:set_animation(anim)
 end
 
-local function who_are_you_looking_at (self, dtime)
-	if self.order == "sleep" then
-		self._locked_object = nil
-		return
-	end
+local function dir_to_pitch(dir)
+	--local dir2 = vector.normalize(dir)
+	local xz = math.abs(dir.x) + math.abs(dir.z)
+	return -math.atan2(-dir.y, xz)
+end
 
+local function who_are_you_looking_at (self, dtime)
+	local pos = self.object:get_pos()
+
+	local stop_look_at_player_chance = math.random(833/self.curiosity)
 	-- was 10000 - div by 12 for avg entities as outside loop
-	local stop_look_at_player = math.random() * 833 <= self.curiosity
+
+	local stop_look_at_player = stop_look_at_player_chance == 1
 
 	if self.attack then
-		self._locked_object = not self.target_time_lost and self.attack or nil
+		if not self.target_time_lost then
+			self._locked_object = self.attack
+		else
+			self._locked_object = nil
+		end
 	elseif self.following then
 		self._locked_object = self.following
 	elseif self._locked_object then
-		if stop_look_at_player then self._locked_object = nil end
+		if stop_look_at_player then
+			--minetest.log("Stop look: ".. self.name)
+			self._locked_object = nil
+		end
 	elseif not self._locked_object then
 		if mcl_util.check_dtime_timer(self, dtime, "step_look_for_someone", 0.2) then
-			local pos = self.object:get_pos()
+			--minetest.log("Change look check: ".. self.name)
+
+			-- For the wither this was 20/60=0.33, so probably need to rebalance and divide rates.
+			-- but frequency of check isn't good as it is costly. Making others too infrequent requires testing
+			local chance = 150/self.curiosity
+
+			if chance < 1 then chance = 1 end
+			local look_at_player_chance = math.random(chance)
+
+			-- was 5000 but called in loop based on entities. so div by 12 as estimate avg of entities found,
+			-- then div by 20 as less freq lookup
+
+			local look_at_player = look_at_player_chance == 1
+
 			for _, obj in pairs(minetest.get_objects_inside_radius(pos, 8)) do
-				if obj:is_player() and vector.distance(pos, obj:get_pos()) < 4 then
+				if obj:is_player() and vector.distance(pos,obj:get_pos()) < 4 then
+					--minetest.log("Change look to player: ".. self.name)
 					self._locked_object = obj
 					break
-				elseif obj:is_player() or (obj:get_luaentity() and self ~= obj:get_luaentity() and obj:get_luaentity().name == self.name) then
-					-- For the wither this was 20/60=0.33, so probably need to rebalance and divide rates.
-					-- but frequency of check isn't good as it is costly. Making others too infrequent requires testing
-					-- was 5000 but called in loop based on entities. so div by 12 as estimate avg of entities found,
-					-- then div by 20 as less freq lookup
-					if math.random() * 150 <= self.curiosity then
+				elseif obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name == self.name and self ~= obj:get_luaentity()) then
+					if look_at_player then
+						--minetest.log("Change look to mob: ".. self.name)
 						self._locked_object = obj
 						break
 					end
 				end
 			end
 		end
+
 	end
 end
 
 function mob_class:check_head_swivel(dtime)
 	if not self.head_swivel or type(self.head_swivel) ~= "string" then return end
 
-	who_are_you_looking_at(self, dtime)
 
-	local newr, oldp, oldr = vector.zero(), nil, nil
-	if self.object.get_bone_override then -- minetest >= 5.9
-		local ov = self.object:get_bone_override(self.head_swivel)
-		oldp, oldr = ov.position.vec, ov.rotation.vec
-	else -- minetest < 5.9
-		oldp, oldr = self.object:get_bone_position(self.head_swivel)
-		oldr = vector.apply(oldr, math.rad) -- old API uses radians
-	end
+	who_are_you_looking_at (self, dtime)
 
-	local locked_object = self._locked_object
-	if locked_object and (locked_object:is_player() or locked_object:get_luaentity()) and locked_object:get_hp() > 0 then
+	local final_rotation = vector.zero()
+	local oldp,oldr = self.object:get_bone_position(self.head_swivel)
+
+	if self._locked_object and (self._locked_object:is_player() or self._locked_object:get_luaentity()) and self._locked_object:get_hp() > 0 then
 		local _locked_object_eye_height = 1.5
-		if locked_object:is_player() then
-			_locked_object_eye_height = locked_object:get_properties().eye_height
-		elseif locked_object:get_luaentity() then
-			_locked_object_eye_height = locked_object:get_luaentity().head_eye_height
+		if self._locked_object:get_luaentity() then
+			_locked_object_eye_height = self._locked_object:get_luaentity().head_eye_height
+		end
+		if self._locked_object:is_player() then
+			_locked_object_eye_height = self._locked_object:get_properties().eye_height
 		end
 		if _locked_object_eye_height then
+
 			local self_rot = self.object:get_rotation()
 			-- If a mob is attached, should we really be messing with what they are looking at?
 			-- Should this be excluded?
@@ -362,48 +381,40 @@ function mob_class:check_head_swivel(dtime)
 				self_rot = self.object:get_attach():get_rotation()
 			end
 
-			local ps = self.object:get_pos()
-			ps.y = ps.y + self.head_eye_height * .7
-			local pt = locked_object:get_pos()
-			pt.y = pt.y + _locked_object_eye_height
-			local dir = vector.direction(ps, pt)
-			local mob_yaw = self_rot.y + math.atan2(dir.x, dir.z) + self.head_yaw_offset
-			local mob_pitch = math.asin(-dir.y) * self.head_pitch_multiplier
+			local player_pos = self._locked_object:get_pos()
+			local direction_player = vector.direction(vector.add(self.object:get_pos(), vector.new(0, self.head_eye_height*.7, 0)), vector.add(player_pos, vector.new(0, _locked_object_eye_height, 0)))
+			local mob_yaw = math.deg(-(-(self_rot.y)-(-minetest.dir_to_yaw(direction_player))))+self.head_yaw_offset
+			local mob_pitch = math.deg(-dir_to_pitch(direction_player))*self.head_pitch_multiplier
 
-			if (mob_yaw < -PI_THIRD or mob_yaw > PI_THIRD) and not (self.attack and self.state == "attack" and not self.runaway) then
-				newr = vector.multiply(oldr, 0.9)
+			if (mob_yaw < -60 or mob_yaw > 60) and not (self.attack and self.state == "attack" and not self.runaway) then
+				final_rotation = vector.multiply(oldr, 0.9)
 			elseif self.attack and self.state == "attack" and not self.runaway then
 				if self.head_yaw == "y" then
-					newr = vector.new(mob_pitch, mob_yaw, 0)
+					final_rotation = vector.new(mob_pitch, mob_yaw, 0)
 				elseif self.head_yaw == "z" then
-					newr = vector.new(mob_pitch, 0, -mob_yaw)
+					final_rotation = vector.new(mob_pitch, 0, -mob_yaw)
 				end
+
 			else
+
 				if self.head_yaw == "y" then
-					newr = vector.new((mob_pitch-oldr.x)*.3+oldr.x, (mob_yaw-oldr.y)*.3+oldr.y, 0)
+					final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, ((mob_yaw-oldr.y)*.3)+oldr.y, 0)
 				elseif self.head_yaw == "z" then
-					newr = vector.new((mob_pitch-oldr.x)*.3+oldr.x, 0, ((mob_yaw-oldr.y)*.3+oldr.y)*-3)
+					final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, 0, -(((mob_yaw-oldr.y)*.3)+oldr.y)*3)
 				end
 			end
 		end
-	elseif not locked_object and math.abs(oldr.y) > 0.05 and math.abs(oldr.x) < 0.05 then
-		newr = vector.multiply(oldr, 0.9)
-	end
-	
-	-- 0.02 is about 1.14 degrees tolerance, to update less often
-	local newp = vector.new(0, self.bone_eye_height, self.horizontal_head_height)
-	if math.abs(oldr.x-newr.x) + math.abs(oldr.y-newr.y) + math.abs(oldr.z-newr.z) < 0.02 and vector.equals(oldp, newp) then return end
-	if self.object.get_bone_override then -- minetest >= 5.9
-		self.object:set_bone_override(self.head_swivel, {
-			position = { vec = newp, absolute = true },
-			rotation = { vec = newr, absolute = true } })
-	else -- minetest < 5.9
-		-- old API uses degrees not radians
-		self.object:set_bone_position(self.head_swivel, newp, vector.apply(newr, math.deg))
+	elseif not self._locked_object and math.abs(oldr.y) > 3 and math.abs(oldr.x) < 3 then
+		final_rotation = vector.multiply(oldr, 0.9)
+	else
+		--final_rotation = vector.new(0,0,0)
 	end
+
+	mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horizontal_head_height), final_rotation)
 end
 
 
+
 function mob_class:set_animation_speed()
 	local v = self.object:get_velocity()
 	if v then

mods/ENTITIES/mcl_mobs/init.lua

@@ -141,7 +141,7 @@ function mcl_mobs.register_mob(name, def)
 	local final_def = {
 		use_texture_alpha = def.use_texture_alpha,
 		head_swivel = def.head_swivel or nil, -- bool to activate this function
-		head_yaw_offset = math.rad(def.head_yaw_offset or 0), -- for wonkey model bones
+		head_yaw_offset = def.head_yaw_offset or 0, -- for wonkey model bones
 		head_pitch_multiplier = def.head_pitch_multiplier or 1, --for inverted pitch
 		bone_eye_height = def.bone_eye_height or 1.4, -- head bone offset
 		head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
@@ -615,7 +615,7 @@ function mcl_mobs.register_egg(mob_id, desc, background_color, overlay_color, ad
 
 				pos.y = pos.y - 1
 				local mob = mcl_mobs.spawn(pos, mob_name)
-				if not mob then
+				if not object then
 					pos.y = pos.y + 1
 					mob = mcl_mobs.spawn(pos, mob_name)
 					if not mob then return end

mods/ENTITIES/mcl_mobs/physics.lua

@@ -927,7 +927,8 @@ end
 
 -- falling and fall damage
 -- returns true if mob died
-function mob_class:falling(pos, moveresult)
+function mob_class:falling(pos)
+
 	if self.fly and self.state ~= "die" then
 		return
 	end
@@ -950,13 +951,7 @@ function mob_class:falling(pos, moveresult)
 			new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
 		elseif v.y <= 0 and v.y > self.fall_speed then
 			-- fall downwards at set speed
-			if moveresult and moveresult.touching_ground then
-				-- when touching ground, retain a minimal gravity to keep the touching_ground flag
-				-- but also to not get upwards acceleration with large dtime when on bouncy ground
-				new_acceleration = vector.new(0, self.fall_speed * 0.01, 0)
-			else
-				new_acceleration = vector.new(0, self.fall_speed, 0)
-			end
+			new_acceleration = vector.new(0, self.fall_speed, 0)
 		else
 			-- stop accelerating once max fall speed hit
 			new_acceleration =vector.zero()

mods/ENTITIES/mobs_mc/axolotl.lua

@@ -72,24 +72,18 @@ local axolotl = {
 	fly = true,
 	fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" },
 	breathes_in_water = true,
-	jump = false, -- would get them out of the water too often
+	jump = true,
 	damage = 2,
 	reach = 2,
 	attack_type = "dogfight",
 	attack_animals = true,
 	specific_attack = {
-		"mobs_mc:cod",
-		"mobs_mc:glow_squid",
-		"mobs_mc:salmon",
-		"mobs_mc:tropical_fish",
-		"mobs_mc:squid",
-		"mobs_mc:zombie", -- todo: only drowned?
-		"mobs_mc:baby_zombie",
-		"mobs_mc:husk",
-		"mobs_mc:baby_husk",
-		"mobs_mc:guardian_elder",
-		"mobs_mc:guardian",
-	},
+		"extra_mobs_cod",
+		"extra_mobs_glow_squid",
+		"extra_mobs_salmon",
+		"extra_mobs_tropical_fish",
+		"mobs_mc_squid"
+		 },
 	runaway = true,
 }
 

mods/ENTITIES/mobs_mc/stalker.lua

@@ -7,13 +7,12 @@ local S = minetest.get_translator("mobs_mc")
 --###################
 
 
-local function get_texture(self, prev)
-	local standing_on = minetest.registered_nodes[self.standing_on]
-	-- TODO: we do not have access to param2 here (color palette index) yet
+local function get_texture(self)
+	local on_name = self.standing_on
 	local texture
 	local texture_suff = ""
-	if standing_on and (standing_on.walkable or standing_on.groups.liquid) then
-		local tiles = standing_on.tiles
+	if on_name and on_name ~= "air" then
+		local tiles = minetest.registered_nodes[on_name].tiles
 		if tiles then
 			local tile = tiles[1]
 			local color
@@ -26,7 +25,7 @@ local function get_texture(self, prev)
 				texture = tile
 			end
 			if not color then
-				color = minetest.colorspec_to_colorstring(standing_on.color)
+				color = minetest.colorspec_to_colorstring(minetest.registered_nodes[on_name].color)
 			end
 			if color then
 				texture_suff = "^[multiply:" .. color .. "^[hsl:0:0:20"
@@ -34,19 +33,14 @@ local function get_texture(self, prev)
 		end
 	end
 	if not texture or texture == "" then
-		-- try to keep last texture when, e.g., falling
-		if prev and (not (not self.attack)) == (string.find(prev, "vl_mobs_stalker_overlay_angry.png") ~= nil) then
-			return prev
-		end
 		texture = "vl_stalker_default.png"
-	else
-		texture = texture:gsub("([\\^:\\[])", "\\%1") -- escape texture modifiers
-		texture = "(vl_stalker_default.png^[combine:16x24:0,0=(" .. texture .. "):0,16=(" .. texture .. ")" .. texture_suff .. ")"
 	end
+	texture = texture:gsub("([\\^:\\[])","\\%1") -- escape texture modifiers
+	texture = "([combine:16x24:0,0=(" .. texture .. "):0,16=(" .. texture ..")".. texture_suff
 	if self.attack then
-		texture = texture .. "^vl_mobs_stalker_overlay_angry.png"
+		texture = texture .. ")^vl_mobs_stalker_overlay_angry.png"
 	else
-		texture = texture .. "^vl_mobs_stalker_overlay.png"
+		texture = texture .. ")^vl_mobs_stalker_overlay.png"
 	end
 	return texture
 end
@@ -138,7 +132,7 @@ mcl_mobs.register_mob("mobs_mc:stalker", {
 				self:boom(mcl_util.get_object_center(self.object), self.explosion_strength)
 			end
 		end
-		local new_texture = get_texture(self, self._stalker_texture)
+		local new_texture = get_texture(self)
 		if self._stalker_texture ~= new_texture then
 			self.object:set_properties({textures={new_texture, "mobs_mc_empty.png"}})
 			self._stalker_texture = new_texture

mods/ENVIRONMENT/mcl_weather/rain.lua

@@ -157,7 +157,6 @@ function mcl_weather.rain.clear()
 		mcl_weather.rain.remove_sound(player)
 		mcl_weather.rain.remove_player(player)
 		mcl_weather.remove_spawners_player(player)
-		player:set_clouds({color="#FFF0EF"})
 	end
 end
 

mods/ENVIRONMENT/mcl_weather/skycolor.lua

@@ -2,7 +2,6 @@
 local modname = minetest.get_current_modname()
 local modpath = minetest.get_modpath(modname)
 local NIGHT_VISION_RATIO = 0.45
-local DEBUG = false
 
 -- Settings
 local minimum_update_interval = { 250e3 }
@@ -191,8 +190,8 @@ end
 
 function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	-- Clamp current_val to valid range
-	current_val = math.max(minval, current_val)
-	current_val = math.min(maxval, current_val)
+	current_val = math.min(minval, current_val)
+	current_val = math.max(maxval, current_val)
 
 	-- Rescale current_val from a number between minval and maxval to a number between 1 and #colors
 	local scaled_value = (current_val - minval) / (maxval - minval) * (#colors - 1) + 1.0
@@ -200,7 +199,7 @@ function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	-- Get the first color's values
 	local index1 = math.floor(scaled_value)
 	local color1 = colors[index1]
-	local frac1 = 1.0 - (scaled_value - index1)
+	local frac1 = scaled_value - index1
 
 	-- Get the second color's values
 	local index2 = math.min(index1 + 1, #colors) -- clamp to maximum color index (will occur if index1 == #colors)
@@ -208,32 +207,11 @@ function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	local color2 = colors[index2]
 
 	-- Interpolate between color1 and color2
-	local res = {
+	return {
 		r = math.floor(frac1 * color1.r + frac2 * color2.r),
 		g = math.floor(frac1 * color1.g + frac2 * color2.g),
 		b = math.floor(frac1 * color1.b + frac2 * color2.b),
 	}
-
-	if DEBUG then
-		minetest.log(dump({
-			minval = minval,
-			maxval = maxval,
-			current_val = current_val,
-			colors = colors,
-			res = res,
-			scaled_value = scaled_value,
-
-			frac1 = frac1,
-			index1 = index1,
-			color1 = color1,
-
-			frac2 = frac2,
-			index2 = index2,
-			color2 = color2,
-		}))
-	end
-
-	return res
 end
 
 -- Simple getter. Either returns user given players list or get all connected players if none provided

mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua

@@ -40,21 +40,18 @@ function dimension_handlers.overworld(player, sky_data)
 	end
 
 	-- Use overworld defaults
-	local day_color = mcl_weather.skycolor.get_sky_layer_color(0.5)
+	local day_color = mcl_weather.skycolor.get_sky_layer_color(0.15)
 	local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.27)
 	local night_color = mcl_weather.skycolor.get_sky_layer_color(0.1)
 	sky_data.sky = {
 		type = "regular",
 		sky_color = {
-			day_sky = day_color or "#7BA4FF",
-			day_horizon = day_color or "#C0D8FF",
-			dawn_sky = dawn_color or "7BA4FF",
-			dawn_horizon = dawn_color or "#C0D8FF",
-			night_sky = night_color or "000000",
-			night_horizon = night_color or "4A6790",
-			fog_sun_tint = "#ff5f33",
-			fog_moon_tint = nil,
-			fog_tint_type = "custom",
+			day_sky = day_color,
+			day_horizon = day_color,
+			dawn_sky = dawn_color,
+			dawn_horizon = dawn_color,
+			night_sky = night_color,
+			night_horizon = night_color,
 		},
 		clouds = true,
 	}
@@ -78,15 +75,18 @@ function dimension_handlers.overworld(player, sky_data)
 		local day_color = mcl_weather.skycolor.get_sky_layer_color(0.5)
 		local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.75)
 		local night_color = mcl_weather.skycolor.get_sky_layer_color(0)
-		table.update(sky_data.sky.sky_color,{
-			day_sky = day_color or "#7BA4FF",
-			day_horizon = day_color or "#C0D8FF",
-			dawn_sky = dawn_color or "7BA4FF",
-			dawn_horizon = dawn_color or "#C0D8FF",
-			night_sky = night_color or "000000",
-			night_horizon = night_color or "4A6790",
-			fog_tint_type = "default",
-		})
+		sky_data.sky = {
+			type = "regular",
+			sky_color = {
+				day_sky = day_color,
+				day_horizon = day_color,
+				dawn_sky = dawn_color,
+				dawn_horizon = dawn_color,
+				night_sky = night_color,
+				night_horizon = night_color,
+			},
+			clouds = true,
+		}
 		sky_data.sun = {visible = false, sunrise_visible = false}
 		sky_data.moon = {visible = false}
 		sky_data.stars = {visible = false}
@@ -164,8 +164,7 @@ function dimension_handlers.nether(player, sky_data)
 end
 
 function dimension_handlers.void(player, sky_data)
-	sky_data.sky = {
-		type = "plain",
+	sky_data.sky = { type = "plain",
 		base_color = "#000000",
 		clouds = false,
 	}

mods/ENVIRONMENT/mcl_weather/snow.lua

@@ -75,15 +75,13 @@ function mcl_weather.has_snow(pos)
 end
 
 function mcl_weather.snow.set_sky_box()
-	if mcl_weather.skycolor.current_layer_name() ~= "weather-pack-snow-sky" then
-		mcl_weather.skycolor.add_layer(
-			"weather-pack-snow-sky",
-			{{r=0, g=0, b=0},
-			{r=85, g=86, b=86},
-			{r=135, g=135, b=135},
-			{r=85, g=86, b=86},
-			{r=0, g=0, b=0}})
-	end
+	mcl_weather.skycolor.add_layer(
+		"weather-pack-snow-sky",
+		{{r=0, g=0, b=0},
+		{r=85, g=86, b=86},
+		{r=135, g=135, b=135},
+		{r=85, g=86, b=86},
+		{r=0, g=0, b=0}})
 	mcl_weather.skycolor.active = true
 	for _, player in pairs(get_connected_players()) do
 		player:set_clouds({color="#ADADADE8"})

mods/ENVIRONMENT/mcl_weather/thunder.lua

@@ -23,15 +23,13 @@ minetest.register_globalstep(function(dtime)
 	mcl_weather.rain.make_weather()
 
 	if mcl_weather.thunder.init_done == false then
-		if mcl_weather.skycolor.current_layer_name() ~= "weather-pack-thunder-sky" then
-			mcl_weather.skycolor.add_layer("weather-pack-thunder-sky", {
-				{r=0, g=0, b=0},
-				{r=40, g=40, b=40},
-				{r=85, g=86, b=86},
-				{r=40, g=40, b=40},
-				{r=0, g=0, b=0},
-			})
-		end
+		mcl_weather.skycolor.add_layer("weather-pack-thunder-sky", {
+			{r=0, g=0, b=0},
+			{r=40, g=40, b=40},
+			{r=85, g=86, b=86},
+			{r=40, g=40, b=40},
+			{r=0, g=0, b=0},
+		})
 		mcl_weather.skycolor.active = true
 		for _, player in pairs(get_connected_players()) do
 			player:set_clouds({color="#3D3D3FE8"})

mods/HUD/mcl_inventory/creative.lua

@@ -418,18 +418,6 @@ minetest.register_on_joinplayer(function(player)
 	end
 end)
 
----@param player mt.PlayerObjectRef
-local function is_touch_enabled(playername)
-	-- Minetest < 5.7.0 support
-	if not minetest.get_player_window_information then
-		return false
-	end
-	local window = minetest.get_player_window_information(playername)
-	-- Always return a boolean (not nil) to avoid false-negatives when
-	-- comparing to a boolean later.
-	return window and window.touch_controls or false
-end
-
 ---@param player mt.PlayerObjectRef
 function mcl_inventory.set_creative_formspec(player)
 	local playername = player:get_player_name()
@@ -578,10 +566,8 @@ function mcl_inventory.set_creative_formspec(player)
 			bg_img = "crafting_creative_inactive" .. button_bg_postfix[this_tab] .. ".png"
 		end
 		return table.concat({
-			"style[" .. this_tab ..       ";border=false;bgimg=;bgimg_pressed=]",
-			"style[" .. this_tab .. "_outer;border=false;bgimg=" .. bg_img ..
-				";bgimg_pressed=" .. bg_img .. "]",
-			"button[" .. offset[this_tab] .. ";1.5,1.44;" .. this_tab .. "_outer;]",
+			"style[" .. this_tab .. ";border=false;bgimg=;bgimg_pressed=;noclip=true]",
+			"image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]",
 			"item_image_button[" .. boffset[this_tab] .. ";1,1;" .. tab_icon[this_tab] .. ";" .. this_tab .. ";]",
 		})
 	end
@@ -591,21 +577,11 @@ function mcl_inventory.set_creative_formspec(player)
 		caption = "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, filtername[name])) .. "]"
 	end
 
-	local touch_enabled = is_touch_enabled(playername)
-	players[playername].last_touch_enabled = touch_enabled
-
 	local formspec = table.concat({
 		"formspec_version[6]",
-		-- Original formspec height was 8.75, increased to include tab buttons.
-		-- This avoids tab buttons going off-screen with high scaling values.
-		"size[13,11.43]",
-		-- Use as much space as possible on mobile - the tab buttons are a lot
-		-- of padding already.
-		touch_enabled and "padding[-0.015,-0.015]" or "",
+		"size[13,8.75]",
 
-		"no_prepend[]", mcl_vars.gui_nonbg, mcl_vars.gui_bg_color,
-		"background9[0,1.34;13,8.75;mcl_base_textures_background9.png;;7]",
-		"container[0,1.34]",
+		"style_type[image;noclip=true]",
 
 		-- Hotbar
 		mcl_formspec.get_itemslot_bg_v4(0.375, 7.375, 9, 1),
@@ -662,7 +638,6 @@ function mcl_inventory.set_creative_formspec(player)
 			"set_focus[search;true]",
 		})
 	end
-	formspec = formspec .. "container_end[]"
 	if pagenum then formspec = formspec .. "p" .. tostring(pagenum) end
 	player:set_inventory_formspec(formspec)
 end
@@ -680,54 +655,54 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 
 	local name = player:get_player_name()
 
-	if fields.blocks or fields.blocks_outer then
+	if fields.blocks then
 		if players[name].page == "blocks" then return end
 		set_inv_page("blocks", player)
 		page = "blocks"
-	elseif fields.deco or fields.deco_outer then
+	elseif fields.deco then
 		if players[name].page == "deco" then return end
 		set_inv_page("deco", player)
 		page = "deco"
-	elseif fields.redstone or fields.redstone_outer then
+	elseif fields.redstone then
 		if players[name].page == "redstone" then return end
 		set_inv_page("redstone", player)
 		page = "redstone"
-	elseif fields.rail or fields.rail_outer then
+	elseif fields.rail then
 		if players[name].page == "rail" then return end
 		set_inv_page("rail", player)
 		page = "rail"
-	elseif fields.misc or fields.misc_outer then
+	elseif fields.misc then
 		if players[name].page == "misc" then return end
 		set_inv_page("misc", player)
 		page = "misc"
-	elseif fields.nix or fields.nix_outer then
+	elseif fields.nix then
 		set_inv_page("all", player)
 		page = "nix"
-	elseif fields.food or fields.food_outer then
+	elseif fields.food then
 		if players[name].page == "food" then return end
 		set_inv_page("food", player)
 		page = "food"
-	elseif fields.tools or fields.tools_outer then
+	elseif fields.tools then
 		if players[name].page == "tools" then return end
 		set_inv_page("tools", player)
 		page = "tools"
-	elseif fields.combat or fields.combat_outer then
+	elseif fields.combat then
 		if players[name].page == "combat" then return end
 		set_inv_page("combat", player)
 		page = "combat"
-	elseif fields.mobs or fields.mobs_outer then
+	elseif fields.mobs then
 		if players[name].page == "mobs" then return end
 		set_inv_page("mobs", player)
 		page = "mobs"
-	elseif fields.brew or fields.brew_outer then
+	elseif fields.brew then
 		if players[name].page == "brew" then return end
 		set_inv_page("brew", player)
 		page = "brew"
-	elseif fields.matr or fields.matr_outer  then
+	elseif fields.matr then
 		if players[name].page == "matr" then return end
 		set_inv_page("matr", player)
 		page = "matr"
-	elseif fields.inv or fields.inv_outer then
+	elseif fields.inv then
 		if players[name].page == "inv" then return end
 		page = "inv"
 	elseif fields.search == "" and not fields.creative_next and not fields.creative_prev then
@@ -843,19 +818,3 @@ minetest.register_on_player_inventory_action(function(player, action, inventory,
 		player:get_inventory():set_stack("main", inventory_info.index, stack)
 	end
 end)
-
--- This is necessary because get_player_window_information may return nil in
--- on_joinplayer.
--- (Also, Minetest plans to add support for toggling touchscreen mode in-game.)
-minetest.register_globalstep(function(dtime)
-	for _, player in pairs(minetest.get_connected_players()) do
-		local name = player:get_player_name()
-
-		if minetest.is_creative_enabled(name) then
-			local touch_enabled = is_touch_enabled(name)
-			if touch_enabled ~= players[name].last_touch_enabled then
-				mcl_inventory.set_creative_formspec(player)
-			end
-		end
-	end
-end)

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -5,6 +5,9 @@
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
 -- CONSTS
+local DOUBLE_DROP_CHANCE = 8
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_ENDCAP_NAME = "mcl_bamboo:bamboo_endcap"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
@@ -13,7 +16,7 @@ local BAMBOO_PLANK = BAMBOO .. "_plank"
 local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 local node_sound = mcl_sounds.node_sound_wood_defaults()
-local pr = PseudoRandom((os.time() + 15766) * 12)
+local pr = PseudoRandom((os.time() + 15766) * 12) -- switched from math.random() to PseudoRandom because the random wasn't very random.
 
 local on_rotate
 if minetest.get_modpath("screwdriver") then
@@ -28,16 +31,38 @@ local bamboo_def = {
 	paramtype = "light",
 	groups = {handy = 1, axey = 1, choppy = 1, dig_by_piston = 1, plant = 1, non_mycelium_plant = 1, flammable = 3},
 	sounds = node_sound,
-	drop = BAMBOO,
+
+	drop = {
+		max_items = 1,
+		-- From the API:
+		-- max_items: Maximum number of item lists to drop.
+		-- The entries in 'items' are processed in order. For each:
+		-- Item filtering is applied, chance of drop is applied, if both are
+		-- successful the entire item list is dropped.
+		-- Entry processing continues until the number of dropped item lists
+		-- equals 'max_items'.
+		-- Therefore, entries should progress from low to high drop chance.
+		items = {
+			-- Examples:
+			{
+				-- 1 in DOUBLE_DROP_CHANCE chance of dropping.
+				-- Default rarity is '1'.
+				rarity = DOUBLE_DROP_CHANCE,
+				items = {BAMBOO .. " 2"},
+			},
+			{
+				-- 1 in 1 chance of dropping. (Note: this means that it will drop 100% of the time.)
+				-- Default rarity is '1'.
+				rarity = 1,
+				items = {BAMBOO},
+			},
+		},
+	},
 
 	inventory_image = "mcl_bamboo_bamboo_shoot.png",
 	wield_image = "mcl_bamboo_bamboo_shoot.png",
 	_mcl_blast_resistance = 1,
 	_mcl_hardness = 1,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		return mcl_bamboo.grow_bamboo(pos, true)
-	end,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -61,6 +86,7 @@ local bamboo_def = {
 	on_rotate = on_rotate,
 
 	on_place = function(itemstack, placer, pointed_thing)
+
 		if not pointed_thing then
 			return itemstack
 		end
@@ -215,6 +241,9 @@ local bamboo_def = {
 		if node_above and ((bamboo_node and bamboo_node > 0) or node_above.name == BAMBOO_ENDCAP_NAME) then
 			minetest.remove_node(new_pos)
 			minetest.sound_play(node_sound.dug, sound_params, true)
+			if pr:next(1, DOUBLE_DROP_CHANCE) == 1 then
+				minetest.add_item(new_pos, istack)
+			end
 			minetest.add_item(new_pos, istack)
 		end
 	end,
@@ -224,12 +253,10 @@ minetest.register_node(BAMBOO, bamboo_def)
 local bamboo_top = table.copy(bamboo_def)
 bamboo_top.groups = {not_in_creative_inventory = 1, handy = 1, axey = 1, choppy = 1, dig_by_piston = 1, plant = 1, non_mycelium_plant = 1, flammable = 3}
 bamboo_top.tiles = {"mcl_bamboo_endcap.png"}
-
--- bamboo_top.drawtype = "plantlike_rooted" --"plantlike"
-bamboo_top.drawtype = "plantlike"
-bamboo_top.paramtype2 = "meshoptions"
-bamboo_top.param2 = 2
-bamboo_top.waving = 2
+bamboo_top.drawtype = "plantlike_rooted" --"plantlike"
+--bamboo_top.paramtype2 = "meshoptions"
+--bamboo_top.param2 = 2
+-- bamboo_top.waving = 2
 bamboo_top.special_tiles = {{name = "mcl_bamboo_endcap.png"}}
 bamboo_top.nodebox = nil
 bamboo_top.selection_box = nil

mods/ITEMS/mcl_bamboo/bamboo_items.lua

@@ -9,6 +9,8 @@ local SIDE_SCAFFOLDING = false
 local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal"
 -- ---------------------------------------------------------------------------
 local SCAFFOLDING_NAME = "mcl_bamboo:scaffolding"
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 

mods/ITEMS/mcl_bamboo/globals.lua

@@ -44,10 +44,6 @@ mcl_bamboo.bamboo_index = {
 	"mcl_bamboo:bamboo_2",
 	"mcl_bamboo:bamboo_3",
 }
-mcl_bamboo.bamboo_set = {}
-for _,key in pairs(mcl_bamboo.bamboo_index) do
-	mcl_bamboo.bamboo_set[key] = true
-end
 
 function mcl_bamboo.is_bamboo(node_name)
 	local index = table.indexof(mcl_bamboo.bamboo_index, node_name)
@@ -78,7 +74,7 @@ function mcl_bamboo.break_orphaned(pos)
 	local node_name = node_below.name
 
 	-- short circuit checks.
-	if node_name == "ignore" or mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
+	if mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
 		return
 	end
 
@@ -98,84 +94,172 @@ end
 --]]
 
 function mcl_bamboo.grow_bamboo(pos, bonemeal_applied)
-	local log = mcl_bamboo.mcl_log
 	local node_above = minetest.get_node(vector.offset(pos, 0, 1, 0))
-	log("Grow bamboo called; bonemeal: " .. tostring(bonemeal_applied))
+	mcl_bamboo.mcl_log("Grow bamboo called; bonemeal: " .. tostring(bonemeal_applied))
 
-	if not bonemeal_applied then
-		-- Only allow natural growth at the top of the bamboo
-		if mcl_bamboo.is_bamboo(node_above.name) ~= false then return false end
-
-		-- Don't perform natual growth in low light
-		if minetest.get_node_light(pos) < 8 then return false end
+	if not bonemeal_applied and mcl_bamboo.is_bamboo(node_above.name) ~= false then
+		return false -- short circuit this function if we're trying to grow (std) the bamboo and it's not the top shoot.
 	end
-
-	-- Determine the location of soil
-	local soil_pos
-	soil_pos,a,b = mcl_util.trace_nodes(pos, -1, mcl_bamboo.bamboo_set, BAMBOO_MAX_HEIGHT - 1)
-
-	-- No soil found, return false so that bonemeal isn't used
-	if not soil_pos then return false end
-	log("Grow bamboo; soil found. ")
-
-	-- Find the first bamboo shoot and retrieve data about it
-	local first_shoot = vector.offset(soil_pos, 0, 1, 0)
-	local first_shoot_meta = minetest.get_meta(first_shoot)
-
-	-- Get or initialize bamboo height
-	local height = (first_shoot_meta and first_shoot_meta:get_int("height", -1)) or -1
-	if height == -1 then
-		height = rand(BAM_MAX_HEIGHT_STPCHK + 1, BAM_MAX_HEIGHT_TOP + 1)
-		first_shoot_meta:set_int("height", height)
-	end
-	log("Grow bamboo; height: " .. height)
-
-	-- Locate the bamboo tip
-	local bamboo_tip,actual_height,bamboo_tip_node = mcl_util.trace_nodes(first_shoot, 1, mcl_bamboo.bamboo_set, height - 1)
-	log("Current height: "..tostring(actual_height))
-
-	-- Short circuit growth if the bamboo is already finished growing
-	if not bamboo_tip or not actual_height or actual_height >= height then
-		log("Bamboo is already as large as it can grow")
+	if minetest.get_node_light(pos) < 8 then
 		return false
 	end
 
-	-- Now that we are actually going to add nodes, initialize some more information
-	local first_shoot_node_name = minetest.get_node(first_shoot).name
+	-- variables used in more than one spot.
+	local first_shoot
+	local chk_pos
+	local soil_pos
+	local node_name = ""
+	local dist = 0
+	local node_below
+	-- -------------------
 
-	-- If applying bonemeal, randomly grow two segments instead of one
-	local grow_amount = 1
+	mcl_bamboo.mcl_log("Grow bamboo; checking for soil: ")
+	-- the soil node below the bamboo.
+	for py = -1, BAMBOO_SOIL_DIST, -1 do
+		chk_pos = vector.offset(pos, 0, py, 0)
+		node_name = minetest.get_node(chk_pos).name
+		if mcl_bamboo.is_dirt(node_name) then
+			soil_pos = chk_pos
+			break
+		end
+		if mcl_bamboo.is_bamboo(node_name) == false then
+			break
+		end
+	end
+	-- requires knowing where the soil node is.
+	if soil_pos == nil then
+		return false -- returning false means don't use up the bonemeal.
+	end
+
+	mcl_bamboo.mcl_log("Grow bamboo; soil found. ")
+	local grow_amount = rand(1, GROW_DOUBLE_CHANCE)
+	grow_amount = rand(1, GROW_DOUBLE_CHANCE)
+	grow_amount = rand(1, GROW_DOUBLE_CHANCE) -- because yeah, not truly random, or even a good prng.
+	grow_amount = rand(1, GROW_DOUBLE_CHANCE)
+	local init_height = rand(BAM_MAX_HEIGHT_STPCHK + 1, BAM_MAX_HEIGHT_TOP + 1)
+	mcl_bamboo.mcl_log("Grow bamboo; random height: " .. init_height)
+
+	node_name = ""
+
+	-- update: add randomized max height to first node's meta data.
+	first_shoot = vector.offset(soil_pos, 0, 1, 0)
+	local meta = minetest.get_meta(first_shoot)
+	node_below = minetest.get_node(first_shoot).name
+
+	mcl_bamboo.mcl_log("Grow bamboo; checking height meta ")
+	-- check the meta data for the first node, to see how high to make the stalk.
+	if not meta then
+		-- if no metadata, set the metadata!!!
+		meta:set_int("height", init_height)
+	end
+	local height = meta:get_int("height", -1)
+	mcl_bamboo.mcl_log("Grow bamboo; meta-height: " .. height)
+	if height <= 10 then
+		height = init_height
+		meta:set_int("height", init_height)
+	end
+
+	mcl_bamboo.mcl_log("Grow bamboo; height: " .. height)
+
+	-- Bonemeal: Grows the bamboo by 1-2 stems. (per the minecraft wiki.)
 	if bonemeal_applied then
-		local rng = PcgRandom(minetest.hash_node_position(pos) + minetest.get_us_time())
-		if rng:next(1, GROW_DOUBLE_CHANGE) == 1 then
-			grow_amount = 2
+		-- handle applying bonemeal.
+		for py = 1, BAM_MAX_HEIGHT_TOP do
+			-- find the top node of bamboo.
+			chk_pos = vector.offset(pos, 0, py, 0)
+			node_name = minetest.get_node(chk_pos).name
+			dist = vector.distance(soil_pos, chk_pos)
+			if mcl_bamboo.is_bamboo(node_name) == false or node_name == BAMBOO_ENDCAP_NAME then
+				break
+			end
+		end
+
+		mcl_bamboo.mcl_log("Grow bamboo; dist: " .. dist)
+
+		if node_name == BAMBOO_ENDCAP_NAME then
+			-- prevent overgrowth
+			return false
+		end
+
+		-- check to see if we have a full stalk of bamboo.
+		if dist >= height - 1 then
+			if dist == height - 1 then
+				-- equals top of the stalk before the cap
+				if node_name == "air" then
+					mcl_bamboo.mcl_log("Grow bamboo; Placing endcap")
+					minetest.set_node(vector.offset(chk_pos, 0, 1, 0), { name = BAMBOO_ENDCAP_NAME })
+					return true -- returning true means use up the bonemeal.
+				else
+					return false
+				end
+			else
+				-- okay, we're higher than the end cap, fail out.
+				return false -- returning false means don't use up the bonemeal.
+			end
+		end
+
+		-- and now, the meat of the section... add bamboo to the stalk.
+		-- at this point, we should be lower than the generated maximum height. ~ about height -2 or lower.
+		if dist <= height - 2 then
+			if node_name == "air" then
+				-- here we can check to see if we can do up to 2 bamboo shoots onto the stalk
+				mcl_bamboo.mcl_log("Grow bamboo; Placing bamboo.")
+				minetest.set_node(chk_pos, { name = node_below })
+				-- handle growing a second node.
+				if grow_amount == 2 then
+					chk_pos = vector.offset(chk_pos, 0, 1, 0)
+					if minetest.get_node(chk_pos).name == "air" then
+						mcl_bamboo.mcl_log("Grow bamboo; OOOH! It's twofer day!")
+						minetest.set_node(chk_pos, { name = node_below })
+					end
+				end
+				return true -- exit out with a success. We've added 1-2 nodes, per the wiki.
+			end
 		end
 	end
-	log("Growing up to "..grow_amount.." segments")
 
-	-- Perform bamboo growth
-	for i = 1,grow_amount do
-		-- Check for air to grow into
-		local bamboo_tip_node = minetest.get_node(bamboo_tip)
-		if not bamboo_tip_node or bamboo_tip_node.name ~= "air" then
-			-- Something is blocking growth, stop and signal that use bonemeal has been used if at least on segment has grown
-			return i ~= 1
+	-- Non-Bonemeal growth.
+	for py = 1, BAM_MAX_HEIGHT_TOP do
+		-- Find the topmost node above the stalk, and check it for "air"
+		chk_pos = vector.offset(pos, 0, py, 0)
+		node_below = minetest.get_node(pos).name
+		node_name = minetest.get_node(chk_pos).name
+		dist = vector.distance(soil_pos, chk_pos)
+
+		if node_name ~= "air" and mcl_bamboo.is_bamboo(node_name) == false then
+			break
 		end
 
-		if actual_height + 1 == height then
-			-- This is the end cap
-			minetest.set_node(bamboo_tip, { name = BAMBOO_ENDCAP_NAME })
-			return true
-		else
-			-- This isn't the end cap, add a bamboo segment
-			minetest.set_node(bamboo_tip, { name = first_shoot_node_name })
-			actual_height = actual_height + 1
+		-- stop growing check. ie, handle endcap placement.
+		if dist >= height - 1 then
+			local above_node_name = minetest.get_node(vector.offset(chk_pos, 0, 1, 0)).name
+			if node_name == "air" and above_node_name == "air" then
+				if height - 1 == dist then
+					mcl_bamboo.mcl_log("Grow bamboo; Placing endcap")
+					minetest.set_node(chk_pos, { name = BAMBOO_ENDCAP_NAME })
+				end
+			end
+			break
 		end
 
-		bamboo_tip = vector.offset(bamboo_tip, 0, 1, 0)
+		-- handle regular node placement.
+		-- find the air node above the top shoot. place a node. And then, if short enough,
+		-- check for second node placement.
+		if node_name == "air" then
+			mcl_bamboo.mcl_log("Grow bamboo; dist: " .. dist)
+			mcl_bamboo.mcl_log("Grow bamboo; Placing bamboo.")
+			minetest.set_node(chk_pos, { name = node_below })
+			-- handle growing a second node. (1 in 32 chance.)
+			if grow_amount == 2 and dist <= height - 2 then
+				chk_pos = vector.offset(chk_pos, 0, 1, 0)
+				if minetest.get_node(chk_pos).name == "air" then
+					mcl_bamboo.mcl_log("Grow bamboo; OOOH! It's twofer day!")
+					minetest.set_node(chk_pos, { name = node_below })
+				end
+			end
+			break
+		end
 	end
-
-	return true
 end
 
 -- Add Groups function, courtesy of Warr1024.

mods/ITEMS/mcl_bamboo/init.lua

@@ -7,6 +7,8 @@
 
 -- LOCALS
 local modname = minetest.get_current_modname()
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 
 mcl_bamboo = {}

mods/ITEMS/mcl_bamboo/recipes.lua

@@ -5,6 +5,8 @@
 --- These are all of the fuel recipes and all of the crafting recipes, consolidated into one place.
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 -- Craftings

mods/ITEMS/mcl_beds/mod.conf

@@ -2,4 +2,4 @@ name = mcl_beds
 author = BlockMen
 description =
 depends = playerphysics
-optional_depends = mcl_sounds, mcl_worlds, mcl_wool, mcl_dye, mcl_explosions, mcl_weather, mcl_spawn, doc, mesecons, mesecons_mvps
+optional_depends = mcl_sounds, mcl_worlds, mcl_wool, mcl_dye, mcl_explosions, mcl_weather, mcl_spawn, doc, mesecons

mods/ITEMS/mcl_bone_meal/API.md

@@ -1,76 +0,0 @@
-
-# Bone meal API
-Bonemealing callbacks and particle functions.
-
-
-## _on_bone_meal(itemstack, placer, pointed_thing)
-The bone meal API provides a callback definition that nodes can use to
-register a handler that is executed when a bone meal item is used on it.
-
-Nodes that wish to use the bone meal API should in their node registration
-define a callback handler named `_on_bone_meal`.
-
-Note that by registering the callback handler, the node declares that bone
-meal can be used on it and as a result, when the user is not in creative
-mode, the used bone meal is spent and taken from the itemstack passed to
-the `on_place()` handler of the bone meal item used regardless of whether
-the bone meal had an effect on the node and regardless of the result of
-the callback handler.
-
-It is for all intents and purposes up to the callback defined in the node to
-decide how to handle the specific effect that bone meal has on that node.
-
-The `_on_bone_meal` callback handler is a
-
-  `function(itemstack, placer, pointed_thing)`
-
-Its arguments are:
-* `itemstack`: the stack of bonem eal being applied
-* `placer`: ObjectRef of the player who aplied the bone meal, can be nil!
-* `pointed_thing`: exact pointing location (see Minetest API), where the
-	bone meal is applied
-
-The return value of the handler function indicates if the bonemealing had
-its intended effect.  If `true`, 'bone meal particles' are spawned at the
-position of the bonemealed node.
-
-The `on_place` code in the bone meal item will spawn bone meal particles and
-decrease the bone meal itemstack if the handler returned `true` and the
-`placer` is not in creative mode.
-
-
-## mcl_bone_meal.add_bone_meal_particle(pos, def)
-Spawns standard or custom bone meal particles.
-* `pos`: position, is ignored if you define def.minpos and def.maxpos
-* `def`: (optional) particle definition; see minetest.add_particlespawner()
-	for more details.
-
-## mcl_bone_meal.use_bone_meal(itemstack, placer, pointed_thing)
-For use in on_rightclick handlers that need support bone meal processing in addition
-to other behaviors. Before calling, verify that the player is wielding bone meal.
-* `itemstack`: The stack of bone meal being used
-* `placer`: ObjectRef of the player who aplied the bone meal, can be nil!
-* `pointed_thing`: exact pointing location (see Minetest API), where the
-	bone meal is applied
-
-Returns itemstack with one bone meal consumed if not in creative mode.
-
-# Legacy API
-The bone meal API also provides a legacy compatibility function.  This
-function is not meant to be continued and callers should migrate to the
-newer bonemealing API.
-
-## mcl_bone_meal.register_on_bone_meal_apply(function(pointed_thing, placer))
-Called when the bone meal is applied anywhere.
-* `pointed_thing`: exact pointing location (see Minetest API), where the
-	bone meal is applied
-* `placer`: ObjectRef of the player who aplied the bone meal, can be nil!
-This function is deprecated and will be removed at some time in the future.
-Bone meal is not consumed unless the provided function returns true.
-
-## mcl_dye.add_bone_meal_particle(pos, def)
-## mcl_dye.register_on_bone_meal_apply(function(pointed_thing, user))
-These shims in mcl_dye that point to corresponding legacy compatibility
-functions in mcl_bone_meal remain for legacy callers that have not yet been
-updated to the new API.  These shims will be removed at some time in the
-future.

mods/ITEMS/mcl_bone_meal/init.lua

@@ -1,156 +0,0 @@
-local S = minetest.get_translator(minetest.get_current_modname())
-
-local longdesc = S(
-	"Bone meal is a white dye and also useful as a fertilizer to " ..
-	"speed up the growth of many plants."
-)
-local usagehelp = S(
-	"Rightclick a sheep to turn its wool white. Rightclick a plant " ..
-	"to speed up its growth. Note that not all plants can be " ..
-	"fertilized like this. When you rightclick a grass block, tall " ..
-	"grass and flowers will grow all over the place."
-)
-
-mcl_bone_meal = {}
-
--- Bone meal particle API:
-
---- Spawns bone meal particles.
--- pos: where the particles spawn
--- def: particle spawner parameters, see minetest.add_particlespawner() for
---	details on these parameters.
---
-function mcl_bone_meal.add_bone_meal_particle(pos, def)
-	def = def or {}
-	minetest.add_particlespawner({
-		amount = def.amount or 10,
-		time = def.time or 0.1,
-		minpos = def.minpos or vector.subtract(pos, 0.5),
-		maxpos = def.maxpos or vector.add(pos, 0.5),
-		minvel = def.minvel or vector.new(-0.01, 0.01, -0.01),
-		maxvel = def.maxvel or vector.new(0.01, 0.01, 0.01),
-		minacc = def.minacc or vector.new(0, 0, 0),
-		maxacc = def.maxacc or vector.new(0, 0, 0),
-		minexptime = def.minexptime or 1,
-		maxexptime = def.maxexptime or 4,
-		minsize = def.minsize or 0.7,
-		maxsize = def.maxsize or 2.4,
-		texture = "mcl_particles_bonemeal.png^[colorize:#00EE00:125",
-		glow = def.glow or 1,
-	})
-end
-
--- Begin legacy bone meal API.
---
--- Compatibility code for legacy users of the old bone meal API.
--- This code will be removed at some time in the future.
---
-mcl_bone_meal.bone_meal_callbacks = {}
-
--- Shims for the old API are still available in mcl_dye and defer to
--- the real functions in mcl_bone_meal.
---
-function mcl_bone_meal.register_on_bone_meal_apply(func)
-	minetest.log("warning", "register_on_bone_meal_apply(func) is deprecated. Read mcl_bone_meal/API.md!")
-	local lines = string.split(debug.traceback(),"\n")
-	for _,line in ipairs(lines) do
-		minetest.log("warning",line)
-	end
-	table.insert(mcl_bone_meal.bone_meal_callbacks, func)
-end
-
--- Legacy registered users of the old API are handled through this function.
---
-local function legacy_apply_bone_meal(pointed_thing, placer)
-	-- Legacy API support
-	local callbacks = mcl_bone_meal.bone_meal_callbacks
-	for i = 1,#callbacks do
-		if callbacks[i](pointed_thing, placer) then
-			return true
-		end
-	end
-
-	return false
-end
--- End legacy bone meal API
-
-function mcl_bone_meal.use_bone_meal(itemstack, placer, pointed_thing)
-	local positions = {pointed_thing.under, pointed_thing.above}
-	for i = 1,2 do
-		local pos = positions[i]
-
-		-- Check protection
-		if mcl_util.check_area_protection(pos, pointed_thing.above, placer) then return false end
-
-		local node = minetest.get_node(pos)
-		local ndef = minetest.registered_nodes[node.name]
-		local success = false
-		local consume
-
-		-- If the pointed node can be bonemealed, let it handle the processing.
-		if ndef and ndef._on_bone_meal then
-			success = ndef._on_bone_meal(itemstack, placer, {under = pos, above = vector.offset(pos, 0, 1, 0)})
-			consume = true
-		else
-			-- Otherwise try the legacy API.
-			success = legacy_apply_bone_meal(pointed_thing, placer)
-			consume = success
-		end
-
-		-- Take the item
-		if consume then
-			-- Particle effects
-			mcl_bone_meal.add_bone_meal_particle(pos)
-
-			if not placer or not minetest.is_creative_enabled(placer:get_player_name()) then
-				itemstack:take_item()
-			end
-
-			return itemstack
-		end
-
-		if success then return itemstack end
-	end
-
-	return itemstack
-end
-
-minetest.register_craftitem("mcl_bone_meal:bone_meal", {
-	description = S("Bone Meal"),
-	_tt_help = S("Speeds up plant growth"),
-	_doc_items_longdesc = longdesc,
-	_doc_items_usagehelp = usagehelp,
-	inventory_image = "mcl_bone_meal.png",
-	groups = {craftitem=1},
-	on_place = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		local node = minetest.get_node(pos)
-		local ndef = minetest.registered_nodes[node.name]
-
-		-- Use pointed node's on_rightclick function first, if present.
-		if placer and not placer:get_player_control().sneak then
-			if ndef and ndef.on_rightclick then
-				local new_stack = mcl_util.call_on_rightclick(itemstack, placer, pointed_thing)
-				if new_stack and new_stack ~= itemstack then return new_stack end
-			end
-		end
-
-		return mcl_bone_meal.use_bone_meal(itemstack, placer, pointed_thing)
-	end,
-	_on_dispense = function(itemstack, pos, droppos, dropnode, dropdir)
-		local pointed_thing
-		if dropnode.name == "air" then
-			pointed_thing = {above = droppos, under = vector.offset(droppos, 0, -1 ,0)}
-		else
-			pointed_thing = {above = pos, under = droppos}
-		end
-
-		return mcl_bone_meal.use_bone_meal(itemstack, nil, pointed_thing)
-	end,
-	_dispense_into_walkable = true
-})
-
-minetest.register_craft({
-	output = "mcl_bone_meal:bone_meal 3",
-	recipe = {{"mcl_mobitems:bone"}},
-})

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.de.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=Knochenmehl
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=Knochenmehl ist ein weißer Farbstoff und auch nützlich als Dünger, um das Wachstum vieler Pflanzen zu beschleunigen.
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Rechtsklicken Sie auf ein Schaf, um die Wolle weiß einzufärben. Rechtsklicken Sie auf eine Pflanze, um ihr Wachstum zu beschleunigen. Beachten Sie, dass nicht alle Pflanzen darauf ansprechen. Benutzen Sie es auf einem Grasblock, wächst viel hohes Gras und vielleicht auch ein paar Blumen.
-Speeds up plant growth=Beschleunigt Pflanzenwachstum

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.es.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=Harina de hueso
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=La harina de hueso es un tinte blanco y también es útil como fertilizante para acelerar el crecimiento de muchas plantas.
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=RHaga clic derecho en una oveja para volver su lana blanca. Haga clic derecho en una planta para acelerar su crecimiento. Tenga en cuenta que no todas las plantas pueden ser fertilizadas de esta manera. Cuando haces clic derecho en un bloque de hierba, crecerán hierba alta y flores por todo el lugar.
-Speeds up plant growth=Acelera el crecimiento de las plantas

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.fr.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=Farine d'Os
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=La farine d'os est une teinture blanche et est également utile comme engrais pour accélérer la croissance de nombreuses plantes.
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Cliquez avec le bouton droit sur un mouton pour blanchir sa laine. Cliquez avec le bouton droit sur une plante pour accélérer sa croissance. Cependant, toutes les plantes ne peuvent pas être fertilisées de cette manière. Lorsque vous cliquez avec le bouton droit sur un bloc d'herbe, les hautes herbes et les fleurs poussent autour.
-Speeds up plant growth=Accélère la croissance des plantes

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.pl.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=Mączka kostna
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=Mączka kostna to biała farba i przydatny nawóz, który przyspiesza rośnięcie wielu roślin.
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Kliknij prawym na owcę, aby wybielić jej wełnę. Kliknij prawym na roślinę aby przyspieszyć jej wzrost. Zważ, że nie na wszystkie rośliny to tak działa. Gdy klikniesz prawym na blok trawy, wysoka trawa wyrośnie wokół.
-Speeds up plant growth=Przyspiesza wzrost roślin

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.ru.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=Костная мука
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=Костная мука является белым красителем. Она также полезна в качестве удобрения, чтобы увеличить скорость роста многих растений.
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Кликните правой по овце, чтобы сделать её шерсть белой. Кликните правой по растению, чтобы ускорить его рост. Имейте в виду, что не все растения можно удобрять таким способом. Если вы кликнете по травяному блоку, то на этом месте вырастет высокая трава и цветы.
-Speeds up plant growth=Ускоряет рост растений

mods/ITEMS/mcl_bone_meal/locale/mcl_bonemeal.zh_TW.tr

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=骨粉
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=骨粉是一種白色染料，也可作為肥料，加速許多植物的生長。
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=右鍵點擊一隻羊，使其羊毛變白。右鍵點擊一株植物以加快其生長速度。注意，不是所有的植物都能像這樣施肥。當你右鍵點擊一個草方時，高高的草和花會到處生長。
-Speeds up plant growth=加速植物生長

mods/ITEMS/mcl_bone_meal/locale/template.txt

@@ -1,5 +0,0 @@
-# textdomain: mcl_bone_meal
-Bone Meal=
-Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=
-Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=
-Speeds up plant growth=

mods/ITEMS/mcl_bone_meal/mod.conf

@@ -1,3 +0,0 @@
-name = mcl_bone_meal
-description = Bone meal can be used as a fertilizer and as a dye.
-author = kabou, teknomunk

mods/ITEMS/mcl_bows/arrow.lua

@@ -257,10 +257,10 @@ function ARROW_ENTITY.on_step(self, dtime)
 							mcl_burning.set_on_fire(obj, 5)
 						end
 						if not self._in_player and not self._blocked then
-							mcl_util.deal_damage(obj, self._damage, {type = "arrow", source = self._shooter, direct = self.object})
-							if self._extra_hit_func then
-								self._extra_hit_func(obj)
-							end
+							obj:punch(self.object, 1.0, {
+								full_punch_interval=1.0,
+								damage_groups={fleshy=self._damage},
+							}, self.object:get_velocity())
 							if obj:is_player() then
 								if not mcl_shields.is_blocking(obj) then
 									local placement

mods/ITEMS/mcl_bows/bow.lua

@@ -168,8 +168,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
 		itemstack:get_meta():set_string("active", "true")
 		return itemstack
 	end,
-	groups = {weapon=1,weapon_ranged=1,bow=1,cannot_block=1,enchantability=1},
-	touch_interaction = "short_dig_long_place",
+	groups = {weapon=1,weapon_ranged=1,bow=1,enchantability=1},
 	_mcl_uses = 385,
 })
 
@@ -217,7 +216,7 @@ for level=0, 2 do
 		wield_scale = mcl_vars.tool_wield_scale,
 		stack_max = 1,
 		range = 0, -- Pointing range to 0 to prevent punching with bow :D
-		groups = {not_in_creative_inventory=1, not_in_craft_guide=1, bow=1, cannot_block=1, enchantability=1},
+		groups = {not_in_creative_inventory=1, not_in_craft_guide=1, bow=1, enchantability=1},
 		-- Trick to disable digging as well
 		on_use = function() return end,
 		on_drop = function(itemstack, dropper, pos)
@@ -236,7 +235,6 @@ for level=0, 2 do
 		on_place = function(itemstack)
 			return itemstack
 		end,
-		touch_interaction = "short_dig_long_place",
 		_mcl_uses = 385,
 	})
 end

mods/ITEMS/mcl_bows/crossbow.lua

@@ -158,8 +158,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
 		itemstack:get_meta():set_string("active", "true")
 		return itemstack
 	end,
-	groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1},
-	touch_interaction = "short_dig_long_place",
+	groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1},
 	_mcl_uses = 326,
 })
 
@@ -194,8 +193,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
 		itemstack:get_meta():set_string("active", "true")
 		return itemstack
 	end,
-	groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1,not_in_creative_inventory=1},
-	touch_interaction = "short_dig_long_place",
+	groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1,not_in_creative_inventory=1},
 	_mcl_uses = 326,
 })
 
@@ -240,7 +238,7 @@ for level=0, 2 do
 		wield_scale = mcl_vars.tool_wield_scale,
 		stack_max = 1,
 		range = 0, -- Pointing range to 0 to prevent punching with bow :D
-		groups = {not_in_creative_inventory=1, not_in_craft_guide=1, cannot_block=1, bow=1, enchantability=1},
+		groups = {not_in_creative_inventory=1, not_in_craft_guide=1, bow=1, enchantability=1},
 		-- Trick to disable digging as well
 		on_use = function() return end,
 		on_drop = function(itemstack, dropper, pos)
@@ -259,7 +257,6 @@ for level=0, 2 do
 		on_place = function(itemstack)
 			return itemstack
 		end,
-		touch_interaction = "short_dig_long_place",
 		_mcl_uses = 385,
 	})
 end

mods/ITEMS/mcl_chests/init.lua

@@ -79,7 +79,7 @@ minetest.register_lbm({
 		local node_name = node.name
 		node.name = node_name .. "_small"
 		minetest.swap_node(pos, node)
-		mcl_chests.select_and_spawn_entity(pos, node)
+		select_and_spawn_entity(pos, node)
 		if node_name == "mcl_chests:trapped_chest_on" then
 			minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos))
 			mcl_chests.chest_update_after_close(pos)

mods/ITEMS/mcl_cocoas/init.lua

@@ -2,34 +2,29 @@ local S = minetest.get_translator(minetest.get_current_modname())
 
 mcl_cocoas = {}
 
---- Place a cocoa pod.
--- Attempt to place a cocoa pod on a jungle tree.  Checks if attachment
--- point is a jungle tree and sets the correct orientation of the stem.
---
-function mcl_cocoas.place(itemstack, placer, pt, plantname)
+-- Place cocoa
+local function cocoa_place(itemstack, placer, pt, plantname)
 	-- check if pointing at a node
 	if not pt or pt.type ~= "node" then
 		return
 	end
 
-	local node = minetest.get_node(pt.under)
+	local under = minetest.get_node(pt.under)
 
 	-- return if any of the nodes are not registered
-	local def = minetest.registered_nodes[node.name]
-	if not def then
+	if not minetest.registered_nodes[under.name] then
 		return
 	end
 
 	-- Am I right-clicking on something that has a custom on_rightclick set?
 	if placer and not placer:get_player_control().sneak then
-		if def and def.on_rightclick then
-			local new_stack = mcl_util.call_on_rightclick(itemstack, placer, pt)
-			if new_stack and new_stack ~= itemstack then return new_stack end
+		if minetest.registered_nodes[under.name] and minetest.registered_nodes[under.name].on_rightclick then
+			return minetest.registered_nodes[under.name].on_rightclick(pt.under, under, placer, itemstack) or itemstack
 		end
 	end
 
 	-- Check if pointing at jungle tree
-	if node.name ~= "mcl_core:jungletree"
+	if under.name ~= "mcl_core:jungletree"
 	or minetest.get_node(pt.above).name ~= "air" then
 		return
 	end
@@ -44,7 +39,9 @@ function mcl_cocoas.place(itemstack, placer, pt, plantname)
 
 	-- Add the node, set facedir and remove 1 item from the itemstack
 	minetest.set_node(pt.above, {name = plantname, param2 = minetest.dir_to_facedir(clickdir)})
+
 	minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}, true)
+
 	if not minetest.is_creative_enabled(placer:get_player_name()) then
 		itemstack:take_item()
 	end
@@ -52,119 +49,111 @@ function mcl_cocoas.place(itemstack, placer, pt, plantname)
 	return itemstack
 end
 
---- Grows cocoa pod one size larger.
--- Attempts to grow a cocoa at pos, returns true when grown, returns false
--- if there's no cocoa or it is already at full size.
---
+-- Attempts to grow a cocoa at pos, returns true when grown, returns false if there's no cocoa
+-- or it is already at full size
 function mcl_cocoas.grow(pos)
 	local node = minetest.get_node(pos)
 	if node.name == "mcl_cocoas:cocoa_1" then
 		minetest.set_node(pos, {name = "mcl_cocoas:cocoa_2", param2 = node.param2})
 	elseif node.name == "mcl_cocoas:cocoa_2" then
 		minetest.set_node(pos, {name = "mcl_cocoas:cocoa_3", param2 = node.param2})
-	else
-		return false
+		return true
 	end
-	return true
+	return false
 end
 
--- only caller was mcl_dye, consider converting these into local functions.
-local cocoa_place = mcl_cocoas.place
-local cocoa_grow = mcl_cocoas.grow
+-- Cocoa definition
+-- 1st stage
+local crop_def = {
+	description = S("Premature Cocoa Pod"),
+	_doc_items_create_entry = true,
+	_doc_items_longdesc = S("Cocoa pods grow on the side of jungle trees in 3 stages."),
+	drawtype = "mesh",
+	mesh = "mcl_cocoas_cocoa_stage_0.obj",
+	tiles = {"mcl_cocoas_cocoa_stage_0.png"},
+	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	walkable = true,
+	drop = "mcl_cocoas:cocoa_beans",
+	collision_box = {
+		type = "fixed",
+		fixed = {
+			{-0.125, -0.0625, 0.1875, 0.125, 0.25, 0.4375},  -- Pod
+		},
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.125, -0.0625, 0.1875, 0.125, 0.5, 0.5},  -- Pod
+		},
+	},
+	groups = {
+		handy = 1, axey = 1,
+		dig_by_water=1, destroy_by_lava_flow=1, dig_by_piston=1,
+		attached_node_facedir=1,
+		not_in_creative_inventory=1,
+		cocoa=1
+	},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	on_rotate = false,
+	_mcl_blast_resistance = 3,
+	_mcl_hardness = 0.2,
+}
 
--- Cocoa pod variant definitions.
---[[ TODO: Use a mesh for cocoas for perfect texture compability. ]]
-local podinfo = {
-	{	desc = S("Premature Cocoa Pod"),
-		longdesc = S("Cocoa pods grow on the side of jungle trees in 3 stages."),
-		tiles = {
-			"mcl_cocoas_cocoa_stage_0.png",
-		},
-		n_box = {-0.125, -0.0625, 0.1875, 0.125, 0.25, 0.4375},
-		s_box = {-0.125, -0.0625, 0.1875, 0.125, 0.5,  0.5   },
+-- 2nd stage
+minetest.register_node("mcl_cocoas:cocoa_1", table.copy(crop_def))
+
+crop_def.description = S("Medium Cocoa Pod")
+crop_def._doc_items_create_entry = false
+crop_def.groups.cocoa = 2
+crop_def.mesh = "mcl_cocoas_cocoa_stage_1.obj"
+crop_def.tiles = {"mcl_cocoas_cocoa_stage_1.png"}
+crop_def.collision_box = {
+	type = "fixed",
+	fixed = {
+		{-0.1875, -0.1875, 0.0625, 0.1875, 0.25, 0.4375},  -- Pod
 	},
-	{	desc = S("Medium Cocoa Pod"),
-		tiles = {
-			"mcl_cocoas_cocoa_stage_1.png",
-		},
-		n_box = {-0.1875, -0.1875, 0.0625, 0.1875, 0.25, 0.4375},
-		s_box = {-0.1875, -0.1875, 0.0625, 0.1875, 0.5,  0.5   },
-	},
-	{	desc = S("Mature Cocoa Pod"),
-		longdesc = S("A mature cocoa pod grew on a jungle tree to its full size and it is ready to be harvested for cocoa beans. It won't grow any further."),
-		tiles = {
-			"mcl_cocoas_cocoa_stage_2.png",
-		},
-		n_box = {-0.25, -0.3125, -0.0625, 0.25, 0.25, 0.4375},
-		s_box = {-0.25, -0.3125, -0.0625, 0.25, 0.5,  0.5   },
+}
+crop_def.selection_box = {
+	type = "fixed",
+	fixed = {
+		{-0.1875, -0.1875, 0.0625, 0.1875, 0.5, 0.5},
 	},
 }
 
-for i = 1, 3 do
-	local def = {
-		description = podinfo[i].desc,
-		_doc_items_create_entry = true,
-		_doc_items_longdesc = podinfo[i].longdesc,
-		paramtype = "light",
-		paramtype2 = "facedir",
-		drawtype = "nodebox",
-		tiles = podinfo[i].tiles,
-		use_texture_alpha = "clip",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				podinfo[i].n_box, -- Pod
-				-- FIXME: This has a thickness of 0. Is this OK in Minetest?
-				{ 0, 0.25, 0.25, 0, 0.5, 0.5 }, }, -- Stem
-		},
-		collision_box = {
-			type = "fixed",
-			fixed = podinfo[i].n_box
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = podinfo[i].s_box
-		},
-		groups = {
-			handy = 1, axey = 1, attached_node_facedir = 1,
-			dig_by_water = 1, destroy_by_lava_flow = 1, dig_by_piston = 1,
-			cocoa = i, not_in_creative_inventory = 1,
-		},
-		sunlight_propagates = true,
-		walkable = true,
-		drop = "mcl_cocoas:cocoa_beans",
-		sounds = mcl_sounds.node_sound_wood_defaults(),
-		on_rotate = false,
-		_mcl_blast_resistance = 3,
-		_mcl_hardness = 0.2,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			return cocoa_grow(pos)
-		end,
-	}
+minetest.register_node("mcl_cocoas:cocoa_2", table.copy(crop_def))
 
-	if i == 2 then
-		def._doc_items_longdesc = nil
-		def._doc_items_create_entry = false
-	end
-	if i == 3 then
-		def.drop = "mcl_cocoas:cocoa_beans 3"
-		def._on_bone_mealing = nil
-	end
-
-	minetest.register_node("mcl_cocoas:cocoa_" .. i, table.copy(def))
-end
+-- Final stage
+crop_def.description = S("Mature Cocoa Pod")
+crop_def._doc_items_longdesc = S("A mature cocoa pod grew on a jungle tree to its full size and it is ready to be harvested for cocoa beans. It won't grow any further.")
+crop_def._doc_items_create_entry = true
+crop_def.groups.cocoa = 3
+crop_def.mesh = "mcl_cocoas_cocoa_stage_2.obj"
+crop_def.tiles = {"mcl_cocoas_cocoa_stage_2.png"}
+crop_def.collision_box = {
+	type = "fixed",
+	fixed = {
+		{-0.25, -0.3125, -0.0625, 0.25, 0.25, 0.4375},  -- Pod
+	},
+}
+crop_def.selection_box = {
+	type = "fixed",
+	fixed = {
+		{-0.25, -0.3125, -0.0625, 0.25, 0.5, 0.5},
+	},
+}
+crop_def.drop = "mcl_cocoas:cocoa_beans 3"
+minetest.register_node("mcl_cocoas:cocoa_3", table.copy(crop_def))
 
 minetest.register_craftitem("mcl_cocoas:cocoa_beans", {
-	inventory_image = "mcl_cocoa_beans.png",
-	_tt_help = S("Grows at the side of jungle trees"),
-	_doc_items_longdesc = S("Cocoa beans can be used to plant cocoa, bake cookies or cract brown dye."),
-	_doc_items_usagehelp = S("Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."),
 	description = S("Cocoa Beans"),
-	stack_max = 64,
-	groups = {
-		craftitem = 1, compostability = 65,
-	},
+	_tt_help = S("Grows at the side of jungle trees"),
+	_doc_items_longdesc = S("Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye."),
+	_doc_items_usagehelp = S("Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."),
+	inventory_image = "mcl_cocoas_cocoa_beans.png",
+	groups = {craftitem = 1, compostability = 65},
 	on_place = function(itemstack, placer, pointed_thing)
 		return cocoa_place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1")
 	end,

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=Kakaobohnen
 Grows at the side of jungle trees=Wächst an der Seite von Dschungelbäumen
 Cocoa beans can be used to plant cocoa pods, bake chocolate cookies or craft brown dye.=Kakaobohnen können benutzt werden, um Kakao anzupflanzen, Kekse zu backen oder braune Farbstoffe herzustellen.
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Rechtsklicken Sie auf ein Schaf, um die Wolle braun einzufärben. Rechtsklicken Sie an die Seite eines Dschungelbaumstamms (Dschungelholz), um eine junge Kakaoschote zu pflanzen.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Rechtsklicken Sie an die Seite eines Dschungelbaumstamms (Dschungelholz), um eine junge Kakaoschote zu pflanzen.
 Premature Cocoa Pod=Junge Kakaoschote
 Cocoa pods grow on the side of jungle trees in 3 stages.=Kakaoschoten wachsen an der Seite von Dschungelbäumen in 3 Stufen.
 Medium Cocoa Pod=Mittelgroße Kakaoschote

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=Granos de cacao
 Grows at the side of jungle trees=Crece al lado de los árboles de la jungla
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Los granos de cacao se pueden usar para plantar cacao, hornear galletas o hacer tintes marrones.
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Haga clic derecho en una oveja para convertir su lana en marrón. Haga clic derecho en el costado del tronco de un árbol de la jungla para plantar un cacao joven.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Haga clic derecho en el costado del tronco de un árbol de la jungla para plantar un cacao joven.
 Premature Cocoa Pod=Vaina de cacao prematura
 Cocoa pods grow on the side of jungle trees in 3 stages.=Las vainas de cacao crecen al lado de los árboles de jungla en 3 etapas.
 Medium Cocoa Pod=Vaina de cacao mediana

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=Fèves de Cacao
 Grows at the side of jungle trees=Pousse à côté des arbres de la jungle
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Les fèves de cacao peuvent être utilisées pour planter du cacao, faire des biscuits ou fabriquer de la teinture brune.
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Faites un clic droit sur un mouton pour brunir sa laine. Clic droit sur le côté d'un tronc d'arbre de la jungle (Bois Acajou) pour planter un jeune cacao.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Clic droit sur le côté d'un tronc d'arbre de la jungle (Bois Acajou) pour planter un jeune cacaoyer.
 Premature Cocoa Pod=Gousse de cacao prématurée
 Cocoa pods grow on the side of jungle trees in 3 stages.=Les cabosses de cacao poussent sur le côté des arbres d'Acajou en 3 étapes.
 Medium Cocoa Pod=Gousse de cacao moyenne

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=Ziarna kakaowe
 Grows at the side of jungle trees=Rośnie na boku tropikalnych drzew
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Ziarna kakaowe mogą być używane do sadzenia kakao, pieczenia ciasteczek lub robienia brązowego barwnika.
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Naciśnij prawym aby zafarbować wełnę owcy na brązowo. Naciśnij prawym na boku tropikalnego pnia (Tropikalne drewno) aby zasadzić młode kakao.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Naciśnij prawym na boku tropikalnego pnia (Tropikalne drewno) aby zasadzić młode kakao.
 Premature Cocoa Pod=Niedojrzała roślina kakao
 Cocoa pods grow on the side of jungle trees in 3 stages.=Roślina kakao rośnie na bokach tropikalnych drzew w 3 etapach
 Medium Cocoa Pod=Średnio-dojrzała roślina kakao

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=Какао-бобы
 Grows at the side of jungle trees=Растут на стволах тропических деревьев
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Какао-бобы можно использовать для посадки какао, выпечки печенья или изготовления коричневого красителя.
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Кликните правой по овце, чтобы сделать её шерсть коричневой. Кликните правой по боковой части ствола тропического дерева, чтобы посадить молодое какао.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Кликните правой по боковой части ствола тропического дерева, чтобы посадить молодое какао.
 Premature Cocoa Pod=Молодой стручок какао
 Cocoa pods grow on the side of jungle trees in 3 stages.=Стручки какао растут на деревьях джунглей в 3 этапа.
 Medium Cocoa Pod=Средний стручок какао

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr

@@ -2,7 +2,7 @@
 Cocoa Beans=可可豆
 Grows at the side of jungle trees=在叢林木側生長
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=可可豆可用於種植可可、烘烤餅乾或製作棕色染料。
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=右鍵點擊一隻羊，使其羊毛變成褐色。右鍵點擊叢林木的一側，可以種植一個可可。
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=右鍵點擊叢林木的一側，可以種植一個可可。
 Premature Cocoa Pod=成長中的可可豆莢（第1階段）
 Cocoa pods grow on the side of jungle trees in 3 stages.=可可莢果分3個階段生長在叢林樹的側面。
 Medium Cocoa Pod=成長中的可可豆莢（第2階段）

mods/ITEMS/mcl_cocoas/locale/template.txt

@@ -2,7 +2,7 @@
 Cocoa Beans=
 Grows at the side of jungle trees=
 Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=
-Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=
 Premature Cocoa Pod=
 Cocoa pods grow on the side of jungle trees in 3 stages.=
 Medium Cocoa Pod=

mods/ITEMS/mcl_cocoas/mod.conf

@@ -1,4 +1,4 @@
 name = mcl_cocoas
 description = Cocoa pods which grow at jungle trees. Does not include cocoa beans.
-depends = mcl_sounds, mcl_core, mcl_util
-optional_depends = doc
+depends = mcl_sounds, mcl_core
+optional_depends = doc

mods/ITEMS/mcl_composters/init.lua

@@ -11,7 +11,7 @@ local composter_description = S(
 	"Composter"
 )
 local composter_longdesc = S(
-	"Composters can convert various organic items into bone meal."
+	"Composters can convert various organic items into bonemeal."
 )
 local composter_usagehelp = S(
 	"Use organic items on the composter to fill it with layers of compost. " ..
@@ -48,41 +48,6 @@ local vector_offset = vector.offset
 local is_protected = minetest.is_protected
 local record_protection_violation = minetest.record_protection_violation
 
---- Math and node swap during compost progression
----@param pos Vector Position of the node
----@param node node
----@param chance integer Value of "compostability" group of inserted item
-local function composter_progress_chance(pos, node, chance)
-	-- calculate leveling up chance
-	local rand = math.random(0,100)
-	if chance >= rand then
-		-- get current compost level
-		local level = registered_nodes[node.name]["_mcl_compost_level"]
-		-- spawn green particles above new layer
-		mcl_bone_meal.add_bone_meal_particle(vector_offset(pos, 0, level/8, 0))
-		-- update composter block
-		if level < 7 then
-			level = level + 1
-		else
-			level = "ready"
-		end
-		swap_node(pos, {name = "mcl_composters:composter_" .. level})
-		minetest.sound_play({name="default_grass_footstep", gain=0.4}, {
-			pos = pos,
-			gain= 0.4,
-			max_hear_distance = 16,
-		}, true)
-		-- a full composter becomes ready for harvest after one second
-		-- the block will get updated by the node timer callback set in node reg def
-		if level == 7 then
-			local timer = get_node_timer(pos)
-			if not timer:is_started() then
-				timer:start(1)
-			end
-		end
-	end
-end
-
 --- Fill the composter when rightclicked.
 --
 -- `on_rightclick` handler for composter blocks of all fill levels except
@@ -121,6 +86,41 @@ local function composter_add_item(pos, node, player, itemstack, pointed_thing)
 	return itemstack
 end
 
+--- Math and node swap during compost progression
+---@param pos Vector Position of the node
+---@param node node
+---@param chance integer Value of "compostability" group of inserted item 
+function composter_progress_chance(pos, node, chance)
+	-- calculate leveling up chance
+	local rand = math.random(0,100)
+	if chance >= rand then
+		-- get current compost level
+		local level = registered_nodes[node.name]["_mcl_compost_level"]
+		-- spawn green particles above new layer
+		mcl_dye.add_bone_meal_particle(vector_offset(pos, 0, level/8, 0))
+		-- update composter block
+		if level < 7 then
+			level = level + 1
+		else
+			level = "ready"
+		end
+		swap_node(pos, {name = "mcl_composters:composter_" .. level})
+		minetest.sound_play({name="default_grass_footstep", gain=0.4}, {
+			pos = pos,
+			gain= 0.4,
+			max_hear_distance = 16,
+		}, true)
+		-- a full composter becomes ready for harvest after one second
+		-- the block will get updated by the node timer callback set in node reg def
+		if level == 7 then
+			local timer = get_node_timer(pos)
+			if not timer:is_started() then
+				timer:start(1)
+			end
+		end
+	end
+end
+
 --- Update a full composter block to ready for harvesting.
 --
 -- `on_timer` handler. The timer is set in function 'composter_add_item'
@@ -203,7 +203,7 @@ end
 --
 minetest.register_node("mcl_composters:composter", {
 	description = composter_description,
-	_tt_help = S("Converts organic items into bone meal"),
+	_tt_help = S("Converts organic items into bonemeal"),
 	_doc_items_longdesc = composter_longdesc,
 	_doc_items_usagehelp = composter_usagehelp,
 	paramtype = "light",

mods/ITEMS/mcl_composters/locale/mcl_composters.fr.tr

@@ -4,4 +4,4 @@ Composters can convert various organic items into bonemeal.=Les composteurs peuv
 Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost.  Some items have a bigger chance of adding an extra layer than other items.  After filling up with 7 layers of compost, the composter is full.  After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter.=Utiliser des objets organiques sur le composteur pour le remplir de couches de compost. Chaque fois qu'un objet est mis dans le composteur, il y a une chance d'ajouter une nouvelle couche de compost au composteur. Certains objets ont une plus grande chance que d'autres d'ajouter une couche supplémentaire. Après l'avoir rempli de 7 couches de compost, le composteur est plein. Après un délai d'approximativement une seconde, le composteur est prêt et on peut récupérer la farine d'os. Cliquer droit le composteur permet de récupérer la farine d'os et de vider le composteur.
 filled=rempli
 ready for harvest=prêt pour la récolte
-Converts organic items into bone meal=Convertit les objets organiques en farine d'os.
+Converts organic items into bonemeal=Convertit les objets organiques en farine d'os.

mods/ITEMS/mcl_composters/locale/mcl_composters.ja.tr

@@ -4,4 +4,4 @@ Composters can convert various organic items into bonemeal.=コンポスター
 Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost.  Some items have a bigger chance of adding an extra layer than other items.  After filling up with 7 layers of compost, the composter is full. After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter."=コンポスターに有機物を入れて、堆肥の層を作りましょう。コンポスターに有機物を入れるたびに、次の堆肥の層が追加されるチャンスが起きます。 追加される確率がより高くなっているアイテムもいくつかあります。 7層分の堆肥が充填されると、コンポスターは満杯となります。その約1秒後に、骨粉を取り出せる準備が完了します。右クリックして骨粉を取り出すと、コンポスターは空になります。
 filled=充足
 ready for harvest=収穫可能
-Converts organic items into bone meal=有機物を骨粉に変える
+Converts organic items into bonemeal=有機物を骨粉に変える

mods/ITEMS/mcl_composters/locale/mcl_composters.ru.tr

@@ -4,4 +4,4 @@ Composters can convert various organic items into bonemeal.=Компостер
 Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost.  Some items have a bigger chance of adding an extra layer than other items.  After filling up with 7 layers of compost, the composter is full.  After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter.=Используйте органические предметы на компостере, чтобы заполнить его слоями перегноя. Каждый раз когда в компостер попадает предмет, есть шанс что в компостере появится новый слой перегноя. Некоторые предметы имеют больший шанс на появление нового слоя. После заполнения 7 слоями перегноя, компостер можно опустошить, забрав из него костную муку. После задержки в одну секунду компостер будет готов и костная мука будет извлечена из него. Правым кликом по компостеру чтобы забрать костную муку.
 filled=заполнен
 ready for harvest=готов к сбору
-Converts organic items into bone meal=Перерабатывает органику в костную муку
+Converts organic items into bonemeal=Перерабатывает органику в костную муку

mods/ITEMS/mcl_composters/locale/template.txt

@@ -1,7 +1,7 @@
 # textdomain: mcl_composters
 Composter=
-Composters can convert various organic items into bone meal.=
-Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost.  Some items have a bigger chance of adding an extra layer than other items.  After filling up with 7 layers of compost, the composter is full. After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter.=
+Composters can convert various organic items into bonemeal.=
+Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost.  Some items have a bigger chance of adding an extra layer than other items.  After filling up with 7 layers of compost, the composter is full.  After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter.=
 filled=
 ready for harvest=
-Converts organic items into bone meal=
+Converts organic items into bonemeal=

mods/ITEMS/mcl_composters/mod.conf

@@ -1,5 +1,5 @@
 name = mcl_composters
 author = kabou
 description = Composters can convert various organic items into bonemeal.
-depends = mcl_core, mcl_sounds, mcl_bone_meal, mcl_hoppers
+depends = mcl_core, mcl_sounds, mcl_dye, mcl_hoppers
 optional_depends = doc

mods/ITEMS/mcl_core/nodes_trees.lua

@@ -280,14 +280,6 @@ function mcl_core.register_sapling(subname, description, longdesc, tt_help, text
 					nn == "mcl_core:podzol" or nn == "mcl_core:podzol_snow" or
 					nn == "mcl_core:dirt" or nn == "mcl_core:mycelium" or nn == "mcl_core:coarse_dirt"
 		end),
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			-- Saplings: 45% chance to advance growth stage
-			if math.random(1,100) <= 45 then
-				return mcl_core.grow_sapling(pos, n)
-			end
-		end,
 		node_placement_prediction = "",
 		_mcl_blast_resistance = 0,
 		_mcl_hardness = 0,

mods/ITEMS/mcl_crimson/init.lua

@@ -5,8 +5,6 @@ local modpath = minetest.get_modpath(modname)
 -- by debiankaios
 -- adapted for mcl2 by cora
 
-local MAXIMUM_VINE_HEIGHT = 25
-
 local wood_slab_groups = {handy = 1, axey = 1, material_wood = 1, wood_slab = 1}
 local wood_stair_groups = {handy = 1, axey = 1, material_wood = 1, wood_stairs = 1}
 
@@ -18,36 +16,21 @@ function generate_crimson_tree(pos)
 	minetest.place_schematic(pos,modpath.."/schematics/crimson_fungus_1.mts","random",nil,false,"place_center_x,place_center_z")
 end
 
-function grow_vines(pos, moreontop, vine, dir)
-	-- Sanity checks
+function grow_vines(pos, moreontop ,vine, dir)
 	if dir == nil then dir = 1 end
-	if not moreontop or moreontop < 1 then return false end
-
-	local allowed_nodes = {}
-	allowed_nodes[vine] = true
-
-	-- Find the root, tip and calculate height
-	local root,_,root_node = mcl_util.trace_nodes(pos, -dir, allowed_nodes, MAXIMUM_VINE_HEIGHT)
-	if not root then return false end
-	local tip,height,tip_node = mcl_util.trace_nodes(vector.offset(root, 0, dir, 0), dir, allowed_nodes, MAXIMUM_VINE_HEIGHT)
-	if not tip then return false end
-
-	local res = false
-	for i = 1,moreontop do
-		-- Check if we can grow into this position
-		if height >= MAXIMUM_VINE_HEIGHT then return res end
-		if tip_node.name ~= "air" then return res end
-
-		-- Update world map data
-		minetest.set_node(tip, {name = vine})
-
-		-- Move to the next position and flag that growth has occured
-		tip = vector.offset(tip, 0, dir, 0)
-		tip_node = minetest.get_node(tip)
-		height = height + 1
-		res = true
-	end
-	return res
+	local n
+	repeat
+		pos = vector.offset(pos,0,dir,0)
+		n = minetest.get_node(pos)
+		if n.name == "air" then
+			for i=0,math.max(moreontop,1) do
+				if minetest.get_node(pos).name == "air" then
+					minetest.set_node(vector.offset(pos,0,i*dir,0),{name=vine})
+				end
+			end
+			break
+		end
+	until n.name ~= "air" and n.name ~= vine
 end
 
 local nether_plants = {
@@ -100,20 +83,17 @@ minetest.register_node("mcl_crimson:warped_fungus", {
 	light_source = 1,
 	sounds = mcl_sounds.node_sound_leaves_defaults(),
 	node_placement_prediction = "",
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		local nodepos = minetest.get_node(vector.offset(pos, 0, -1, 0))
-
-		if nodepos.name == "mcl_crimson:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
-			local random = math.random(1, 5)
-			if random == 1 then
-				minetest.remove_node(pos)
-				generate_warped_tree(pos)
-				return true
+	on_rightclick = function(pos, node, pointed_thing, player, itemstack)
+		if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
+			local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
+			if nodepos.name == "mcl_crimson:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
+				local random = math.random(1, 5)
+				if random == 1 then
+					minetest.remove_node(pos)
+					generate_warped_tree(pos)
+				end
 			end
 		end
-
-		return false
 	end,
 	_mcl_blast_resistance = 0,
 })
@@ -122,12 +102,6 @@ mcl_flowerpots.register_potted_flower("mcl_crimson:warped_fungus", {
 	name = "warped_fungus",
 	desc = S("Warped Fungus"),
 	image = "mcl_crimson_warped_fungus.png",
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local n = has_nylium_neighbor(pointed_thing.under)
-		if n then
-			minetest.set_node(pointed_thing.under,n)
-		end
-	end,
 })
 
 minetest.register_node("mcl_crimson:twisting_vines", {
@@ -147,9 +121,6 @@ minetest.register_node("mcl_crimson:twisting_vines", {
 		fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 },
 	},
 	node_placement_prediction = "",
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		return grow_vines(pointed_thing.under, math.random(1, 3),"mcl_crimson:twisting_vines")
-	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local pn = clicker:get_player_name()
 		if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn or "") then
@@ -170,28 +141,26 @@ minetest.register_node("mcl_crimson:twisting_vines", {
 		end
 
 		elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
-			return mcl_bone_meal.use_bone_meal(itemstack, clicker, {under=pos, above=pos})
+			if not minetest.is_creative_enabled(clicker:get_player_name()) then
+				itemstack:take_item()
+			end
+			grow_vines(pos, math.random(1, 3),"mcl_crimson:twisting_vines")
 		end
 		return itemstack
 	end,
 	on_place = function(itemstack, placer, pointed_thing)
 		local under = pointed_thing.under
-		local unode = minetest.get_node(under)
-		local unode_def = minetest.registered_nodes[unode.name]
-
 		local above = pointed_thing.above
-		local anode = minetest.get_node(above)
-		local anode_def = minetest.registered_nodes[anode.name]
-
+		local unode = minetest.get_node(under)
 		if under.y < above.y then
 			minetest.set_node(above, {name = "mcl_crimson:twisting_vines"})
 			if not minetest.is_creative_enabled(placer:get_player_name()) then
 				itemstack:take_item()
 			end
-		elseif unode_def and unode_def.on_rightclick then
-			return unode_def.on_rightclick(under, unode, placer, itemstack, pointed_thing)
-		elseif anode_def and anode_def.on_rightclick then
-			return unode_def.on_rightclick(above, anode, placer, itemstack, pointed_thing)
+		else
+			if unode.name == "mcl_crimson:twisting_vines" then
+				return minetest.registered_nodes[unode.name].on_rightclick(under, unode, placer, itemstack, pointed_thing)
+			end
 		end
 		return itemstack
 	end,
@@ -199,7 +168,7 @@ minetest.register_node("mcl_crimson:twisting_vines", {
 		local above = vector.offset(pos,0,1,0)
 		local abovenode = minetest.get_node(above)
 		minetest.node_dig(pos, node, digger)
-		if abovenode.name == node.name then
+		if abovenode.name == node.name and (not mcl_core.check_vines_supported(above, abovenode)) then
 			minetest.registered_nodes[node.name].on_dig(above, node, digger)
 		end
 	end,
@@ -242,9 +211,6 @@ minetest.register_node("mcl_crimson:weeping_vines", {
 		fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 },
 	},
 	node_placement_prediction = "",
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		return grow_vines(pointed_thing.under, math.random(1, 3),"mcl_crimson:weeping_vines", -1)
-	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local pn = clicker:get_player_name()
 		if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn or "") then
@@ -265,28 +231,26 @@ minetest.register_node("mcl_crimson:weeping_vines", {
 		end
 
 		elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
-			return mcl_bone_meal.use_bone_meal(itemstack, clicker, {under=pos, above=pos})
+			if not minetest.is_creative_enabled(clicker:get_player_name()) then
+				itemstack:take_item()
+			end
+			grow_vines(pos, math.random(1, 3),"mcl_crimson:weeping_vines", -1)
 		end
 		return itemstack
 	end,
 	on_place = function(itemstack, placer, pointed_thing)
 		local under = pointed_thing.under
-		local unode = minetest.get_node(under)
-		local unode_def = minetest.registered_nodes[unode.name]
-
 		local above = pointed_thing.above
-		local anode = minetest.get_node(above)
-		local anode_def = minetest.registered_nodes[anode.name]
-
+		local unode = minetest.get_node(under)
 		if under.y > above.y then
 			minetest.set_node(above, {name = "mcl_crimson:weeping_vines"})
 			if not minetest.is_creative_enabled(placer:get_player_name()) then
 				itemstack:take_item()
 			end
-		elseif unode_def and unode_def.on_rightclick then
-			return unode_def.on_rightclick(under, unode, placer, itemstack, pointed_thing)
-		elseif anode_def and anode_def.on_rightclick then
-			return unode_def.on_rightclick(above, anode, placer, itemstack, pointed_thing)
+		else
+			if unode.name == "mcl_crimson:weeping_vines" then
+				return minetest.registered_nodes[unode.name].on_rightclick(under, unode, placer, itemstack, pointed_thing)
+			end
 		end
 		return itemstack
 	end,
@@ -294,7 +258,7 @@ minetest.register_node("mcl_crimson:weeping_vines", {
 		local below = vector.offset(pos,0,-1,0)
 		local belownode = minetest.get_node(below)
 		minetest.node_dig(pos, node, digger)
-		if belownode.name == node.name then
+		if belownode.name == node.name and (not mcl_core.check_vines_supported(below, belownode)) then
 			minetest.registered_nodes[node.name].on_dig(below, node, digger)
 		end
 	end,
@@ -429,11 +393,6 @@ minetest.register_node("mcl_crimson:warped_nylium", {
 	_mcl_hardness = 0.4,
 	_mcl_blast_resistance = 0.4,
 	_mcl_silk_touch_drop = true,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local node = minetest.get_node(pointed_thing.under)
-		spread_nether_plants(pointed_thing.under,node)
-		return true
-	end,
 })
 
 --Stem bark, stripped stem and bark
@@ -566,21 +525,17 @@ minetest.register_node("mcl_crimson:crimson_fungus", {
 		fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 },
 	},
 	node_placement_prediction = "",
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		local nodepos = minetest.get_node(vector.offset(pos, 0, -1, 0))
-		if nodepos.name == "mcl_crimson:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
-			local random = math.random(1, 5)
-			if random == 1 then
-				minetest.remove_node(pos)
-				generate_crimson_tree(pos)
-
-				return true
+	on_rightclick = function(pos, node, pointed_thing, player)
+		if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
+			local nodepos = minetest.get_node(vector.offset(pos, 0, -1, 0))
+			if nodepos.name == "mcl_crimson:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
+				local random = math.random(1, 5)
+				if random == 1 then
+					minetest.remove_node(pos)
+					generate_crimson_tree(pos)
+				end
 			end
 		end
-
-		-- Failed to spread nylium
-		return false
 	end,
 	_mcl_blast_resistance = 0,
 })
@@ -727,11 +682,6 @@ minetest.register_node("mcl_crimson:crimson_nylium", {
 	_mcl_hardness = 0.4,
 	_mcl_blast_resistance = 0.4,
 	_mcl_silk_touch_drop = true,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local node = minetest.get_node(pointed_thing.under)
-		spread_nether_plants(pointed_thing.under,node)
-		return true
-	end,
 })
 
 minetest.register_craft({
@@ -773,6 +723,19 @@ minetest.register_craft({
 mcl_stairs.register_stair("crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", wood_stair_groups, false, S("Crimson Stair"))
 mcl_stairs.register_slab("crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", wood_slab_groups, false, S("Crimson Slab"))
 
+mcl_dye.register_on_bone_meal_apply(function(pt,user)
+	if not pt.type == "node" then return end
+	local node = minetest.get_node(pt.under)
+	if node.name == "mcl_nether:netherrack" then
+		local n = has_nylium_neighbor(pt.under)
+		if n then
+			minetest.set_node(pt.under,n)
+		end
+	elseif node.name == "mcl_crimson:warped_nylium" or node.name == "mcl_crimson:crimson_nylium" then
+		spread_nether_plants(pt.under,node)
+	end
+end)
+
 minetest.register_abm({
 	label = "Turn Crimson Nylium and Warped Nylium below solid block into Netherrack",
 	nodenames = {"mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium"},

mods/ITEMS/mcl_dye/API.md

@@ -0,0 +1,14 @@
+# mcl_dye
+
+# Bone meal API
+Callback and particle functions.
+
+## mcl_dye.add_bone_meal_particle(pos, def)
+Spawns standard or custom bone meal particles.
+* `pos`: position, is ignored if you define def.minpos and def.maxpos
+* `def`: (optional) particle definition
+
+## mcl_dye.register_on_bone_meal_apply(function(pointed_thing, user))
+Called when the bone meal is applied anywhere.
+* `pointed_thing`: exact pointing location (see Minetest API), where the bone meal is applied
+* `user`: ObjectRef of the player who aplied the bone meal, can be nil!

mods/ITEMS/mcl_dye/init.lua

@@ -15,6 +15,7 @@ mcl_dye = {}
 
 local S = minetest.get_translator(minetest.get_current_modname())
 
+local math = math
 local string = string
 
 -- Base color groups:
@@ -114,23 +115,328 @@ for _, row in pairs(dyes) do
 	})
 end
 
--- Legacy support for things now in mcl_bone_meal.
--- These shims will at some time in the future be removed.
+-- Bone meal code to be moved into its own mod.
 --
 function mcl_dye.add_bone_meal_particle(pos, def)
-	minetest.log("warning", "mcl_dye.add_bone_meal_particles() is deprecated.  Read mcl_bone_meal/API.md!")
-	local lines = string.split(debug.traceback(),"\n")
-	for _,line in ipairs(lines) do
-		minetest.log("warning",line)
+	if not def then
+		def = {}
 	end
-	mcl_bone_meal.add_bone_meal_particle(pos, def)
+	minetest.add_particlespawner({
+		amount = def.amount or 10,
+		time = def.time or 0.1,
+		minpos = def.minpos or vector.subtract(pos, 0.5),
+		maxpos = def.maxpos or vector.add(pos, 0.5),
+		minvel = def.minvel or vector.new(-0.01, 0.01, -0.01),
+		maxvel = def.maxvel or vector.new(0.01, 0.01, 0.01),
+		minacc = def.minacc or vector.new(0, 0, 0),
+		maxacc = def.maxacc or vector.new(0, 0, 0),
+		minexptime = def.minexptime or 1,
+		maxexptime = def.maxexptime or 4,
+		minsize = def.minsize or 0.7,
+		maxsize = def.maxsize or 2.4,
+		texture = "mcl_particles_bonemeal.png^[colorize:#00EE00:125", -- TODO: real MC color
+		glow = def.glow or 1,
+	})
 end
 
+mcl_dye.bone_meal_callbacks = {}
+
 function mcl_dye.register_on_bone_meal_apply(func)
-	minetest.log("warning", "mcl_dye.register_on_bone_meal_apply() is deprecated.  Read mcl_bone_meal/API.md!")
-	mcl_bone_meal.register_on_bone_meal_apply(func)
+	table.insert(mcl_dye.bone_meal_callbacks, func)
 end
 
+local function apply_bone_meal(pointed_thing, user)
+	-- Bone meal currently spawns all flowers found in the plains.
+	local flowers_table_plains = {
+		"mcl_flowers:dandelion",
+		"mcl_flowers:dandelion",
+		"mcl_flowers:poppy",
+
+		"mcl_flowers:oxeye_daisy",
+		"mcl_flowers:tulip_orange",
+		"mcl_flowers:tulip_red",
+		"mcl_flowers:tulip_white",
+		"mcl_flowers:tulip_pink",
+		"mcl_flowers:azure_bluet",
+	}
+	local flowers_table_simple = {
+		"mcl_flowers:dandelion",
+		"mcl_flowers:poppy",
+	}
+	local flowers_table_swampland = {
+		"mcl_flowers:blue_orchid",
+	}
+	local flowers_table_flower_forest = {
+		"mcl_flowers:dandelion",
+		"mcl_flowers:poppy",
+		"mcl_flowers:oxeye_daisy",
+		"mcl_flowers:tulip_orange",
+		"mcl_flowers:tulip_red",
+		"mcl_flowers:tulip_white",
+		"mcl_flowers:tulip_pink",
+		"mcl_flowers:azure_bluet",
+		"mcl_flowers:allium",
+	}
+
+	local pos = pointed_thing.under
+	local n = minetest.get_node(pos)
+	if n.name == "" then return false end
+
+	if mcl_util.check_area_protection(pos, pointed_thing.above, user) then
+		return false
+	end
+
+	for _, func in pairs(mcl_dye.bone_meal_callbacks) do
+		if func(pointed_thing, user) then
+			return true
+		end
+	end
+
+	if minetest.get_item_group(n.name, "sapling") >= 1 then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Saplings: 45% chance to advance growth stage
+		if math.random(1, 100) <= 45 then
+			if n.name == "mcl_cherry_blossom:cherrysapling" then
+				return mcl_cherry_blossom.generate_cherry_tree(pos) -- If cherry blossom sapling, run that callback instead.
+			else
+				return mcl_core.grow_sapling(pos, n)
+			end
+		end
+	elseif minetest.get_item_group(n.name, "mushroom") == 1 then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Try to grow huge mushroom
+
+		-- Must be on a dirt-type block
+		local below = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
+		if below.name ~= "mcl_core:mycelium" and below.name ~= "mcl_core:dirt" and minetest.get_item_group(below.name, "grass_block") ~= 1 and below.name ~= "mcl_core:coarse_dirt" and below.name ~= "mcl_core:podzol" then
+			return false
+		end
+
+		-- Select schematic
+		local schematic, offset, height
+		if n.name == "mcl_mushrooms:mushroom_brown" then
+			schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_brown.mts"
+			offset = { x = -3, y = -1, z = -3 }
+			height = 8
+		elseif n.name == "mcl_mushrooms:mushroom_red" then
+			schematic = minetest.get_modpath("mcl_mushrooms").."/schematics/mcl_mushrooms_huge_red.mts"
+			offset = { x = -2, y = -1, z = -2 }
+			height = 8
+		else
+			return false
+		end
+		-- 40% chance
+		if math.random(1, 100) <= 40 then
+			-- Check space requirements
+			for i=1,3 do
+				local cpos = vector.add(pos, {x=0, y=i, z=0})
+				if minetest.get_node(cpos).name ~= "air" then
+					return false
+				end
+			end
+			local yoff = 3
+			local minp, maxp = {x=pos.x-3, y=pos.y+yoff, z=pos.z-3}, {x=pos.x+3, y=pos.y+yoff+(height-3), z=pos.z+3}
+			local diff = vector.subtract(maxp, minp)
+			diff = vector.add(diff, {x=1,y=1,z=1})
+			local totalnodes = diff.x * diff.y * diff.z
+			local goodnodes = minetest.find_nodes_in_area(minp, maxp, {"air", "group:leaves"})
+			if #goodnodes < totalnodes then
+				return false
+			end
+
+			-- Place the huge mushroom
+			minetest.remove_node(pos)
+			local place_pos = vector.add(pos, offset)
+			local ok = minetest.place_schematic(place_pos, schematic, 0, nil, false)
+			return ok ~= nil
+		end
+		return false
+	-- Wheat, Potato, Carrot, Pumpkin Stem, Melon Stem: Advance by 2-5 stages
+	elseif string.find(n.name, "mcl_farming:wheat_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		local stages = math.random(2, 5)
+		return mcl_farming:grow_plant("plant_wheat", pos, n, stages, true)
+	elseif string.find(n.name, "mcl_farming:potato_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		local stages = math.random(2, 5)
+		return mcl_farming:grow_plant("plant_potato", pos, n, stages, true)
+	elseif string.find(n.name, "mcl_farming:carrot_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		local stages = math.random(2, 5)
+		return mcl_farming:grow_plant("plant_carrot", pos, n, stages, true)
+	elseif string.find(n.name, "mcl_farming:pumpkin_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		local stages = math.random(2, 5)
+		return mcl_farming:grow_plant("plant_pumpkin_stem", pos, n, stages, true)
+	elseif string.find(n.name, "mcl_farming:melontige_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		local stages = math.random(2, 5)
+		return mcl_farming:grow_plant("plant_melon_stem", pos, n, stages, true)
+	elseif string.find(n.name, "mcl_farming:beetroot_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Beetroot: 75% chance to advance to next stage
+		if math.random(1, 100) <= 75 then
+			return mcl_farming:grow_plant("plant_beetroot", pos, n, 1, true)
+		end
+	elseif string.find(n.name, "mcl_farming:sweet_berry_bush_") then
+		mcl_dye.add_bone_meal_particle(pos)
+		if n.name == "mcl_farming:sweet_berry_bush_3" then
+			return minetest.add_item(vector.offset(pos,math.random()-0.5,math.random()-0.5,math.random()-0.5),"mcl_farming:sweet_berry")
+		else
+			return mcl_farming:grow_plant("plant_sweet_berry_bush", pos, n, 1, true)
+		end
+	elseif n.name == "mcl_cocoas:cocoa_1" or n.name == "mcl_cocoas:cocoa_2" then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Cocoa: Advance by 1 stage
+		mcl_cocoas.grow(pos)
+		return true
+	elseif minetest.get_item_group(n.name, "grass_block") == 1 then
+		-- Grass Block: Generate tall grass and random flowers all over the place
+		for i = -7, 7 do
+			for j = -7, 7 do
+				for y = -1, 1 do
+					pos = vector.offset(pointed_thing.above, i, y, j)
+					n = minetest.get_node(pos)
+					local n2 = minetest.get_node(vector.offset(pos, 0, -1, 0))
+
+					if n.name ~= "" and n.name == "air" and (minetest.get_item_group(n2.name, "grass_block_no_snow") == 1) then
+						-- Randomly generate flowers, tall grass or nothing
+						if math.random(1, 100) <= 90 / ((math.abs(i) + math.abs(j)) / 2)then
+							-- 90% tall grass, 10% flower
+							mcl_dye.add_bone_meal_particle(pos, {amount = 4})
+							if math.random(1,100) <= 90 then
+								local col = n2.param2
+								minetest.add_node(pos, {name="mcl_flowers:tallgrass", param2=col})
+							else
+								local flowers_table
+								if mg_name == "v6" then
+									flowers_table = flowers_table_plains
+								else
+									local biome = minetest.get_biome_name(minetest.get_biome_data(pos).biome)
+									if biome == "Swampland" or biome == "Swampland_shore" or biome == "Swampland_ocean" or biome == "Swampland_deep_ocean" or biome == "Swampland_underground" then
+										flowers_table = flowers_table_swampland
+									elseif biome == "FlowerForest" or biome == "FlowerForest_beach" or biome == "FlowerForest_ocean" or biome == "FlowerForest_deep_ocean" or biome == "FlowerForest_underground" then
+										flowers_table = flowers_table_flower_forest
+									elseif biome == "Plains" or biome == "Plains_beach" or biome == "Plains_ocean" or biome == "Plains_deep_ocean" or biome == "Plains_underground" or biome == "SunflowerPlains" or biome == "SunflowerPlains_ocean" or biome == "SunflowerPlains_deep_ocean" or biome == "SunflowerPlains_underground" then
+										flowers_table = flowers_table_plains
+									else
+										flowers_table = flowers_table_simple
+									end
+								end
+								minetest.add_node(pos, {name=flowers_table[math.random(1, #flowers_table)]})
+							end
+						end
+					end
+				end
+			end
+		end
+		return true
+
+	-- Double flowers: Drop corresponding item
+	elseif n.name == "mcl_flowers:rose_bush" or n.name == "mcl_flowers:rose_bush_top" then
+		mcl_dye.add_bone_meal_particle(pos)
+		minetest.add_item(pos, "mcl_flowers:rose_bush")
+		return true
+	elseif n.name == "mcl_flowers:peony" or n.name == "mcl_flowers:peony_top" then
+		mcl_dye.add_bone_meal_particle(pos)
+		minetest.add_item(pos, "mcl_flowers:peony")
+		return true
+	elseif n.name == "mcl_flowers:lilac" or n.name == "mcl_flowers:lilac_top" then
+		mcl_dye.add_bone_meal_particle(pos)
+		minetest.add_item(pos, "mcl_flowers:lilac")
+		return true
+	elseif n.name == "mcl_flowers:sunflower" or n.name == "mcl_flowers:sunflower_top" then
+		mcl_dye.add_bone_meal_particle(pos)
+		minetest.add_item(pos, "mcl_flowers:sunflower")
+		return true
+
+	elseif n.name == "mcl_flowers:tallgrass" then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Tall Grass: Grow into double tallgrass
+		local toppos = { x=pos.x, y=pos.y+1, z=pos.z }
+		local topnode = minetest.get_node(toppos)
+		if minetest.registered_nodes[topnode.name].buildable_to then
+			minetest.set_node(pos, { name = "mcl_flowers:double_grass", param2 = n.param2 })
+			minetest.set_node(toppos, { name = "mcl_flowers:double_grass_top", param2 = n.param2 })
+			return true
+		end
+
+--[[
+	Here for when Bonemeal becomes an api, there's code if needed for handling applying to bamboo.
+	-- Handle applying bonemeal to bamboo.
+	elseif mcl_bamboo.is_bamboo(n.name) then
+		local success = mcl_bamboo.grow_bamboo(pos, true)
+		if success then
+			mcl_dye.add_bone_meal_particle(pos)
+		end
+		return success
+--]]
+	elseif n.name == "mcl_flowers:fern" then
+		mcl_dye.add_bone_meal_particle(pos)
+		-- Fern: Grow into large fern
+		local toppos = { x=pos.x, y=pos.y+1, z=pos.z }
+		local topnode = minetest.get_node(toppos)
+		if minetest.registered_nodes[topnode.name].buildable_to then
+			minetest.set_node(pos, { name = "mcl_flowers:double_fern", param2 = n.param2 })
+			minetest.set_node(toppos, { name = "mcl_flowers:double_fern_top", param2 = n.param2 })
+			return true
+		end
+	end
+
+	return false
+end
+
+mcl_dye.apply_bone_meal = apply_bone_meal
+
+-- Bone meal item registration.
+--
+-- To be moved into its own mod.
+--
+minetest.register_craftitem(":mcl_bone_meal:bone_meal", {
+	inventory_image = "mcl_bone_meal_bone_meal.png",
+	description = S("Bone Meal"),
+	_tt_help = S("Speeds up plant growth"),
+	_doc_items_longdesc = S("Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants."),
+	_doc_items_usagehelp = S("Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place."),
+	stack_max = 64,
+	on_place = function(itemstack, user, pointed_thing)
+		-- Use pointed node's on_rightclick function first, if present
+		local node = minetest.get_node(pointed_thing.under)
+		if user and not user:get_player_control().sneak then
+			if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+				return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
+			end
+		end
+
+		-- Use the bone meal on the ground
+		if (apply_bone_meal(pointed_thing, user) and (not minetest.is_creative_enabled(user:get_player_name()))) then
+			itemstack:take_item()
+		end
+		return itemstack
+	end,
+	_on_dispense = function(stack, pos, droppos, dropnode, dropdir)
+		-- Apply bone meal, if possible
+		local pointed_thing
+		if dropnode.name == "air" then
+			pointed_thing = { above = droppos, under = { x=droppos.x, y=droppos.y-1, z=droppos.z } }
+		else
+			pointed_thing = { above = pos, under = droppos }
+		end
+		local success = apply_bone_meal(pointed_thing, nil)
+		if success then
+			stack:take_item()
+		end
+		return stack
+	end,
+	_dispense_into_walkable = true
+})
+
+minetest.register_craft({
+	output = "mcl_bone_meal:bone_meal 3",
+	recipe = {{"mcl_mobitems:bone"}},
+})
+
+
 -- Dye creation recipes.
 --
 minetest.register_craft({
@@ -303,16 +609,19 @@ minetest.register_craft({
 	output = "mcl_dye:magenta 2",
 	recipe = {"mcl_dye:violet", "mcl_dye:pink"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:pink 2",
 	recipe = {"mcl_dye:red", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:cyan 2",
 	recipe = {"mcl_dye:blue", "mcl_dye:dark_green"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:violet 2",

mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr

@@ -17,3 +17,11 @@ Magenta Dye=Magenta Farbstoff
 Pink Dye=Rosa Farbstoff
 This item is a dye which is used for dyeing and crafting.=Dieser Gegenstand ist ein Farbstoff, der zum Einfärben und in der Herstellung benutzt werden kann.
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=Rechtsklicken Sie auf ein Schaf, um seine Wolle zu färben. Andere Dinge werden mit der Fertigung eingefärbt.
+Bone Meal=Knochenmehl
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=Knochenmehl ist ein weißer Farbstoff und auch nützlich als Dünger, um das Wachstum vieler Pflanzen zu beschleunigen.
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Rechtsklicken Sie auf ein Schaf, um die Wolle weiß einzufärben. Rechtsklicken Sie auf eine Pflanze, um ihr Wachstum zu beschleunigen. Beachten Sie, dass nicht alle Pflanzen darauf ansprechen. Benutzen Sie es auf einem Grasblock, wächst viel hohes Gras und vielleicht auch ein paar Blumen.
+Cocoa beans are a brown dye and can be used to plant cocoas.=Kakaobohnen sind ein brauner Farbstoff und werden benutzt, um Kakao anzupflanzen.
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Rechtsklicken Sie auf ein Schaf, um die Wolle braun einzufärben. Rechtsklicken Sie an die Seite eines Dschungelbaumstamms (Dschungelholz), um eine junge Kakaoschote zu pflanzen.
+Cocoa Beans=Kakaobohnen
+Grows at the side of jungle trees=Wächst an der Seite von Dschungelbäumen
+Speeds up plant growth=Beschleunigt Pflanzenwachstum

mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr

@@ -17,3 +17,9 @@ Magenta Dye=Tinte magenta
 Pink Dye=Tinte rosado
 This item is a dye which is used for dyeing and crafting.=Este artículo es un tinte que se utiliza para teñir y elaborar.
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=Haga clic derecho sobre una oveja para teñir su lana. Otras cosas pueden ser teñidas mediante la elaboración.
+Bone Meal=Harina de hueso
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=La harina de hueso es un tinte blanco y también es útil como fertilizante para acelerar el crecimiento de muchas plantas.
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=RHaga clic derecho en una oveja para volver su lana blanca. Haga clic derecho en una planta para acelerar su crecimiento. Tenga en cuenta que no todas las plantas pueden ser fertilizadas de esta manera. Cuando haces clic derecho en un bloque de hierba, crecerán hierba alta y flores por todo el lugar.
+Cocoa beans are a brown dye and can be used to plant cocoas.=Los granos de cacao son un tinte marrón y se pueden usar para plantar cacao.
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Haga clic derecho en una oveja para convertir su lana en marrón. Haga clic derecho en el costado del tronco de un árbol de jungla para plantar un cacao joven.
+Cocoa Beans=Granos de cacao

mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr

@@ -17,3 +17,11 @@ Magenta Dye=Teinture Magenta
 Pink Dye=Teinture Rose
 This item is a dye which is used for dyeing and crafting.=Cet objet est un colorant utilisé pour la teinture et l'artisanat.
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=Clic droit sur un mouton pour teindre sa laine. D'autres choses sont teintes par l'artisanat.
+Bone Meal=Farine d'Os
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=La farine d'os est une teinture blanche et également utile comme engrais pour accélérer la croissance de nombreuses plantes.
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Cliquez avec le bouton droit sur un mouton pour blanchir sa laine. Cliquez avec le bouton droit sur une plante pour accélérer sa croissance. Notez que toutes les plantes ne peuvent pas être fertilisées comme ça. Lorsque vous cliquez avec le bouton droit sur un bloc d'herbe, les hautes herbes et les fleurs poussent partout.
+Cocoa beans are a brown dye and can be used to plant cocoas.=Les fèves de cacao ont une teinture brune et peuvent être utilisées pour planter du cacao.
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Faites un clic droit sur un mouton pour brunir sa laine. Clic droit sur le côté d'un tronc d'arbre de la jungle (Bois Acajou) pour planter un jeune cacao.
+Cocoa Beans=Fèves de Cacao
+Grows at the side of jungle trees=Pousse à côté des arbres de la jungle
+Speeds up plant growth=Accélère la croissance des plantes

mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr

@@ -17,3 +17,11 @@ Magenta Dye=Karmazynowa farba
 Pink Dye=Różowa farba
 This item is a dye which is used for dyeing and crafting.=Ten przedmiot to farba wykorzystywana to farbowania i wytwarzania.
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=Kliknij prawym na owcę aby zafarbować jej wełnę. Inne rzeczy mogą być zafarbowane przy wytwarzaniu.
+Bone Meal=Mączka kostna
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=Mączka kostna to biała farba i przydatny nawóz, który przyspiesza rośnięcie wielu roślin.
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Kliknij prawym na owcę, aby wybielić jej wełnę. Kliknij prawym na roślinę aby przyspieszyć jej wzrost. Zważ, że nie na wszystkie rośliny to tak działa. Gdy klikniesz prawym na blok trawy, wysoka trawa wyrośnie wokół.
+Cocoa beans are a brown dye and can be used to plant cocoas.=Ziarna kakaowe mogą być wykorzystane do sadzenia kakao.
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Naciśnij prawym aby zafarbować wełnę owcy na brązowo. Naciśnij prawym na boku tropikalnego pnia (Tropikalne drewno) aby zasadzić młode kakao.
+Cocoa Beans=Ziarna kakaowe
+Grows at the side of jungle trees=Rośnie na boku tropikalnych drzew
+Speeds up plant growth=Przyspiesza wzrost roślin

mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr

@@ -22,3 +22,6 @@ Bone meal is a white dye and also useful as a fertilizer to speed up the growth
 Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=Кликните правой по овце, чтобы сделать её шерсть белой. Кликните правой по растению, чтобы ускорить его рост. Имейте в виду, что не все растения можно удобрять таким способом. Если вы кликнете по травяному блоку, то на этом месте вырастет высокая трава и цветы.
 Cocoa beans are a brown dye and can be used to plant cocoas.=Какао-бобы являются коричневым красителем. Их также можно использовать, чтобы посадить какао.
 Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Кликните правой по овце, чтобы сделать её шерсть коричневой. Кликните правой по боковой части ствола тропического дерева, чтобы посадить молодое какао.
+Cocoa Beans=Какао-бобы
+Grows at the side of jungle trees=Растут на стволах тропических деревьев
+Speeds up plant growth=Ускоряет рост растений

mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr

@@ -17,3 +17,9 @@ Magenta Dye=洋紅色染料
 Pink Dye=粉紅色染料
 This item is a dye which is used for dyeing and crafting.=這個物品是一種用於染色和合成的染料。
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=右鍵單擊綿羊以染它的毛。其他東西是通過合成染色的。
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=骨粉是一種白色染料，也可作為肥料，加速許多植物的生長。
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=右鍵點擊一隻羊，使其羊毛變白。右鍵點擊一株植物以加快其生長速度。注意，不是所有的植物都能像這樣施肥。當你右鍵點擊一個草方時，高高的草和花會到處生長。
+Cocoa beans are a brown dye and can be used to plant cocoas.=可可豆是一種棕色染料，也可用於種植可可。
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=右鍵點擊一隻羊，使其羊毛變成褐色。右鍵點擊叢林木的一側，可以種植一個可可。
+Grows at the side of jungle trees=在叢林木側生長
+Speeds up plant growth=加速植物生長

mods/ITEMS/mcl_dye/locale/template.txt

@@ -17,3 +17,11 @@ Magenta Dye=
 Pink Dye=
 This item is a dye which is used for dyeing and crafting.=
 Rightclick on a sheep to dye its wool. Other things are dyed by crafting.=
+Bone Meal=
+Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants.=
+Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place.=
+Cocoa beans are a brown dye and can be used to plant cocoas.=
+Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=
+Cocoa Beans=
+Grows at the side of jungle trees=
+Speeds up plant growth=

mods/ITEMS/mcl_dye/mod.conf

@@ -1,3 +1,2 @@
 name = mcl_dye
-description = Adds color to your world!
-depends = mcl_bone_meal, mcl_cocoas
+depends = mcl_core, mcl_flowers, mcl_mobitems, mcl_cocoas

mods/ITEMS/mcl_farming/beetroot.lua

@@ -13,44 +13,78 @@ minetest.register_craftitem("mcl_farming:beetroot_seeds", {
 	end
 })
 
-local size = {[0]=-5, -4, -3}
+minetest.register_node("mcl_farming:beetroot_0", {
+	description = S("Premature Beetroot Plant (Stage 1)"),
+	_doc_items_longdesc = S("Beetroot plants are plants which grow on farmland under sunlight in 4 stages. On hydrated farmland, they grow a bit faster. They can be harvested at any time but will only yield a profit when mature."),
+	_doc_items_entry_name = S("Premature Beetroot Plant"),
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	sunlight_propagates = true,
+	place_param2 = 3,
+	walkable = false,
+	drawtype = "plantlike",
+	drop = "mcl_farming:beetroot_seeds",
+	tiles = {"mcl_farming_beetroot_0.png"},
+	inventory_image = "mcl_farming_beetroot_0.png",
+	wield_image = "mcl_farming_beetroot_0.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}
+		},
+	},
+	groups = {dig_immediate=3, not_in_creative_inventory=1,plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1},
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+	_mcl_blast_resistance = 0,
+})
 
-for i = 0, 2 do
-	minetest.register_node("mcl_farming:beetroot_".. i, {
-		description = S("Premature Beetroot Plant (Stage ".. i + 1 ..")"),
-		_doc_items_longdesc = S("Beetroot plants are plants which grow on farmland under sunlight in 4 stages. On hydrated farmland, they grow a bit faster. They can be harvested at any time but will only yield a profit when mature."),
-		_doc_items_entry_name = S("Premature Beetroot Plant"),
-		paramtype = "light",
-		paramtype2 = "meshoptions",
-		sunlight_propagates = true,
-		place_param2 = 3,
-		walkable = false,
-		drawtype = "plantlike",
-		drop = "mcl_farming:beetroot_seeds",
-		tiles = {"mcl_farming_beetroot_".. i ..".png"},
-		inventory_image = "mcl_farming_beetroot_".. i ..".png",
-		wield_image = "mcl_farming_beetroot_".. i ..".png",
-		selection_box = {
-			type = "fixed",
-			fixed = { {-0.5, -0.5, -0.5, 0.5, size[i]/16, 0.5} },
+minetest.register_node("mcl_farming:beetroot_1", {
+	description = S("Premature Beetroot Plant (Stage 2)"),
+	_doc_items_create_entry = false,
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	sunlight_propagates = true,
+	place_param2 = 3,
+	walkable = false,
+	drawtype = "plantlike",
+	drop = "mcl_farming:beetroot_seeds",
+	tiles = {"mcl_farming_beetroot_1.png"},
+	inventory_image = "mcl_farming_beetroot_1.png",
+	wield_image = "mcl_farming_beetroot_1.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -4/16, 0.5}
 		},
-		groups = {
-			dig_immediate=3, not_in_creative_inventory=1,
-			plant=1, attached_node=1, dig_by_water=1,
-			destroy_by_lava_flow=1,dig_by_piston=1
+	},
+	groups = {dig_immediate=3, not_in_creative_inventory=1,plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1},
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+	_mcl_blast_resistance = 0,
+})
+
+minetest.register_node("mcl_farming:beetroot_2", {
+	description = S("Premature Beetroot Plant (Stage 3)"),
+	_doc_items_create_entry = false,
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	sunlight_propagates = true,
+	place_param2 = 3,
+	walkable = false,
+	drawtype = "plantlike",
+	drop = "mcl_farming:beetroot_seeds",
+	tiles = {"mcl_farming_beetroot_2.png"},
+	inventory_image = "mcl_farming_beetroot_2.png",
+	wield_image = "mcl_farming_beetroot_2.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -3/16, 0.5}
 		},
-		sounds = mcl_sounds.node_sound_leaves_defaults(),
-		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			-- 75% chance to advance to next stage
-			if math.random(1, 100) <= 75 then
-				return mcl_farming:grow_plant("plant_beetroot", pos, n, 1, true)
-			end
-		end
-	})
-end
+	},
+	groups = {dig_immediate=3, not_in_creative_inventory=1,plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1},
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+	_mcl_blast_resistance = 0,
+})
 
 minetest.register_node("mcl_farming:beetroot", {
 	description = S("Mature Beetroot Plant"),
@@ -137,8 +171,7 @@ minetest.register_craft({
 	},
 })
 
--- beetroots grow at 2/3rd of the default speed
-mcl_farming:add_plant("plant_beetroot", "mcl_farming:beetroot", {"mcl_farming:beetroot_0", "mcl_farming:beetroot_1", "mcl_farming:beetroot_2"}, 8.7012, 35)
+mcl_farming:add_plant("plant_beetroot", "mcl_farming:beetroot", {"mcl_farming:beetroot_0", "mcl_farming:beetroot_1", "mcl_farming:beetroot_2"}, 68, 3)
 
 if minetest.get_modpath("doc") then
 	for i = 1, 2 do

mods/ITEMS/mcl_farming/carrots.lua

@@ -45,12 +45,6 @@ for i=1, 7 do
 		groups = {dig_immediate=3, not_in_creative_inventory=1,plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1},
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			local stages = math.random(2, 5)
-			return mcl_farming:grow_plant("plant_carrot", pos, n, stages, true)
-		end
 	})
 end
 
@@ -124,7 +118,7 @@ minetest.register_craft({
 	}
 })
 
-mcl_farming:add_plant("plant_carrot", "mcl_farming:carrot", {"mcl_farming:carrot_1", "mcl_farming:carrot_2", "mcl_farming:carrot_3", "mcl_farming:carrot_4", "mcl_farming:carrot_5", "mcl_farming:carrot_6", "mcl_farming:carrot_7"}, 5.8013, 35)
+mcl_farming:add_plant("plant_carrot", "mcl_farming:carrot", {"mcl_farming:carrot_1", "mcl_farming:carrot_2", "mcl_farming:carrot_3", "mcl_farming:carrot_4", "mcl_farming:carrot_5", "mcl_farming:carrot_6", "mcl_farming:carrot_7"}, 25, 20)
 
 if minetest.get_modpath("doc") then
 	for i=2,7 do

mods/ITEMS/mcl_farming/melon.lua

@@ -109,12 +109,6 @@ for s=1,7 do
 		groups = {dig_immediate=3, not_in_creative_inventory=1, plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1, plant_melon_stem=s},
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			local stages = math.random(2, 5)
-			return mcl_farming:grow_plant("plant_melon_stem", pos, n, stages, true)
-		end
 	})
 end
 
@@ -129,10 +123,10 @@ local stem_def = {
 }
 
 -- Register stem growth
-mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 5.8014, 35)
+mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 30, 5)
 
 -- Register actual melon, connected stems and stem-to-melon growth
-mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 5.8015, 35, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127")
+mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127")
 
 -- Items and crafting
 minetest.register_craftitem("mcl_farming:melon_item", {

mods/ITEMS/mcl_farming/potatoes.lua

@@ -49,12 +49,6 @@ for i=1, 7 do
 		groups = {dig_immediate=3, not_in_creative_inventory=1,plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1},
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			local stages = math.random(2, 5)
-			return mcl_farming:grow_plant("plant_potato", pos, n, stages, true)
-		end
 	})
 end
 
@@ -141,7 +135,7 @@ minetest.register_craft({
 	cooktime = 10,
 })
 
-mcl_farming:add_plant("plant_potato", "mcl_farming:potato", {"mcl_farming:potato_1", "mcl_farming:potato_2", "mcl_farming:potato_3", "mcl_farming:potato_4", "mcl_farming:potato_5", "mcl_farming:potato_6", "mcl_farming:potato_7"}, 5.8016, 35)
+mcl_farming:add_plant("plant_potato", "mcl_farming:potato", {"mcl_farming:potato_1", "mcl_farming:potato_2", "mcl_farming:potato_3", "mcl_farming:potato_4", "mcl_farming:potato_5", "mcl_farming:potato_6", "mcl_farming:potato_7"}, 19.75, 20)
 
 minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack, user, pointed_thing)
 

mods/ITEMS/mcl_farming/pumpkin.lua

@@ -79,12 +79,6 @@ for s=1,7 do
 		groups = {dig_immediate=3, not_in_creative_inventory=1, plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1,},
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			local stages = math.random(2, 5)
-			return mcl_farming:grow_plant("plant_pumpkin_stem", pos, n, stages, true)
-		end
 	})
 end
 
@@ -186,10 +180,10 @@ if minetest.get_modpath("mcl_armor") then
 end
 
 -- Register stem growth
-mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 5.8017, 35)
+mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5)
 
 -- Register actual pumpkin, connected stems and stem-to-pumpkin growth
-mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 5.8018, 35, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127")
+mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127")
 
 -- Steal function to properly disconnect a carved pumpkin
 pumpkin_face_base_def.after_destruct = minetest.registered_nodes["mcl_farming:pumpkin"].after_destruct

mods/ITEMS/mcl_farming/shared_functions.lua

@@ -5,99 +5,73 @@
 --
 local math = math
 local vector = vector
-local random = math.random
-local floor = math.floor
 
 local plant_lists = {}
 mcl_farming.plant_lists = plant_lists -- export
-local plant_nodename_to_id = {} -- map nodes to plants
-local plant_step_from_name = {} -- map nodes to growth steps
+local plant_nodename_to_id_list = {}
 
-local growth_factor = tonumber(minetest.settings:get("vl_plant_growth")) or 1.0
+local time_speed = tonumber(minetest.settings:get("time_speed")) or 72
+local time_multiplier = time_speed > 0 and (86400 / time_speed) or 0
 
--- wetness of the surroundings
--- dry farmland = 1 point
--- wet farmland = 3 points
--- center point gives + 1 point, so 2 resp. 4
--- neighbors only 25%
-local function get_moisture_level(pos)
-	local n = vector.offset(pos, 0, -1, 0)
-	local totalm = 1
-	for z = -1,1 do
-		n.z = pos.z + z
-		for x = -1,1 do
-			n.x = pos.x + x
-			local ndef = minetest.registered_nodes[minetest.get_node(n).name]
-			local soil = ndef and ndef.groups.soil
-			if soil and soil >= 2 then
-				local m = soil > 2 and 3 or 1
-				-- corners have less weight
-				if x ~= 0 or z ~= 0 then m = m * 0.25 end
-				totalm = totalm + m
-			end
-		end
+local function get_intervals_counter(pos, interval, chance)
+	if time_multiplier == 0 then return 0 end
+	-- "wall clock time", so plants continue to grow while sleeping
+	local current_game_time = (minetest.get_day_count() + minetest.get_timeofday()) * time_multiplier
+	local approx_interval = math.max(interval, 1) * math.max(chance, 1)
+
+	local meta = minetest.get_meta(pos)
+	local last_game_time = meta:get_float("last_gametime")
+	if last_game_time < 1 then
+		last_game_time = current_game_time - approx_interval * 0.5
+	elseif last_game_time == current_game_time then
+		current_game_time = current_game_time + approx_interval
 	end
-	return totalm
+	meta:set_float("last_gametime", current_game_time)
+	return (current_game_time - last_game_time) / approx_interval
 end
 
--- moisture penalty function:
--- 0.5 if both on the x axis and the z axis at least one of the same plants grows
--- 0.5 if at least one diagonal neighbor is the same
--- 1.0 otherwise
--- we cannot use the names directly, because growth is encoded in the names
-local function get_same_crop_penalty(pos)
-	local name = minetest.get_node(pos).name
-	local plant = plant_nodename_to_id[name]
-	if not plant then return 1 end
-	local n = vector.copy(pos)
-	-- check adjacent positions, avoid vector allocations and reduce node accesses
-	n.x = pos.x - 1
-	local dx = plant_nodename_to_id[minetest.get_node(n).name] == plant
-	n.x = pos.x + 1
-	dx = dx or plant_nodename_to_id[minetest.get_node(n).name] == plant
-	if dx then -- no need to check z otherwise
-		n.x = pos.x
-		n.z = pos.z - 1
-		local dz = plant_nodename_to_id[minetest.get_node(n).name] == plant
-		n.z = pos.z + 1
-		dz = dz or plant_nodename_to_id[minetest.get_node(n).name] == plant
-		if dz then return 0.5 end
+local function get_avg_light_level(pos)
+	local meta = minetest.get_meta(pos)
+	-- EWMA would use a single variable:
+	-- local avg = meta:get_float("avg_light")
+	-- avg = avg + (node_light - avg) * 0.985
+	-- meta.set_float("avg_light", avg)
+	local summary = meta:get_int("avg_light_summary")
+	local counter = meta:get_int("avg_light_count")
+	if counter > 99 then
+		summary, counter = math.ceil(summary * 0.5), 50
 	end
-	-- check diagonals, clockwise
-	n.x, n.z = pos.x - 1, pos.z - 1
-	if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
-	n.x = pos.x + 1
-	if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
-	n.z = pos.z + 1
-	if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
-	n.x = pos.x - 1
-	if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
-	return 1
+	local node_light = minetest.get_node_light(pos)
+	if node_light ~= nil then
+		summary, counter = summary + node_light, counter + 1
+		meta:set_int("avg_light_summary", summary)
+		meta:set_int("avg_light_count", counter)
+	end
+	return math.ceil(summary / counter)
 end
 
 function mcl_farming:add_plant(identifier, full_grown, names, interval, chance)
-	interval = growth_factor > 0 and (interval / growth_factor) or 0
 	local plant_info = {}
 	plant_info.full_grown = full_grown
 	plant_info.names = names
 	plant_info.interval = interval
 	plant_info.chance = chance
-	plant_nodename_to_id[full_grown] = identifier
 	for _, nodename in pairs(names) do
-		plant_nodename_to_id[nodename] = identifier
+		plant_nodename_to_id_list[nodename] = identifier
 	end
+	plant_info.step_from_name = {}
 	for i, name in ipairs(names) do
-		plant_step_from_name[name] = i
+		plant_info.step_from_name[name] = i
 	end
 	plant_lists[identifier] = plant_info
-	if interval == 0 then return end -- growth disabled
 	minetest.register_abm({
 		label = string.format("Farming plant growth (%s)", identifier),
 		nodenames = names,
 		interval = interval,
 		chance = chance,
 		action = function(pos, node)
-			mcl_farming:grow_plant(identifier, pos, node, 1, false)
+			local low_speed = minetest.get_node(vector.offset(pos, 0, -1, 0)).name ~= "mcl_farming:soil_wet"
+			mcl_farming:grow_plant(identifier, pos, node, 1, false, low_speed)
 		end,
 	})
 end
@@ -107,30 +81,40 @@ end
 -- pos: Position
 -- node: Node table
 -- stages: Number of stages to advance (optional, defaults to 1)
--- ignore_light_water: if true, ignore light and water requirements for growing
+-- ignore_light: if true, ignore light requirements for growing
+-- low_speed: grow more slowly (not wet), default false
 -- Returns true if plant has been grown by 1 or more stages.
 -- Returns false if nothing changed.
-function mcl_farming:grow_plant(identifier, pos, node, stages, ignore_light_water)
-	-- number of missed interval ticks, for catch-up in block loading
+function mcl_farming:grow_plant(identifier, pos, node, stages, ignore_light, low_speed)
+	stages = stages or 1
 	local plant_info = plant_lists[identifier]
-	if not plant_info then return end
-	if not ignore_light_water then
-		if (minetest.get_node_light(pos, 0.5) or 0) < 0 then return false end -- day light
-		local odds = floor(25 / (get_moisture_level(pos) * get_same_crop_penalty(pos))) + 1
-		for i = 1,stages do
-			-- compared to info from the MC wiki, our ABM runs a third as often, hence we use triple the chance
-			if random() * odds >= 3 then stages = stages - 1 end
+	local intervals_counter = get_intervals_counter(pos, plant_info.interval, plant_info.chance)
+	if stages > 0 then intervals_counters = intervals_counter - 1 end
+	if low_speed then -- 10% speed approximately
+		if intervals_counter < 1.01 and math.random(0, 9) > 0 then return false end
+		intervals_counter = intervals_counter / 10
+	end
+	if not ignore_light and intervals_counter < 1.5 then
+		local light = minetest.get_node_light(pos)
+		if not light or light < 10 then return false end
+	end
+
+	if intervals_counter >= 1.5 then
+		local average_light_level = get_avg_light_level(pos)
+		if average_light_level < 0.1 then return false end
+		if average_light_level < 10 then
+			intervals_counter = intervals_counter * average_light_level / 10
 		end
 	end
 
-	if stages == 0 then return false end
-	local step = plant_step_from_name[node.name]
+	local step = plant_info.step_from_name[node.name]
 	if step == nil then return false end
-	minetest.set_node(pos, {
-		name = plant_info.names[step + stages] or plant_info.full_grown,
-		param = node.param,
-		param2 = node.param2,
-	})
+	stages = stages + math.floor(intervals_counter)
+	if stages == 0 then return false end
+	local new_node = { name = plant_info.names[step + stages] or plant_info.full_grown }
+	new_node.param = node.param
+	new_node.param2 = node.param2
+	minetest.set_node(pos, new_node)
 	return true
 end
 
@@ -173,13 +157,40 @@ end
 
 
 function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, stem_itemstring, stem_def, stem_drop, gourd_itemstring, gourd_def, grow_interval, grow_chance, connected_stem_texture)
-	grow_interval = growth_factor > 0 and (grow_interval / growth_factor) or 0
 	local connected_stem_names = {
 		connected_stem_basename .. "_r",
 		connected_stem_basename .. "_l",
 		connected_stem_basename .. "_t",
 		connected_stem_basename .. "_b" }
 
+	-- Connect the stem at stempos to the first neighboring gourd block.
+	-- No-op if not a stem or no gourd block found
+	local function try_connect_stem(stempos)
+		local stem = minetest.get_node(stempos)
+		if stem.name ~= full_unconnected_stem then return false end
+		-- four directions, but avoid table allocation
+		local neighbor = vector.offset(stempos, 1, 0, 0)
+		if minetest.get_node(neighbor).name == gourd_itemstring then
+			minetest.swap_node(stempos, { name = connected_stem_names[1] })
+			return true
+		end
+		local neighbor = vector.offset(stempos, -1, 0, 0)
+		if minetest.get_node(neighbor).name == gourd_itemstring then
+			minetest.swap_node(stempos, { name = connected_stem_names[2] })
+			return true
+		end
+		local neighbor = vector.offset(stempos, 0, 0, 1)
+		if minetest.get_node(neighbor).name == gourd_itemstring then
+			minetest.swap_node(stempos, { name = connected_stem_names[3] })
+			return true
+		end
+		local neighbor = vector.offset(stempos, 0, 0, -1)
+		if minetest.get_node(neighbor).name == gourd_itemstring then
+			minetest.swap_node(stempos, { name = connected_stem_names[4] })
+			return true
+		end
+	end
+
 	-- Register gourd
 	if not gourd_def.after_destruct then
 		gourd_def.after_destruct = function(blockpos, oldnode)
@@ -189,21 +200,34 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 			local stempos = vector.offset(blockpos, -1, 0, 0)
 			if minetest.get_node(stempos).name == connected_stem_names[1] then
 				minetest.swap_node(stempos, { name = full_unconnected_stem })
+				try_connect_stem(stempos)
 			end
 			local stempos = vector.offset(blockpos, 1, 0, 0)
 			if minetest.get_node(stempos).name == connected_stem_names[2] then
 				minetest.swap_node(stempos, { name = full_unconnected_stem })
+				try_connect_stem(stempos)
 			end
 			local stempos = vector.offset(blockpos, 0, 0, -1)
 			if minetest.get_node(stempos).name == connected_stem_names[3] then
 				minetest.swap_node(stempos, { name = full_unconnected_stem })
+				try_connect_stem(stempos)
 			end
 			local stempos = vector.offset(blockpos, 0, 0, 1)
 			if minetest.get_node(stempos).name == connected_stem_names[4] then
 				minetest.swap_node(stempos, { name = full_unconnected_stem })
+				try_connect_stem(stempos)
 			end
 		end
 	end
+	if not gourd_def.on_construct then
+		function gourd_def.on_construct(blockpos)
+			-- Connect all unconnected stems at full size
+			try_connect_stem(vector.offset(blockpos, 1, 0, 0))
+			try_connect_stem(vector.offset(blockpos, -1, 0, 0))
+			try_connect_stem(vector.offset(blockpos, 0, 0, 1))
+			try_connect_stem(vector.offset(blockpos, 0, 0, -1))
+		end
+	end
 	minetest.register_node(gourd_itemstring, gourd_def)
 
 	-- Register unconnected stem
@@ -219,8 +243,8 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 	stem_def.drop = stem_def.drop or stem_drop
 	stem_def.groups = stem_def.groups or { dig_immediate = 3, not_in_creative_inventory = 1, plant = 1, attached_node = 1, dig_by_water = 1, destroy_by_lava_flow = 1 }
 	stem_def.sounds = stem_def.sounds or mcl_sounds.node_sound_leaves_defaults()
+	stem_def.on_construct = stem_def.on_construct or try_connect_stem
 	minetest.register_node(stem_itemstring, stem_def)
-	plant_nodename_to_id[stem_itemstring] = stem_itemstring
 
 	-- Register connected stems
 
@@ -283,14 +307,22 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 			sounds = mcl_sounds.node_sound_leaves_defaults(),
 			_mcl_blast_resistance = 0,
 		})
-		plant_nodename_to_id[connected_stem_names[i]] = stem_itemstring
 
 		if minetest.get_modpath("doc") then
 			doc.add_entry_alias("nodes", full_unconnected_stem, "nodes", connected_stem_names[i])
 		end
 	end
 
-	if grow_interval == 0 then return end
+	-- Check for a suitable spot to grow
+	local function check_neighbor_soil(blockpos)
+		if minetest.get_node(blockpos).name ~= "air" then return false end
+		local floorpos = vector.offset(blockpos, 0, -1, 0)
+		local floorname = minetest.get_node(floorpos).name
+		if floorname == "mcl_core:dirt" then return true end
+		local floordef = minetest.registered_nodes[floorname]
+		return floordef.groups.grass_block or floordef.groups.dirt or (floordef.groups.soil or 0) >= 2
+	end
+
 	minetest.register_abm({
 		label = "Grow gourd stem to gourd (" .. full_unconnected_stem .. " → " .. gourd_itemstring .. ")",
 		nodenames = { full_unconnected_stem },
@@ -298,27 +330,39 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		interval = grow_interval,
 		chance = grow_chance,
 		action = function(stempos)
-			local light = minetest.get_node_light(stempos, 0.5)
-			if not light or light < 9 then return end
-			-- Pick one neighbor and check if it can be used to grow
-			local dir = random(1, 4) -- pick direction at random
-			local neighbor = (dir == 1 and vector.offset(stempos, 1, 0, 0))
-				or (dir == 2 and vector.offset(stempos, -1, 0, 0))
-				or (dir == 3 and vector.offset(stempos, 0, 0, 1))
-				or  vector.offset(stempos, 0, 0, -1)
-			if minetest.get_node(neighbor).name ~= "air" then return end -- occupied
-			-- check for suitable floor -- in contrast to MC, we think everything solid is fine
-			local floorpos = vector.offset(neighbor, 0, -1, 0)
-			local floorname = minetest.get_node(floorpos).name
-			local floordef = minetest.registered_nodes[floorname]
-			if not floordef or not floordef.walkable then return end
-
-			-- check moisture level
-			local odds = floor(25 / (get_moisture_level(stempos) * get_same_crop_penalty(stempos))) + 1
-			-- we triple the odds, and rather call the ABM less often
-			if random() * odds >= 3 then return end
+			local light = minetest.get_node_light(stempos)
+			if not light or light <= 10 then return end
+			-- Check the four neighbors and filter out neighbors where gourds can't grow
+			local neighbor, dir, nchance = nil, -1, 1 -- reservoir sampling
+			if nchance == 1 or math.random(1, nchance) == 1 then
+				local blockpos = vector.offset(stempos, 1, 0, 0)
+				if check_neighbor_soil(blockpos) then
+					neighbor, dir, nchance = blockpos, 1, nchance + 1
+				end
+			end
+			if nchance == 1 or math.random(1, nchance) == 1 then
+				local blockpos = vector.offset(stempos, -1, 0, 0)
+				if check_neighbor_soil(blockpos) then
+					neighbor, dir, nchance = blockpos, 2, nchance + 1
+				end
+			end
+			if nchance == 1 or math.random(1, nchance) == 1 then
+				local blockpos = vector.offset(stempos, 0, 0, 1)
+				if check_neighbor_soil(blockpos) then
+					neighbor, dir, nchance = blockpos, 3, nchance + 1
+				end
+			end
+			if nchance == 1 or math.random(1, nchance) == 1 then
+				local blockpos = vector.offset(stempos, 0, 0, -1)
+				if check_neighbor_soil(blockpos) then
+					neighbor, dir, nchance = blockpos, 4, nchance + 1
+				end
+			end
 
+			-- Gourd needs at least 1 free neighbor to grow
+			if not neighbor then return end
 			minetest.swap_node(stempos, { name = connected_stem_names[dir] })
+			-- Place the gourd
 			if gourd_def.paramtype2 == "facedir" then
 				local p2 = (dir == 1 and 3) or (dir == 2 and 1) or (dir == 3 and 2) or 0
 				minetest.add_node(neighbor, { name = gourd_itemstring, param2 = p2 })
@@ -327,7 +371,8 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 			end
 
 			-- Reset farmland, etc. to dirt when the gourd grows on top
-			if (floordef.groups.dirtifies_below_solid or 0) > 0 then
+			local floorpos = vector.offset(neighbor, 0, -1, 0)
+			if minetest.get_item_group(minetest.get_node(floorpos).name, "dirtifies_below_solid") == 1 then
 				minetest.set_node(floorpos, { name = "mcl_core:dirt" })
 			end
 		end,
@@ -364,21 +409,10 @@ minetest.register_lbm({
 	nodenames = { "group:plant" },
 	run_at_every_load = true,
 	action = function(pos, node, dtime_s)
-		local identifier = plant_nodename_to_id[node.name]
+		local identifier = plant_nodename_to_id_list[node.name]
 		if not identifier then return end
-
-		local plant_info = plant_lists[identifier]
-		if not plant_info then return end
-		local rolls = floor(dtime_s / plant_info.interval)
-		if rolls <= 0 then return end
-		-- simulate how often the block will be ticked
-		local stages = 0
-		for i = 1,rolls do
-			if random(1, plant_info.chance) == 1 then stages = stages + 1 end
-		end
-		if stages > 0 then
-			mcl_farming:grow_plant(identifier, pos, node, stages, false)
-		end
+		local low_speed = minetest.get_node(vector.offset(pos, 0, -1, 0)).name ~= "mcl_farming:soil_wet"
+		mcl_farming:grow_plant(identifier, pos, node, 0, false, low_speed)
 	end,
 })
 

mods/ITEMS/mcl_farming/soil.lua

@@ -15,6 +15,10 @@ minetest.register_node("mcl_farming:soil", {
 			{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
 		}
 	},
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_int("wet", 0)
+	end,
 	groups = {handy=1,shovely=1, dirtifies_below_solid=1, dirtifier=1, soil=2, soil_sapling=1, deco_block=1 },
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
 	_mcl_blast_resistance = 0.6,
@@ -34,6 +38,10 @@ minetest.register_node("mcl_farming:soil_wet", {
 			{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
 		}
 	},
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_int("wet", 7)
+	end,
 	groups = {handy=1,shovely=1, not_in_creative_inventory=1, dirtifies_below_solid=1, dirtifier=1, soil=3, soil_sapling=1 },
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
 	_mcl_blast_resistance = 0.6,
@@ -43,54 +51,75 @@ minetest.register_node("mcl_farming:soil_wet", {
 minetest.register_abm({
 	label = "Farmland hydration",
 	nodenames = {"mcl_farming:soil", "mcl_farming:soil_wet"},
-	interval = 2.73,
-	chance = 25,
+	interval = 15,
+	chance = 4,
 	action = function(pos, node)
+		-- Get wetness value
+		local meta = minetest.get_meta(pos)
+		local wet = meta:get_int("wet")
+		if not wet then
+			if node.name == "mcl_farming:soil" then
+				wet = 0
+			else
+				wet = 7
+			end
+		end
+
 		-- Turn back into dirt when covered by solid node
-		local above_node = minetest.get_node_or_nil(vector.offset(pos, 0, 1, 0))
-		if above_node and minetest.get_item_group(above_node.name, "solid") ~= 0 then
-			node.name = "mcl_core:dirt"
-			minetest.set_node(pos, node)
-			return
+		local above_node = minetest.get_node_or_nil({x=pos.x,y=pos.y+1,z=pos.z})
+		if above_node then
+			if minetest.get_item_group(above_node.name, "solid") ~= 0 then
+				node.name = "mcl_core:dirt"
+				minetest.set_node(pos, node)
+				return
+			end
 		end
 
-		-- in rain, become wet, do not decay
-		if mcl_weather and mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
-			if node.name == "mcl_farming:soil" then
+		-- Check an area of 9×2×9 around the node for nodename (9×9 on same level and 9×9 below)
+		local function check_surroundings(pos, nodename)
+			local nodes = minetest.find_nodes_in_area({x=pos.x-4,y=pos.y,z=pos.z-4}, {x=pos.x+4,y=pos.y+1,z=pos.z+4}, {nodename})
+			return #nodes > 0
+		end
+
+		if check_surroundings(pos, "group:water") then
+			if node.name ~= "mcl_farming:soil_wet" then
+				-- Make it wet
 				node.name = "mcl_farming:soil_wet"
 				minetest.set_node(pos, node)
 			end
-			return
-		end
+		else -- No water nearby.
+			-- The decay branch (make farmland dry or turn back to dirt)
 
-		-- Check an area of 9x2x9 around the node for nodename (9x9 on same level and 9x9 above)
-		-- include "ignore" to detect unloaded blocks
-		local nodes, counts = minetest.find_nodes_in_area(vector.offset(pos, -4, 0, -4), vector.offset(pos, 4, 1, 4), {"group:water", "ignore"})
-		local ignore = counts.ignore or 0
-		local has_water, fully_loaded = #nodes > ignore, ignore == 0
-
-		-- Hydrate by rain or water, do not decay
-		if has_water then
-			if node.name == "mcl_farming:soil" then
-				node.name = "mcl_farming:soil_wet"
-				minetest.set_node(pos, node)
+			-- Don't decay while it's raining
+			if mcl_weather.rain.raining then
+				if mcl_weather.is_outdoor(pos) then
+					return
+				end
 			end
-			return
-		end
-		-- No decay near unloaded areas (ignore) since these might include water.
-		if not fully_loaded then return end
+			-- No decay near unloaded areas since these might include water.
+			if not check_surroundings(pos, "ignore") then
+				if wet <= 0 then
+					--local n_def = minetest.registered_nodes[node.name] or nil
+					local nn = minetest.get_node_or_nil({x=pos.x,y=pos.y+1,z=pos.z})
+					if not nn or not nn.name then
+						return
+					end
+					local nn_def = minetest.registered_nodes[nn.name] or nil
 
-		-- Decay: make wet farmland dry up
-		if node.name == "mcl_farming:soil_wet" then
-			node.name = "mcl_farming:soil"
-			minetest.set_node(pos, node)
-			return
-		end
-		-- Revert to dirt if wetness is 0, and no plant above
-		local above = minetest.get_node_or_nil(vector.offset(pos, 0, 1, 0))
-		if minetest.get_item_group(above.name, "plant") == 0 then
-			node.name = "mcl_core:dirt"
-			minetest.set_node(pos, node)
+					if nn_def and minetest.get_item_group(nn.name, "plant") == 0 then
+						node.name = "mcl_core:dirt"
+						minetest.set_node(pos, node)
+						return
+					end
+				else
+					if wet == 7 then
+						node.name = "mcl_farming:soil"
+						minetest.swap_node(pos, node)
+					end
+					-- Slowly count down wetness
+					meta:set_int("wet", wet-1)
+				end
+			end
 		end
 	end,
 })

mods/ITEMS/mcl_farming/sweet_berry.lua

@@ -12,25 +12,6 @@ for i=0, 3 do
 	local drop_berries = (i >= 2)
 	local berries_to_drop = drop_berries and {i - 1, i} or nil
 
-	local on_bonemealing = nil
-	local function do_berry_drop(pos)
-		for j=1, berries_to_drop[math.random(2)] do
-			minetest.add_item(pos, "mcl_farming:sweet_berry")
-		end
-		minetest.swap_node(pos, {name = "mcl_farming:sweet_berry_bush_1"})
-	end
-	if i ~= 3 then
-		on_bonemealing = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local node = minetest.get_node(pos)
-			return mcl_farming:grow_plant("plant_sweet_berry_bush", pos, node, 0, true)
-		end
-	else
-		on_bonemealing = function(itemstack, placer, pointed_thing)
-			do_berry_drop(pointed_thing.under)
-		end
-	end
-
 	minetest.register_node(node_name, {
 		drawtype = "plantlike",
 		tiles = {texture},
@@ -64,7 +45,6 @@ for i=0, 3 do
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
 		_mcl_hardness = 0,
-		_on_bone_meal = on_bonemealing,
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			local pn = clicker:get_player_name()
 			if clicker:is_player() and minetest.is_protected(pos, pn) then
@@ -80,13 +60,11 @@ for i=0, 3 do
 				return
 			end
 
-			if i >= 2 then
-				do_berry_drop(pos)
-			else
-				-- Use bonemeal
-				if mcl_bone_meal and clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
-					return mcl_bone_meal.use_bone_meal(itemstack, clicker, pointed_thing)
+			if drop_berries then
+				for j=1, berries_to_drop[math.random(2)] do
+					minetest.add_item(pos, "mcl_farming:sweet_berry")
 				end
+				minetest.swap_node(pos, {name = "mcl_farming:sweet_berry_bush_1"})
 			end
 			return itemstack
 		end,
@@ -121,8 +99,8 @@ minetest.register_craftitem("mcl_farming:sweet_berry", {
 })
 minetest.register_alias("mcl_sweet_berry:sweet_berry", "mcl_farming:sweet_berry")
 
--- TODO: Find proper interval and chance values for sweet berry bushes. Current interval and chance values are copied from mcl_farming:beetroot which has similar growth stages, 2/3rd of the default.
-mcl_farming:add_plant("plant_sweet_berry_bush", "mcl_farming:sweet_berry_bush_3", {"mcl_farming:sweet_berry_bush_0", "mcl_farming:sweet_berry_bush_1", "mcl_farming:sweet_berry_bush_2"}, 8.7019, 35)
+-- TODO: Find proper interval and chance values for sweet berry bushes. Current interval and chance values are copied from mcl_farming:beetroot which has similar growth stages.
+mcl_farming:add_plant("plant_sweet_berry_bush", "mcl_farming:sweet_berry_bush_3", {"mcl_farming:sweet_berry_bush_0", "mcl_farming:sweet_berry_bush_1", "mcl_farming:sweet_berry_bush_2"}, 68, 3)
 
 local function berry_damage_check(obj)
 	local p = obj:get_pos()

mods/ITEMS/mcl_farming/wheat.lua

@@ -60,12 +60,6 @@ for i=1,7 do
 			dig_by_water=1,destroy_by_lava_flow=1, dig_by_piston=1},
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		_mcl_blast_resistance = 0,
-		_on_bone_meal = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			local n = minetest.get_node(pos)
-			local stages = math.random(2, 5)
-			return mcl_farming:grow_plant("plant_wheat", pos, n, stages, true)
-		end
 	})
 end
 
@@ -105,7 +99,7 @@ minetest.register_node("mcl_farming:wheat", {
 	}
 })
 
-mcl_farming:add_plant("plant_wheat", "mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3", "mcl_farming:wheat_4", "mcl_farming:wheat_5", "mcl_farming:wheat_6", "mcl_farming:wheat_7"}, 5.8020, 35)
+mcl_farming:add_plant("plant_wheat", "mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3", "mcl_farming:wheat_4", "mcl_farming:wheat_5", "mcl_farming:wheat_6", "mcl_farming:wheat_7"}, 25, 20)
 
 minetest.register_craftitem("mcl_farming:wheat_item", {
 	description = S("Wheat"),

mods/ITEMS/mcl_fire/init.lua

@@ -44,12 +44,34 @@ shuffle_table(adjacents)
 local function has_flammable(pos)
 	for k,v in pairs(adjacents) do
 		local p=vector.add(pos,v)
-		local n=minetest.get_node_or_nil(p)
-		if n and minetest.get_item_group(n.name, "flammable") ~= 0 then
+		local n=get_node_or_nil(p)
+		if n and get_item_group(n.name, "flammable") ~= 0 then
 			return p
 		end
 	end
 end
+local all_adjacents = {}
+for x = 0,1 do
+	for y = 0,1 do
+		for z = 0,1 do
+			all_adjacents[#all_adjacents+1] = vector.new(x*2-1, y*2-1, z*2-1)
+		end
+	end
+end
+
+local function get_adjacent_fire_age(pos)
+	local lowest_age = nil
+	for k,v in pairs(all_adjacents) do
+		local p = vector.add(pos, v)
+		local node = get_node_or_nil(p)
+		if node and get_item_group(node.name, "fire") ~= 0 then
+			if not lowest_age or node.param2 < lowest_age then
+				lowest_age = node.param2
+			end
+		end
+	end
+	return lowest_age
+end
 
 local smoke_pdef = {
 	amount = 0.009,
@@ -90,7 +112,40 @@ else
 	eternal_fire_help = S("Eternal fire is a damaging block. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.")
 end
 
-local function spawn_fire(pos, age)
+-- exponential constant is such that at age=255, p=0.5%
+local K1 = ( math.log(0.005) / math.log(10) ) / 255
+local function spawn_fire(pos, age, force)
+	if not age then
+		minetest.log("warning","No age specified at "..debug.traceback())
+
+		-- Get adjacent age
+		local adjacent_age = get_adjacent_fire_age(pos)
+
+		-- Don't create new fire if we can't find adjacent fire from this position
+		if not adjacent_age then return end
+
+		age = adjacent_age + math.ceil(minetest.get_humidity(pos)/10) + math.random(5)
+	end
+	if age <= 1 then
+		minetest.log("warning","new flash point at "..vector.to_string(pos).." age="..tostring(age)..",backtrace = "..debug.traceback())
+	end
+	if age >= 255 then
+		age = 255
+	end
+
+	local node = get_node(pos)
+	local node_is_flammable = get_item_group(node.name, "flammable")
+
+	-- Limit fire spread
+	local probability_age = age
+	if node_is_flammable then
+		probability_age = probability_age * 0.80
+	end
+	local probability = math.pow(10,K1 * probability_age)
+	if not force and math.random(65536)/65536 >= probability then
+		return
+	end
+
 	set_node(pos, {name="mcl_fire:fire", param2 = age})
 	minetest.check_single_for_falling({x=pos.x, y=pos.y+1, z=pos.z})
 end
@@ -358,19 +413,47 @@ if not fire_enabled then
 
 else -- Fire enabled
 
+	-- Extinguish parameters
+	local C2 = math.log(1/20) / math.log(10)
+	local K2 = -C2 / 255
+
 	-- Fire Spread
 	minetest.register_abm({
 		label = "Ignite flame",
 		nodenames ={"mcl_fire:fire","mcl_fire:eternal_fire"},
 		interval = 7,
-		chance = 12,
+		chance = 5,
 		catch_up = false,
 		action = function(pos)
+			local node = get_node(pos)
+			local age = node.param2
+
+			-- Always age the source fire
+			age = age + math.ceil(minetest.get_humidity(pos)/10) + math.random(5)
+			if age > 255 then age = 255 end
+			node.param2 = age
+
 			local p = get_ignitable(pos)
 			if p then
-				spawn_fire(p)
+				-- Spawn new fire with an age based on this node's age
+				spawn_fire(p, age + math.ceil(minetest.get_humidity(p)/10) + math.random(5))
 				shuffle_table(adjacents)
 			end
+
+			if node.name ~= "mcl_fire:eternal_fire" then
+				-- Randomly extinguish fires with increasing probability the older they are
+				local extinguish_probability = math.pow(10,K2 * age + C2)
+				if math.random(65536)/65536 <= extinguish_probability then
+					node.name = "air"
+					node.param2 = 0
+
+				-- Extinguish fires not adjacent to flammable materials
+				elseif not has_flammable(pos) then
+					node.name = "air"
+					node.param2 = 0
+				end
+			end
+			set_node(pos, node)
 		end
 	})
 
@@ -385,26 +468,7 @@ else -- Fire enabled
 		action = function(pos)
 			local p=get_ignitable_by_lava(pos)
 			if p then
-				spawn_fire(p)
-			end
-		end,
-	})
-
-	minetest.register_abm({
-		label = "Remove fires",
-		nodenames = {"mcl_fire:fire"},
-		interval = 7,
-		chance = 3,
-		catch_up = false,
-		action = function(pos)
-			local p=has_flammable(pos)
-			if p then
-				local n=minetest.get_node_or_nil(p)
-				if n and minetest.get_item_group(n.name, "flammable") < 1 then
-					minetest.remove_node(pos)
-				end
-			else
-				minetest.remove_node(pos)
+				spawn_fire(p, 0)
 			end
 		end,
 	})
@@ -423,15 +487,27 @@ else -- Fire enabled
 				return
 			end
 
-			local nn = minetest.get_node(p).name
-			local def = minetest.registered_nodes[nn]
-			local fgroup = minetest.get_item_group(nn, "flammable")
+			local node = get_node(p)
+			local node_name = node.name
+			local def = minetest.registered_nodes[node_name]
+			local fgroup = minetest.get_item_group(node_name, "flammable")
 
 			if def and def._on_burn then
 				def._on_burn(p)
 			elseif fgroup ~= -1 then
-				spawn_fire(p)
+				local source_node = get_node(pos)
+				local age = source_node.param2
+
+				spawn_fire(p, age + math.ceil(minetest.get_humidity(p)/10) + math.random(5), true)
 				minetest.check_for_falling(p)
+
+				if source_node.name == "mcl_fire:fire" then
+					-- Always age the source fire
+					age = age + math.ceil(minetest.get_humidity(pos)/10) + math.random(5)
+					if age > 255 then age = 255 end
+					source_node.param2 = age
+					set_node(pos, source_node)
+				end
 			end
 		end
 	})
@@ -454,17 +530,17 @@ function mcl_fire.set_fire(pointed_thing, player, allow_on_fire)
 		return
 	end
 
-	local n_pointed = minetest.get_node(pointed_thing.under)
+	local n_pointed = get_node(pointed_thing.under)
 	if allow_on_fire == false and get_item_group(n_pointed.name, "fire") ~= 0 then
 		return
 	end
 
-	local n_fire_pos = minetest.get_node(pointed_thing.above)
+	local n_fire_pos = get_node(pointed_thing.above)
 	if n_fire_pos.name ~= "air" then
 		return
 	end
 
-	local n_below = minetest.get_node(vector.offset(pointed_thing.above, 0, -1, 0))
+	local n_below = get_node(vector.offset(pointed_thing.above, 0, -1, 0))
 	if minetest.get_item_group(n_below.name, "water") ~= 0 then
 		return
 	end

mods/ITEMS/mcl_flowers/bonemealing.lua

@@ -1,136 +0,0 @@
--- bonemealing grass nodes
---
--- When bonemealing "mcl_core:dirt_with_grass", it spawns grass and flowers
--- over a 7x7 patch of adjacent grassy nodes.
---
--- Because of potential dependency complications it is not advisable to add
--- callbacks to mcl_core that create dependencies on mods that depend on
--- mcl_core, such as mcl_flowers.
---
--- To work around this restriction, the bonemealing callback is defined here
--- and the _on_bone_meal callback in "mcl_core:dirt_with_grass" node
--- definition is overwritten with it.
-
-local mg_name = minetest.get_mapgen_setting("mg_name")
-
-local flowers_table_simple = {
-	"mcl_flowers:dandelion",
-	"mcl_flowers:poppy",
-}
-local flowers_table_plains = {
-	"mcl_flowers:dandelion",
-	"mcl_flowers:dandelion",
-	"mcl_flowers:poppy",
-	"mcl_flowers:oxeye_daisy",
-	"mcl_flowers:tulip_orange",
-	"mcl_flowers:tulip_red",
-	"mcl_flowers:tulip_white",
-	"mcl_flowers:tulip_pink",
-	"mcl_flowers:azure_bluet",
-}
-local flowers_table_swampland = {
-	"mcl_flowers:blue_orchid",
-}
-local flowers_table_flower_forest = {
-	"mcl_flowers:dandelion",
-	"mcl_flowers:poppy",
-	"mcl_flowers:oxeye_daisy",
-	"mcl_flowers:tulip_orange",
-	"mcl_flowers:tulip_red",
-	"mcl_flowers:tulip_white",
-	"mcl_flowers:tulip_pink",
-	"mcl_flowers:azure_bluet",
-	"mcl_flowers:allium",
-}
-
-local biome_flowers_tables = {
-	["Plains"] = flowers_table_plains,
-	["Plains_beach"] = flowers_table_plains,
-	["Plains_ocean"] = flowers_table_plains,
-	["Plains_deep_ocean"] = flowers_table_plains,
-	["Plains_underground"] = flowers_table_plains,
-	["SunflowerPlains"] = flowers_table_plains,
-	["SunflowerPlains_ocean"] = flowers_table_plains,
-	["SunflowerPlains_deep_ocean"] = flowers_table_plains,
-	["SunflowerPlains_underground"] = flowers_table_plains,
-	["Swampland"] = flowers_table_swampland,
-	["Swampland_shore"] = flowers_table_swampland,
-	["Swampland_ocean"] = flowers_table_swampland,
-	["Swampland_deep_ocean"] = flowers_table_swampland,
-	["Swampland_underground"] = flowers_table_swampland,
-	["FlowerForest"] = flowers_table_flower_forest,
-	["FlowerForest_beach"] = flowers_table_flower_forest,
-	["FlowerForest_ocean"] = flowers_table_flower_forest,
-	["FlowerForest_deep_ocean"] = flowers_table_flower_forest,
-	["FlowerForest_underground"] = flowers_table_flower_forest,
-}
-
--- Randomly generate flowers, tall grass or nothing
--- pos: node to place into
--- color: param2 value for tall grass
---
-local function add_random_flower(pos, color)
-	-- 90% tall grass, 10% flower
-	local rnd = math.random(1,100)
-	if rnd <= 60 then
-		minetest.add_node(pos, {name="mcl_flowers:tallgrass", param2=color})
-	elseif rnd <= 80 then
-		-- double tallgrass
-		local toppos = vector.offset(pos, 0, 1, 0)
-		local topnode = minetest.get_node(toppos)
-		if minetest.registered_nodes[topnode.name].buildable_to then
-			minetest.set_node(pos, { name = "mcl_flowers:double_grass", param2 = color })
-			minetest.set_node(toppos, { name = "mcl_flowers:double_grass_top", param2 = color })
-			return true
-		end
-	else
-		local flowers_table
-		if mg_name == "v6" then
-			flowers_table = flowers_table_plains
-		else
-			local biome = minetest.get_biome_name(minetest.get_biome_data(pos).biome)
-			flowers_table = biome_flowers_tables[biome] or flowers_table_simple
-		end
-		minetest.add_node(pos, {name=flowers_table[math.random(1, #flowers_table)]})
-	end
-end
-
---- Generate tall grass and random flowers in a 7x7 area
--- Bonemealing callback handler for "mcl_core:dirt_with_grass"
---
-local function bonemeal_grass(pointed_thing, placer)
-	local pos, below, r, color
-	for i = -7, 7 do for j = -7, 7 do for y = -1, 1 do
-		pos = vector.offset(pointed_thing.above, i, y, j)
-		if minetest.get_node(pos).name == "air" then
-			below = minetest.get_node(vector.offset(pos, 0, -1, 0))
-			r = ((math.abs(i) + math.abs(j)) / 2)
-			if (minetest.get_item_group(below.name, "grass_block_no_snow") == 1) and
-					math.random(1, 100) <= 90 / r then
-				color = below.param2
-				add_random_flower(pos, color)
-				if math.random(1,5) == 1 then
-					mcl_bone_meal.add_bone_meal_particle(pos)
-				end
-			end
-		end
-	end end end
-	return true
-end
-
--- Override "mcl_core:dirt_with_grass" bonemealing handler.
-local nodename = "mcl_core:dirt_with_grass"
-local olddef = minetest.registered_nodes[nodename]
-if not olddef then
-	minetest.log("warning", "'mcl_core:dirt_with_grass' not registered, cannot add override!")
-else
-	local oldhandler = olddef._on_bone_meal
-	local newhandler = function(itemstack, placer, pointed_thing)
-		local res = bonemeal_grass(pointed_thing, placer)
-		if oldhandler then
-			res = oldhandler(itemstack, placer, pointed_thing) or res
-		end
-		return res
-	end
-	minetest.override_item(nodename, {_on_bone_meal = newhandler})
-end

mods/ITEMS/mcl_flowers/init.lua

@@ -162,18 +162,6 @@ local def_tallgrass = {
 	_mcl_fortune_drop = fortune_wheat_seed_drop,
 	node_placement_prediction = "",
 	on_place = on_place_flower,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		local n = minetest.get_node(pos)
-		-- Grow into double tallgrass
-		local toppos = vector.offset(pos, 0, 1, 0)
-		local topnode = minetest.get_node(toppos)
-		if minetest.registered_nodes[topnode.name].buildable_to then
-			minetest.set_node(pos, { name = "mcl_flowers:double_grass", param2 = n.param2 })
-			minetest.set_node(toppos, { name = "mcl_flowers:double_grass_top", param2 = n.param2 })
-			return true
-		end
-	end,
 	_mcl_blast_resistance = 0,
 	_mcl_hardness = 0,
 }
@@ -192,18 +180,6 @@ def_fern.selection_box = {
 	fixed = { -6/16, -0.5, -6/16, 6/16, 5/16, 6/16 },
 }
 def_fern.groups.compostability = 65
-def_fern._on_bone_meal = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.under
-		local n = minetest.get_node(pos)
-		-- Grow into double fern.
-		local toppos = vector.offset(pos, 0, 1, 0)
-		local topnode = minetest.get_node(toppos)
-		if minetest.registered_nodes[topnode.name].buildable_to then
-			minetest.set_node(pos, { name = "mcl_flowers:double_fern", param2 = n.param2 })
-			minetest.set_node(toppos, { name = "mcl_flowers:double_fern_top", param2 = n.param2 })
-			return true
-		end
-	end
 
 minetest.register_node("mcl_flowers:fern", def_fern)
 
@@ -267,16 +243,10 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 	if name == "double_grass" then
 		bottom_groups.compostability = 50
 	end
-	local on_bonemealing
 	if is_flower then
 		bottom_groups.flower = 1
 		bottom_groups.place_flowerlike = 1
 		bottom_groups.dig_immediate = 3
-		on_bonemealing = function(itemstack, placer, pointed_thing)
-			local pos = pointed_thing.under
-			minetest.add_item(pos, "mcl_flowers:"..name)
-			return true
-		end
 	else
 		bottom_groups.place_flowerlike = 2
 		bottom_groups.handy = 1
@@ -411,7 +381,6 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 				minetest.remove_node(top)
 			end
 		end,
-		_on_bone_meal = on_bonemealing,
 		groups = bottom_groups,
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 		mesh = mesh
@@ -450,7 +419,6 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 				minetest.remove_node(bottom)
 			end
 		end,
-		_on_bone_meal = on_bonemealing,
 		groups = top_groups,
 		sounds = mcl_sounds.node_sound_leaves_defaults(),
 	})
@@ -604,6 +572,3 @@ if mod_mcimport and mg_name == "singlenode" and fix_doubleplants == true then
 end
 
 dofile(modpath.."/register.lua")
-
--- Bonemealing handler and override for "mcl_core:dirt_with_grass":
-dofile(modpath.."/bonemealing.lua")

mods/ITEMS/mcl_flowers/mod.conf

@@ -1,3 +1,3 @@
 name=mcl_flowers
-depends=mcl_core, mcl_util, mcl_sounds, mcl_bone_meal
-optional_depends=screwdriver, doc, mcl_flowerpots
+depends=mcl_core, mcl_util, mcl_sounds
+optional_depends=screwdriver, doc, mcl_flowerpots

mods/ITEMS/mcl_mushrooms/small.lua

@@ -1,8 +1,5 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
-local modpath = minetest.get_modpath(minetest.get_current_modname())
-local schempath = modpath .. "/schematics/"
-
 local on_place = mcl_util.generate_on_place_plant_function(function(place_pos, place_node)
 	local soil_node = minetest.get_node_or_nil({x=place_pos.x, y=place_pos.y-1, z=place_pos.z})
 	if not soil_node then return false end
@@ -19,40 +16,6 @@ local on_place = mcl_util.generate_on_place_plant_function(function(place_pos, p
 	return ((snn == "mcl_core:podzol" or snn == "mcl_core:podzol_snow" or snn == "mcl_core:mycelium" or snn == "mcl_core:mycelium_snow") or (light_ok and minetest.get_item_group(snn, "solid") == 1 and minetest.get_item_group(snn, "opaque") == 1))
 end)
 
--- Try to grow huge mushroom
-local function apply_bonemeal(pos, schematic, offset)
-	-- Must be on a dirt-type block
-	local below = minetest.get_node(vector.offset(pos, 0, -1, 0))
-	if minetest.get_item_group(below.name, "grass_block") ~= 1
-			and below.name ~= "mcl_core:mycelium"
-			and below.name ~= "mcl_core:dirt"
-			and below.name ~= "mcl_core:coarse_dirt"
-			and below.name ~= "mcl_core:podzol" then
-		return false
-	end
-	-- 40% chance
-	if math.random(1, 100) <= 40 then
-		-- Check space requirements
-		for i= 1, 3 do
-			local cpos = vector.offset(pos, 0, i, 0)
-			if minetest.get_node(cpos).name ~= "air" then
-				return false
-			end
-		end
-		local minp = vector.offset(pos, -3, 3, -3)
-		local maxp = vector.offset(pos, 3, 8, 3)
-		local diff = maxp - minp
-		local goodnodes = minetest.find_nodes_in_area(minp, maxp, {"air", "group:leaves"})
-		if #goodnodes < (diff.x + 1) * (diff.y + 1) * (diff.z + 1) then
-			return false
-		end
-		-- Place the huge mushroom
-		minetest.remove_node(pos)
-		return minetest.place_schematic(pos + offset, schematic, 0, nil, false)
-	end
-	return false
-end
-
 local longdesc_intro_brown = S("Brown mushrooms are fungi which grow and spread in darkness, but are sensitive to light. They are inedible as such, but they can be used to craft food items.")
 local longdesc_intro_red = S("Red mushrooms are fungi which grow and spread in darkness, but are sensitive to light. They are inedible as such, but they can be used to craft food items.")
 
@@ -88,11 +51,6 @@ minetest.register_node("mcl_mushrooms:mushroom_brown", {
 	},
 	node_placement_prediction = "",
 	on_place = on_place,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local schematic = schempath .. "mcl_mushrooms_huge_brown.mts"
-		local offset = vector.new(-3, -1, -3)
-		return apply_bonemeal(pointed_thing.under, schematic, offset)
-	end,
 	_mcl_blast_resistance = 0,
 })
 
@@ -120,11 +78,6 @@ minetest.register_node("mcl_mushrooms:mushroom_red", {
 	},
 	node_placement_prediction = "",
 	on_place = on_place,
-	_on_bone_meal = function(itemstack, placer, pointed_thing)
-		local schematic = schempath .. "mcl_mushrooms_huge_red.mts"
-		local offset = vector.new(-2, -1, -2)
-		return apply_bonemeal(pointed_thing.under, schematic, offset)
-	end,
 	_mcl_blast_resistance = 0,
 })
 

mods/ITEMS/mcl_ocean/kelp.lua

@@ -196,7 +196,7 @@ function kelp.find_unsubmerged(pos, node, height)
 	for i=1,height do
 		walk_pos.y = y + i
 		local walk_node = mt_get_node(walk_pos)
-		if walk_node.name ~= "ignore" and not kelp.is_submerged(walk_node) then
+		if not kelp.is_submerged(walk_node) then
 			return walk_pos, walk_node, height, i
 		end
 	end

mods/ITEMS/mcl_shields/init.lua

@@ -211,37 +211,16 @@ local function set_interact(player, interact)
 		return
 	end
 	local meta = player:get_meta()
-
-	if interact and meta:get_int("mcl_shields:interact_revoked") ~= 0 then
-		meta:set_int("mcl_shields:interact_revoked", 0)
-		privs.interact = true
-	elseif not interact then
-		meta:set_int("mcl_shields:interact_revoked", privs.interact and 1 or 0)
-		privs.interact = nil
+	if meta:get_int("mcl_privs:interact_revoked") ~= 1 then
+		privs.interact = interact
+		minetest.set_player_privs(player_name, privs)
+		meta:set_int("mcl_privs:interact_revoked",0)
 	end
-
-	minetest.set_player_privs(player_name, privs)
 end
 
--- Prevent player from being able to circumvent interact privilage removal by
--- using shield.
-minetest.register_on_priv_revoke(function(name, revoker, priv)
-	if priv == "interact" and revoker then
-		local player = minetest.get_player_by_name(name)
-		if not player then
-			return
-		end
-		local meta = player:get_meta()
-		meta:set_int("mcl_shields:interact_revoked", 0)
-	end
-end)
-
 local shield_hud = {}
 
 local function remove_shield_hud(player)
-	set_interact(player, true)
-	playerphysics.remove_physics_factor(player, "speed", "shield_speed")
-
 	if not shield_hud[player] then return end --this function takes a long time. only run it when necessary
 	player:hud_remove(shield_hud[player])
 	shield_hud[player] = nil
@@ -252,6 +231,9 @@ local function remove_shield_hud(player)
 	if not hf.wielditem then
 		player:hud_set_flags({wielditem = true})
 	end
+
+	playerphysics.remove_physics_factor(player, "speed", "shield_speed")
+	set_interact(player, true)
 end
 
 local function add_shield_entity(player, i)
@@ -269,11 +251,6 @@ local function remove_shield_entity(player, i)
 	end
 end
 
-local function is_rmb_conflicting_node(nodename)
-	local nodedef = minetest.registered_nodes[nodename] or {}
-	return nodedef.on_rightclick
-end
-
 local function handle_blocking(player)
 	local player_shield = mcl_shields.players[player]
 	local rmb = player:get_player_control().RMB
@@ -282,25 +259,14 @@ local function handle_blocking(player)
 		return
 	end
 
-	local pointed_thing = mcl_util.get_pointed_thing(player, true)
-	local wielded_stack = player:get_wielded_item()
-
 	local shield_in_offhand = mcl_shields.wielding_shield(player, 1)
 	local shield_in_hand = mcl_shields.wielding_shield(player)
 	local not_blocking = player_shield.blocking == 0
 
-	if pointed_thing and pointed_thing.type == "node" then
-		local pointed_node = minetest.get_node(pointed_thing.under)
-		if minetest.get_item_group(pointed_node.name, "container") > 1
-				or is_rmb_conflicting_node(pointed_node.name)
-				or wielded_stack:get_definition().type == "node" then
-			return
-		end
-	end
-
+	local pos = player:get_pos()
 	if shield_in_hand then
 		if not_blocking then
-			minetest.after(0.05, function()
+			minetest.after(0.25, function()
 				if (not_blocking or not shield_in_offhand) and shield_in_hand and rmb then
 					player_shield.blocking = 2
 					set_shield(player, true, 2)
@@ -310,15 +276,22 @@ local function handle_blocking(player)
 			player_shield.blocking = 2
 		end
 	elseif shield_in_offhand then
-		local offhand_can_block = minetest.get_item_group(wielded_item(player), "cannot_block") ~= 1
+		local pointed_thing = mcl_util.get_pointed_thing(player, true)
+		local offhand_can_block = (wielded_item(player) == "" or not pointed_thing)
+		and (minetest.get_item_group(wielded_item(player), "bow") ~= 1 and minetest.get_item_group(wielded_item(player), "crossbow") ~= 1)
+
+		if pointed_thing and pointed_thing.type == "node" then
+			if minetest.get_item_group(minetest.get_node(pointed_thing.under).name, "container") > 1 then
+				return
+			end
+		end
 
 		if not offhand_can_block then
 			return
 		end
 		if not_blocking then
-			minetest.after(0.05, function()
-				if (not_blocking or not shield_in_hand) and shield_in_offhand
-						and rmb and offhand_can_block then
+			minetest.after(0.25, function()
+				if (not_blocking or not shield_in_hand) and shield_in_offhand and rmb  and offhand_can_block then
 					player_shield.blocking = 1
 					set_shield(player, true, 1)
 				end
@@ -371,7 +344,7 @@ local function add_shield_hud(shieldstack, player, blocking)
 		z_index = -200,
 	})
 	playerphysics.add_physics_factor(player, "speed", "shield_speed", 0.5)
-	set_interact(player, false)
+	set_interact(player, nil)
 end
 
 local function update_shield_hud(player, blocking, shieldstack)

mods/ITEMS/mcl_signs/mod.conf

@@ -1,4 +1,4 @@
 name = mcl_signs
 description = New and Improved signs - can be colored and made to glow.
-depends = mcl_core, mcl_sounds, mcl_dye, mcl_colors, mcl_util, mesecons_mvps
+depends = mcl_core, mcl_sounds, mcl_dye, mcl_colors, mcl_util
 optional_depends = doc

mods/ITEMS/mcl_smithing_table/init.lua

@@ -167,12 +167,6 @@ minetest.register_node("mcl_smithing_table:table", {
 	end,
 
 	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local name = player:get_player_name()
-		if minetest.is_protected(pos, name) then
-			minetest.record_protection_violation(pos, name)
-			return 0
-		end
-
 		local stackname = stack:get_name()
 		local def = stack:get_definition()
 		if 			
@@ -193,16 +187,6 @@ minetest.register_node("mcl_smithing_table:table", {
 		return 0
 	end,
 
-	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local name = player:get_player_name()
-		if minetest.is_protected(pos, name) then
-			minetest.record_protection_violation(pos, name)
-			return 0
-		else
-			return stack:get_count()
-		end
-	end,
-
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		return 0
 	end,

mods/ITEMS/mcl_spyglass/init.lua

@@ -6,7 +6,6 @@ minetest.register_tool("mcl_spyglass:spyglass",{
 	inventory_image = "mcl_spyglass.png",
 	stack_max = 1,
 	_mcl_toollike_wield = true,
-	touch_interaction = "short_dig_long_place",
 })
 
 minetest.register_craft({

mods/MAPGEN/tsm_railcorridors/gameconfig.lua

@@ -36,11 +36,7 @@ else
 	end
 end
 
-tsm_railcorridors.carts = {
-	"mcl_minecarts:minecart", "mcl_minecarts:minecart",
-	"mcl_minecarts:chest_minecart", "mcl_minecarts:chest_minecart",
-	"mcl_minecarts:tnt_minecart"
-}
+tsm_railcorridors.carts = { "mcl_minecarts:chest_minecart" }
 
 -- This is called after a spawner has been placed by the game.
 -- Use this to properly set up the metadata and stuff.
@@ -58,11 +54,9 @@ end
 function tsm_railcorridors.on_construct_cart(_, cart, pr_carts)
 	local l = cart:get_luaentity()
 	local inv = mcl_entity_invs.load_inv(l,27)
-	if inv then -- otherwise probably not a chest minecart
-		local items = tsm_railcorridors.get_treasures(pr_carts)
-		mcl_loot.fill_inventory(inv, "main", items, pr_carts)
-		mcl_entity_invs.save_inv(l)
-	end
+	local items = tsm_railcorridors.get_treasures(pr_carts)
+	mcl_loot.fill_inventory(inv, "main", items, pr_carts)
+	mcl_entity_invs.save_inv(l)
 end
 
 -- Fallback function. Returns a random treasure. This function is called for chests

mods/MAPGEN/tsm_railcorridors/init.lua

@@ -397,9 +397,7 @@ end
 -- This is a workaround thanks to the fact that minetest.add_entity is unreliable as fuck
 -- See: https://github.com/minetest/minetest/issues/4759
 -- FIXME: Kill this horrible hack with fire as soon you can.
-local RecheckCartHack = nil
-if not minetest.features.random_state_restore then -- proxy for minetest > 5.9.0, this feature will not be removed
-RecheckCartHack = function(params)
+local function RecheckCartHack(params)
 	local pos = params[1]
 	local cart_id = params[2]
 	-- Find cart
@@ -414,7 +412,6 @@ RecheckCartHack = function(params)
 	end
 	minetest.log("info", "[tsm_railcorridors] Cart spawn FAILED: "..minetest.pos_to_string(pos))
 end
-end
 
 -- Try to place a cobweb.
 -- pos: Position of cobweb
@@ -938,17 +935,13 @@ local function spawn_carts()
 			-- See <https://github.com/minetest/minetest/issues/4759>
 			local cart_id = tsm_railcorridors.carts[cart_type]
 			minetest.log("info", "[tsm_railcorridors] Cart spawn attempt: "..minetest.pos_to_string(cpos))
-			local obj = minetest.add_entity(cpos, cart_id)
+			minetest.add_entity(cpos, cart_id)
 
 			-- This checks if the cart is actually spawned, it's a giant hack!
 			-- Note that the callback function is also called there.
 			-- TODO: Move callback function to this position when the
 			-- minetest.add_entity bug has been fixed (supposedly in 5.9.0?)
-			if RecheckCartHack then
-				minetest.after(3, RecheckCartHack, {cpos, cart_id})
-			else
-				tsm_railcorridors.on_construct_cart(cpos, obj, pr_carts)
-			end
+			minetest.after(3, RecheckCartHack, {cpos, cart_id})
 		end
 	end
 	carts_table = {}

mods/MISC/bonemeal/init.lua

@@ -1,33 +0,0 @@
-bonemeal = {
-	item_list = {
-		bucket_water = "mcl_buckets:bucket_water",
-		bucket_empty = "mcl_buckets:bucket_empty",
-		dirt = "mcl_core:dirt",
-		torch = "mcl_torches:torch",
-		coral = "mcl_ocean:dead_horn_coral_block"
-	}
-}
-
-function bonemeal:on_use(pos, strength, node)
-	-- Fake itemstack for bone meal
-	local itemstack = ItemStack("mcl_bone_meal:bone_meal")
-
-	local pointed_thing = {
-		above = pos,
-		under = vector.offset(pos, 0, -1, 0)
-	}
-	mcl_bone_meal.use_bone_meal(itemstack, nil, pointed_thing)
-end
-
-function bonemeal:is_creative(player_name)
-	return minetest.is_creative_enabled(player_name)
-end
-
-function bonemeal:add_deco(list)
-	minetest.log("TODO: implement bonemeal:add_deco("..dump(list).."..)")
-	for i = 1,#list do
-		local item = list[i]
-	end
-end
-
-minetest.register_alias("bonemeal:bone", "mcl_mobitems:bone")

mods/MISC/bonemeal/mod.conf

@@ -1,4 +0,0 @@
-name = bonemeal
-author = teknomunk
-description = Compatibility shim for WorldEdit-Additions bonemeal support
-depends = mcl_bone_meal, mcl_mobitems, mcl_flowers

mods/MISC/mcl_privs/init.lua

@@ -30,5 +30,17 @@ for _, action in pairs({"grant", "revoke"}) do
 		if priv == "fly" then
 			meta:set_int("mcl_privs:fly_changed", 1)
 		end
+
+		--[[
+			so e.g. hackers who have been revoked of the interact privilege
+			will not automatically get the interact privilege through the mcl shields code back
+		]]
+		if priv == "interact" then
+			if action == "revoke" then
+				meta:set_int("mcl_privs:interact_revoked", 1)
+			else
+				meta:set_int("mcl_privs:interact_revoked", 0)
+			end
+		end
 	end)
-end
+end

mods/PLAYER/mcl_music/init.lua

@@ -18,9 +18,7 @@ local valley_of_ghosts = "exhale_and_tim_unwin-valley_of_ghosts"
 local farmer = "exhale_and_tim_unwin-farmer"
 
 local dimension_to_base_track = {
-	["overworld"]	= {
-		"Fief-Soul_of_a_Nameless_Bard"
-	},
+	["overworld"]	= {pianowtune, never_grow_up, flock_of_one, gift, hailing_forest, lonely_blossom, farmer},
 	["nether"]		= {nether_tune, valley_of_ghosts},
 	["end"]			= {end_tune},
 	["mining"]		= {odd_block},
@@ -134,7 +132,6 @@ local function play()
 				local track = pick_track(dimension, underground)
 				if track then
 					play_song(track, player_name, dimension, day_count)
-					minetest.log("action", "[mcl_music] Play song '" .. track .. "' for player: " .. player_name)
 				else
 					--minetest.log("no track found. weird")
 				end
@@ -218,8 +215,8 @@ minetest.register_chatcommand("music", {
 			meta:set_int("mcl_music:disable", 1)
 			display_new_state = S("off")
 		end
-
+		
 		stop_music_for_listener_name(playername)
 		minetest.chat_send_player(sender_name, S("Set music for @1 to: @2", playername, display_new_state))
-	end,
-})
+	end, 
+})

settingtypes.txt

@@ -45,9 +45,6 @@ mcl_disabled_structures (Disabled structures) string
 # Comma separated list of disabled event names
 mcl_disabled_events (Disabled events) string
 
-# Control the relative plant growth speed (default: 1)
-vl_plant_growth (Plant growth factor) float 1.0 0 100
-
 [Players]
 # If enabled, players respawn at the bed they last lay on instead of normal
 # spawn.