Merge pull request 'ITEMS/mcl_farming: Convert correct floor node to dirt as gourd grows' (#231 ) from fix-gourd-farmland-dirtification into master

Reviewed-on: Mineclonia/Mineclonia#231 Reviewed-by: Li0n_2 <li0n_2@noreply.git.minetest.land>
Convert correct floor node to dirt as gourd grows
2022-01-15 22:07:24 +00:00 · 2022-01-13 07:29:57 +01:00 · 2022-01-12 21:19:10 +00:00 · 2022-01-12 11:09:07 -06:00 · 2021-12-20 22:42:59 +00:00 · 2021-12-20 21:38:24 +01:00
11 changed files with 74 additions and 30 deletions
--- a/GROUPS.md
+++ b/GROUPS.md
@ -21,7 +21,7 @@ The basic digging time groups determine by which tools a node can be dug.
 * `swordy=1`: Diggable by sword (any material), and this node is *not* a cobweb
 * `swordy_cobweb=1`: Diggable by sword (any material), and this node is a cobweb
 * `shearsy=1`: Diggable by shears, and this node is *not* wool
-* `shearsy=wool=1`: Diggable by shears, and this node is wool
+* `shearsy_wool=1`: Diggable by shears, and this node is wool
 * `handy=1`: Breakable by hand and this node gives it useful drop when dug by hand. All nodes which are breakable by pickaxe, axe, shovel, sword or shears are also automatically breakable by hand, but not neccess
 * `creative_breakable=1`: Block is breakable by hand in creative mode. This group is implied if the node belongs to any other digging group

--- a/mods/ITEMS/mcl_chests/init.lua
+++ b/mods/ITEMS/mcl_chests/init.lua
@ -1,6 +1,41 @@
 local S = minetest.get_translator("mcl_chests")
 local mod_doc = minetest.get_modpath("doc")

+-- Christmas chest setup
+local it_is_christmas = false
+local date = os.date("*t")
+if (
+	date.month == 12 and (
+		date.day == 24 or
+		date.day == 25 or
+		date.day == 26
+	)
+) then
+	it_is_christmas = true
+end
+
+local tiles_chest_normal_small = {"mcl_chests_normal.png"}
+local tiles_chest_normal_double = {"mcl_chests_normal_double.png"}
+
+if it_is_christmas then
+	tiles_chest_normal_small = {"mcl_chests_normal_present.png^mcl_chests_noise.png"}
+	tiles_chest_normal_double = {"mcl_chests_normal_double_present.png^mcl_chests_noise_double.png"}
+end
+
+local tiles_chest_trapped_small = {"mcl_chests_trapped.png"}
+local tiles_chest_trapped_double = {"mcl_chests_trapped_double.png"}
+
+if it_is_christmas then
+	tiles_chest_trapped_small = {"mcl_chests_trapped_present.png^mcl_chests_noise.png"}
+	tiles_chest_trapped_double = {"mcl_chests_trapped_double_present.png^mcl_chests_noise_double.png"}
+end
+
+local tiles_chest_ender_small = {"mcl_chests_ender.png"}
+
+if it_is_christmas then
+	tiles_chest_ender_small = {"mcl_chests_ender_present.png^mcl_chests_noise.png"}
+end
+
 -- Chest Entity
 local animate_chests = (minetest.settings:get_bool("animated_chests") ~= false)
 local entity_animations = {
@ -221,12 +256,12 @@ local chest_update_after_close = function(pos)
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_small", param2 = node.param2})

 		if animate_chests then
-			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", tiles_chest_trapped_small, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
 		end
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)
 	elseif node.name == "mcl_chests:trapped_chest_on_left" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_left", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
+		find_or_create_entity(pos, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)

 		local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left")
@ -238,7 +273,7 @@ local chest_update_after_close = function(pos)

 		local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right")
 		minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_left", param2 = node.param2})
-		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
+		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
 		mesecon.receptor_off(pos_other, trapped_chest_mesecons_rules)
 	end
 end
@ -849,8 +884,8 @@ register_chest("chest",
 	chestusage,
 	S("27 inventory slots") .. "\n" .. S("Can be combined to a large chest"),
 	{
-		small = {"mcl_chests_normal.png"},
-		double = {"mcl_chests_normal_double.png"},
+		small = tiles_chest_normal_small,
+		double = tiles_chest_normal_double,
 		inv = {"default_chest_top.png", "mcl_chests_chest_bottom.png",
 		"mcl_chests_chest_right.png", "mcl_chests_chest_left.png",
 		"mcl_chests_chest_back.png", "default_chest_front.png"},
@ -865,8 +900,8 @@ register_chest("chest",
 )

 local traptiles = {
-	small = {"mcl_chests_trapped.png"},
-	double = {"mcl_chests_trapped_double.png"},
+	small = tiles_chest_trapped_small,
+	double = tiles_chest_trapped_double,
 	inv = {"mcl_chests_chest_trapped_top.png", "mcl_chests_chest_trapped_bottom.png",
 	"mcl_chests_chest_trapped_right.png", "mcl_chests_chest_trapped_left.png",
 	"mcl_chests_chest_trapped_back.png", "mcl_chests_chest_trapped_front.png"},
@ -892,7 +927,7 @@ register_chest("trapped_chest",
 	function(pos, node, clicker)
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_small", param2 = node.param2})
 		if animate_chests then
-			find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small")
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", tiles_chest_trapped_small, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small")
 		end
 		mesecon.receptor_on(pos, trapped_chest_mesecons_rules)
 	end,
@ -901,7 +936,7 @@ register_chest("trapped_chest",
 		meta:set_int("players", 1)

 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_left", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_on_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left")
+		find_or_create_entity(pos, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left")
 		mesecon.receptor_on(pos, trapped_chest_mesecons_rules)

 		local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left")
@ -915,7 +950,7 @@ register_chest("trapped_chest",
 		mesecon.receptor_on(pos, trapped_chest_mesecons_rules)

 		minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_on_left", param2 = node.param2})
-		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_on_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left")
+		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left")
 		mesecon.receptor_on(pos_other, trapped_chest_mesecons_rules)
 	end
 )
@ -937,14 +972,14 @@ local function close_if_trapped_chest(pos, player)
 	if node.name == "mcl_chests:trapped_chest_on_small" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_small", param2 = node.param2})
 		if animate_chests then
-			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
+			find_or_create_entity(pos, "mcl_chests:trapped_chest_small", tiles_chest_trapped_small, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small")
 		end
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)

 		player_chest_close(player)
 	elseif node.name == "mcl_chests:trapped_chest_on_left" then
 		minetest.swap_node(pos, {name="mcl_chests:trapped_chest_left", param2 = node.param2})
-		find_or_create_entity(pos, "mcl_chests:trapped_chest_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
+		find_or_create_entity(pos, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
 		mesecon.receptor_off(pos, trapped_chest_mesecons_rules)

 		local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left")
@ -958,7 +993,7 @@ local function close_if_trapped_chest(pos, player)

 		local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right")
 		minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_left", param2 = node.param2})
-		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", {"mcl_chests_trapped_double.png"}, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
+		find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left")
 		mesecon.receptor_off(pos_other, trapped_chest_mesecons_rules)

 		player_chest_close(player)
@ -1006,7 +1041,7 @@ minetest.register_node("mcl_chests:ender_chest", {
 	_doc_items_usagehelp = S("Rightclick the ender chest to access your personal interdimensional inventory."),
 	drawtype = "mesh",
 	mesh = "mcl_chests_chest.obj",
-	tiles = {"mcl_chests_ender.png"},
+	tiles = tiles_chest_ender_small,
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
 	paramtype = "light",
 	paramtype2 = "facedir",
@ -1059,8 +1094,8 @@ minetest.register_node("mcl_chests:ender_chest_small", {
 		type = "fixed",
 		fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375},
 	},
-	tiles = animate_chests and {"mcl_chests_blank.png"} or {"mcl_chests_ender.png"},
-	_chest_entity_textures = {"mcl_chests_ender.png"},
+	tiles = animate_chests and {"mcl_chests_blank.png"} or tiles_chest_ender_small,
+	_chest_entity_textures = tiles_chest_ender_small,
 	_chest_entity_sound = "mcl_chests_enderchest",
 	_chest_entity_mesh = "mcl_chests_chest",
 	_chest_entity_animation_type = "chest",
@ -1082,11 +1117,11 @@ minetest.register_node("mcl_chests:ender_chest_small", {
 		meta:set_string("formspec", formspec_ender_chest)

 		if animate_chests then
-			create_entity(pos, "mcl_chests:ender_chest_small", {"mcl_chests_ender.png"}, minetest.get_node(pos).param2, false, "mcl_chests_enderchest", "mcl_chests_chest", "chest")
+			create_entity(pos, "mcl_chests:ender_chest_small", tiles_chest_ender_small, minetest.get_node(pos).param2, false, "mcl_chests_enderchest", "mcl_chests_chest", "chest")
 		end
 	end,
 	on_rightclick = function(pos, node, clicker)
-		player_chest_open(clicker, pos, "mcl_chests:ender_chest_small", {"mcl_chests_ender.png"}, node.param2, false, "mcl_chests_enderchest", "mcl_chests_chest")
+		player_chest_open(clicker, pos, "mcl_chests:ender_chest_small", tiles_chest_ender_small, node.param2, false, "mcl_chests_enderchest", "mcl_chests_chest")
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
 		if fields.quit then
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_ender_present.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_ender_present.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_noise.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_noise.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_noise_double.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_noise_double.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_normal_double_present.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_normal_double_present.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_normal_present.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_normal_present.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_trapped_double_present.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_trapped_double_present.png
--- a/mods/ITEMS/mcl_chests/textures/mcl_chests_trapped_present.png
+++ b/mods/ITEMS/mcl_chests/textures/mcl_chests_trapped_present.png
--- a/mods/ITEMS/mcl_farming/shared_functions.lua
+++ b/mods/ITEMS/mcl_farming/shared_functions.lua
@ -388,12 +388,11 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 					{ x=0, y=0, z=-1 },
 					{ x=0, y=0, z=1 },
 				}
-				local floorpos, floor
 				for n=#neighbors, 1, -1 do
 					local offset = neighbors[n]
 					local blockpos = vector.add(stempos, offset)
-					floorpos = { x=blockpos.x, y=blockpos.y-1, z=blockpos.z }
-					floor = minetest.get_node(floorpos)
+					local floorpos = { x=blockpos.x, y=blockpos.y-1, z=blockpos.z }
+					local floor = minetest.get_node(floorpos)
 					local block = minetest.get_node(blockpos)
 					local soilgroup = minetest.get_item_group(floor.name, "soil")
 					if not ((minetest.get_item_group(floor.name, "grass_block") == 1 or floor.name=="mcl_core:dirt" or soilgroup == 2 or soilgroup == 3) and block.name == "air") then
@ -407,6 +406,8 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 					local r = math.random(1, #neighbors)
 					local offset = neighbors[r]
 					local blockpos = vector.add(stempos, offset)
+					local floorpos = { x=blockpos.x, y=blockpos.y-1, z=blockpos.z }
+					local floor = minetest.get_node(floorpos)
 					local p2
 					if offset.x == 1 then
 						minetest.set_node(stempos, {name=connected_stem_names[1]})
--- a/mods/MISC/mcl_selftests/init.lua
+++ b/mods/MISC/mcl_selftests/init.lua
@ -75,14 +75,22 @@ local test_minetest_find_nodes_in_area_can_count = function(dtime)
 	local nodes_expected = math.pow( 1 + (2 * radius), 3 )
 	local nodes_counted = nnum[nodename]
 	local nodes_difference = nodes_expected - nodes_counted
-	-- Yes, the following line is supposed to crash the game in
-	-- the case that Minetest forgot how to count the number of
-	-- nodes in a three dimensional volume it just filled. This
-	-- function contains an excellent explanation on what not to
-	-- do further up. I strongly suggest to pester Minetest core
-	-- devs about this issue and not the author of the function,
-	-- should this test ever fail.
-	assert ( 0 == nodes_difference )
+	-- Originally, there was an assertion here that made the game
+	-- crash at startup if Minetest forgot how to count. This was
+	-- originally intended to avoid buggy engine releases, but it
+	-- mostly made people upset and hindered debugging. Also, the
+	-- assertion contained no error message hinting at the reason
+	-- for the crash, making it exceptionally user-unfriendly. It
+	-- follows that a game or mod should only assert on behaviour
+	-- of the Lua code, not the underlying implementation, unless
+	-- engine bugs are bad enough to permanently corrupt a world.
+	if ( 0 ~= nodes_difference ) then
+		minetest.debug(
+			"minetest.find_nodes_in_area() failed to find " ..
+			nodes_difference .. " nodes that were placed. " ..
+			"Downgrading to Minetest 5.4.1 might fix this."
+		)
+	end
 end

 minetest.after( 0, test_minetest_find_nodes_in_area_can_count )
Author	SHA1	Message	Date
My favourite Minetest cheat clients are Dragonfire and Waspsaliva.	23f1c51912	Merge pull request 'ITEMS/mcl_farming: Convert correct floor node to dirt as gourd grows' (#231 ) from fix-gourd-farmland-dirtification into master Reviewed-on: Mineclonia/Mineclonia#231 Reviewed-by: Li0n_2 <li0n_2@noreply.git.minetest.land>	2022-01-15 22:07:24 +00:00
Nils Dagsson Moskopp	4d02af8c94	Convert correct floor node to dirt as gourd grows Before this patch, growing a gourd (e.g. melon, pumpkin) would always convert a node west of the node below the stem to dirt if belonged to the group “dirtifies_below_solid”. This happened because of a loop in which the variables floorpos and floor were re-used without setting a new value … therefore, both floorpos and floor were always containing the last values set in a previous loop instead of the correct values. This patch fixes the problem by setting both variables in both loops.	2022-01-13 07:29:57 +01:00
Li0n_2	7ede0ca79a	Merge pull request 'Fix shearsy wool typo in GROUPS.md' (#229 ) from JosiahWI/Mineclonia:fix-groups-typo into master Reviewed-on: Mineclonia/Mineclonia#229 Reviewed-by: Li0n_2 <li0n_2@noreply.git.minetest.land>	2022-01-12 21:19:10 +00:00
JosiahWI	e2e7e15b39	fix one character typo in GROUPS.md	2022-01-12 11:09:07 -06:00
cora	93a0879b40	Merge pull request 'MISC/mcl_selftests: Do not crash if minetest.find_nodes_in_area() lies' (#214 ) from fix-selftest-crash into master Reviewed-on: Mineclonia/Mineclonia#214 Reviewed-by: cora <cora@noreply.git.minetest.land>	2021-12-20 22:42:59 +00:00
Nils Dagsson Moskopp	0b5fa14041	Do not crash if minetest.find_nodes_in_area() lies	2021-12-20 21:38:24 +01:00
cora	4f33f626f5	Merge pull request 'ITEMS/mcl_chests: Reskin chests as presents on December 24th to 26th' (#212 ) from add-christmas-chests into master Reviewed-on: Mineclonia/Mineclonia#212 Reviewed-by: cora <cora@noreply.git.minetest.land>	2021-12-20 16:34:54 +00:00
Nils Dagsson Moskopp	df7bd78af5	Add noise to christmas chest textures	2021-12-12 15:40:29 +01:00
Nils Dagsson Moskopp	fe3e837e1b	Reskin chests as presents on December 24th to 26th	2021-12-11 18:17:53 +01:00