Add node detector blacklist api

NaN can cause problems (and errors) if the receiving node doesn't check for it, this PR makes it so NaN values are removed from digiline messages.

mesecons/internal.lua

@@ -51,27 +51,18 @@ mesecon.fifo_queue = dofile(minetest.get_modpath("mesecons").."/fifo_queue.lua")
 
 -- General
 function mesecon.get_effector(nodename)
-	if  minetest.registered_nodes[nodename]
-	and minetest.registered_nodes[nodename].mesecons
-	and minetest.registered_nodes[nodename].mesecons.effector then
-		return minetest.registered_nodes[nodename].mesecons.effector
-	end
+	local def = minetest.registered_nodes[nodename]
+	return def and def.mesecons and def.mesecons.effector
 end
 
 function mesecon.get_receptor(nodename)
-	if  minetest.registered_nodes[nodename]
-	and minetest.registered_nodes[nodename].mesecons
-	and minetest.registered_nodes[nodename].mesecons.receptor then
-		return minetest.registered_nodes[nodename].mesecons.receptor
-	end
+	local def = minetest.registered_nodes[nodename]
+	return def and def.mesecons and def.mesecons.receptor
 end
 
 function mesecon.get_conductor(nodename)
-	if  minetest.registered_nodes[nodename]
-	and minetest.registered_nodes[nodename].mesecons
-	and minetest.registered_nodes[nodename].mesecons.conductor then
-		return minetest.registered_nodes[nodename].mesecons.conductor
-	end
+	local def = minetest.registered_nodes[nodename]
+	return def and def.mesecons and def.mesecons.conductor
 end
 
 function mesecon.get_any_outputrules(node)

mesecons_delayer/init.lua

@@ -62,6 +62,8 @@ local def = {
 	sounds = mesecon.node_sound.stone,
 	on_blast = mesecon.on_blastnode,
 	drop = "mesecons_delayer:delayer_off_1",
+	delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
+	delayer_offstate = "mesecons_delayer:delayer_off_"..tostring(i),
 }
 
 -- Deactivated delayer definition defaults
@@ -93,7 +95,6 @@ local off_state = {
 			param2 = node.param2
 		})
 	end,
-	delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
 	mesecons = {
 		receptor =
 		{
@@ -103,6 +104,7 @@ local off_state = {
 		effector =
 		{
 			rules = delayer_get_input_rules,
+			action_off = delayer_deactivate,
 			action_on = delayer_activate
 		}
 	},
@@ -134,7 +136,6 @@ local on_state = {
 			param2 = node.param2
 		})
 	end,
-	delayer_offstate = "mesecons_delayer:delayer_off_"..tostring(i),
 	mesecons = {
 		receptor =
 		{
@@ -144,7 +145,8 @@ local on_state = {
 		effector =
 		{
 			rules = delayer_get_input_rules,
-			action_off = delayer_deactivate
+			action_off = delayer_deactivate,
+			action_on = delayer_activate
 		}
 	},
 }

mesecons_detector/init.lua

@@ -4,6 +4,16 @@ local side_texture = mesecon.texture.steel_block or "mesecons_detector_side.png"
 
 local GET_COMMAND = "GET"
 
+
+local function comma_list_to_table(comma_list)
+	local tbl = {}
+	for _, str in ipairs(string.split(comma_list:gsub("%s", ""), ",")) do
+		tbl[str] = true
+	end
+	return tbl
+end
+
+
 -- Object detector
 -- Detects players in a certain radius
 -- The radius can be specified in mesecons/settings.lua
@@ -35,10 +45,7 @@ local function object_detector_scan(pos)
 	if next(objs) == nil then return false end
 
 	local scanname = minetest.get_meta(pos):get_string("scanname")
-	local scan_for = {}
-	for _, str in pairs(string.split(scanname:gsub(" ", ""), ",")) do
-		scan_for[str] = true
-	end
+	local scan_for = comma_list_to_table(scanname)
 
 	local every_player = scanname == ""
 	for _, obj in pairs(objs) do
@@ -150,6 +157,23 @@ minetest.register_abm({
 -- Node detector
 -- Detects the node in front of it
 
+local blacklist = {
+	air = true,
+	ignore = true,
+}
+
+function mesecon.node_detector_blacklist_add(node)
+	blacklist[node] = true
+end
+
+function mesecon.node_detector_blacklist_remove(node)
+	blacklist[node] = nil
+end
+
+function mesecon.node_detector_on_blacklist(node)
+	return blacklist[node] == true
+end
+
 local function node_detector_make_formspec(pos)
 	local meta = minetest.get_meta(pos)
 	if meta:get_string("distance") == ""  then meta:set_string("distance", "0") end
@@ -188,9 +212,10 @@ local function node_detector_scan(pos)
 		vector.subtract(pos, vector.multiply(minetest.facedir_to_dir(node.param2), distance + 1))
 	).name
 	local scanname = meta:get_string("scanname")
+	local scan_for = comma_list_to_table(scanname)
 
-	return (frontname == scanname) or
-		(frontname ~= "air" and frontname ~= "ignore" and scanname == "")
+	return (scan_for[frontname]) or
+		(blacklist[frontname] ~= true and scanname == "")
 end
 
 local function node_detector_send_node_name(pos, node, channel, meta)

mesecons_extrawires/vertical.lua

@@ -40,35 +40,39 @@ local bottom_rules = {
 	{x=0, y=2, z=0} -- receive power from pressure plate / detector / ... 2 nodes above
 }
 
+local function is_vertical_conductor(nodename)
+	local def = minetest.registered_nodes[nodename]
+	return def and def.is_vertical_conductor
+end
+
 local vertical_updatepos = function (pos)
 	local node = minetest.get_node(pos)
-	if minetest.registered_nodes[node.name]
-	and minetest.registered_nodes[node.name].is_vertical_conductor then
-		local node_above = minetest.get_node(vector.add(pos, vertical_rules[1]))
-		local node_below = minetest.get_node(vector.add(pos, vertical_rules[2]))
-
-		local above = minetest.registered_nodes[node_above.name]
-			and minetest.registered_nodes[node_above.name].is_vertical_conductor
-		local below = minetest.registered_nodes[node_below.name]
-			and minetest.registered_nodes[node_below.name].is_vertical_conductor
-
-		mesecon.on_dignode(pos, node)
-
-		-- Always place offstate conductor and let mesecon.on_placenode take care
-		local newname = "mesecons_extrawires:vertical_"
-		if above and below then -- above and below: vertical mesecon
-			newname = newname .. "off"
-		elseif above and not below then -- above only: bottom
-			newname = newname .. "bottom_off"
-		elseif not above and below then -- below only: top
-			newname = newname .. "top_off"
-		else -- no vertical wire above, no vertical wire below: use bottom
-			newname = newname .. "bottom_off"
-		end
-
-		minetest.set_node(pos, {name = newname})
-		mesecon.on_placenode(pos, {name = newname})
+	if not is_vertical_conductor(node.name) then
+		return
 	end
+
+	local node_above = minetest.get_node(vector.add(pos, vertical_rules[1]))
+	local node_below = minetest.get_node(vector.add(pos, vertical_rules[2]))
+
+	local above = is_vertical_conductor(node_above.name)
+	local below = is_vertical_conductor(node_below.name)
+
+	mesecon.on_dignode(pos, node)
+
+	-- Always place offstate conductor and let mesecon.on_placenode take care
+	local newname = "mesecons_extrawires:vertical_"
+	if above and below then -- above and below: vertical mesecon
+		newname = newname .. "off"
+	elseif above and not below then -- above only: bottom
+		newname = newname .. "bottom_off"
+	elseif not above and below then -- below only: top
+		newname = newname .. "top_off"
+	else -- no vertical wire above, no vertical wire below: use bottom
+		newname = newname .. "bottom_off"
+	end
+
+	minetest.set_node(pos, {name = newname})
+	mesecon.on_placenode(pos, {name = newname})
 end
 
 local vertical_update = function (pos)

mesecons_gamecompat/compat_mtg.lua

@@ -59,6 +59,10 @@ if minetest.get_modpath("mesecons_mvps") then
 		"doors:hidden",
 		"doors:trapdoor_steel",
 		"doors:trapdoor_steel_open",
+		"beds:bed_bottom",
+		"beds:bed_top",
+		"beds:fancy_bed_bottom",
+		"beds:fancy_bed_top",
 		"xpanes:door_steel_bar_a",
 		"xpanes:door_steel_bar_b",
 		"xpanes:door_steel_bar_c",

mesecons_luacontroller/init.lua

@@ -388,7 +388,10 @@ local function clean_and_weigh_digiline_message(msg, back_references)
 		return msg, #msg + 25
 	elseif t == "number" then
 		-- Numbers are passed by value so need not be touched, and cost 8 bytes
-		-- as all numbers in Lua are doubles.
+		-- as all numbers in Lua are doubles. NaN values are removed.
+		if msg ~= msg then
+			return nil, 0
+		end
 		return msg, 8
 	elseif t == "boolean" then
 		-- Booleans are passed by value so need not be touched, and cost 1

mesecons_mvps/init.lua

@@ -81,9 +81,9 @@ function mesecon.mvps_get_stack(pos, dir, maximum, all_pull_sticky)
 			if #nodes > maximum then return nil end
 
 			-- add connected nodes to frontiers
-			if minetest.registered_nodes[nn.name]
-			and minetest.registered_nodes[nn.name].mvps_sticky then
-				local connected = minetest.registered_nodes[nn.name].mvps_sticky(np, nn)
+			local nndef = minetest.registered_nodes[nn.name]
+			if nndef and nndef.mvps_sticky then
+				local connected = nndef.mvps_sticky(np, nn)
 				for _, cp in ipairs(connected) do
 					frontiers:add(cp)
 				end
@@ -96,10 +96,9 @@ function mesecon.mvps_get_stack(pos, dir, maximum, all_pull_sticky)
 			for _, r in ipairs(mesecon.rules.alldirs) do
 				local adjpos = vector.add(np, r)
 				local adjnode = minetest.get_node(adjpos)
-				if minetest.registered_nodes[adjnode.name]
-				and minetest.registered_nodes[adjnode.name].mvps_sticky then
-					local sticksto = minetest.registered_nodes[adjnode.name]
-						.mvps_sticky(adjpos, adjnode)
+				local adjdef = minetest.registered_nodes[adjnode.name]
+				if adjdef and adjdef.mvps_sticky then
+					local sticksto = adjdef.mvps_sticky(adjpos, adjnode)
 
 					-- connects to this position?
 					for _, link in ipairs(sticksto) do

mesecons_wires/init.lua

@@ -13,11 +13,11 @@ local S = minetest.get_translator(minetest.get_current_modname())
 -- self_pos = pos of any mesecon node, from_pos = pos of conductor to getconnect for
 local wire_getconnect = function (from_pos, self_pos)
 	local node = minetest.get_node(self_pos)
-	if minetest.registered_nodes[node.name]
-	and minetest.registered_nodes[node.name].mesecons then
+	local def = minetest.registered_nodes[node.name]
+	if def and def.mesecons then
 		-- rules of node to possibly connect to
 		local rules
-		if (minetest.registered_nodes[node.name].mesecon_wire) then
+		if def.mesecon_wire then
 			rules = mesecon.rules.default
 		else
 			rules = mesecon.get_any_rules(node)
@@ -68,16 +68,18 @@ end
 
 local update_on_place_dig = function (pos, node)
 	-- Update placed node (get_node again as it may have been dug)
-	local nn = minetest.get_node(pos)
-	if (minetest.registered_nodes[nn.name])
-	and (minetest.registered_nodes[nn.name].mesecon_wire) then
-		wire_updateconnect(pos)
+	do
+		local nn = minetest.get_node(pos)
+		local def = minetest.registered_nodes[nn.name]
+		if def and def.mesecon_wire then
+			wire_updateconnect(pos)
+		end
 	end
 
 	-- Update nodes around it
 	local rules
-	if minetest.registered_nodes[node.name]
-	and minetest.registered_nodes[node.name].mesecon_wire then
+	local ndef = minetest.registered_nodes[node.name]
+	if ndef and ndef.mesecon_wire then
 		rules = mesecon.rules.default
 	else
 		rules = mesecon.get_any_rules(node)
@@ -86,8 +88,8 @@ local update_on_place_dig = function (pos, node)
 
 	for _, r in ipairs(mesecon.flattenrules(rules)) do
 		local np = vector.add(pos, r)
-		if minetest.registered_nodes[minetest.get_node(np).name]
-		and minetest.registered_nodes[minetest.get_node(np).name].mesecon_wire then
+		local rdef = minetest.registered_nodes[minetest.get_node(np).name]
+		if rdef and rdef.mesecon_wire then
 			wire_updateconnect(np)
 		end
 	end