Version MFF.

.github/workflows/check-release.yml

@@ -1,15 +0,0 @@
-on: [push, pull_request]
-name: Check & Release
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@main
-    - name: apt
-      run: sudo apt-get install -y luarocks
-    - name: luacheck install
-      run: luarocks install --local luacheck
-    - name: luacheck run
-      run: $HOME/.luarocks/bin/luacheck ./

.gitignore

@@ -1,3 +0,0 @@
-*~
-*.patch
-*.diff

.luacheckrc

@@ -1,36 +0,0 @@
-std = "lua51c"
-
-ignore = {
-	"21/_+", -- Unused variable, except "_", "__", etc.
-	"213", -- Unused loop variable
-	"421", -- Shadowing a local variable
-	"422", -- Shadowing an argument
-	"423", -- Shadowing a loop variable
-	"431", -- Shadowing an upvalue
-	"432", -- Shadowing an upvalue argument
-	"433", -- Shadowing an upvalue loop variable
-	"542", -- Empty if branch
-}
-
-max_line_length = 200
-
-read_globals = {
-	"default",
-	"digiline",
-	"doors",
-	"dump",
-	"jit",
-	"minetest",
-	"screwdriver",
-	"string.split",
-	"table.copy",
-	"table.insert_all",
-	"vector",
-	"VoxelArea",
-}
-
-globals = {"mesecon"}
-
-files["mesecons/actionqueue.lua"] = {
-	globals = {"minetest.registered_globalsteps"},
-}

README.md

@@ -12,9 +12,9 @@ MESECONS by Jeija and contributors
 
 Mezzee-what?
 ------------
-[Mesecons](https://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay.
+[Mesecons](http://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay.
 
-Mesecons is a mod for [Minetest](https://www.minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks.
+Mesecons is a mod for [Minetest](http://minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks.
 
 Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics.
 
@@ -22,9 +22,9 @@ OK, I want in.
 --------------
 Go get it!
 
-[DOWNLOAD IT NOW](https://github.com/minetest-mods/mesecons/archive/master.zip)
+[DOWNLOAD IT NOW](https://github.com/Jeija/minetest-mod-mesecons/archive/master.zip)
 
-Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](https://wiki.minetest.net/Mods) over at the official Minetest Wiki. For your convenience, here's a quick summary:
+Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary:
 
 1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer.
 2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one.
@@ -43,11 +43,9 @@ Or maybe a [comprehensive reference](http://mesecons.net/items.html) is your sty
 
 An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
 
-There is also a [wiki page](https://wiki.minetest.net/Mods/Mesecons) dedicated to this mod.
-
 Want to get more into building? Why not check out the [Mesecons Laboratory](http://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders?
 
-Want to contribute to Mesecons itself? Check out the [source code](https://github.com/minetest-mods/mesecons)!
+Want to contribute to Mesecons itself? Check out the [source code](https://github.com/Jeija/minetest-mod-mesecons)!
 
 Who wrote it anyways?
 ---------------------
@@ -55,7 +53,6 @@ These awesome people made Mesecons possible!
 
 | Contributor     | Contribution                     |
 | --------------- | -------------------------------- |
-| Hawk777         | Code for VoxelManip caching      |
 | Jat15           | Various tweaks.                  |
 | Jeija           | **Main developer! Everything.**  |
 | Jordach         | Noteblock sounds.                |
@@ -74,10 +71,8 @@ There are also a whole bunch of other people helping with everything from code t
 
 Alright, how can I use it?
 --------------------------
-All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic).
+All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic). That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one.
-That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one.
 
-All code in this project is licensed under the LGPL version 3.
+All code in this project is licensed under the LGPL version 3 or later. That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license.
-That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license.
 
 No warranty is provided, express or implied, for any part of the project.

bower.json

@@ -1,12 +0,0 @@
-{
-    "name": "mesecons",
-    "description": "Mesecons is a mod for Minetest that implements items related to digital circuitry: wires, buttons, lights, and programmable controllers.",
-    "homepage": "https://mesecons.net",
-    "authors": ["Jeija"],
-    "license": "LGPL-3.0",
-    "keywords": [
-        "mesecons",
-        "minetest",
-        "mod"
-    ]
-}

documentation.json

@@ -1,6 +1,6 @@
 {
 	"Conductors" : {
-		"Mesecon" : "mesecons_wires/doc/mesecon",
+		"Mesecon" : "mesecons/doc/mesecon",
 		"Insulated Wire" : "mesecons_insulated/doc/insulated",
 		"T-Junction" : "mesecons_extrawires/doc/tjunction",
 		"Crossing" : "mesecons_extrawires/doc/crossing",
@@ -42,8 +42,6 @@
 	},
 	"Logic" : {
 		"Luacontroller" : "mesecons_luacontroller/doc/luacontroller",
-		"FPGA" : "mesecons_fpga/doc/fpga",
-		"FPGA Programmer" : "mesecons_fpga/doc/programmer",
 		"Torch" : "mesecons_torch/doc/torch",
 		"Delayer" : "mesecons_delayer/doc/delayer",
 		"Gates" : {

mesecons/actionqueue.lua

@@ -1,149 +1,101 @@
---[[
+mesecon.queue.actions={} -- contains all ActionQueue actions
-Mesecons uses something it calls an ActionQueue.
 
-The ActionQueue holds functions and actions.
+function mesecon.queue:add_function(name, func)
-Functions are added on load time with a specified name.
+	mesecon.queue.funcs[name] = func
-Actions are preserved over server restarts.
-
-Each action consists of a position, the name of an added function to be called,
-the params that should be used in this function call (additionally to the pos),
-the time after which it should be executed, an optional overwritecheck and a
-priority.
-
-If time = 0, the action will be executed in the next globalstep, otherwise the
-earliest globalstep when it will be executed is the after next globalstep.
-
-It is guaranteed, that for two actions ac1, ac2 where ac1 ~= ac2,
-ac1.time == ac2.time, ac1.priority == ac2.priority and ac1 was added earlier
-than ac2, ac1 will be executed before ac2 (but in the same globalstep).
-
-Note: Do not pass references in params, as they can not be preserved.
-
-Also note: Some of the guarantees here might be dropped at some time.
-]]
-
-
--- localize for speed
-local queue = mesecon.queue
-
-queue.actions = {} -- contains all ActionQueue actions
-
-function queue:add_function(name, func)
-	self.funcs[name] = func
 end
 
 -- If add_action with twice the same overwritecheck and same position are called, the first one is overwritten
 -- use overwritecheck nil to never overwrite, but just add the event to the queue
 -- priority specifies the order actions are executed within one globalstep, highest first
 -- should be between 0 and 1
-function queue:add_action(pos, func, params, time, overwritecheck, priority)
+function mesecon.queue:add_action(pos, func, params, time, overwritecheck, priority)
 	-- Create Action Table:
 	time = time or 0 -- time <= 0 --> execute, time > 0 --> wait time until execution
 	priority = priority or 1
-	local action = {
+	local action = {	pos=mesecon.tablecopy(pos),
-		pos = mesecon.tablecopy(pos),
 				func=func,
 				params=mesecon.tablecopy(params or {}),
 				time=time,
 				owcheck=(overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
-		priority = priority
+				priority=priority}
-	}
 
-	 -- check if old action has to be overwritten / removed:
+	local toremove = nil
-	if overwritecheck then
+	-- Otherwise, add the action to the queue
-		for i, ac in ipairs(self.actions) do
+	if overwritecheck then -- check if old action has to be overwritten / removed:
-			if vector.equals(pos, ac.pos)
+		for i, ac in ipairs(mesecon.queue.actions) do
-					and mesecon.cmpAny(overwritecheck, ac.owcheck) then
+			if(vector.equals(pos, ac.pos)
-				-- remove the old action
+			and mesecon.cmpAny(overwritecheck, ac.owcheck)) then
-				table.remove(self.actions, i)
+				toremove = i
 				break
 			end
 		end
 	end
 
-	table.insert(self.actions, action)
+	if (toremove ~= nil) then
+		table.remove(mesecon.queue.actions, toremove)
+	end
+
+	table.insert(mesecon.queue.actions, action)
 end
 
 -- execute the stored functions on a globalstep
 -- if however, the pos of a function is not loaded (get_node_or_nil == nil), do NOT execute the function
--- this makes sure that resuming mesecons circuits when restarting minetest works fine (hm, where do we do this?)
+-- this makes sure that resuming mesecons circuits when restarting minetest works fine
 -- However, even that does not work in some cases, that's why we delay the time the globalsteps
--- start to be execute by 4 seconds
+-- start to be execute by 5 seconds
-
+local get_highest_priority = function (actions)
-local function globalstep_func(dtime)
+	local highestp = -1
-	local actions = queue.actions
+	local highesti
-	-- split into two categories:
+	for i, ac in ipairs(actions) do
-	-- actions_now: actions to execute now
+		if ac.priority > highestp then
-	-- queue.actions: actions to execute later
+			highestp = ac.priority
-	local actions_now = {}
+			highesti = i
-	queue.actions = {}
-
-	for _, ac in ipairs(actions) do
-		if ac.time > 0 then
-			-- action ac is to be executed later
-			-- ~> insert into queue.actions
-			ac.time = ac.time - dtime
-			table.insert(queue.actions, ac)
-		else
-			-- action ac is to be executed now
-			-- ~> insert into actions_now
-			table.insert(actions_now, ac)
 		end
 	end
 
-	-- stable-sort the executed actions after their priority
+	return highesti
-	-- some constructions might depend on the execution order, hence we first
-	-- execute the actions that had a lower index in actions_now
-	local old_action_order = {}
-	for i, ac in ipairs(actions_now) do
-		old_action_order[ac] = i
-	end
-	table.sort(actions_now, function(ac1, ac2)
-		if ac1.priority ~= ac2.priority then
-			return ac1.priority > ac2.priority
-		else
-			return old_action_order[ac1] < old_action_order[ac2]
-		end
-	end)
-
-	-- execute highest priorities first, until all are executed
-	for _, ac in ipairs(actions_now) do
-		queue:execute(ac)
-	end
 end
 
--- delay the time the globalsteps start to be execute by 4 seconds
-do
 local m_time = 0
 local resumetime = mesecon.setting("resumetime", 4)
-	local globalstep_func_index = #minetest.registered_globalsteps + 1
-
 minetest.register_globalstep(function (dtime)
 	m_time = m_time + dtime
 	-- don't even try if server has not been running for XY seconds; resumetime = time to wait
 	-- after starting the server before processing the ActionQueue, don't set this too low
-		if m_time < resumetime then
+	if (m_time < resumetime) then return end
-			return
+	local actions = mesecon.tablecopy(mesecon.queue.actions)
+	local actions_now={}
+
+	mesecon.queue.actions = {}
+
+	-- sort actions into two categories:
+	-- those toexecute now (actions_now) and those to execute later (mesecon.queue.actions)
+	for i, ac in ipairs(actions) do
+		if ac.time > 0 then
+			ac.time = ac.time - dtime -- executed later
+			table.insert(mesecon.queue.actions, ac)
+		else
+			table.insert(actions_now, ac)
 		end
-		-- replace this globalstep function
-		minetest.registered_globalsteps[globalstep_func_index] = globalstep_func
-	end)
 	end
 
-function queue:execute(action)
+	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
-	-- ignore if action queue function name doesn't exist,
+		local hp = get_highest_priority(actions_now)
-	-- (e.g. in case the action queue savegame was written by an old mesecons version)
+		mesecon.queue:execute(actions_now[hp])
-	if self.funcs[action.func] then
+		table.remove(actions_now, hp)
-		self.funcs[action.func](action.pos, unpack(action.params))
 	end
+end)
+
+function mesecon.queue:execute(action)
+	mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
 end
 
 
 -- Store and read the ActionQueue to / from a file
 -- so that upcoming actions are remembered when the game
 -- is restarted
-queue.actions = mesecon.file2table("mesecon_actionqueue")
+mesecon.queue.actions = mesecon.file2table("mesecon_actionqueue")
 
 minetest.register_on_shutdown(function()
-	mesecon.table2file("mesecon_actionqueue", queue.actions)
+	mesecon.table2file("mesecon_actionqueue", mesecon.queue.actions)
 end)

mesecons/depends.txt

@@ -0,0 +1 @@
+default

mesecons/doc/mesecon/description.html

@@ -0,0 +1 @@
+ Mesecons are the wires, use them to connect effectors with receptors.

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/init.lua

@@ -3,7 +3,7 @@
 -- |  \/  | |___ ____  |___ |      |    | | \  | |____
 -- |      | |        | |    |      |    | |  \ |     |
 -- |      | |___ ____| |___ |____  |____| |   \| ____|
--- by Jeija, Uberi (Temperest), sfan5, VanessaE, Hawk777 and contributors
+-- by Jeija, Uberi (Temperest), sfan5, VanessaE
 --
 --
 --
@@ -11,7 +11,7 @@
 -- See the documentation on the forum for additional information, especially about crafting
 --
 --
--- For basic development resources, see http://mesecons.net/developers.html
+-- For developer documentation see the Developers' section on mesecons.TK
 --
 --
 --
@@ -70,11 +70,19 @@ dofile(minetest.get_modpath("mesecons").."/internal.lua");
 -- these are the only functions you need to remember
 
 mesecon.queue:add_function("receptor_on", function (pos, rules)
-	mesecon.vm_begin()
-
 	rules = rules or mesecon.rules.default
 
-	-- Call turnon on all linking positions
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = vector.add(pos, rule)
+		-- if area is not loaded, keep trying
+		if minetest.get_node_or_nil(np) == nil then
+			mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+			return
+		end
+	end
+
+	-- execute action
 	for _, rule in ipairs(mesecon.flattenrules(rules)) do
 		local np = vector.add(pos, rule)
 		local rulenames = mesecon.rules_link_rule_all(pos, rule)
@@ -82,8 +90,6 @@ mesecon.queue:add_function("receptor_on", function (pos, rules)
 			mesecon.turnon(np, rulename)
 		end
 	end
-
-	mesecon.vm_commit()
 end)
 
 function mesecon.receptor_on(pos, rules)
@@ -93,21 +99,23 @@ end
 mesecon.queue:add_function("receptor_off", function (pos, rules)
 	rules = rules or mesecon.rules.default
 
-	-- Call turnoff on all linking positions
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = vector.add(pos, rule)
+		if minetest.get_node_or_nil(np) == nil then
+			mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+			return
+		end
+	end
+
 	for _, rule in ipairs(mesecon.flattenrules(rules)) do
 		local np = vector.add(pos, rule)
 		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
-			mesecon.vm_begin()
+			if not mesecon.connected_to_receptor(np, mesecon.invertRule(rule)) then
-			mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
+				mesecon.turnoff(np, rulename)
-
-			-- Turnoff returns true if turnoff process was successful, no onstate receptor
-			-- was found along the way. Commit changes that were made in voxelmanip. If turnoff
-			-- returns true, an onstate receptor was found, abort voxelmanip transaction.
-			if (mesecon.turnoff(np, rulename)) then
-				mesecon.vm_commit()
 			else
-				mesecon.vm_abort()
+				mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
 			end
 		end
 	end
@@ -118,11 +126,14 @@ function mesecon.receptor_off(pos, rules)
 end
 
 
-print("[OK] Mesecons")
+minetest.log("action", "[OK] Mesecons")
 
 -- Deprecated stuff
 -- To be removed in future releases
 dofile(minetest.get_modpath("mesecons").."/legacy.lua");
 
+--The actual wires
+dofile(minetest.get_modpath("mesecons").."/wires.lua");
+
 --Services like turnoff receptor on dignode and so on
 dofile(minetest.get_modpath("mesecons").."/services.lua");

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)
 
@@ -37,6 +37,11 @@
 -- HIGH-LEVEL Internals
 -- mesecon.is_power_on(pos)				--> Returns true if pos emits power in any way
 -- mesecon.is_power_off(pos)				--> Returns true if pos does not emit power in any way
+-- mesecon.turnon(pos, link) 				--> link is the input rule that caused calling turnon, turns on every connected node, iterative
+-- mesecon.turnoff(pos, link)				--> link is the input rule that caused calling turnoff, turns off every connected node, iterative
+-- mesecon.connected_to_receptor(pos, link)		--> Returns true if pos is connected to a receptor directly or via conductors, iterative
+-- mesecon.rules_link(output, input, dug_outputrules)	--> Returns true if outputposition + outputrules = inputposition and inputposition + inputrules = outputposition (if the two positions connect)
+-- mesecon.rules_link_anydir(outp., inp., d_outpr.)	--> Same as rules mesecon.rules_link but also returns true if output and input are swapped
 -- mesecon.is_powered(pos)				--> Returns true if pos is powered by a receptor or a conductor
 
 -- RULES ROTATION helpers
@@ -46,8 +51,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 +97,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
@@ -318,7 +321,7 @@ function mesecon.get_conductor_on(node_off, rulename)
 			return conductor.states[tonumber(binstate,2)+1]
 		end
 	end
-	return nil
+	return offstate
 end
 
 function mesecon.get_conductor_off(node_on, rulename)
@@ -334,7 +337,7 @@ function mesecon.get_conductor_off(node_on, rulename)
 			return conductor.states[tonumber(binstate,2)+1]
 		end
 	end
-	return nil
+	return onstate
 end
 
 function mesecon.conductor_get_rules(node)
@@ -368,190 +371,207 @@ function mesecon.is_power_off(pos, rulename)
 	return false
 end
 
--- The set of conductor states which require light updates when they change.
-local light_update_conductors
-
--- Calculate the contents of the above set if they have not been calculated.
-local function find_light_update_conductors()
-	-- The expensive calculation is only done the first time.
-	if light_update_conductors then return end
-
-	light_update_conductors = {}
-
-	-- Find conductors whose lighting characteristics change depending on their state.
-	local checked = {}
-	for name, def in pairs(minetest.registered_nodes) do
-		local conductor = mesecon.get_conductor(name)
-		if conductor and not checked[name] then
-			-- Find the other states of the conductor besides the current one.
-			local other_states
-			if conductor.onstate then
-				other_states = {conductor.onstate}
-			elseif conductor.offstate then
-				other_states = {conductor.offstate}
-			else
-				other_states = conductor.states
-			end
-
-			-- Check the conductor. Other states are marked as checked.
-			for _, other_state in ipairs(other_states) do
-				local other_def = minetest.registered_nodes[other_state]
-				if (def.paramtype == "light") ~= (other_def.paramtype == "light")
-				or def.sunlight_propagates ~= other_def.sunlight_propagates
-				or def.light_source ~= other_def.light_source then
-					-- The light characteristics change depending on the state.
-					-- The states are added to the set.
-					light_update_conductors[name] = true
-					for _, other_state in ipairs(other_states) do
-						light_update_conductors[other_state] = true
-						checked[other_state] = true
-					end
-					break
-				end
-				checked[other_state] = true
-			end
-		end
-	end
-end
-
--- Turn off an equipotential section starting at `pos`, which outputs in the direction of `link`.
--- Breadth-first search. Map is abstracted away in a voxelmanip.
--- Follow all all conductor paths replacing conductors that were already
--- looked at, activating / changing all effectors along the way.
 function mesecon.turnon(pos, link)
-	find_light_update_conductors()
+	local frontiers = {{pos = pos, link = link}}
-
-	local frontiers = fifo_queue.new()
-	frontiers:add({pos = pos, link = link})
-	local pos_can_be_skipped = {}
 
 	local depth = 1
-	for f in frontiers:iter() do
+	while frontiers[depth] do
+		local f = frontiers[depth]
 		local node = mesecon.get_node_force(f.pos)
 
+		-- area not loaded, postpone action
 		if not node then
-			-- Area does not exist; do nothing
+			mesecon.queue:add_action(f.pos, "turnon", {f.link}, nil, true)
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
+		elseif mesecon.is_conductor_off(node, f.link) then
-		elseif mesecon.is_conductor(node.name) then
 			local rules = mesecon.conductor_get_rules(node)
 
-			if mesecon.is_conductor_off(node, f.link) then
+			-- Success: If false, at least one neighboring node is unloaded,
-				-- Call turnon on neighbors
+			-- postpone turning on action
+			local success = true
+			local neighborlinks = {}
+
+			-- 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
+				-- Neighboring node not loaded, postpone turning on current node
-							frontiers:add({pos = np, link = l})
+				-- since we can't even know if neighboring node has matching rules
-						end
+				if not mesecon.get_node_force(np) then
+					success = false
+					break
+				else
+					neighborlinks[minetest.hash_node_position(np)] = mesecon.rules_link_rule_all(f.pos, r)
 				end
 			end
 
-				mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link), light_update_conductors[node.name] ~= nil)
+			if success then
-			end
+				minetest.swap_node(f.pos, {name = mesecon.get_conductor_on(node, f.link),
+					param2 = node.param2})
 
-			-- Only conductors with flat rules can be reliably skipped later
+				for npos, links in pairs(neighborlinks) do
-			if not rules[1] or rules[1].x then
+					-- links = all links to node, l = each single link
-				pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = minetest.get_position_from_hash(npos), link = l})
+					end
+				end
+			else
+				mesecon.queue:add_action(f.pos, "turnon", {f.link}, nil, true)
 			end
 		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
 end
 
--- Turn on an equipotential section starting at `pos`, which outputs in the direction of `link`.
+mesecon.queue:add_function("turnon", function(pos, rulename, recdepth)
--- Breadth-first search. Map is abstracted away in a voxelmanip.
+	mesecon.turnon(pos, rulename, recdepth)
--- Follow all all conductor paths replacing conductors that were already
+end)
--- looked at, deactivating / changing all effectors along the way.
--- In case an onstate receptor is discovered, abort the process by returning false, which will
--- cause `receptor_off` to discard all changes made in the voxelmanip.
--- Contrary to turnon, turnoff has to cache all change and deactivate signals so that they will only
--- be called in the very end when we can be sure that no conductor was found along the path.
---
--- Signal table entry structure:
--- {
---	pos = position of effector,
---	node = node descriptor (name, param1 and param2),
---	link = link the effector is connected to,
---	depth = indicates order in which signals wire fired, higher is later
--- }
-function mesecon.turnoff(pos, link)
-	find_light_update_conductors()
 
-	local frontiers = fifo_queue.new()
+function mesecon.turnoff(pos, link)
-	frontiers:add({pos = pos, link = link})
+	local frontiers = {{pos = pos, link = link}}
-	local signals = {}
-	local pos_can_be_skipped = {}
 
 	local depth = 1
-	for f in frontiers:iter() do
+	while frontiers[depth] do
+		local f = frontiers[depth]
 		local node = mesecon.get_node_force(f.pos)
 
+		-- area not loaded, postpone action
 		if not node then
-			-- Area does not exist; do nothing
+			mesecon.queue:add_action(f.pos, "turnoff", {f.link}, nil, true)
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
+		elseif mesecon.is_conductor_on(node, f.link) then
-		elseif mesecon.is_conductor(node.name) then
 			local rules = mesecon.conductor_get_rules(node)
 
-			if mesecon.is_conductor_on(node, f.link) then
+			-- Success: If false, at least one neighboring node is unloaded,
+			-- postpone turning on action
+			local success = true
+			local neighborlinks = {}
+
+			-- call turnoff 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
+				-- Neighboring node not loaded, postpone turning off current node
-						-- Check if an onstate receptor is connected. If that is the case,
+				-- since we can't even know if neighboring node has matching rules
-						-- abort this turnoff process by returning false. `receptor_off` will
+				if not mesecon.get_node_force(np) then
-						-- discard all the changes that we made in the voxelmanip:
+					success = false
-						if mesecon.rules_link_rule_all_inverted(f.pos, r)[1] then
+					break
-							if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
+				else
-								return false
+					neighborlinks[minetest.hash_node_position(np)] = mesecon.rules_link_rule_all(f.pos, r)
 				end
 			end
 
-						-- Call turnoff on neighbors
+			if success then
-						for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
+				minetest.swap_node(f.pos, {name = mesecon.get_conductor_off(node, f.link),
-							frontiers:add({pos = np, link = l})
+					param2 = node.param2})
-						end
-					end
-				end
 
-				mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link), light_update_conductors[node.name] ~= nil)
+				for npos, links in pairs(neighborlinks) do
+					-- links = all links to node, l = each single link
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = minetest.get_position_from_hash(npos), link = l})
 					end
-
+				end
-			-- Only conductors with flat rules can be reliably skipped later
+			else
-			if not rules[1] or rules[1].x then
+				mesecon.queue:add_action(f.pos, "turnoff", {f.link}, nil, true)
-				pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 			end
 		elseif mesecon.is_effector(node.name) then
-			table.insert(signals, {
+			mesecon.changesignal(f.pos, node, f.link, mesecon.state.off, depth)
-				pos = f.pos,
+			if mesecon.is_effector_on(node.name) and not mesecon.is_powered(f.pos) then
-				node = node,
+				mesecon.deactivate(f.pos, node, f.link, depth)
-				link = f.link,
+			end
-				depth = depth
-			})
-		else
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		end
 		depth = depth + 1
 	end
-
-	for _, sig in ipairs(signals) do
-		mesecon.changesignal(sig.pos, sig.node, sig.link, mesecon.state.off, sig.depth)
-		if mesecon.is_effector_on(sig.node.name) and not mesecon.is_powered(sig.pos) then
-			mesecon.deactivate(sig.pos, sig.node, sig.link, sig.depth)
-		end
 end
 
+mesecon.queue:add_function("turnoff", function(pos, rulename, recdepth)
+	mesecon.turnoff(pos, rulename, recdepth)
+end)
+
+
+function mesecon.connected_to_receptor(pos, link)
+	local node = mesecon.get_node_force(pos)
+	if not node then return false end
+
+	-- Check if conductors around are connected
+	local rules = mesecon.get_any_inputrules(node)
+	if not rules then return false end
+
+	for _, rule in ipairs(mesecon.rule2meta(link, rules)) do
+		local links = mesecon.rules_link_rule_all_inverted(pos, rule)
+		for _, l in ipairs(links) do
+			local np = vector.add(pos, l)
+			if mesecon.find_receptor_on(np, mesecon.invertRule(l)) then
 				return true
 			end
+		end
+	end
+
+	return false
+end
+
+function mesecon.find_receptor_on(pos, link)
+	local frontiers = {{pos = pos, link = link}}
+	local checked = {}
+
+	-- List of positions that have been searched for onstate receptors
+	local depth = 1
+	while frontiers[depth] do
+		local f = frontiers[depth]
+		local node = mesecon.get_node_force(f.pos)
+
+		if not node then return false end
+		if mesecon.is_receptor_on(node.name) then return true end
+		if mesecon.is_conductor_on(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
+
+			-- call turnoff on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = vector.add(f.pos, r)
+
+				local links = mesecon.rules_link_rule_all_inverted(f.pos, r)
+				for _, l in ipairs(links) do
+					local checkedstring = np.x..np.y..np.z..l.x..l.y..l.z
+					if not checked[checkedstring] then
+						table.insert(frontiers, {pos = np, link = l})
+						checked[checkedstring] = true
+					end
+				end
+			end
+
+		end
+		depth = depth + 1
+	end
+end
+
+function mesecon.rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
+	local outputnode = mesecon.get_node_force(output)
+	local inputnode = mesecon.get_node_force(input)
+
+	local outputrules = dug_outputrules or mesecon.get_any_outputrules(outputnode)
+	local inputrules = mesecon.get_any_inputrules(inputnode)
+	if not outputrules or not inputrules then
+		return
+	end
+
+	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
+		-- Check if output sends to input
+		if vector.equals(vector.add(output, outputrule), input) then
+			for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
+				-- Check if input accepts from output
+				if  vector.equals(vector.add(input, inputrule), output) then
+					return true, inputrule
+				end
+			end
+		end
+	end
+
+	return false
+end
 
--- Get all linking inputrules of inputnode (effector or conductor) that is connected to
--- outputnode (receptor or conductor) at position `output` and has an output in direction `rule`
 function mesecon.rules_link_rule_all(output, rule)
 	local input = vector.add(output, rule)
 	local inputnode = mesecon.get_node_force(input)
@@ -571,9 +591,8 @@ function mesecon.rules_link_rule_all(output, rule)
 	return rules
 end
 
--- Get all linking outputnodes of outputnode (receptor or conductor) that is connected to
--- inputnode (effector or conductor) at position `input` and has an input in direction `rule`
 function mesecon.rules_link_rule_all_inverted(input, rule)
+	--local irule = mesecon.invertRule(rule)
 	local output = vector.add(input, rule)
 	local outputnode = mesecon.get_node_force(output)
 	local outputrules = mesecon.get_any_outputrules(outputnode)
@@ -590,6 +609,10 @@ function mesecon.rules_link_rule_all_inverted(input, rule)
 	return rules
 end
 
+function mesecon.rules_link_anydir(pos1, pos2)
+	return mesecon.rules_link(pos1, pos2) or mesecon.rules_link(pos2, pos1)
+end
+
 function mesecon.is_powered(pos, rule)
 	local node = mesecon.get_node_force(pos)
 	local rules = mesecon.get_any_inputrules(node)
@@ -627,3 +650,52 @@ function mesecon.is_powered(pos, rule)
 	if (#sourcepos == 0) then return false
 	else return sourcepos end
 end
+
+--Rules rotation Functions:
+function mesecon.rotate_rules_right(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x = -rule.z,
+			y =  rule.y,
+			z =  rule.x,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_left(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x =  rule.z,
+			y =  rule.y,
+			z = -rule.x,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_down(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x = -rule.y,
+			y =  rule.x,
+			z =  rule.z,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_up(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x =  rule.y,
+			y = -rule.x,
+			z =  rule.z,
+			name = rule.name})
+	end
+	return nr
+end

mesecons/legacy.lua

@@ -1,14 +1,30 @@
--- Un-forceload any forceloaded mapblocks from older versions of Mesecons which
+-- Ugly hack to prevent breaking compatibility with other mods
--- used forceloading instead of VoxelManipulators.
+-- Just remove the following two functions to delete the hack, to be done when other mods have updated
-local BLOCKSIZE = 16
+function mesecon.receptor_on(self, pos, rules)
-
+	if (self.receptor_on) then
--- convert block hash --> node position
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_on.")
-local function unhash_blockpos(hash)
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
-	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
+		print("[Mesecons]          to use mesecon.receptor_on instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
+	end
+	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
 end
 
-local old_forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
+function mesecon.receptor_off(self, pos, rules)
-for hash, _ in pairs(old_forceloaded_blocks) do
+	if (self.receptor_off) then
-	minetest.forceload_free_block(unhash_blockpos(hash))
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_off.")
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
+		print("[Mesecons]          to use mesecon.receptor_off instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
 	end
-os.remove(minetest.get_worldpath().."/mesecon_forceloaded")
+	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+end
+

mesecons/mod.conf

@@ -1,4 +0,0 @@
-name = mesecons
-# default is an optional dependency as some mods may expect it as a transitory
-# dependency when they depend on mesecons.
-optional_depends = default

mesecons/oldwires.lua

@@ -4,13 +4,13 @@ minetest.register_node("mesecons:mesecon_off", {
 	inventory_image = "jeija_mesecon_off.png",
 	wield_image = "jeija_mesecon_off.png",
 	paramtype = "light",
-	is_ground_content = false,
+	is_ground_content = true,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
 	},
-	groups = {dig_immediate=3, mesecon=1, mesecon_conductor_craftable=1},
+	groups = {dig_immediate=2, mesecon=1, mesecon_conductor_craftable=1}, --MFF
     	description="Mesecons",
 	mesecons = {conductor={
 		state = mesecon.state.off,
@@ -22,15 +22,15 @@ minetest.register_node("mesecons:mesecon_on", {
 	drawtype = "raillike",
 	tiles = {"jeija_mesecon_on.png", "jeija_mesecon_curved_on.png", "jeija_mesecon_t_junction_on.png", "jeija_mesecon_crossing_on.png"},
 	paramtype = "light",
-	is_ground_content = false,
+	is_ground_content = true,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
 	},
-	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
+	groups = {dig_immediate=2, not_in_creaive_inventory=1, mesecon=1}, --MFF
 	drop = "mesecons:mesecon_off 1",
-	light_source = minetest.LIGHT_MAX-11,
+	light_source = default.LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,
 		offstate = "mesecons:mesecon_off"

mesecons/presets.lua

@@ -1,8 +1,8 @@
 mesecon.rules = {}
 mesecon.state = {}
 
-mesecon.rules.default = {
+mesecon.rules.default =
-	{x =  0, y =  0, z = -1},
+{{x=0,  y=0,  z=-1},
  {x=1,  y=0,  z=0},
  {x=-1, y=0,  z=0},
  {x=0,  y=0,  z=1},
@@ -13,73 +13,42 @@ mesecon.rules.default = {
  {x=0,  y=1,  z=1},
  {x=0,  y=-1, z=1},
  {x=0,  y=1,  z=-1},
-	{x =  0, y = -1, z = -1},
+ {x=0,  y=-1, z=-1}}
-}
 
-mesecon.rules.floor = mesecon.merge_rule_sets(mesecon.rules.default, {{x = 0, y = -1, z = 0}})
+mesecon.rules.pplate = mesecon.mergetable(mesecon.rules.default, {{x=0, y=-2, z=0}})
 
-mesecon.rules.pplate = mesecon.merge_rule_sets(mesecon.rules.floor, {{x = 0, y = -2, z = 0}})
+mesecon.rules.buttonlike =
-
+{{x = 1,  y = 0, z = 0},
-mesecon.rules.buttonlike = {
-	{x = 1,  y =  0, z =  0},
  {x = 1,  y = 1, z = 0},
  {x = 1,  y =-1, z = 0},
  {x = 1,  y =-1, z = 1},
  {x = 1,  y =-1, z =-1},
-	{x = 2,  y =  0, z =  0},
+ {x = 2,  y = 0, z = 0}}
-}
 
-mesecon.rules.flat = {
+mesecon.rules.flat =
-	{x =  1, y = 0, z =  0},
+{{x = 1, y = 0, z = 0},
  {x =-1, y = 0, z = 0},
  {x = 0, y = 0, z = 1},
-	{x =  0, y = 0, z = -1},
+ {x = 0, y = 0, z =-1}}
-}
 
-mesecon.rules.alldirs = {
+mesecon.rules.alldirs =
-	{x =  1, y =  0,  z =  0},
+{{x= 1, y= 0,  z= 0},
  {x=-1, y= 0,  z= 0},
  {x= 0, y= 1,  z= 0},
  {x= 0, y=-1,  z= 0},
  {x= 0, y= 0,  z= 1},
-	{x =  0, y =  0,  z = -1},
+ {x= 0, y= 0,  z=-1}}
-}
-
-local rules_wallmounted = {
-	xp = mesecon.rotate_rules_down(mesecon.rules.floor),
-	xn = mesecon.rotate_rules_up(mesecon.rules.floor),
-	yp = mesecon.rotate_rules_up(mesecon.rotate_rules_up(mesecon.rules.floor)),
-	yn = mesecon.rules.floor,
-	zp = mesecon.rotate_rules_left(mesecon.rotate_rules_up(mesecon.rules.floor)),
-	zn = mesecon.rotate_rules_right(mesecon.rotate_rules_up(mesecon.rules.floor)),
-}
-
-local rules_buttonlike = {
-	xp = mesecon.rules.buttonlike,
-	xn = mesecon.rotate_rules_right(mesecon.rotate_rules_right(mesecon.rules.buttonlike)),
-	yp = mesecon.rotate_rules_down(mesecon.rules.buttonlike),
-	yn = mesecon.rotate_rules_up(mesecon.rules.buttonlike),
-	zp = mesecon.rotate_rules_right(mesecon.rules.buttonlike),
-	zn = mesecon.rotate_rules_left(mesecon.rules.buttonlike),
-}
-
-local function rules_from_dir(ruleset, dir)
-	if dir.x ==  1 then return ruleset.xp end
-	if dir.y ==  1 then return ruleset.yp end
-	if dir.z ==  1 then return ruleset.zp end
-	if dir.x == -1 then return ruleset.xn end
-	if dir.y == -1 then return ruleset.yn end
-	if dir.z == -1 then return ruleset.zn end
-end
-
-mesecon.rules.wallmounted_get = function(node)
-	local dir = minetest.wallmounted_to_dir(node.param2)
-	return rules_from_dir(rules_wallmounted, dir)
-end
 
 mesecon.rules.buttonlike_get = function(node)
-	local dir = minetest.facedir_to_dir(node.param2)
+	local rules = mesecon.rules.buttonlike
-	return rules_from_dir(rules_buttonlike, dir)
+	if node.param2 == 2 then
+		rules=mesecon.rotate_rules_left(rules)
+	elseif node.param2 == 3 then
+		rules=mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
+	elseif node.param2 == 0 then
+		rules=mesecon.rotate_rules_right(rules)
+	end
+	return rules
 end
 
 mesecon.state.on = "on"

mesecons/services.lua

@@ -1,7 +1,7 @@
 -- Dig and place services
 
 mesecon.on_placenode = function (pos, node)
-	mesecon.execute_autoconnect_hooks_now(pos, node)
+	mesecon.update_autoconnect(pos, node)
 
 	-- Receptors: Send on signal when active
 	if mesecon.is_receptor_on(node.name) then
@@ -16,13 +16,12 @@ mesecon.on_placenode = function(pos, node)
 			-- also call receptor_on if itself is powered already, so that neighboring
 			-- conductors will be activated (when pushing an on-conductor with a piston)
 			for _, s in ipairs(sources) do
-				local rule = vector.subtract(s, pos)
+				local rule = vector.subtract(pos, s)
 				mesecon.turnon(pos, rule)
 			end
 			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
 		elseif mesecon.is_conductor_on(node) then
-			node.name = mesecon.get_conductor_off(node)
+			minetest.swap_node(pos, {name = mesecon.get_conductor_off(node)})
-			minetest.swap_node(pos, node)
 		end
 	end
 
@@ -59,78 +58,39 @@ mesecon.on_dignode = function(pos, node)
 	elseif mesecon.is_receptor_on(node.name) then
 		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
 	end
-
+	mesecon.queue:add_action(pos, "update_autoconnect", {node})
-	mesecon.execute_autoconnect_hooks_queue(pos, node)
 end
 
-function mesecon.on_blastnode(pos)
+mesecon.queue:add_function("update_autoconnect", mesecon.update_autoconnect)
-	local node = minetest.get_node(pos)
-	minetest.remove_node(pos)
-	mesecon.on_dignode(pos, node)
-	return minetest.get_node_drops(node.name, "")
-end
 
 minetest.register_on_placenode(mesecon.on_placenode)
 minetest.register_on_dignode(mesecon.on_dignode)
 
 -- Overheating service for fast circuits
-local OVERHEAT_MAX = mesecon.setting("overheat_max", 20)
-local COOLDOWN_TIME = mesecon.setting("cooldown_time", 2.0)
-local COOLDOWN_STEP = mesecon.setting("cooldown_granularity", 0.5)
-local COOLDOWN_MULTIPLIER = OVERHEAT_MAX / COOLDOWN_TIME
-local cooldown_timer = 0.0
-local object_heat = {}
 
 -- returns true if heat is too high
-function mesecon.do_overheat(pos)
+mesecon.do_overheat = function(pos)
-	local id = minetest.hash_node_position(pos)
+	local meta = minetest.get_meta(pos)
-	local heat = (object_heat[id] or 0) + 1
+	local heat = meta:get_int("heat") or 0
-	object_heat[id] = heat
+
-	if heat >= OVERHEAT_MAX then
+	heat = heat + 1
-		minetest.log("action", "Node overheats at " .. minetest.pos_to_string(pos))
+	meta:set_int("heat", heat)
-		object_heat[id] = nil
+
+	if heat < mesecon.setting("overheat_max", 20) then
+		mesecon.queue:add_action(pos, "cooldown", {}, 1, nil, 0)
+	else
 		return true
 	end
+
 	return false
 end
 
-function mesecon.do_cooldown(pos)
-	local id = minetest.hash_node_position(pos)
-	object_heat[id] = nil
-end
 
-function mesecon.get_heat(pos)
+mesecon.queue:add_function("cooldown", function (pos)
-	local id = minetest.hash_node_position(pos)
+	local meta = minetest.get_meta(pos)
-	return object_heat[id] or 0
+	local heat = meta:get_int("heat")
-end
 
-function mesecon.move_hot_nodes(moved_nodes)
+	if (heat > 0) then
-	local new_heat = {}
+		meta:set_int("heat", heat - 1)
-	for _, n in ipairs(moved_nodes) do
-		local old_id = minetest.hash_node_position(n.oldpos)
-		local new_id = minetest.hash_node_position(n.pos)
-		new_heat[new_id] = object_heat[old_id]
-		object_heat[old_id] = nil
 	end
-	for id, heat in pairs(new_heat) do
+end)
-		object_heat[id] = heat
-	end
-end
-
-local function global_cooldown(dtime)
-	cooldown_timer = cooldown_timer + dtime
-	if cooldown_timer < COOLDOWN_STEP then
-		return -- don't overload the CPU
-	end
-	local cooldown = COOLDOWN_MULTIPLIER * cooldown_timer
-	cooldown_timer = 0
-	for id, heat in pairs(object_heat) do
-		heat = heat - cooldown
-		if heat <= 0 then
-			object_heat[id] = nil -- free some RAM
-		else
-			object_heat[id] = heat
-		end
-	end
-end
-minetest.register_globalstep(global_cooldown)

mesecons/settings.lua

@@ -1,15 +1,15 @@
 -- SETTINGS
 function mesecon.setting(setting, default)
 	if type(default) == "boolean" then
-		local read = minetest.settings:get_bool("mesecon."..setting)
+		local read = minetest.setting_getbool("mesecon."..setting)
 		if read == nil then
 			return default
 		else
 			return read
 		end
 	elseif type(default) == "string" then
-		return minetest.settings:get("mesecon."..setting) or default
+		return minetest.setting_get("mesecon."..setting) or default
 	elseif type(default) == "number" then
-		return tonumber(minetest.settings:get("mesecon."..setting) or default)
+		return tonumber(minetest.setting_get("mesecon."..setting) or default)
 	end
 end

mesecons/util.lua

@@ -6,56 +6,6 @@ function mesecon.move_node(pos, newpos)
 	minetest.get_meta(pos):from_table(meta)
 end
 
--- Rules rotation Functions:
-function mesecon.rotate_rules_right(rules)
-	local nr = {}
-	for i, rule in ipairs(rules) do
-		table.insert(nr, {
-			x = -rule.z,
-			y =  rule.y,
-			z =  rule.x,
-			name = rule.name})
-	end
-	return nr
-end
-
-function mesecon.rotate_rules_left(rules)
-	local nr = {}
-	for i, rule in ipairs(rules) do
-		table.insert(nr, {
-			x =  rule.z,
-			y =  rule.y,
-			z = -rule.x,
-			name = rule.name})
-	end
-	return nr
-end
-
-function mesecon.rotate_rules_down(rules)
-	local nr = {}
-	for i, rule in ipairs(rules) do
-		table.insert(nr, {
-			x = -rule.y,
-			y =  rule.x,
-			z =  rule.z,
-			name = rule.name})
-	end
-	return nr
-end
-
-function mesecon.rotate_rules_up(rules)
-	local nr = {}
-	for i, rule in ipairs(rules) do
-		table.insert(nr, {
-			x =  rule.y,
-			y = -rule.x,
-			z =  rule.z,
-			name = rule.name})
-	end
-	return nr
-end
---
-
 function mesecon.flattenrules(allrules)
 --[[
 	{
@@ -164,9 +114,7 @@ end
 
 function mesecon.get_bit(binary,bit)
 	bit = bit or 1
-	local len = binary:len()
+	local c = binary:len()-(bit-1)
-	if bit > len then return false end
-	local c = len-(bit-1)
 	return binary:sub(c,c) == "1"
 end
 
@@ -188,36 +136,34 @@ function mesecon.invertRule(r)
 	return vector.multiply(r, -1)
 end
 
-function mesecon.tablecopy(obj) -- deep copy
+function mesecon.tablecopy(table) -- deep table copy
-	if type(obj) == "table" then
+	if type(table) ~= "table" then return table end -- no need to copy
-		return table.copy(obj)
+	local newtable = {}
+
+	for idx, item in pairs(table) do
+		if type(item) == "table" then
+			newtable[idx] = mesecon.tablecopy(item)
+		else
+			newtable[idx] = item
 		end
-	return obj
 	end
 
--- Returns whether two values are equal.
+	return newtable
--- In tables, keys are compared for identity but values are compared recursively.
+end
--- There is no protection from infinite recursion.
+
 function mesecon.cmpAny(t1, t2)
 	if type(t1) ~= type(t2) then return false end
-	if type(t1) ~= "table" then return t1 == t2 end
+	if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end
 
-	-- Check that for each key of `t1` both tables have the same value
 	for i, e in pairs(t1) do
 		if not mesecon.cmpAny(e, t2[i]) then return false end
 	end
 
-	-- Check that all keys of `t2` are also keys of `t1` so were checked in the previous loop
-	for i, _ in pairs(t2) do
-		if t1[i] == nil then return false end
-	end
-
 	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
@@ -230,41 +176,14 @@ 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
 	spec_common.__mesecon_basename = name
 	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)
@@ -286,7 +205,7 @@ end
 -- File writing / reading utilities
 local wpath = minetest.get_worldpath()
 function mesecon.file2table(filename)
-	local f = io.open(wpath.."/"..filename, "r")
+	local f = io.open(wpath..DIR_DELIM..filename, "r")
 	if f == nil then return {} end
 	local t = f:read("*all")
 	f:close()
@@ -295,12 +214,12 @@ function mesecon.file2table(filename)
 end
 
 function mesecon.table2file(filename, table)
-	local f = io.open(wpath.."/"..filename, "w")
+	local f = io.open(wpath..DIR_DELIM..filename, "w")
 	f:write(minetest.serialize(table))
 	f:close()
 end
 
--- Block position "hashing" (convert to integer) functions for voxelmanip cache
+-- Forceloading: Force server to load area if node is nil
 local BLOCKSIZE = 16
 
 -- convert node position --> block hash
@@ -312,173 +231,45 @@ local function hash_blockpos(pos)
 	})
 end
 
--- Maps from a hashed mapblock position (as returned by hash_blockpos) to a
+-- convert block hash --> node position
--- table.
+local function unhash_blockpos(hash)
---
+	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
--- Contents of the table are:
--- “vm” → the VoxelManipulator
--- “dirty” → true if data has been modified
---
--- Nil if no VM-based transaction is in progress.
-local vm_cache = nil
-
--- Cache from node position hashes to nodes (represented as tables).
-local vm_node_cache = nil
-
--- Whether the current transaction will need a light update afterward.
-local vm_update_light = false
-
--- Starts a VoxelManipulator-based transaction.
---
--- During a VM transaction, calls to vm_get_node and vm_swap_node operate on a
--- cached copy of the world loaded via VoxelManipulators. That cache can later
--- be committed to the real map by means of vm_commit or discarded by means of
--- vm_abort.
-function mesecon.vm_begin()
-	vm_cache = {}
-	vm_node_cache = {}
-	vm_update_light = false
 end
 
--- Finishes a VoxelManipulator-based transaction, freeing the VMs and map data
+mesecon.forceloaded_blocks = {}
--- and writing back any modified areas.
-function mesecon.vm_commit()
-	for hash, tbl in pairs(vm_cache) do
-		if tbl.dirty then
-			local vm = tbl.vm
-			vm:write_to_map(vm_update_light)
-			vm:update_map()
-		end
-	end
-	vm_cache = nil
-	vm_node_cache = nil
-end
 
--- Finishes a VoxelManipulator-based transaction, freeing the VMs and throwing
+-- get node and force-load area
--- away any modified areas.
-function mesecon.vm_abort()
-	vm_cache = nil
-	vm_node_cache = nil
-end
-
--- Gets the cache entry covering a position, populating it if necessary.
-local function vm_get_or_create_entry(pos)
-	local hash = hash_blockpos(pos)
-	local tbl = vm_cache[hash]
-	if not tbl then
-		tbl = {vm = minetest.get_voxel_manip(pos, pos), dirty = false}
-		vm_cache[hash] = tbl
-	end
-	return tbl
-end
-
--- Gets the node at a given position during a VoxelManipulator-based
--- transaction.
-function mesecon.vm_get_node(pos)
-	local hash = minetest.hash_node_position(pos)
-	local node = vm_node_cache[hash]
-	if not node then
-		node = vm_get_or_create_entry(pos).vm:get_node_at(pos)
-		vm_node_cache[hash] = node
-	end
-	return node.name ~= "ignore" and {name = node.name, param1 = node.param1, param2 = node.param2} or nil
-end
-
--- Sets a node’s name during a VoxelManipulator-based transaction.
---
--- Existing param1, param2, and metadata are left alone.
---
--- The swap will necessitate a light update unless update_light equals false.
-function mesecon.vm_swap_node(pos, name, update_light)
-	-- If one node needs a light update, all VMs should use light updates to
-	-- prevent newly calculated light from being overwritten by other VMs.
-	vm_update_light = vm_update_light or update_light ~= false
-
-	local tbl = vm_get_or_create_entry(pos)
-	local hash = minetest.hash_node_position(pos)
-	local node = vm_node_cache[hash]
-	if not node then
-		node = tbl.vm:get_node_at(pos)
-		vm_node_cache[hash] = node
-	end
-	node.name = name
-	tbl.vm:set_node_at(pos, node)
-	tbl.dirty = true
-end
-
--- Gets the node at a given position, regardless of whether it is loaded or
--- not, respecting a transaction if one is in progress.
---
--- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
--- the server’s main map data cache and then accessed from there.
---
--- Inside a VM transaction, the transaction’s VM cache is used.
 function mesecon.get_node_force(pos)
-	if vm_cache then
+	local hash = hash_blockpos(pos)
-		return mesecon.vm_get_node(pos)
+
+	if mesecon.forceloaded_blocks[hash] == nil then
+		-- if no more forceload spaces are available, try again next time
+		if minetest.forceload_block(pos) then
+			mesecon.forceloaded_blocks[hash] = 0
+		end
 	else
-		local node = minetest.get_node_or_nil(pos)
+		mesecon.forceloaded_blocks[hash] = 0
-		if node == nil then
-			-- Node is not currently loaded; use a VoxelManipulator to prime
-			-- the mapblock cache and try again.
-			minetest.get_voxel_manip(pos, pos)
-			node = minetest.get_node_or_nil(pos)
-		end
-		return node
-	end
 	end
 
--- Swaps the node at a given position, regardless of whether it is loaded or
+	return minetest.get_node_or_nil(pos)
--- not, respecting a transaction if one is in progress.
+end
---
+
--- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
+minetest.register_globalstep(function (dtime)
--- the server’s main map data cache and then accessed from there.
+	for hash, time in pairs(mesecon.forceloaded_blocks) do
---
+		-- unload forceloaded blocks after 10 minutes without usage
--- Inside a VM transaction, the transaction’s VM cache is used.
+		if (time > mesecon.setting("forceload_timeout", 600)) then
---
+			minetest.forceload_free_block(unhash_blockpos(hash))
--- This function can only be used to change the node’s name, not its parameters
+			mesecon.forceloaded_blocks[hash] = nil
--- or metadata.
---
--- The swap will necessitate a light update unless update_light equals false.
-function mesecon.swap_node_force(pos, name, update_light)
-	if vm_cache then
-		return mesecon.vm_swap_node(pos, name, update_light)
 		else
-		-- This serves to both ensure the mapblock is loaded and also hand us
+			mesecon.forceloaded_blocks[hash] = time + dtime
-		-- the old node table so we can preserve param2.
-		local node = mesecon.get_node_force(pos)
-		node.name = name
-		minetest.swap_node(pos, node)
 		end
 	end
+end)
 
--- Autoconnect Hooks
+-- Store and read the forceloaded blocks to / from a file
--- Nodes like conductors may change their appearance and their connection rules
+-- so that those blocks are remembered when the game
--- right after being placed or after being dug, e.g. the default wires use this
+-- is restarted
--- to automatically connect to linking nodes after placement.
+mesecon.forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
--- After placement, the update function will be executed immediately so that the
+minetest.register_on_shutdown(function()
--- possibly changed rules can be taken into account when recalculating the circuit.
+	mesecon.table2file("mesecon_forceloaded", mesecon.forceloaded_blocks)
--- After digging, the update function will be queued and executed after
+end)
--- recalculating the circuit. The update function must take care of updating the
--- node at the given position itself, but also all of the other nodes the given
--- position may have (had) a linking connection to.
-mesecon.autoconnect_hooks = {}
-
--- name: A unique name for the hook, e.g. "foowire". Used to name the actionqueue function.
--- fct: The update function with parameters function(pos, node)
-function mesecon.register_autoconnect_hook(name, fct)
-	mesecon.autoconnect_hooks[name] = fct
-	mesecon.queue:add_function("autoconnect_hook_"..name, fct)
-end
-
-function mesecon.execute_autoconnect_hooks_now(pos, node)
-	for _, fct in pairs(mesecon.autoconnect_hooks) do
-		fct(pos, node)
-	end
-end
-
-function mesecon.execute_autoconnect_hooks_queue(pos, node)
-	for name in pairs(mesecon.autoconnect_hooks) do
-		mesecon.queue:add_action(pos, "autoconnect_hook_"..name, {node})
-	end
-end

mesecons/wires.lua

@@ -14,7 +14,7 @@ local wire_getconnect = function (from_pos, self_pos)
 	if minetest.registered_nodes[node.name]
 	and minetest.registered_nodes[node.name].mesecons then
 		-- rules of node to possibly connect to
-		local rules
+		local rules = {}
 		if (minetest.registered_nodes[node.name].mesecon_wire) then
 			rules = mesecon.rules.default
 		else
@@ -73,7 +73,7 @@ local update_on_place_dig = function (pos, node)
 	end
 
 	-- Update nodes around it
-	local rules
+	local rules = {}
 	if minetest.registered_nodes[node.name]
 	and minetest.registered_nodes[node.name].mesecon_wire then
 		rules = mesecon.rules.default
@@ -91,7 +91,10 @@ local update_on_place_dig = function (pos, node)
 	end
 end
 
-mesecon.register_autoconnect_hook("wire", update_on_place_dig)
+function mesecon.update_autoconnect(pos, node)
+	if (not node) then node = minetest.get_node(pos) end
+	update_on_place_dig(pos, node)
+end
 
 -- ############################
 -- ## Wire node registration ##
@@ -140,7 +143,7 @@ nid_inc = function (nid)
 	return i <= 8
 end
 
-local function register_wires()
+register_wires = function()
 	local nid = {}
 	while true do
 		-- Create group specifiction and nodeid string (see note above for details)
@@ -194,30 +197,26 @@ local function register_wires()
 			offstate = "mesecons:wire_"..nodeid.."_off"
 		}}
 
-		local groups_on = {dig_immediate = 3, mesecon_conductor_craftable = 1,
+		local groups_on = {dig_immediate = 2, mesecon_conductor_craftable = 1,
-			not_in_creative_inventory = 1, not_in_craft_guide = 1}
+			not_in_creative_inventory = 1} --MFF
-		local groups_off = {dig_immediate = 3, mesecon_conductor_craftable = 1}
+		local groups_off = {dig_immediate = 2, mesecon_conductor_craftable = 1} --MFF
 		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, {
+		mesecon.register_node("mesecons:wire_"..nodeid, {
 			description = "Mesecon",
 			drawtype = "nodebox",
 			inventory_image = "mesecons_wire_inv.png",
 			wield_image = "mesecons_wire_inv.png",
 			paramtype = "light",
 			paramtype2 = "facedir",
-			is_ground_content = false,
 			sunlight_propagates = true,
 			selection_box = selectionbox,
 			node_box = nodebox,
 			walkable = false,
 			drop = "mesecons:wire_00000000_off",
-			mesecon_wire = true,
+			mesecon_wire = true
-			sounds = default.node_sound_defaults(),
-			on_rotate = false,
 		}, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off},
 		{tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})
 

mesecons_alias/depends.txt

@@ -0,0 +1 @@
+mesecons

mesecons_alias/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_alias
-depends = mesecons

mesecons_blinkyplant/depends.txt

@@ -0,0 +1 @@
+mesecons

mesecons_blinkyplant/doc/blinkyplant/description.html

@@ -1,2 +1 @@
 The blinky plants toggles between on and off state every three seconds. Can be used to make clocks. Also works after having restarted the game.
-It stops blinking in an inactive block, then starts again when the block becomes active.

mesecons_blinkyplant/init.lua

@@ -10,12 +10,26 @@ local toggle_timer = function (pos)
 end
 
 local on_timer = function (pos)
+	-- DO NOT TOUCH OR.. THREATS! Thanks, MFF
+	local activate = false
+	for _, player in pairs(minetest.get_connected_players()) do
+		local p = player:getpos()
+		local dist = ((p.x-pos.x)^2 + (p.y-pos.y)^2 + (p.z-pos.z)^2)^0.5
+		if dist < 40 then
+			activate = true
+			break
+		end
+	end
+
+	if activate then
 		local node = minetest.get_node(pos)
 		if(mesecon.flipstate(pos, node) == "on") then
 			mesecon.receptor_on(pos)
 		else
 			mesecon.receptor_off(pos)
 		end
+	-- Our modification stops there, thank you, @crabman77
+	end
 	toggle_timer(pos)
 end
 
@@ -24,7 +38,6 @@ mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
 	drawtype = "plantlike",
 	inventory_image = "jeija_blinky_plant_off.png",
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -32,13 +45,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, _, 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_blinkyplant/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_blinkyplant
-depends = default, mesecons

mesecons_button/depends.txt

@@ -0,0 +1,2 @@
+mesecons
+mesecons_receiver

mesecons_button/init.lua

@@ -4,16 +4,13 @@
 
 mesecon.button_turnoff = function (pos)
 	local node = minetest.get_node(pos)
-	if node.name ~= "mesecons_button:button_on" then -- has been dug
+	if node.name=="mesecons_button:button_on" then --has not been dug
-		return
-	end
 		minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
-	minetest.sound_play("mesecons_button_pop", { pos = pos }, true)
+		minetest.sound_play("mesecons_button_pop", {pos=pos})
 		local rules = mesecon.rules.buttonlike_get(node)
 		mesecon.receptor_off(pos, rules)
 	end
-
+end
-local use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or nil
 
 minetest.register_node("mesecons_button:button_off", {
 	drawtype = "nodebox",
@@ -25,13 +22,10 @@ minetest.register_node("mesecons_button:button_off", {
 	"jeija_wall_button_sides.png",
 	"jeija_wall_button_off.png"
 	},
-	use_texture_alpha = use_texture_alpha,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	legacy_wallmounted = true,
 	walkable = false,
-	on_rotate = mesecon.buttonlike_onrotate,
 	sunlight_propagates = true,
 	selection_box = {
 	type = "fixed",
@@ -49,15 +43,14 @@ minetest.register_node("mesecons_button:button_off", {
 	on_rightclick = function (pos, node)
 		minetest.swap_node(pos, {name = "mesecons_button:button_on", param2=node.param2})
 		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
-		minetest.sound_play("mesecons_button_push", { pos = pos }, true)
+		minetest.sound_play("mesecons_button_push", {pos=pos})
-		minetest.get_node_timer(pos):start(1)
+		minetest.after(1, mesecon.button_turnoff, pos)
 	end,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
 		state = mesecon.state.off,
 		rules = mesecon.rules.buttonlike_get
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_button:button_on", {
@@ -70,14 +63,11 @@ minetest.register_node("mesecons_button:button_on", {
 		"jeija_wall_button_sides.png",
 		"jeija_wall_button_on.png"
 		},
-	use_texture_alpha = use_texture_alpha,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	legacy_wallmounted = true,
 	walkable = false,
-	on_rotate = false,
+	light_source = default.LIGHT_MAX-7,
-	light_source = minetest.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",
@@ -97,9 +87,7 @@ minetest.register_node("mesecons_button:button_on", {
 	mesecons = {receptor = {
 		state = mesecon.state.on,
 		rules = mesecon.rules.buttonlike_get
-	}},
+	}}
-	on_timer = mesecon.button_turnoff,
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_craft({

mesecons_button/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_button
-depends = default, mesecons, mesecons_receiver

mesecons_commandblock/depends.txt

@@ -0,0 +1 @@
+mesecons

mesecons_commandblock/doc/commandblock/description.html

@@ -1,2 +1 @@
 There is no crafting recipe as this should only be available for server admins. Quite similar to the Minecraft counterpart. Executes server commands.
-It works in inactive blocks.

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
@@ -79,7 +78,7 @@ local function after_place(pos, placer)
 	end
 end
 
-local function receive_fields(pos, _, fields, sender)
+local function receive_fields(pos, formname, fields, sender)
 	if not fields.submit then
 		return
 	end
@@ -111,7 +110,7 @@ local function resolve_commands(commands, pos)
 	local nearest, farthest = nil, nil
 	local min_distance, max_distance = math.huge, -1
 	for index, player in pairs(players) do
-		local distance = vector.distance(pos, player:get_pos())
+		local distance = vector.distance(pos, player:getpos())
 		if distance < min_distance then
 			min_distance = distance
 			nearest = player:get_player_name()
@@ -175,15 +174,13 @@ end
 local function can_dig(pos, player)
 	local meta = minetest.get_meta(pos)
 	local owner = meta:get_string("owner")
-	return owner == "" or owner == player:get_player_name() or
+	return owner == "" or owner == player:get_player_name()
-		minetest.check_player_privs(player, "protection_bypass")
 end
 
 minetest.register_node("mesecons_commandblock:commandblock_off", {
 	description = "Command Block",
 	tiles = {"jeija_commandblock_off.png"},
 	inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
-	is_ground_content = false,
 	groups = {cracky=2, mesecon_effector_off=1},
 	on_construct = construct,
 	after_place_node = after_place,
@@ -192,13 +189,11 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_on = commandblock_action_on
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_commandblock:commandblock_on", {
 	tiles = {"jeija_commandblock_on.png"},
-	is_ground_content = false,
 	groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},
 	light_source = 10,
 	drop = "mesecons_commandblock:commandblock_off",
@@ -209,6 +204,5 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_off = commandblock_action_off
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
 })

mesecons_commandblock/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_commandblock
-depends = default, mesecons

mesecons_delayer/depends.txt

@@ -0,0 +1 @@
+mesecons

mesecons_delayer/doc/delayer/description.html

@@ -1 +1 @@
-The delayer delays the signal from the input for a determined time. The time can be set by punching the delayer. Possible delays are: 0.1 seconds, 0.3 seconds, 0.5 seconds and 1 second. You may try to use it for creating songs with the noteblock. It works in unloaded blocks.
+The delayer delays the signal from the input for a determined time. The time can be set by punching the delayer. Possible delays are: 0.1 seconds, 0.3 seconds, 0.5 seconds and 1 second. You may try to use it for creating songs with the noteblock.

mesecons_delayer/init.lua

@@ -33,12 +33,21 @@ end
 
 -- Register the 2 (states) x 4 (delay times) delayers
 
-local delaytime = { 0.1, 0.3, 0.5, 1.0 }
-
 for i = 1, 4 do
+local groups = {}
+if i == 1 then
+	groups = {bendy=2,snappy=1,dig_immediate=2}
+else
+	groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1}
+end
 
-local boxes = {
+local delaytime
-	 { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
+if 		i == 1 then delaytime = 0.1
+elseif	i == 2 then delaytime = 0.3
+elseif	i == 3 then delaytime = 0.5
+elseif	i == 4 then delaytime = 1.0 end
+
+boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
 
 	 { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 },		-- the jeweled "on" indicator
 	 { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 },
@@ -48,40 +57,11 @@ local boxes = {
 
 	 { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 },		-- the timer indicator
 	 { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 },		-- the two wire stubs
-	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }
+	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }}
-}
 
--- Delayer definition defaults
+minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
-local def = {
-	drawtype = "nodebox",
-	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or nil,
-	walkable = true,
-	selection_box = {
-		type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
-	},
-	node_box = {
-		type = "fixed",
-		fixed = boxes
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
-	is_ground_content = false,
-	delayer_time = delaytime[i],
-	sounds = default.node_sound_stone_defaults(),
-	on_blast = mesecon.on_blastnode,
-	drop = "mesecons_delayer:delayer_off_1",
-}
-
--- Deactivated delayer definition defaults
-local off_groups = {bendy=2,snappy=1,dig_immediate=2}
-if i > 1 then
-	off_groups.not_in_creative_inventory = 1
-end
-
-local off_state = {
 	description = "Delayer",
+	drawtype = "nodebox",
 	tiles = {
 		"mesecons_delayer_off_"..tostring(i)..".png",
 		"mesecons_delayer_bottom.png",
@@ -92,18 +72,35 @@ local off_state = {
 		},
 	inventory_image = "mesecons_delayer_off_1.png",
 	wield_image = "mesecons_delayer_off_1.png",
-	groups = off_groups,
+	walkable = true,
-	on_punch = function(pos, node, puncher)
+	selection_box = {
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
+		type = "fixed",
-			return
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = boxes
+	},
+	groups = groups,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	drop = 'mesecons_delayer:delayer_off_1',
+	on_punch = function (pos, node)
+		if node.name=="mesecons_delayer:delayer_off_1" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_2", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_2" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_3", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_3" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_4", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_4" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_1", param2=node.param2})
 		end
-
-		minetest.swap_node(pos, {
-			name = "mesecons_delayer:delayer_off_"..tostring(i % 4 + 1),
-			param2 = node.param2
-		})
 	end,
+	delayer_time = delaytime,
 	delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
+	sounds = default.node_sound_stone_defaults(),
 	mesecons = {
 		receptor =
 		{
@@ -115,16 +112,13 @@ local off_state = {
 			rules = delayer_get_input_rules,
 			action_on = delayer_activate
 		}
-	},
 	}
-for k, v in pairs(def) do
+})
-	off_state[k] = off_state[k] or v
-end
-minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state)
 
--- Activated delayer definition defaults
+
-local on_state = {
+minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
 	description = "You hacker you",
+	drawtype = "nodebox",
 	tiles = {
 		"mesecons_delayer_on_"..tostring(i)..".png",
 		"mesecons_delayer_bottom.png",
@@ -133,17 +127,33 @@ local on_state = {
 		"mesecons_delayer_sides_on.png",
 		"mesecons_delayer_sides_on.png"
 		},
+	walkable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = boxes
+	},
 	groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1},
-	on_punch = function(pos, node, puncher)
+	paramtype = "light",
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
+	paramtype2 = "facedir",
-			return
+	sunlight_propagates = true,
+	is_ground_content = true,
+	drop = 'mesecons_delayer:delayer_off_1',
+	on_punch = function (pos, node)
+		if node.name=="mesecons_delayer:delayer_on_1" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_2", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_2" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_3", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_3" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_4", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_4" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_1", param2=node.param2})
 		end
-
-		minetest.swap_node(pos, {
-			name = "mesecons_delayer:delayer_on_"..tostring(i % 4 + 1),
-			param2 = node.param2
-		})
 	end,
+	delayer_time = delaytime,
 	delayer_offstate = "mesecons_delayer:delayer_off_"..tostring(i),
 	mesecons = {
 		receptor =
@@ -156,13 +166,8 @@ local on_state = {
 			rules = delayer_get_input_rules,
 			action_off = delayer_deactivate
 		}
-	},
 	}
-for k, v in pairs(def) do
+})
-	on_state[k] = on_state[k] or v
-end
-minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), on_state)
-
 end
 
 minetest.register_craft({

mesecons_delayer/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_delayer
-depends = default, mesecons

mesecons_detector/depends.txt

@@ -0,0 +1,2 @@
+mesecons
+mesecons_materials

mesecons_detector/doc/nodedetector/description.html

@@ -1,11 +1,6 @@
 The node detector is a receptor. It changes its state when either any node
 or a specific node is detected. Right-click it to set a nodename to scan for.
-It can also receive digiline signals. For example, you can send
+It can also receive digiline signals. You can either send "GET" and it will
-<code>{distance=4, scanname="default:dirt"}</code>
+respond with the detected nodename or you can send any other string and it will
-to set distance to 4 and scan for dirt. You can omit either parameter.
+set this string as the node to scan for.
-There is also a command parameter: <code>{command="get"}</code> will respond
-with the detected nodename and <code>{command="scan"}</code> will respond with
-a boolean using the distance and nodename of the detector.
 Nodenames must include the mod they reside in, so for instance default:dirt, not just dirt.
-The distance parameter specifies how many blocks are between the node detector and the node to detect.
-Automatic scanning with Mesecons output only works when the detector is in an active block, but Digilines queries always work.

mesecons_detector/doc/objectdetector/description.html

@@ -1,5 +1,3 @@
 The object detector is a receptor. It changes its state when a player approaches.
 Right-click it to set a name to scan for.
-You can also search for comma-separated lists of players where the detector gets activated if any of the names in the list are found.
 It can also receive digiline signals which are the name to scan for on the specified channel in the right-click menu.
-Automatic scanning with Mesecons output only works when the detector is in an active block, but Digilines queries always work.

mesecons_detector/init.lua

@@ -4,19 +4,18 @@ local GET_COMMAND = "GET"
 -- Detects players in a certain radius
 -- The radius can be specified in mesecons/settings.lua
 
-local function object_detector_make_formspec(pos)
+-- The following file was modified to detect multiple players
+local object_detector_make_formspec = function (pos)
 	local meta = minetest.get_meta(pos)
 	meta:set_string("formspec", "size[9,2.5]" ..
-		"field[0.3,  0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
+		"field[0.3,  0;12,2;scanname;Name of player(s) to scan for (empty for any, separate with comma):;${scanname}]"..
 		"field[0.3,1.5;4 ,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
 		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local function object_detector_on_receive_fields(pos, _, fields, sender)
+local function object_detector_on_receive_fields(pos, _, fields)
 	if not fields.scanname or not fields.digiline_channel then return end
 
-	if minetest.is_protected(pos, sender:get_player_name()) then return end
-
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
 	meta:set_string("digiline_channel", fields.digiline_channel)
@@ -26,37 +25,36 @@ end
 -- returns true if player was found, false if not
 local function object_detector_scan(pos)
 	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
-
+	for k, obj in pairs(objs) do
-	-- abort if no scan results were found
+		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
-	if next(objs) == nil then return false end
+		local scanname = minetest.get_meta(pos):get_string("scanname"):gsub(' ', "")
-
+		if (scanname == "" and isname ~= "") then
-	local scanname = minetest.get_meta(pos):get_string("scanname")
+			minetest.get_meta(pos):set_string("scanedname", "")
-	local scan_for = {}
+			return true
-	for _, str in pairs(string.split(scanname:gsub(" ", ""), ",")) do
-		scan_for[str] = true
 		end
-
+		local founds = {}
-	local every_player = scanname == ""
+		for _, name in pairs(scanname:split(',')) do
-	for _, obj in pairs(objs) do
+			if (isname == name and isname ~= "") then
-		-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
+				table.insert(founds, isname)
-		local foundname = obj:get_player_name()
+			end
-		if foundname ~= "" then
+		end
-			if every_player or scan_for[foundname] then
+		if #founds > 0 then
+			minetest.get_meta(pos):set_string("scannedname", table.concat(founds, ','))
 			return true
 		end
 	end
-	end
+	minetest.get_meta(pos):set_string("scanedname", "")
-
 	return false
 end
 
 -- set player name when receiving a digiline signal on a specific channel
 local object_detector_digiline = {
 	effector = {
-		action = function(pos, _, channel, msg)
+		action = function (pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
-			if channel == meta:get_string("digiline_channel") then
+			local active_channel = meta:get_string("digiline_channel")
-				meta:set_string("scanname", msg)
+			if channel == active_channel then
+				meta:set_string("scanedname", msg)
 				object_detector_make_formspec(pos)
 			end
 		end,
@@ -66,7 +64,6 @@ local object_detector_digiline = {
 minetest.register_node("mesecons_detector:object_detector_off", {
 	tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png"},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = true,
 	groups = {cracky=3},
 	description="Player Detector",
@@ -77,14 +74,12 @@ minetest.register_node("mesecons_detector:object_detector_off", {
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
 	sounds = default.node_sound_stone_defaults(),
-	digiline = object_detector_digiline,
+	digiline = object_detector_digiline
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_detector:object_detector_on", {
 	tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = true,
 	groups = {cracky=3,not_in_creative_inventory=1},
 	drop = 'mesecons_detector:object_detector_off',
@@ -95,8 +90,7 @@ minetest.register_node("mesecons_detector:object_detector_on", {
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
 	sounds = default.node_sound_stone_defaults(),
-	digiline = object_detector_digiline,
+	digiline = object_detector_digiline
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_craft({
@@ -108,15 +102,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'mesecons_detector:object_detector_off',
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "mesecons_microcontroller:microcontroller0000", "default:steel_ingot"},
-		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
-	}
-})
-
 minetest.register_abm({
 	nodenames = {"mesecons_detector:object_detector_off"},
 	interval = 1,
@@ -147,23 +132,17 @@ minetest.register_abm({
 -- Detects the node in front of it
 
 local function node_detector_make_formspec(pos)
-	local meta = minetest.get_meta(pos)
+	minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" ..
-	if meta:get_string("distance") == ""  then meta:set_string("distance", "0") end
-	meta:set_string("formspec", "size[9,2.5]" ..
 		"field[0.3,  0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
-		"field[0.3,1.5;2.5,2;distance;Distance (0-"..mesecon.setting("node_detector_distance_max", 10).."):;${distance}]"..
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
-		"field[3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
 		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local function node_detector_on_receive_fields(pos, _, fields, sender)
+local function node_detector_on_receive_fields(pos, _, fields)
 	if not fields.scanname or not fields.digiline_channel then return end
 
-	if minetest.is_protected(pos, sender:get_player_name()) then return end
-
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
-	meta:set_string("distance", fields.distance or "0")
 	meta:set_string("digiline_channel", fields.digiline_channel)
 	node_detector_make_formspec(pos)
 end
@@ -173,76 +152,58 @@ local function node_detector_scan(pos)
 	local node = minetest.get_node_or_nil(pos)
 	if not node then return end
 
-	local meta = minetest.get_meta(pos)
-
-	local distance = meta:get_int("distance")
-	local distance_max = mesecon.setting("node_detector_distance_max", 10)
-	if distance < 0 then distance = 0 end
-	if distance > distance_max then distance = distance_max end
-
 	local frontname = minetest.get_node(
-		vector.subtract(pos, vector.multiply(minetest.facedir_to_dir(node.param2), distance + 1))
+		vector.subtract(pos, minetest.facedir_to_dir(node.param2))
 	).name
-	local scanname = meta:get_string("scanname")
+	local scanname = minetest.get_meta(pos):get_string("scanname")
 
 	return (frontname == scanname) or
 		(frontname ~= "air" and frontname ~= "ignore" and scanname == "")
 end
 
-local function node_detector_send_node_name(pos, node, channel, meta)
-	local distance = meta:get_int("distance")
-	local distance_max = mesecon.setting("node_detector_distance_max", 10)
-	if distance < 0 then distance = 0 end
-	if distance > distance_max then distance = distance_max end
-	local nodename = minetest.get_node(
-		vector.subtract(pos, vector.multiply(minetest.facedir_to_dir(node.param2), distance + 1))
-	).name
-
-	digiline:receptor_send(pos, digiline.rules.default, channel, nodename)
-end
-
 -- set player name when receiving a digiline signal on a specific channel
 local node_detector_digiline = {
 	effector = {
 		action = function(pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
-
 			if channel ~= meta:get_string("digiline_channel") then return end
 
-			if type(msg) == "table" then
-				if msg.distance or msg.scanname then
-					if msg.distance then
-						meta:set_string("distance", msg.distance)
-					end
-					if msg.scanname then
-						meta:set_string("scanname", msg.scanname)
-					end
-					node_detector_make_formspec(pos)
-				end
-				if msg.command == "get" then
-					node_detector_send_node_name(pos, node, channel, meta)
-				elseif msg.command == "scan" then
-					local result = node_detector_scan(pos)
-					digiline:receptor_send(pos, digiline.rules.default, channel, result)
-				end
-			else
 			if msg == GET_COMMAND then
-					node_detector_send_node_name(pos, node, channel, meta)
+				local nodename = minetest.get_node(
+					vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+				).name
+
+				digiline:receptor_send(pos, digiline.rules.default, channel, nodename)
 			else
 				meta:set_string("scanname", msg)
 				node_detector_make_formspec(pos)
 			end
-			end
 		end,
 	},
 	receptor = {}
 }
 
+local function after_place_node_detector(pos, placer)
+	local placer_pos = placer:getpos()
+	if not placer_pos then
+		return
+	end
+
+	--correct for the player's height
+	if placer:is_player() then
+		placer_pos.y = placer_pos.y + 1.625
+	end
+
+	--correct for 6d facedir
+	local node = minetest.get_node(pos)
+	node.param2 = minetest.dir_to_facedir(vector.subtract(pos, placer_pos), true)
+	minetest.set_node(pos, node)
+end
+
 minetest.register_node("mesecons_detector:node_detector_off", {
 	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	walkable = true,
 	groups = {cracky=3},
 	description="Node Detector",
@@ -251,16 +212,15 @@ minetest.register_node("mesecons_detector:node_detector_off", {
 	}},
 	on_construct = node_detector_make_formspec,
 	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = after_place_node_detector,
 	sounds = default.node_sound_stone_defaults(),
-	digiline = node_detector_digiline,
+	digiline = node_detector_digiline
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_detector:node_detector_on", {
 	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_on.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	walkable = true,
 	groups = {cracky=3,not_in_creative_inventory=1},
 	drop = 'mesecons_detector:node_detector_off',
@@ -269,9 +229,9 @@ minetest.register_node("mesecons_detector:node_detector_on", {
 	}},
 	on_construct = node_detector_make_formspec,
 	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = after_place_node_detector,
 	sounds = default.node_sound_stone_defaults(),
-	digiline = node_detector_digiline,
+	digiline = node_detector_digiline
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_craft({
@@ -283,15 +243,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'mesecons_detector:node_detector_off',
-	recipe = {
-		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
-		{"default:steel_ingot", "mesecons_microcontroller:microcontroller0000", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-	}
-})
-
 minetest.register_abm({
 	nodenames = {"mesecons_detector:node_detector_off"},
 	interval = 1,

mesecons_detector/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_detector
-depends = default, mesecons, mesecons_materials

mesecons_doors/depends.txt

@@ -0,0 +1,2 @@
+mesecons
+doors

mesecons_doors/init.lua

@@ -1,7 +1,7 @@
 -- Modified, from minetest_game/mods/doors/init.lua
 local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
 	pos.y = pos.y + dir
-	if minetest.get_node(pos).name ~= check_name then
+	if not minetest.get_node(pos).name == check_name then
 		return
 	end
 	local p2 = minetest.get_node(pos).param2
@@ -13,20 +13,20 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
 	minetest.swap_node(pos, {name = replace, param2 = p2})
 
 	if (minetest.get_meta(pos):get_int("right") ~= 0) == (params[1] ~= 3) then
-		minetest.sound_play("doors_door_close", { pos = pos, gain = 0.3, max_hear_distance = 10 }, true)
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
 	else
-		minetest.sound_play("doors_door_open", { pos = pos, gain = 0.3, max_hear_distance = 10 }, true)
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
 	end
 end
 
 local function meseconify_door(name)
 	if minetest.registered_items[name .. "_b_1"] then
 		-- old style double-node doors
-		local function toggle_state1 (pos)
+		local function toggle_state1 (pos, node)
 			on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
 		end
 
-		local function toggle_state2 (pos)
+		local function toggle_state2 (pos, node)
 			on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
 		end
 
@@ -49,13 +49,13 @@ local function meseconify_door(name)
 		-- new style mesh node based doors
 		local override = {
 			mesecons = {effector = {
-				action_on = function(pos)
+				action_on = function(pos, node)
 					local door = doors.get(pos)
 					if door then
 						door:open()
 					end
 				end,
-				action_off = function(pos)
+				action_off = function(pos, node)
 					local door = doors.get(pos)
 					if door then
 						door:close()
@@ -66,10 +66,6 @@ local function meseconify_door(name)
 		}
 		minetest.override_item(name .. "_a", override)
 		minetest.override_item(name .. "_b", override)
-		if minetest.registered_items[name .. "_c"] then
-			minetest.override_item(name .. "_c", override)
-			minetest.override_item(name .. "_d", override)
-		end
 	end
 end
 
@@ -77,17 +73,29 @@ meseconify_door("doors:door_wood")
 meseconify_door("doors:door_steel")
 meseconify_door("doors:door_glass")
 meseconify_door("doors:door_obsidian_glass")
-meseconify_door("xpanes:door_steel_bar")
+
+--MFF meseconify all doors, crabman 12/06/2016 
+meseconify_door("doors:door_cherry")
+meseconify_door("doors:door_tin")
+meseconify_door("doors:door_prison")
+meseconify_door("doors:door_gardengate_white")
+meseconify_door("doors:door3_wood")
+meseconify_door("doors:door3_steel")
+meseconify_door("doors:door3_glass")
+meseconify_door("doors:door3_obsidian_glass")
+meseconify_door("doors:door3_cherry")
+meseconify_door("doors:door3_prison")
+
 
 -- Trapdoor
 local function trapdoor_switch(pos, node)
 	local state = minetest.get_meta(pos):get_int("state")
 
 	if state == 1 then
-		minetest.sound_play("doors_door_close", { pos = pos, gain = 0.3, max_hear_distance = 10 }, true)
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
 		minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
 	else
-		minetest.sound_play("doors_door_open", { pos = pos, gain = 0.3, max_hear_distance = 10 }, true)
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
 		minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
 	end
 
@@ -97,13 +105,13 @@ end
 if doors and doors.get then
 	local override = {
 		mesecons = {effector = {
-			action_on = function(pos)
+			action_on = function(pos, node)
 				local door = doors.get(pos)
 				if door then
 					door:open()
 				end
 			end,
-			action_off = function(pos)
+			action_off = function(pos, node)
 				local door = doors.get(pos)
 				if door then
 					door:close()
@@ -115,12 +123,6 @@ if doors and doors.get then
 	minetest.override_item("doors:trapdoor_open", override)
 	minetest.override_item("doors:trapdoor_steel", override)
 	minetest.override_item("doors:trapdoor_steel_open", override)
-
-	if minetest.registered_items["xpanes:trapdoor_steel_bar"] then
-		minetest.override_item("xpanes:trapdoor_steel_bar", override)
-		minetest.override_item("xpanes:trapdoor_steel_bar_open", override)
-	end
-
 else
 	if minetest.registered_nodes["doors:trapdoor"] then
 		minetest.override_item("doors:trapdoor", {

mesecons_doors/mod.conf

@@ -1,3 +0,0 @@
-name = mesecons_doors
-depends = mesecons, doors
-optional_depends = xpanes

mesecons_extrawires/corner.lua

@@ -1,8 +1,12 @@
-local screwdriver_exists = minetest.global_exists("screwdriver")
+local corner_nodebox = {
+	type = "fixed",
+	fixed = {{ -16/32-0.001, -17/32, -3/32, 0, -13/32, 3/32 },
+		   { -3/32, -17/32, -16/32+0.001, 3/32, -13/32, 3/32}}
+}
 
 local corner_selectionbox = {
 		type = "fixed",
-		fixed = { -16/32, -16/32, -16/32, 5/32, -12/32, 5/32 },
+		fixed = { -16/32-0.001, -18/32, -16/32, 5/32, -12/32, 5/32 },
 }
 
 local corner_get_rules = function (node)
@@ -18,61 +22,62 @@ local corner_get_rules = function (node)
 end
 
 minetest.register_node("mesecons_extrawires:corner_on", {
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_corner.obj",
 	tiles = {
-		{ name = "jeija_insulated_wire_sides_on.png", backface_culling = true },
+		"jeija_insulated_wire_curved_tb_on.png",
-		{ name = "jeija_insulated_wire_ends_on.png", backface_culling = true },
+		"jeija_insulated_wire_curved_tb_on.png^[transformR270",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png"
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	walkable = false,
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	node_box = corner_nodebox,
+	groups = {dig_immediate = 2, not_in_creative_inventory = 1}, -- MFF
 	drop = "mesecons_extrawires:corner_off",
-	sounds = default.node_sound_defaults(),
 	mesecons = {conductor =
 	{
 		state = mesecon.state.on,
 		rules = corner_get_rules,
 		offstate = "mesecons_extrawires:corner_off"
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
-	on_rotate = screwdriver_exists and screwdriver.rotate_simple,
 })
 
 minetest.register_node("mesecons_extrawires:corner_off", {
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	description = "Insulated Mesecon Corner",
+	description = "Mesecon Corner",
-	mesh = "mesecons_extrawires_corner.obj",
 	tiles = {
-		{ name = "jeija_insulated_wire_sides_off.png", backface_culling = true },
+		"jeija_insulated_wire_curved_tb_off.png",
-		{ name = "jeija_insulated_wire_ends_off.png", backface_culling = true },
+		"jeija_insulated_wire_curved_tb_off.png^[transformR270",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png"
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	is_ground_content = false,
 	walkable = false,
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
-	groups = {dig_immediate = 3},
+	node_box = corner_nodebox,
-	sounds = default.node_sound_defaults(),
+	groups = {dig_immediate = 2}, --MFF
 	mesecons = {conductor =
 	{
 		state = mesecon.state.off,
 		rules = corner_get_rules,
 		onstate = "mesecons_extrawires:corner_on"
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
-	on_rotate = screwdriver_exists and screwdriver.rotate_simple,
 })
 
 minetest.register_craft({
 	output = "mesecons_extrawires:corner_off 3",
 	recipe = {
-		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"},
+		{"", "", ""},
-		{"", "mesecons_insulated:insulated_off"},
+		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""},
+		{"", "mesecons_insulated:insulated_off", ""},
 	}
 })

mesecons_extrawires/crossover.lua

@@ -1,4 +1,5 @@
-local crossover_rules = {
+function crossover_get_rules(node)
+	return {
 		{--first wire
 			{x=-1,y=0,z=0},
 			{x=1,y=0,z=0},
@@ -8,6 +9,7 @@ local crossover_rules = {
 			{x=0,y=0,z=1},
 		},
 	}
+end
 
 local crossover_states = {
 	"mesecons_extrawires:crossover_off",
@@ -17,110 +19,143 @@ local crossover_states = {
 }
 
 minetest.register_node("mesecons_extrawires:crossover_off", {
-	description = "Insulated Mesecon Crossover",
+	description = "Insulated Crossover",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
-		"jeija_insulated_wire_sides_off.png",
 		"jeija_insulated_wire_ends_off.png"
 	},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
 	stack_max = 99,
-	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3},
+	node_box = {
-	sounds = default.node_sound_defaults(),
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=2, mesecon=3}, --MFF
 	mesecons = {
 		conductor = {
 			states = crossover_states,
-			rules = crossover_rules,
+			rules = crossover_get_rules(),
 		}
 	},
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_extrawires:crossover_01", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
-		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_01x.png",
-		"jeija_insulated_wire_ends_off.png"
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01z.png",
+		"jeija_insulated_wire_ends_01z.png"
 	},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
 	stack_max = 99,
-	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	node_box = {
-	sounds = default.node_sound_defaults(),
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=2, mesecon=3, not_in_creative_inventory=1}, --MFF
 	mesecons = {
 		conductor = {
 			states = crossover_states,
-			rules = crossover_rules,
+			rules = crossover_get_rules(),
 		}
 	},
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_extrawires:crossover_10", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
-		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_10x.png",
-		"jeija_insulated_wire_ends_on.png"
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10z.png",
+		"jeija_insulated_wire_ends_10z.png"
 	},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
 	stack_max = 99,
-	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
 	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
-	sounds = default.node_sound_defaults(),
 	mesecons = {
 		conductor = {
 			states = crossover_states,
-			rules = crossover_rules,
+			rules = crossover_get_rules(),
 		}
 	},
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_extrawires:crossover_on", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
 		"jeija_insulated_wire_ends_on.png",
-		"jeija_insulated_wire_sides_on.png",
-		"jeija_insulated_wire_sides_on.png",
 		"jeija_insulated_wire_ends_on.png"
 	},
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
 	stack_max = 99,
-	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
 	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
-	sounds = default.node_sound_defaults(),
 	mesecons = {
 		conductor = {
 			states = crossover_states,
-			rules = crossover_rules,
+			rules = crossover_get_rules(),
 		}
 	},
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_craft({

mesecons_extrawires/depends.txt

@@ -0,0 +1,2 @@
+default
+mesecons