Enforce checks for ignore

It is `buildable_to` so the standard check didn’t work

mesecons/fifo_queue.lua

@@ -1,62 +0,0 @@
-
--- a simple first-in-first-out queue
--- very similar to the one in https://github.com/minetest/minetest/pull/7683
-
-local fifo_queue = {}
-
-local metatable = {__index = fifo_queue}
-
--- creates a new empty queue
-function fifo_queue.new()
-	local q = {n_in = 0, n_out = 0, i_out = 1, buf_in = {}, buf_out = {}}
-	setmetatable(q, metatable)
-	return q
-end
-
--- adds an element to the queue
-function fifo_queue.add(self, v)
-	local n = self.n_in + 1
-	self.n_in = n
-	self.buf_in[n] = v
-end
-
--- removes and returns the next element, or nil of empty
-function fifo_queue.take(self)
-	local i_out = self.i_out
-	if i_out <= self.n_out then
-		local v = self.buf_out[i_out]
-		self.i_out = i_out + 1
-		self.buf_out[i_out] = true
-		return v
-	end
-
-	-- buf_out is empty, try to swap
-	self.i_out = 1
-	self.n_out = 0
-	if self.n_in == 0 then
-		return nil -- empty
-	end
-
-	-- swap
-	self.n_out = self.n_in
-	self.n_in = 0
-	self.buf_out, self.buf_in = self.buf_in, self.buf_out
-
-	local v = self.buf_out[1]
-	self.i_out = 2
-	self.buf_out[1] = true
-	return v
-end
-
--- returns whether the queue is empty
-function fifo_queue.is_empty(self)
-	return self.n_out == self.i_out + 1 and self.n_in == 0
-end
-
--- returns stuff for iteration in a for loop, like pairs
--- adding new elements while iterating is no problem
-function fifo_queue.iter(self)
-	return fifo_queue.take, self, nil
-end
-
-return fifo_queue

mesecons/internal.lua

@@ -11,7 +11,7 @@
 
 -- RECEPTORS
 -- mesecon.is_receptor(nodename)	--> Returns true if nodename is a receptor
--- mesecon.is_receptor_on(nodename)	--> Returns true if nodename is an receptor with state = mesecon.state.on
+-- mesecon.is_receptor_on(nodename	--> Returns true if nodename is an receptor with state = mesecon.state.on
 -- mesecon.is_receptor_off(nodename)	--> Returns true if nodename is an receptor with state = mesecon.state.off
 -- mesecon.receptor_get_rules(node)	--> Returns the rules of the receptor (mesecon.rules.default if none specified)
 
@@ -46,8 +46,6 @@
 -- mesecon.rotate_rules_down(rules)
 -- These functions return rules that have been rotated in the specific direction
 
-local fifo_queue = dofile(minetest.get_modpath("mesecons").."/fifo_queue.lua")
-
 -- General
 function mesecon.get_effector(nodename)
 	if  minetest.registered_nodes[nodename]
@@ -94,8 +92,8 @@ function mesecon.get_any_inputrules(node)
 end
 
 function mesecon.get_any_rules(node)
-	return mesecon.merge_rule_sets(mesecon.get_any_inputrules(node),
+	return mesecon.mergetable(mesecon.get_any_inputrules(node) or {},
-		mesecon.get_any_outputrules(node))
+		mesecon.get_any_outputrules(node) or {})
 end
 
 -- Receptors
@@ -373,39 +371,32 @@ end
 -- Follow all all conductor paths replacing conductors that were already
 -- looked at, activating / changing all effectors along the way.
 function mesecon.turnon(pos, link)
-	local frontiers = fifo_queue.new()
+	local frontiers = {{pos = pos, link = link}}
-	frontiers:add({pos = pos, link = link})
-	local pos_can_be_skipped = {}
 
 	local depth = 1
-	for f in frontiers:iter() do
+	while frontiers[1] do
+		local f = table.remove(frontiers, 1)
 		local node = mesecon.get_node_force(f.pos)
 
 		if not node then
 			-- Area does not exist; do nothing
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		elseif mesecon.is_conductor_off(node, f.link) then
 			local rules = mesecon.conductor_get_rules(node)
 
 			-- Call turnon on neighbors
 			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
 				local np = vector.add(f.pos, r)
-				if not pos_can_be_skipped[minetest.hash_node_position(np)] then
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
-					for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
+					table.insert(frontiers, {pos = np, link = l})
-						frontiers:add({pos = np, link = l})
-					end
 				end
 			end
 
 			mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link))
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		elseif mesecon.is_effector(node.name) then
 			mesecon.changesignal(f.pos, node, f.link, mesecon.state.on, depth)
 			if mesecon.is_effector_off(node.name) then
 				mesecon.activate(f.pos, node, f.link, depth)
 			end
-		else
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		end
 		depth = depth + 1
 	end
@@ -428,42 +419,37 @@ end
 --	depth = indicates order in which signals wire fired, higher is later
 -- }
 function mesecon.turnoff(pos, link)
-	local frontiers = fifo_queue.new()
+	local frontiers = {{pos = pos, link = link}}
-	frontiers:add({pos = pos, link = link})
 	local signals = {}
-	local pos_can_be_skipped = {}
 
 	local depth = 1
-	for f in frontiers:iter() do
+	while frontiers[1] do
+		local f = table.remove(frontiers, 1)
 		local node = mesecon.get_node_force(f.pos)
 
 		if not node then
 			-- Area does not exist; do nothing
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		elseif mesecon.is_conductor_on(node, f.link) then
 			local rules = mesecon.conductor_get_rules(node)
 			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
 				local np = vector.add(f.pos, r)
 
-				if not pos_can_be_skipped[minetest.hash_node_position(np)] then
+				-- Check if an onstate receptor is connected. If that is the case,
-					-- Check if an onstate receptor is connected. If that is the case,
+				-- abort this turnoff process by returning false. `receptor_off` will
-					-- abort this turnoff process by returning false. `receptor_off` will
+				-- discard all the changes that we made in the voxelmanip:
-					-- discard all the changes that we made in the voxelmanip:
+				for _, l in ipairs(mesecon.rules_link_rule_all_inverted(f.pos, r)) do
-					if mesecon.rules_link_rule_all_inverted(f.pos, r)[1] then
+					if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
-						if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
+						return false
-							return false
-						end
 					end
+				end
 
-					-- Call turnoff on neighbors
+				-- Call turnoff on neighbors
-					for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
-						frontiers:add({pos = np, link = l})
+					table.insert(frontiers, {pos = np, link = l})
-					end
 				end
 			end
 
 			mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link))
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		elseif mesecon.is_effector(node.name) then
 			table.insert(signals, {
 				pos = f.pos,
@@ -471,8 +457,6 @@ function mesecon.turnoff(pos, link)
 				link = f.link,
 				depth = depth
 			})
-		else
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		end
 		depth = depth + 1
 	end

mesecons/presets.lua

@@ -16,9 +16,9 @@ mesecon.rules.default = {
 	{x =  0, y = -1, z = -1},
 }
 
-mesecon.rules.floor = mesecon.merge_rule_sets(mesecon.rules.default, {{x = 0, y = -1, z = 0}})
+mesecon.rules.floor = mesecon.mergetable(mesecon.rules.default, {{x = 0, y = -1, z = 0}})
 
-mesecon.rules.pplate = mesecon.merge_rule_sets(mesecon.rules.floor, {{x = 0, y = -2, z = 0}})
+mesecon.rules.pplate = mesecon.mergetable(mesecon.rules.floor, {{x = 0, y = -2, z = 0}})
 
 mesecon.rules.buttonlike = {
 	{x = 1,  y =  0, z =  0},

mesecons/util.lua

@@ -213,9 +213,8 @@ function mesecon.cmpAny(t1, t2)
 	return true
 end
 
--- Deprecated. Use `merge_tables` or `merge_rule_sets` as appropriate.
+-- does not overwrite values; number keys (ipairs) are appended, not overwritten
 function mesecon.mergetable(source, dest)
-	minetest.log("warning", debug.traceback("Deprecated call to mesecon.mergetable"))
 	local rval = mesecon.tablecopy(dest)
 
 	for k, v in pairs(source) do
@@ -228,32 +227,6 @@ function mesecon.mergetable(source, dest)
 	return rval
 end
 
--- Merges several rule sets in one. Order may not be preserved. Nil arguments
--- are ignored.
--- The rule sets must be of the same kind (either all single-level or all two-level).
--- The function may be changed to normalize the resulting set in some way.
-function mesecon.merge_rule_sets(...)
-	local rval = {}
-	for _, t in pairs({...}) do -- ignores nils automatically
-		table.insert_all(rval, mesecon.tablecopy(t))
-	end
-	return rval
-end
-
--- Merges two tables, with entries from `replacements` taking precedence over
--- those from `base`. Returns the new table.
--- Values are deep-copied from either table, keys are referenced.
--- Numerical indices aren’t handled specially.
-function mesecon.merge_tables(base, replacements)
-	local ret = mesecon.tablecopy(replacements) -- these are never overriden so have to be copied in any case
-	for k, v in pairs(base) do
-		if ret[k] == nil then -- it could be `false`
-			ret[k] = mesecon.tablecopy(v)
-		end
-	end
-	return ret
-end
-
 function mesecon.register_node(name, spec_common, spec_off, spec_on)
 	spec_common.drop = spec_common.drop or name .. "_off"
 	spec_common.on_blast = spec_common.on_blast or mesecon.on_blastnode
@@ -261,8 +234,8 @@ function mesecon.register_node(name, spec_common, spec_off, spec_on)
 	spec_on.__mesecon_state = "on"
 	spec_off.__mesecon_state = "off"
 
-	spec_on = mesecon.merge_tables(spec_common, spec_on);
+	spec_on = mesecon.mergetable(spec_common, spec_on);
-	spec_off = mesecon.merge_tables(spec_common, spec_off);
+	spec_off = mesecon.mergetable(spec_common, spec_off);
 
 	minetest.register_node(name .. "_on", spec_on)
 	minetest.register_node(name .. "_off", spec_off)

mesecons_blinkyplant/init.lua

@@ -32,13 +32,7 @@ mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
 		fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},
 	},
 	on_timer = on_timer,
-	on_rightclick = function(pos, node, clicker)
+	on_rightclick = toggle_timer,
-		if minetest.is_protected(pos, clicker and clicker:get_player_name() or "") then
-			return
-		end
-
-		toggle_timer(pos)
-	end,
 	on_construct = toggle_timer
 },{
 	tiles = {"jeija_blinky_plant_off.png"},

mesecons_commandblock/init.lua

@@ -10,7 +10,6 @@ minetest.register_chatcommand("say", {
 minetest.register_chatcommand("tell", {
 	params = "<name> <text>",
 	description = "Say <text> to <name> privately",
-	privs = {shout=true},
 	func = function(name, param)
 		local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")
 		if found == nil then

mesecons_delayer/init.lua

@@ -93,7 +93,7 @@ local off_state = {
 	wield_image = "mesecons_delayer_off_1.png",
 	groups = off_groups,
 	on_punch = function(pos, node, puncher)
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
+		if minetest.is_protected(pos, puncher and puncher:get_player_name()) then
 			return
 		end
 
@@ -134,7 +134,7 @@ local on_state = {
 	},
 	groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1},
 	on_punch = function(pos, node, puncher)
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
+		if minetest.is_protected(pos, puncher and puncher:get_player_name()) then
 			return
 		end
 

mesecons_extrawires/corner.lua

@@ -30,6 +30,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
 	walkable = false,
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
+	node_box = corner_nodebox,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:corner_off",
 	sounds = default.node_sound_defaults(),
@@ -57,6 +58,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
 	walkable = false,
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
+	node_box = corner_nodebox,
 	groups = {dig_immediate = 3},
 	sounds = default.node_sound_defaults(),
 	mesecons = {conductor =

mesecons_extrawires/mesewire.lua

@@ -18,7 +18,7 @@ minetest.override_item("default:mese", {
 
 -- Copy node definition of powered mese from normal mese
 -- and brighten texture tiles to indicate mese is powered
-local powered_def = mesecon.merge_tables(minetest.registered_nodes["default:mese"], {
+local powered_def = mesecon.mergetable(minetest.registered_nodes["default:mese"], {
 	drop = "default:mese",
 	light_source = 5,
 	mesecons = {conductor = {

mesecons_extrawires/vertical.lua

@@ -175,9 +175,9 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
 minetest.register_craft({
 	output = "mesecons_extrawires:vertical_off 3",
 	recipe = {
-		{"group:mesecon_conductor_craftable"},
+		{"mesecons:wire_00000000_off"},
-		{"group:mesecon_conductor_craftable"},
+		{"mesecons:wire_00000000_off"},
-		{"group:mesecon_conductor_craftable"},
+		{"mesecons:wire_00000000_off"}
 	}
 })
 

mesecons_insulated/init.lua

@@ -86,7 +86,7 @@ minetest.register_craft({
 	output = "mesecons_insulated:insulated_off 3",
 	recipe = {
 		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
-		{"group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable"},
+		{"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"},
 		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
 	}
 })

mesecons_mvps/init.lua

@@ -29,6 +29,9 @@ function mesecon.is_mvps_stopper(node, pushdir, stack, stackid)
 end
 
 function mesecon.register_mvps_stopper(nodename, get_stopper)
+	if minetest.registered_nodes[nodename] and minetest.registered_nodes[nodename].buildable_to then
+		minetest.log("warning", ("Registering a buildable-to node \"%s\" as a mesecon stopper, this is not supported"):format(nodename))
+	end
 	if get_stopper == nil then
 			get_stopper = true
 	end
@@ -71,6 +74,10 @@ function mesecon.mvps_get_stack(pos, dir, maximum, all_pull_sticky)
 		local np = frontiers[1]
 		local nn = minetest.get_node(np)
 
+		-- Never push into unloaded blocks. Don’t try to pull from them, either.
+		-- TODO: load blocks instead, as with wires.
+		if nn.name == "ignore" then return nil end
+
 		if not node_replaceable(nn.name) then
 			table.insert(nodes, {node = nn, pos = np})
 			if #nodes > maximum then return nil end
@@ -327,10 +334,6 @@ function mesecon.mvps_move_objects(pos, dir, nodestack, movefactor)
 	end
 end
 
--- Never push into unloaded blocks. Don’t try to pull from them, either.
--- TODO: load blocks instead, as with wires.
-mesecon.register_mvps_stopper("ignore")
-
 mesecon.register_mvps_stopper("doors:door_steel_b_1")
 mesecon.register_mvps_stopper("doors:door_steel_t_1")
 mesecon.register_mvps_stopper("doors:door_steel_b_2")

mesecons_noteblock/init.lua

@@ -3,11 +3,7 @@ minetest.register_node("mesecons_noteblock:noteblock", {
 	tiles = {"mesecons_noteblock.png"},
 	is_ground_content = false,
 	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
-	on_punch = function(pos, node, puncher) -- change sound when punched
+	on_punch = function(pos, node) -- change sound when punched
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
-			return
-		end
-
 		node.param2 = (node.param2+1)%12
 		mesecon.noteblock_play(pos, node.param2)
 		minetest.set_node(pos, node)

mesecons_wires/init.lua

@@ -195,11 +195,10 @@ local function register_wires()
 		}}
 
 		local groups_on = {dig_immediate = 3, mesecon_conductor_craftable = 1,
-			not_in_creative_inventory = 1, not_in_craft_guide = 1}
+			not_in_creative_inventory = 1}
 		local groups_off = {dig_immediate = 3, mesecon_conductor_craftable = 1}
 		if nodeid ~= "00000000" then
 			groups_off["not_in_creative_inventory"] = 1
-			groups_off["not_in_craft_guide"] = 1
 		end
 
 		mesecon.register_node(":mesecons:wire_"..nodeid, {