prevent invalid rotations and add on_rotate callbacks

- fixes a crash with timer=NaN
- fixes 1-tick circels with timer=0
- fixes timegates getting stuck when unloaded in on-state

.luacheckrc

@@ -1,22 +1,9 @@
 read_globals = {
 	-- Defined by Minetest
-	"vector", "PseudoRandom", "VoxelArea", "table",
+	"minetest", "vector", "PseudoRandom", "VoxelArea", "table", "ItemStack",
 
 	-- Mods
 	"digiline", "default", "creative",
-
-	-- Required for the mesechest registration
-	minetest = {
-		fields = {
-			register_lbm = {read_only = false},
-			register_node = {read_only = false},
-			registered_on_player_receive_fields = {
-				read_only = false,
-				other_fields = true,
-			},
-		},
-		other_fields = true
-	}
 }
 globals = {"moremesecons", "mesecon"}
 ignore = {"212", "631", "422", "432"}

moremesecons_adjustable_blinkyplant/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_adjustable_blinkyplant
-depends = mesecons,moremesecons_utils
+depends = mesecons,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_adjustable_player_detector/init.lua

@@ -2,6 +2,8 @@
 -- Detects players in a certain radius
 -- The radius can be changes by right-click (by default 6)
 
+local MAX_RADIUS = moremesecons.setting("adjustable_player_detector", "max_radius", 16, 0)
+
 local function make_formspec(meta)
 	meta:set_string("formspec", "size[9,5]" ..
 		"field[0.3,  0;9,2;scanname;Comma-separated list of the names of players to scan for (empty for any):;${scanname}]"..
@@ -36,7 +38,7 @@ local object_detector_scan = function (pos)
 	local scanname = meta:get_string("scanname")
 	local scan_all = scanname == ""
 	local scan_names = scanname:split(',')
-	local radius = meta:get_int("radius")
+	local radius = math.min(meta:get_int("radius"), MAX_RADIUS)
 	if radius <= 0 then
 		radius = 6
 	end
@@ -76,11 +78,11 @@ local object_detector_digiline = {
 						make_formspec(meta)
 					end
 				end
-				if msg.scanname then
+				if type(msg.scanname) == "string" then
 					meta:set_string("scanname", msg.scanname)
 					make_formspec(meta)
 				end
-				if msg.command and msg.command == "get" then
+				if msg.command == "get" then
 					local found, name = object_detector_scan(pos)
 					if not found then
 						name = ""

moremesecons_adjustable_player_detector/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_adjustable_player_detector
-depends = mesecons
+depends = mesecons,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_commandblock/init.lua

@@ -1,10 +1,12 @@
+local strip_color_codes = minetest.settings:get_bool("strip_color_codes", false)
+
 local function initialize_data(meta)
 	local NEAREST_MAX_DISTANCE = moremesecons.setting("commandblock", "nearest_max_distance", 8, 1)
 
 	local commands = meta:get_string("commands")
 	meta:set_string("formspec",
-		"invsize[9,5;]" ..
+		"size[9,5]" ..
-		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
+		"textarea[0.5,0.5;8.5,4;commands;Commands;"..minetest.formspec_escape(commands).."]" ..
 		"label[1,3.8;@nearest is replaced by the nearest player name ("..tostring(NEAREST_MAX_DISTANCE).." nodes max for the nearest distance)".."]" ..
 		"button_exit[3.3,4.5;2,1;submit;Submit]")
 	local owner = meta:get_string("owner")
@@ -46,7 +48,11 @@ local function receive_fields(pos, _, fields, player)
 	and player:get_player_name() ~= owner then
 		return
 	end
-	meta:set_string("commands", fields.commands)
+	if strip_color_codes then
+		meta:set_string("commands", minetest.strip_colors(fields.commands))
+	else
+		meta:set_string("commands", fields.commands)
+	end
 
 	initialize_data(meta)
 end

moremesecons_commandblock/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_commandblock
-depends = mesecons,moremesecons_utils
+depends = mesecons,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_conductor_signalchanger/init.lua

@@ -45,10 +45,11 @@ mesecon.register_node("moremesecons_conductor_signalchanger:conductor_signalchan
 	inventory_image = "moremesecons_conductor_signalchanger_off.png",
 	groups = {dig_immediate = 2},
 	paramtype = "light",
-	paramtype2 = "facedir",
+	paramtype2 = "4dir",
 	drawtype = "nodebox",
 	selection_box = nodebox,
 	node_box = nodebox,
+	on_rotate = mesecon.on_rotate,
 },{
 	groups = {dig_immediate = 2},
 	mesecons = {

moremesecons_dual_delayer/init.lua

@@ -68,7 +68,7 @@ for n,i in pairs({{0,0},{1,0},{1,1}}) do
 		inventory_image = top_texture,
 		wield_image = top_texture,
 		paramtype = "light",
-		paramtype2 = "facedir",
+		paramtype2 = "4dir",
 		drawtype = "nodebox",
 		node_box = {
 			type = "fixed",
@@ -79,6 +79,7 @@ for n,i in pairs({{0,0},{1,0},{1,1}}) do
 		groups = groups,
 		tiles = {top_texture, "moremesecons_dual_delayer_bottom.png", "moremesecons_dual_delayer_side_left.png", "moremesecons_dual_delayer_side_right.png", "moremesecons_dual_delayer_ends.png", "moremesecons_dual_delayer_ends.png"},
 		use_texture_alpha = use_texture_alpha,
+		on_rotate = mesecon.on_rotate,
 		mesecons = {
 			receptor = {
 				state = mesecon.state.off,

moremesecons_entity_detector/init.lua

@@ -2,6 +2,8 @@
 -- Detects entitys in a certain radius
 -- The radius can be changes by right-click (by default 6)
 
+local MAX_RADIUS = moremesecons.setting("entity_detector", "max_radius", 16, 0)
+
 local function make_formspec(meta)
 	meta:set_string("formspec", "size[9,5]" ..
 		"field[0.3,  0;9,2;scanname;Comma-separated list of the names (itemstring) of entities to scan for (empty for any):;${scanname}]"..
@@ -26,8 +28,7 @@ local function object_detector_on_receive_fields(pos, _, fields, player)
 	meta:set_string("digiline_channel", fields.digiline_channel)
 	local r = tonumber(fields.radius)
 	if r then
-		local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
+		meta:set_int("radius", math.min(r, MAX_RADIUS))
-		meta:set_int("radius", math.min(r, max_radius))
 	end
 end
 
@@ -37,8 +38,7 @@ local object_detector_scan = function (pos)
 	local scanname = meta:get_string("scanname")
 	local scan_all = scanname == ""
 	local scan_names = scanname:split(',')
-	local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
+	local radius = math.min(tonumber(meta:get("radius")) or 6, MAX_RADIUS)
-	local radius = math.min(tonumber(meta:get("radius")) or 6, max_radius)
 	for _,obj in pairs(minetest.get_objects_inside_radius(pos, radius)) do
 		local luaentity = obj:get_luaentity()
 		if luaentity then
@@ -46,9 +46,14 @@ local object_detector_scan = function (pos)
 				return true
 			end
 			local isname = luaentity.name
+			-- If the item is present as dropped item entity:
+			local bitemname = (isname == "__builtin:item" and ItemStack(luaentity.itemstring):get_name())
 			for _, name in ipairs(scan_names) do
-				if isname == name or (isname == "__builtin:item" and luaentity.itemstring == name) then
+				if name == isname then
-					return true
+					return true -- object name matches
+				end
+				if name == bitemname then
+					return true -- item of the item entity matches
 				end
 			end
 		end
@@ -62,7 +67,7 @@ local object_detector_digiline = {
 		action = function (pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
 			local active_channel = meta:get_string("digiline_channel")
-			if channel ~= active_channel then
+			if channel ~= active_channel or type(msg) ~= "string" then
 				return
 			end
 			meta:set_string("scanname", msg)

moremesecons_entity_detector/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_entity_detector
-depends = mesecons
+depends = mesecons,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_induction_transmitter/init.lua

@@ -58,6 +58,7 @@ mesecon.register_node("moremesecons_induction_transmitter:induction_transmitter"
 			{-0.25, -0.25, -0.5, 0.25, 0.25, -0.1875},
 		},
 	},
+	on_rotate = mesecon.on_rotate,
 }, {
 	tiles = {"default_mese_block.png"},
 	groups = {cracky = 3},

moremesecons_injector_controller/init.lua

@@ -42,12 +42,13 @@ mesecon.register_node("moremesecons_injector_controller:injector_controller", {
 	drawtype = "nodebox",
 	inventory_image = "moremesecons_injector_controller_off.png",
 	paramtype = "light",
-	paramtype2 = "facedir",
+	paramtype2 = "4dir",
 	node_box = {
 		type = "fixed",
 		fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }},
 	},
 	on_timer = on_timer,
+	on_rotate = mesecon.on_rotate,
 },{
 	tiles = {"moremesecons_injector_controller_off.png", "moremesecons_injector_controller_side.png", "moremesecons_injector_controller_side.png"},
 	groups = {dig_immediate=2},

moremesecons_mesechest/init.lua

@@ -8,59 +8,8 @@ local function mesechest_get_output_rules(node)
 	return rules
 end
 
-
+-- default.chest.register_chest() doesn't allow to register most of the callbacks we need
-local open_chests = {}
+-- we have to override the chest node we registered again
-
--- Override minetest.register_node so it adds a prefix ":"
-local old_minetest_register_node = minetest.register_node
-minetest.register_node = function(name, def)
-	local old_on_metadata_inventory_put = def.on_metadata_inventory_put
-	local old_on_metadata_inventory_take = def.on_metadata_inventory_take
-	local old_on_rightclick = def.on_rightclick
-
-	def.on_metadata_inventory_put = function(pos, ...)
-		old_on_metadata_inventory_put(pos, ...)
-		mesecon.receptor_on(pos, {mesechest_get_output_rules(minetest.get_node(pos))[2]})
-		minetest.after(1, function(pos)
-			mesecon.receptor_off(pos, {mesechest_get_output_rules(minetest.get_node(pos))[2]})
-		end, pos)
-	end
-	def.on_metadata_inventory_take = function(pos, ...)
-		old_on_metadata_inventory_take(pos, ...)
-		mesecon.receptor_on(pos, {mesechest_get_output_rules(minetest.get_node(pos))[3]})
-		minetest.after(1, function(pos)
-			mesecon.receptor_off(pos, {mesechest_get_output_rules(minetest.get_node(pos))[3]})
-		end, pos)
-	end
-	def.on_rightclick = function(pos, node, clicker, ...)
-		if old_on_rightclick(pos, node, clicker, ...) == nil then
-			mesecon.receptor_on(pos, {mesechest_get_output_rules(node)[1]})
-			open_chests[clicker:get_player_name()] = pos
-		end
-	end
-
-	old_minetest_register_node(":"..name, def)
-end
-local old_minetest_register_lbm = minetest.register_lbm
-minetest.register_lbm = function() end
-
--- Get the on_player_receive_fields function. That's a huge hack
-for i, f in ipairs(minetest.registered_on_player_receive_fields) do
-	local serialized = minetest.serialize(f)
-	if string.find(serialized, "default:chest") then
-		minetest.registered_on_player_receive_fields[i] = function(player, formname, fields)
-			if f(player, formname, fields) == true then
-				local pn = player:get_player_name()
-				if open_chests[pn] then
-					mesecon.receptor_off(open_chests[pn], {mesechest_get_output_rules(minetest.get_node(open_chests[pn]))[1]})
-					open_chests[pn] = nil
-				end
-			end
-		end
-		break
-	end
-end
-
 default.chest.register_chest("moremesecons_mesechest:mesechest", {
 	description = "Mese Chest",
 	tiles = {
@@ -104,8 +53,55 @@ default.chest.register_chest("moremesecons_mesechest:mesechest_locked", {
 	}
 })
 
-minetest.register_node = old_minetest_register_node
+local moremesecons_chests = {}
-minetest.register_lbm = old_minetest_register_lbm
+
+for _, chest in ipairs({"moremesecons_mesechest:mesechest", "moremesecons_mesechest:mesechest_locked",
+						"moremesecons_mesechest:mesechest_open", "moremesecons_mesechest:mesechest_locked_open"}) do
+	local old_def = minetest.registered_nodes[chest]
+
+	local old_on_metadata_inventory_put = old_def.on_metadata_inventory_put
+	local old_on_metadata_inventory_take = old_def.on_metadata_inventory_take
+	local old_on_rightclick = old_def.on_rightclick
+
+	local override = {}
+	override.on_metadata_inventory_put = function(pos, ...)
+		old_on_metadata_inventory_put(pos, ...)
+		mesecon.receptor_on(pos, {mesechest_get_output_rules(minetest.get_node(pos))[2]})
+		minetest.after(1, function(pos)
+			mesecon.receptor_off(pos, {mesechest_get_output_rules(minetest.get_node(pos))[2]})
+		end, pos)
+	end
+	override.on_metadata_inventory_take = function(pos, ...)
+		old_on_metadata_inventory_take(pos, ...)
+		mesecon.receptor_on(pos, {mesechest_get_output_rules(minetest.get_node(pos))[3]})
+		minetest.after(1, function(pos)
+			mesecon.receptor_off(pos, {mesechest_get_output_rules(minetest.get_node(pos))[3]})
+		end, pos)
+	end
+	override.on_rightclick = function(pos, node, clicker, ...)
+		if old_on_rightclick(pos, node, clicker, ...) == nil then
+			mesecon.receptor_on(pos, {mesechest_get_output_rules(node)[1]})
+		end
+	end
+
+	minetest.override_item(chest, override)
+	moremesecons_chests[chest] = true
+end
+
+-- if the chest is getting closed, turn the signal off
+-- luacheck: ignore 122
+local old_lid_close = default.chest.chest_lid_close
+function default.chest.chest_lid_close(pn)
+	local pos = default.chest.open_chests[pn].pos
+	-- old_lid_close will return true if the chest won't be closed
+	if old_lid_close(pn) then
+		return true
+	end
+	local node = minetest.get_node(pos)
+	if moremesecons_chests[node.name] then
+		mesecon.receptor_off(pos, {mesechest_get_output_rules(node)[1]})
+	end
+end
 
 minetest.register_craft({
 	output = "moremesecons_mesechest:mesechest",

moremesecons_playerkiller/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_playerkiller
-depends = mesecons,mesecons_materials,moremesecons_utils
+depends = mesecons,mesecons_materials,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_signalchanger/init.lua

@@ -41,10 +41,11 @@ mesecon.register_node("moremesecons_signalchanger:signalchanger", {
 	inventory_image = "moremesecons_signalchanger_off.png",
 	groups = {dig_immediate = 2},
 	paramtype = "light",
-	paramtype2 = "facedir",
+	paramtype2 = "4dir",
 	drawtype = "nodebox",
 	selection_box = nodebox,
 	node_box = nodebox,
+	on_rotate = mesecon.on_rotate,
 },{
 	groups = {dig_immediate = 2},
 	mesecons = {

moremesecons_teleporter/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_teleporter
-depends = mesecons,moremesecons_utils
+depends = mesecons,moremesecons_utils,default
 optional_depends = craft_guide

moremesecons_timegate/init.lua

@@ -1,3 +1,5 @@
+local MIN_DELAY = moremesecons.setting("timegate", "min_delay", 0.5)
+
 local timegate_get_output_rules = function(node)
 	local rules = {{x = 0, y = 0, z = 1}}
 	for _ = 0, node.param2 do
@@ -14,25 +16,28 @@ local timegate_get_input_rules = function(node)
 	return rules
 end
 
--- Functions that are called after the delay time
+local function turnoff(pos, _, node)
+	if mesecon.is_receptor_on(node.name) then
+		node.name = "moremesecons_timegate:timegate_off"
+		minetest.swap_node(pos, node)
+		mesecon.receptor_off(pos)
+	end
+end
 
-local function timegate_activate(pos, node)
+local function turnon(pos, node)
 	-- using a meta string allows writing the time in hexadecimals
 	local time = tonumber(minetest.get_meta(pos):get_string("time"))
-	if not time then
+	if not (time and time >= MIN_DELAY) then
 		return
 	end
-	node.name = "moremesecons_timegate:timegate_on"
+	-- restart the timer when the input was turned off and on again
-	minetest.swap_node(pos, node)
+	minetest.get_node_timer(pos):start(time)
-	mesecon.receptor_on(pos)
+
-	minetest.after(time, function()
+	if mesecon.is_receptor_off(node.name) then
-		local node = minetest.get_node(pos)
+		node.name = "moremesecons_timegate:timegate_on"
-		if node.name == "moremesecons_timegate:timegate_on" then
+		minetest.swap_node(pos, node)
-			mesecon.receptor_off(pos)
+		mesecon.receptor_on(pos)
-			node.name = "moremesecons_timegate:timegate_off"
+	end
-			minetest.swap_node(pos, node)
-		end
-	end)
 end
 
 local boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
@@ -66,7 +71,7 @@ mesecon.register_node("moremesecons_timegate:timegate", {
 		fixed = boxes
 	},
 	paramtype = "light",
-	paramtype2 = "facedir",
+	paramtype2 = "4dir",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_stone_defaults(),
@@ -78,7 +83,9 @@ mesecon.register_node("moremesecons_timegate:timegate", {
 		and not minetest.is_protected(pos, player:get_player_name()) then
 			minetest.get_meta(pos):set_string("time", fields.time)
 		end
-	end
+	end,
+	on_timer = turnoff,
+	on_rotate = mesecon.on_rotate
 },{
 		tiles = {
 			"moremesecons_timegate_off.png",
@@ -99,7 +106,7 @@ mesecon.register_node("moremesecons_timegate:timegate", {
 			effector =
 			{
 				rules = timegate_get_input_rules,
-				action_on = timegate_activate
+				action_on = turnon
 			}
 		},
 },{
@@ -120,6 +127,7 @@ mesecon.register_node("moremesecons_timegate:timegate", {
 			},
 			effector = {
 				rules = timegate_get_input_rules,
+				action_on = turnon
 			}
 		},
 })

moremesecons_timegate/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_timegate
-depends = mesecons
+depends = mesecons,default
 optional_depends = craft_guide

moremesecons_wireless/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_wireless
-depends = mesecons,moremesecons_utils
+depends = mesecons,moremesecons_utils,default
 optional_depends = digilines,craft_guide

settingtypes.txt

@@ -3,6 +3,10 @@
 # Minimal interval authorized. Any lower will be set to it.
 moremesecons_adjustable_blinky_plant.min_interval (Minimum Interval) float 0.5
 
+[Adjustable Player Detector]
+
+moremesecons_adjustable_player_detector.max_radius (Maximum adjustable player detector radius) float 16 0
+
 [Craftable Commandblock]
 
 # Space-separated list of authorized commands
@@ -65,6 +69,11 @@ moremesecons_teleporter.max_p2t_distance (Maximum Player To Teleporter distance)
 # from an older version which did not use it.
 moremesecons_teleporter.enable_lbm (Enable Registration LBM) bool false
 
+[Timegate]
+
+# Minimum authorized length for the timegate signal. Timegates with a shorter time will not respond.
+moremesecons_timegate.min_delay (Minimum timegate delay) float 0.5
+
 [Wireless]
 
 # Whether to enable the wireless jammer node