Merge pull request 'Add mod.confs to silence Minetest 5.5 warnings' (#298) from rudzik8/Mineclonia:add-mod-confs into master

Reviewed-on: Mineclonia/Mineclonia#298
Reviewed-by: cora <cora@noreply.git.minetest.land>

mods/CORE/walkover/mod.conf

@@ -0,0 +1 @@
+name = walkover

mods/ENTITIES/mobs_mc/snowman.lua

@@ -123,6 +123,10 @@ mobs:register_mob("mobs_mc:snowman", {
 			local pos = self.object:get_pos()
 			minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
 
+			if minetest.registered_items["mcl_farming:pumpkin_face"] then
+				minetest.add_item({x=pos.x, y=pos.y+1.4, z=pos.z}, "mcl_farming:pumpkin_face")
+			end
+
 			-- Wear out
 			if not minetest.is_creative_enabled(clicker:get_player_name()) then
 				item:add_wear(mobs_mc.misc.shears_wear)

mods/ENTITIES/mobs_mc/villager.lua

@@ -74,7 +74,7 @@ local professions = {
 			},
 
 			{
-			{ { "mcl_farming:pumpkin_face", 8, 13 }, E1 },
+			{ { "mcl_farming:pumpkin", 8, 13 }, E1 },
 			{ E1, { "mcl_farming:pumpkin_pie", 2, 3} },
 			},
 

mods/HUD/mcl_experience/mod.conf

@@ -0,0 +1 @@
+name = mcl_experience

mods/HUD/mcl_formspec/mod.conf

@@ -1 +1,2 @@
+name = mcl_formspec
 description = Helper mod to simplify creation of formspecs a little bit

mods/HUD/mcl_tmp_message/mod.conf

@@ -0,0 +1 @@
+name = mcl_tmp_message

mods/ITEMS/REDSTONE/mcl_comparators/init.lua

@@ -43,14 +43,20 @@ end
 
 local comparator_activate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
-	minetest.swap_node(pos, { name = def.comparator_onstate, param2 = node.param2 })
+	local onstate = def.comparator_onstate
+	if onstate then
+		minetest.swap_node(pos, { name = onstate, param2 = node.param2 })
+	end
 	minetest.after(0.1, comparator_turnon , {pos = pos, node = node})
 end
 
 
 local comparator_deactivate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
-	minetest.swap_node(pos, { name = def.comparator_offstate, param2 = node.param2 })
+	local offstate = def.comparator_offstate
+	if offstate then
+		minetest.swap_node(pos, { name = offstate, param2 = node.param2 })
+	end
 	minetest.after(0.1, comparator_turnoff, {pos = pos, node = node})
 end
 

mods/ITEMS/mcl_farming/beetroot.lua

@@ -18,19 +18,21 @@ minetest.register_node("mcl_farming:beetroot_0", {
 	_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,
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
 	drop = "mcl_farming:beetroot_seeds",
-	tiles = {"mcl_farming_beetroot_0.png"},
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_beetroot_0.png") },
+	use_texture_alpha = "clip",
 	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}
+			{-0.5, -9/16, -0.5, 0.5, -6/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},
@@ -42,19 +44,21 @@ 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,
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
 	drop = "mcl_farming:beetroot_seeds",
-	tiles = {"mcl_farming_beetroot_1.png"},
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_beetroot_1.png") },
+	use_texture_alpha = "clip",
 	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, -3/16, 0.5}
+			{-0.5, -9/16, -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},
@@ -66,19 +70,21 @@ 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,
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
 	drop = "mcl_farming:beetroot_seeds",
-	tiles = {"mcl_farming_beetroot_2.png"},
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_beetroot_2.png") },
+	use_texture_alpha = "clip",
 	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, 2/16, 0.5}
+			{-0.5, -9/16, -0.5, 0.5, 1/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},
@@ -91,11 +97,12 @@ minetest.register_node("mcl_farming:beetroot", {
 	_doc_items_longdesc = S("A mature beetroot plant is a farming plant which is ready to be harvested for a beetroot and some beetroot seeds. It won't grow any further."),
 	_doc_items_create_entry = true,
 	paramtype = "light",
-	paramtype2 = "meshoptions",
 	sunlight_propagates = true,
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
 	drop = {
 		--[[ drops 1 beetroot guaranteed.
 		drops 1-4 beetroot seeds:
@@ -112,13 +119,14 @@ minetest.register_node("mcl_farming:beetroot", {
 			{ items = {"mcl_farming:beetroot_seeds 1"}, rarity = 4 },
 		},
 	},
-	tiles = {"mcl_farming_beetroot_3.png"},
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_beetroot_3.png") },
+	use_texture_alpha = "clip",
 	inventory_image = "mcl_farming_beetroot_3.png",
 	wield_image = "mcl_farming_beetroot_3.png",
 	selection_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 3/16, 0.5}
+			{-0.5, -9/16, -0.5, 0.5, 2/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,beetroot=4},

mods/ITEMS/mcl_farming/carrots.lua

@@ -28,18 +28,20 @@ for i=1, 7 do
 		_doc_items_longdesc = longdesc,
 		paramtype = "light",
 		sunlight_propagates = true,
-		paramtype2 = "meshoptions",
+		-- keep place_param2 for plantlike drawtype compatiblity
 		place_param2 = 3,
 		walkable = false,
-		drawtype = "plantlike",
+		drawtype = "nodebox",
+		node_box = mcl_farming:get_plantlike_grid_nodebox(),
 		drop = "mcl_farming:carrot_item",
-		tiles = {texture},
+		tiles = { mcl_farming:align_plantlike_nodebox_texture(texture) },
+		use_texture_alpha = "clip",
 		inventory_image = texture,
 		wield_image = texture,
 		selection_box = {
 			type = "fixed",
 			fixed = {
-				{-0.5, -0.5, -0.5, 0.5, sel_height, 0.5}
+				{-0.5, -9/16, -0.5, 0.5, sel_height - 1/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},
@@ -53,11 +55,13 @@ minetest.register_node("mcl_farming:carrot", {
 	_doc_items_longdesc = S("Mature carrot plants are ready to be harvested for carrots. They won't grow any further."),
 	paramtype = "light",
 	sunlight_propagates = true,
-	paramtype2 = "meshoptions",
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
-	tiles = {"farming_carrot_4.png"},
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("farming_carrot_4.png") },
+	use_texture_alpha = "clip",
 	inventory_image = "farming_carrot_4.png",
 	wield_image = "farming_carrot_4.png",
 	drop = {
@@ -72,7 +76,7 @@ minetest.register_node("mcl_farming:carrot", {
 	selection_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 4/16, 0.5}
+			{-0.5, -9/16, -0.5, 0.5, 3/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},

mods/ITEMS/mcl_farming/init.lua

@@ -27,3 +27,73 @@ dofile(minetest.get_modpath("mcl_farming").."/potatoes.lua")
 
 -- ========= BEETROOT =========
 dofile(minetest.get_modpath("mcl_farming").."/beetroot.lua")
+
+-- This function generates a row of plantlike and nodebox nodes whose
+-- name starts with a given string, starting at a given position. It
+-- places a given node below so that the rendering can be examined.
+local function generate_plant_row(prefix, pos, below_node)
+	local i = 1
+	for node_name, node in pairs(minetest.registered_nodes) do
+		if (
+			1 == node_name:find(prefix) and
+			(
+				"plantlike" == node.drawtype or
+				"nodebox" == node.drawtype
+			)
+		) then
+			local node_pos = {
+				x = pos.x + i,
+				y = pos.y,
+				z = pos.z,
+			}
+			minetest.set_node(
+				node_pos,
+				{
+					name = node_name,
+					param2 = node.place_param2 or 0
+				}
+			)
+			local below_pos = {
+				x = node_pos.x,
+				y = node_pos.y - 1,
+				z = node_pos.z
+			}
+			minetest.set_node(
+				below_pos,
+				below_node
+			)
+			i = i + 1
+		end
+	end
+end
+
+minetest.register_chatcommand("generate_farming_plant_rows",{
+	description = "Generates rows of mcl_farming plant nodes on farming soil and glass",
+	privs = { debug = true },
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		local pos = player:get_pos()
+		local node_prefixes = {
+			"mcl_farming:beetroot",
+			"mcl_farming:carrot",
+			"mcl_farming:melon",
+			"mcl_farming:potato",
+			"mcl_farming:pumpkin",
+			"mcl_farming:wheat",
+		}
+		for i,node_prefix in ipairs(node_prefixes) do
+			generate_plant_row(
+				node_prefix,
+				pos,
+				{ name = "mcl_farming:soil" }
+			)
+			pos.z = pos.z + 2
+			generate_plant_row(
+				node_prefix,
+				pos,
+				{ name = "mcl_core:glass" }
+			)
+			pos.z = pos.z + 2
+		end
+	end
+})

mods/ITEMS/mcl_farming/melon.lua

@@ -91,16 +91,18 @@ for s=1,7 do
 		_doc_items_longdesc = longdesc,
 		paramtype = "light",
 		walkable = false,
-		drawtype = "plantlike",
+		drawtype = "nodebox",
+		node_box = mcl_farming:get_plantlike_plus_nodebox(),
 		sunlight_propagates = true,
 		drop = stem_drop,
-		tiles = {texture},
+		tiles = { mcl_farming:align_plantlike_nodebox_texture(texture) },
+		use_texture_alpha = "clip",
 		wield_image = texture,
 		inventory_image = texture,
 		selection_box = {
 			type = "fixed",
 			fixed = {
-				{-0.15, -0.5, -0.15, 0.15, -0.5+h, 0.15}
+				{-0.15, -9/16, -0.15, 0.15, -9/16+h, 0.15}
 			},
 		},
 		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},

mods/ITEMS/mcl_farming/potatoes.lua

@@ -6,13 +6,13 @@ for i=1, 7 do
 	local texture, selbox
 	if i < 3 then
 		texture = "mcl_farming_potatoes_stage_0.png"
-		selbox = { -0.5, -0.5, -0.5, 0.5, -5/16, 0.5 }
+		selbox = { -0.5, -9/16, -0.5, 0.5, -6/16, 0.5 }
 	elseif i < 5 then
 		texture = "mcl_farming_potatoes_stage_1.png"
-		selbox = { -0.5, -0.5, -0.5, 0.5, -2/16, 0.5 }
+		selbox = { -0.5, -9/16, -0.5, 0.5, -3/16, 0.5 }
 	else
 		texture = "mcl_farming_potatoes_stage_2.png"
-		selbox = { -0.5, -0.5, -0.5, 0.5, 2/16, 0.5 }
+		selbox = { -0.5, -9/16, -0.5, 0.5, 1/16, 0.5 }
 	end
 
 	local create, name, longdesc
@@ -33,13 +33,15 @@ for i=1, 7 do
 		_doc_items_entry_name = name,
 		_doc_items_longdesc = longdesc,
 		paramtype = "light",
-		paramtype2 = "meshoptions",
 		sunlight_propagates = true,
+		-- keep place_param2 for plantlike drawtype compatiblity
 		place_param2 = 3,
 		walkable = false,
-		drawtype = "plantlike",
+		drawtype = "nodebox",
+		node_box = mcl_farming:get_plantlike_grid_nodebox(),
 		drop = "mcl_farming:potato_item",
-		tiles = { texture },
+		tiles = { mcl_farming:align_plantlike_nodebox_texture(texture) },
+		use_texture_alpha = "clip",
 		inventory_image = texture,
 		wield_image = texture,
 		selection_box = {
@@ -57,12 +59,14 @@ minetest.register_node("mcl_farming:potato", {
 	description = S("Mature Potato Plant"),
 	_doc_items_longdesc = S("Mature potato plants are ready to be harvested for potatoes. They won't grow any further."),
 	paramtype = "light",
-	paramtype2 = "meshoptions",
 	sunlight_propagates = true,
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
-	tiles = {"mcl_farming_potatoes_stage_3.png"},
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_potatoes_stage_3.png") },
+	use_texture_alpha = "clip",
 	wield_image = "mcl_farming_potatoes_stage_3.png",
 	inventory_image = "mcl_farming_potatoes_stage_3.png",
 	drop = {
@@ -77,7 +81,7 @@ minetest.register_node("mcl_farming:potato", {
 	selection_box = {
 		type = "fixed",
 		fixed = {
-			{ -0.5, -0.5, -0.5, 0.5, 1/16, 0.5 }
+			{ -0.5, -9/16, -0.5, 0.5, 0, 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},

mods/ITEMS/mcl_farming/pumpkin.lua

@@ -63,16 +63,18 @@ for s=1,7 do
 		_doc_items_longdesc = longdesc,
 		paramtype = "light",
 		walkable = false,
-		drawtype = "plantlike",
+		drawtype = "nodebox",
+		node_box = mcl_farming:get_plantlike_plus_nodebox(),
 		sunlight_propagates = true,
 		drop = stem_drop,
-		tiles = {texture},
+		tiles = { mcl_farming:align_plantlike_nodebox_texture(texture) },
+		use_texture_alpha = "clip",
 		inventory_image = texture,
 		wield_image = texture,
 		selection_box = {
 			type = "fixed",
 			fixed = {
-				{-0.15, -0.5, -0.15, 0.15, -0.5+h, 0.15}
+				{-0.15, -9/16, -0.15, 0.15, -9/16+h, 0.15}
 			},
 		},
 		groups = {dig_immediate=3, not_in_creative_inventory=1, plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1,},
@@ -104,7 +106,6 @@ local pumpkin_base_def = {
 	_mcl_blast_resistance = 1,
 	_mcl_hardness = 1,
 }
-minetest.register_node("mcl_farming:pumpkin", pumpkin_base_def)
 
 local pumpkin_face_base_def = table.copy(pumpkin_base_def)
 pumpkin_face_base_def.description = S("Pumpkin")
@@ -115,6 +116,11 @@ pumpkin_face_base_def.groups.armor_head=1
 pumpkin_face_base_def._mcl_armor_mob_range_factor = 0
 pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman"
 pumpkin_face_base_def.groups.non_combat_armor=1
+pumpkin_face_base_def.on_construct = function(pos)
+	-- Attempt to spawn iron golem or snow golem
+	mobs_mc.tools.check_iron_golem_summon(pos)
+	mobs_mc.tools.check_snow_golem_summon(pos)
+end
 if minetest.get_modpath("mcl_armor") then
 	pumpkin_face_base_def.on_secondary_use = armor.on_armor_use
 end
@@ -123,12 +129,11 @@ end
 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_face", pumpkin_face_base_def, 30, 15, "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")
-function(pos)
+
-	-- Attempt to spawn iron golem or snow golem
+-- Steal function to properly disconnect a carved pumpkin
-	mobs_mc.tools.check_iron_golem_summon(pos)
+pumpkin_face_base_def.after_destruct = minetest.registered_nodes["mcl_farming:pumpkin"].after_destruct
-	mobs_mc.tools.check_snow_golem_summon(pos)
+minetest.register_node("mcl_farming:pumpkin_face", pumpkin_face_base_def)
-end)
 
 -- Jack o'Lantern
 minetest.register_node("mcl_farming:pumpkin_face_light", {
@@ -165,11 +170,6 @@ minetest.register_craft({
 	recipe = {{"mcl_farming:pumpkin"}}
 })
 
-minetest.register_craft({
-	output = "mcl_farming:pumpkin_seeds 4",
-	recipe = {{"mcl_farming:pumpkin_face"}}
-})
-
 minetest.register_craftitem("mcl_farming:pumpkin_pie", {
 	description = S("Pumpkin Pie"),
 	_doc_items_longdesc = S("A pumpkin pie is a tasty food item which can be eaten."),
@@ -187,11 +187,6 @@ minetest.register_craft({
 	output = "mcl_farming:pumpkin_pie",
 	recipe = {"mcl_farming:pumpkin", "mcl_core:sugar", "mcl_throwing:egg"},
 })
-minetest.register_craft({
-	type = "shapeless",
-	output = "mcl_farming:pumpkin_pie",
-	recipe = {"mcl_farming:pumpkin_face", "mcl_core:sugar", "mcl_throwing:egg"},
-})
 
 
 if minetest.get_modpath("doc") then

mods/ITEMS/mcl_farming/shared_functions.lua

@@ -178,7 +178,7 @@ end
 - stem_def: Partial node definition of the fully-grown unconnected stem node. Many fields are already defined. You need to add `tiles` and `description` at minimum. Don't define on_construct without good reason
 - stem_drop: Drop probability table for all stem
 - gourd_itemstring: Desired itemstring of the full gourd node
-- gourd_def: (almost) full definition of the gourd node. This function will add on_construct and after_dig_node to the definition for unconnecting any connected stems
+- gourd_def: (almost) full definition of the gourd node. This function will add on_construct and after_destruct to the definition for unconnecting any connected stems
 - grow_interval: Will attempt to grow a gourd periodically at this interval in seconds
 - grow_chance: Chance of 1/grow_chance to grow a gourd next to the full unconnected stem after grow_interval has passed. Must be a natural number
 - connected_stem_texture: Texture of the connected stem
@@ -228,8 +228,8 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 	end
 
 	-- Register gourd
-	if not gourd_def.after_dig_node then
+	if not gourd_def.after_destruct then
-		gourd_def.after_dig_node = function(blockpos, oldnode, oldmetadata, user)
+		gourd_def.after_destruct = function(blockpos, oldnode)
 			-- Disconnect any connected stems, turning them back to normal stems
 			for n=1, #neighbors do
 				local offset = neighbors[n]
@@ -265,7 +265,7 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		stem_def.selection_box = {
 			type = "fixed",
 			fixed = {
-				{-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}
+				{-0.15, -9/16, -0.15, 0.15, 7/16, 0.15}
 			},
 		}
 	end
@@ -273,7 +273,20 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		stem_def.paramtype = "light"
 	end
 	if not stem_def.drawtype then
-		stem_def.drawtype = "plantlike"
+		stem_def.drawtype = "nodebox"
+	end
+	if not stem_def.node_box then
+		stem_def.node_box = mcl_farming:get_plantlike_plus_nodebox()
+	end
+	if stem_def.tiles then
+		for i=1,#stem_def.tiles do
+			stem_def.tiles[i] = mcl_farming:align_plantlike_nodebox_texture(
+				stem_def.tiles[i]
+			)
+		end
+	end
+	if not stem_def.use_texture_alpha then
+		stem_def.use_texture_alpha = "clip"
 	end
 	if stem_def.walkable == nil then
 		stem_def.walkable = false
@@ -300,7 +313,9 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 	minetest.register_node(stem_itemstring, stem_def)
 
 	-- Register connected stems
-
+	local connected_stem_texture = mcl_farming:align_plantlike_nodebox_texture(
+		connected_stem_texture
+	)
 	local connected_stem_tiles = {
 		{ "blank.png", --top
 		"blank.png", -- bottom
@@ -332,16 +347,16 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		}
 	}
 	local connected_stem_nodebox = {
-		{-0.5, -0.5, 0, 0.5, 0.5, 0},
+		{-0.5, -9/16, 0, 0.5, 7/16, 0},
-		{-0.5, -0.5, 0, 0.5, 0.5, 0},
+		{-0.5, -9/16, 0, 0.5, 7/16, 0},
-		{0, -0.5, -0.5, 0, 0.5, 0.5},
+		{0, -9/16, -0.5, 0, 7/16, 0.5},
-		{0, -0.5, -0.5, 0, 0.5, 0.5},
+		{0, -9/16, -0.5, 0, 7/16, 0.5},
 	}
 	local connected_stem_selectionbox = {
-		{-0.1, -0.5, -0.1, 0.5, 0.2, 0.1},
+		{-0.1, -9/16, -0.1, 0.5, 0.2 - 1/16, 0.1},
-		{-0.5, -0.5, -0.1, 0.1, 0.2, 0.1},
+		{-0.5, -9/16, -0.1, 0.1, 0.2 - 1/16, 0.1},
-		{-0.1, -0.5, -0.1, 0.1, 0.2, 0.5},
+		{-0.1, -9/16, -0.1, 0.1, 0.2 - 1/16, 0.5},
-		{-0.1, -0.5, -0.5, 0.1, 0.2, 0.1},
+		{-0.1, -9/16, -0.5, 0.1, 0.2 - 1/16, 0.1},
 	}
 
 	for i=1, 4 do
@@ -469,3 +484,40 @@ minetest.register_lbm({
 		mcl_farming:grow_plant(identifier, pos, node, false, false, low_speed)
 	end,
 })
+
+-- This function returns a nodebox that imitates a plantlike plus (+)
+-- drawtype, but is shifted 1/16 lower, into the empty space above
+-- farming soil. The regular plantlike drawtype can not do this.
+function mcl_farming:get_plantlike_plus_nodebox()
+	return {
+		type = "fixed",
+		fixed = {
+			{ 0, -9/16, -0.15, 0, 7/16, 0.15 },
+			{ -0.15, -9/16, 0, 0.15, 7/16, 0 }
+		}
+	}
+end
+
+-- This function returns a nodebox that imitates a plantlike grid (#)
+-- drawtype, but is shifted 1/16 lower, into the empty space above
+-- farming soil. The regular plantlike drawtype can not do this.
+function mcl_farming:get_plantlike_grid_nodebox()
+	return {
+		type = "fixed",
+		fixed = {
+			{ 4/16, -9/16, -8/16,  4/16,  7/16,  8/16},
+			{-4/16, -9/16, -8/16, -4/16,  7/16,  8/16},
+			{-8/16, -9/16, -4/16,  8/16,  7/16, -4/16},
+			{-8/16, -9/16,  4/16,  8/16,  7/16,  4/16},
+		}
+	}
+end
+
+-- This function takes a texture and returns a modified texture where
+-- the bottom row is at the top, assuming 16px × 16px textures. This
+-- is used to align textures to a “plantlike” nodebox shifted 1/16
+-- below its own node – into the empty space above farming soil.
+function mcl_farming:align_plantlike_nodebox_texture(texture)
+	local texture = texture:gsub("%^", "\\%^"):gsub(":", "\\:")
+	return "[combine:16x16:0,-15=" .. texture .. ":0,1=" .. texture
+end

mods/ITEMS/mcl_farming/wheat.lua

@@ -39,19 +39,21 @@ for i=1,7 do
 		_doc_items_entry_name = name,
 		_doc_items_longdesc = longdesc,
 		paramtype = "light",
-		paramtype2 = "meshoptions",
+		-- keep place_param2 for plantlike drawtype compatiblity
 		place_param2 = 3,
 		sunlight_propagates = true,
 		walkable = false,
-		drawtype = "plantlike",
+		drawtype = "nodebox",
+		node_box = mcl_farming:get_plantlike_grid_nodebox(),
 		drop = "mcl_farming:wheat_seeds",
-		tiles = {"mcl_farming_wheat_stage_"..(i-1)..".png"},
+		tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_wheat_stage_"..(i-1)..".png") },
+		use_texture_alpha = "clip",
 		inventory_image = "mcl_farming_wheat_stage_"..(i-1)..".png",
 		wield_image = "mcl_farming_wheat_stage_"..(i-1)..".png",
 		selection_box = {
 			type = "fixed",
 			fixed = {
-				{-0.5, -0.5, -0.5, 0.5, sel_heights[i], 0.5}
+				{-0.5, -9/16, -0.5, 0.5, sel_heights[i] - 1/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},
@@ -65,13 +67,21 @@ minetest.register_node("mcl_farming:wheat", {
 	_doc_items_longdesc = S("Mature wheat plants are ready to be harvested for wheat and wheat seeds. They won't grow any further."),
 	sunlight_propagates = true,
 	paramtype = "light",
-	paramtype2 = "meshoptions",
+	-- keep place_param2 for plantlike drawtype compatiblity
 	place_param2 = 3,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
-	tiles = {"mcl_farming_wheat_stage_7.png"},
+	node_box = mcl_farming:get_plantlike_grid_nodebox(),
+	tiles = { mcl_farming:align_plantlike_nodebox_texture("mcl_farming_wheat_stage_7.png") },
+	use_texture_alpha = "clip",
 	inventory_image = "mcl_farming_wheat_stage_7.png",
 	wield_image = "mcl_farming_wheat_stage_7.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{ -0.5, -9/16, -0.5, 0.5, 7/16, 0.5 }
+		}
+	},
 	drop = {
 		max_items = 4,
 		items = {

mods/ITEMS/mcl_tnt/init.lua

@@ -1,4 +1,5 @@
 local S = minetest.get_translator("mcl_tnt")
+local tnt_drop_rate = tonumber(minetest.settings:get("mcl_tnt_drop_rate") or 1.0)
 local tnt_griefing = minetest.settings:get_bool("mcl_tnt_griefing", true)
 
 local mod_death_messages = minetest.get_modpath("mcl_death_messages")
@@ -180,7 +181,7 @@ function TNT:on_step(dtime)
 		self.blinkstatus = not self.blinkstatus
 	end
 	if self.timer > tnt.BOOMTIMER then
-		mcl_explosions.explode(self.object:get_pos(), 4, {}, self.object)
+		mcl_explosions.explode(self.object:get_pos(), 4, { drop_chance = tnt_drop_rate }, self.object)
 		self.object:remove()
 	end
 end

mods/ITEMS/mcl_tools/init.lua

@@ -232,10 +232,10 @@ if minetest.get_modpath("mcl_farming") then
 				local wear = mcl_autogroup.get_wear(toolname, "shearsy")
 				itemstack:add_wear(wear)
 			end
-			minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = above}, true)
+			minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = pointed_thing.above}, true)
 			local dir = vector.subtract(pointed_thing.under, pointed_thing.above)
 			local param2 = minetest.dir_to_facedir(dir)
-			minetest.swap_node(pointed_thing.under, {name="mcl_farming:pumpkin_face", param2 = param2})
+			minetest.set_node(pointed_thing.under, {name="mcl_farming:pumpkin_face", param2 = param2})
 			minetest.add_item(pointed_thing.above, "mcl_farming:pumpkin_seeds 4")
 		end
 		return itemstack

mods/ITEMS/screwdriver/mod.conf

@@ -0,0 +1 @@
+name = screwdriver

mods/MAPGEN/mcl_biomes/init.lua

@@ -3532,7 +3532,7 @@ local function register_decorations()
 	-- Pumpkin
 	minetest.register_decoration({
 		deco_type = "simple",
-		decoration = "mcl_farming:pumpkin_face",
+		decoration = "mcl_farming:pumpkin",
 		param2 = 0,
 		param2_max = 3,
 		place_on = {"group:grass_block_no_snow"},

mods/MAPGEN/mcl_mapgen_core/init.lua

@@ -868,7 +868,7 @@ local function register_mgv6_decorations()
 	-- Pumpkin
 	minetest.register_decoration({
 		deco_type = "simple",
-		decoration = "mcl_farming:pumpkin_face",
+		decoration = "mcl_farming:pumpkin",
 		param2 = 0,
 		param2_max = 3,
 		place_on = {"group:grass_block_no_snow"},

mods/MAPGEN/mcl_structures/init.lua

@@ -532,14 +532,24 @@ local function dir_to_rotation(dir)
 	return "0"
 end
 
+mcl_structures.generate_test_structure_comparator = function(pos, rotation, pr)
+	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_test_structure_comparator.mts"
+	mcl_structures.place_schematic(pos, path, rotation, nil, true, nil, nil, pr)
+end
+
 mcl_structures.generate_test_structure_fireproof = function(pos, rotation, pr)
 	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_test_structure_fireproof.mts"
 	mcl_structures.place_schematic(pos, path, rotation, nil, true, nil, nil, pr)
 end
 
+mcl_structures.generate_test_structure_tnt = function(pos, rotation, pr)
+	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_test_structure_tnt.mts"
+	mcl_structures.place_schematic(pos, path, rotation, nil, true, nil, nil, pr)
+end
+
 -- Debug command
 minetest.register_chatcommand("spawnstruct", {
-	params = "desert_temple | desert_well | igloo | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine | test_structure_fireproof",
+	params = "desert_temple | desert_well | igloo | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine | test_structure_comparator | test_structure_fireproof | test_structure_tnt",
 	description = S("Generate a pre-defined structure near your position."),
 	privs = {debug = true},
 	func = function(name, param)
@@ -573,8 +583,12 @@ minetest.register_chatcommand("spawnstruct", {
 			mcl_structures.generate_end_exit_portal(pos, rot, pr)
 		elseif param == "end_portal_shrine" then
 			mcl_structures.generate_end_portal_shrine(pos, rot, pr)
+		elseif param == "test_structure_comparator" then
+			mcl_structures.generate_test_structure_comparator(pos, rot, pr)
 		elseif param == "test_structure_fireproof" then
 			mcl_structures.generate_test_structure_fireproof(pos, rot, pr)
+		elseif param == "test_structure_tnt" then
+			mcl_structures.generate_test_structure_tnt(pos, rot, pr)
 		elseif param == "" then
 			message = S("Error: No structure type given. Please use “/spawnstruct <type>”.")
 			errord = true

mods/MISC/mcl_engine_workarounds/mod.conf

@@ -0,0 +1 @@
+name = mcl_engine_workarounds

mods/MISC/mcl_selftests/mod.conf

@@ -0,0 +1 @@
+name = mcl_selftests

mods/PLAYER/mcl_player/mod.conf

@@ -0,0 +1 @@
+name = mcl_player

settingtypes.txt

@@ -24,6 +24,9 @@ mcl_doWeatherCycle (Change weather) bool true
 # Note that blocks never have drops when in Creative Mode.
 mcl_doTileDrops (Blocks have drops) bool true
 
+# Chance of a node destroyed by a TNT explosion to be dropped as an item
+mcl_tnt_drop_rate (TNT drop rate) float 1.0 0.0 1.0
+
 # If enabled, TNT explosions destroy blocks.
 mcl_tnt_griefing (TNT destroys blocks) bool true