Properly handle missing screwdriver mod

.github/workflows/check-release.yml

@@ -1,41 +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 ./
-
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@main
-    - name: apt
-      run: sudo apt-get install -y luarocks
-    - name: busted install
-      run: luarocks install --local busted
-    - name: luacov install
-      run: luarocks install --local luacov
-    - name: mineunit install
-      run: luarocks install --server=https://luarocks.org/dev --local mineunit
-    - name: run mesecons tests
-      working-directory: ./mesecons/
-      run: $HOME/.luarocks/bin/mineunit -q
-    - name: run mesecons_mvps tests
-      working-directory: ./mesecons_mvps/
-      run: $HOME/.luarocks/bin/mineunit -q
-    - name: run mesecons_fpga tests
-      working-directory: ./mesecons_fpga/
-      run: $HOME/.luarocks/bin/mineunit -q
-    - name: run mesecons_luacontroller tests
-      working-directory: ./mesecons_luacontroller/
-      run: $HOME/.luarocks/bin/mineunit -q

.gitignore

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

.luacheckrc

@@ -1,59 +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"},
-}
-
--- Test-specific stuff follows.
-
-local test_conf = {
-	read_globals = {
-		"assert",
-		"fixture",
-		"mineunit",
-		"Player",
-		"sourcefile",
-		"world",
-	},
-}
-files["*/spec/*.lua"] = test_conf
-files[".test_fixtures/*.lua"] = test_conf
-
-files[".test_fixtures/screwdriver.lua"] = {
-	globals = {"screwdriver"},
-}
-
-files[".test_fixtures/mesecons_fpga.lua"] = {
-	globals = {"minetest.register_on_player_receive_fields"},
-}

.test_fixtures/mesecons.lua

@@ -1,156 +0,0 @@
-mineunit("core")
-mineunit("server")
-mineunit("voxelmanip")
-
-mineunit:set_current_modname("mesecons")
-mineunit:set_modpath("mesecons", "../mesecons")
-sourcefile("../mesecons/init")
-
--- Utility node: this conductor is used to test the connectivity and state of adjacent wires.
-do
-	local off_spec = {conductor = {
-		state = mesecon.state.off,
-		rules = mesecon.rules.alldirs,
-		onstate = "mesecons:test_conductor_on",
-	}}
-	local on_spec = {conductor = {
-		state = mesecon.state.on,
-		rules = mesecon.rules.alldirs,
-		offstate = "mesecons:test_conductor_off",
-	}}
-	mesecon.register_node("mesecons:test_conductor", {
-		description = "Test Conductor",
-	}, {mesecons = off_spec}, {mesecons = on_spec})
-end
-
--- Utility node: this receptor is used to test power sources.
-do
-	local off_spec = {receptor = {
-		state = mesecon.state.off,
-		rules = mesecon.rules.alldirs,
-	}}
-	local on_spec = {receptor = {
-		state = mesecon.state.on,
-		rules = mesecon.rules.alldirs,
-	}}
-	mesecon.register_node("mesecons:test_receptor", {
-		description = "Test Receptor",
-	}, {mesecons = off_spec}, {mesecons = on_spec})
-end
-
--- Utility node: this effector is used to test circuit outputs.
-do
-	-- This is a list of actions in the form {<kind>, <pos>},
-	-- where <kind> is "on", "off", or "overheat".
-	mesecon._test_effector_events = {}
-	local function action_on(pos, node)
-		table.insert(mesecon._test_effector_events, {"on", pos})
-		node.param2 = node.param2 % 64 + 128 -- Turn on bit 7
-		minetest.swap_node(pos, node)
-	end
-	local function action_off(pos, node)
-		table.insert(mesecon._test_effector_events, {"off", pos})
-		node.param2 = node.param2 % 64 -- Turn off bit 7
-		minetest.swap_node(pos, node)
-	end
-	local function action_change(pos, node, rule_name, new_state)
-		if mesecon.do_overheat(pos) then
-			table.insert(mesecon._test_effector_events, {"overheat", pos})
-			minetest.remove_node(pos)
-			return
-		end
-		-- Set the value of a bit in param2 according to the rule name and new state.
-		local bit = tonumber(rule_name.name, 2)
-		local bits_above = node.param2 - node.param2 % (bit * 2)
-		local bits_below = node.param2 % bit
-		local bits_flipped = new_state == mesecon.state.on and bit or 0
-		node.param2 = bits_above + bits_flipped + bits_below
-		minetest.swap_node(pos, node)
-	end
-	minetest.register_node("mesecons:test_effector", {
-		description = "Test Effector",
-		mesecons = {effector = {
-			action_on = action_on,
-			action_off = action_off,
-			action_change = action_change,
-			rules = {
-				{x =  1, y =  0, z =  0, name = "000001"},
-				{x = -1, y =  0, z =  0, name = "000010"},
-				{x =  0, y =  1, z =  0, name = "000100"},
-				{x =  0, y = -1, z =  0, name = "001000"},
-				{x =  0, y =  0, z =  1, name = "010000"},
-				{x =  0, y =  0, z = -1, name = "100000"},
-			}
-		}},
-	})
-end
-
--- Utility node: this conductor is used to test rotation.
-do
-	local get_rules = mesecon.horiz_rules_getter({{x = 1, y = 0, z = 0}, {x = -1, y = 0, z = 0}})
-	local off_spec = {conductor = {
-		state = mesecon.state.off,
-		rules = get_rules,
-		onstate = "mesecons:test_conductor_rot_on",
-	}}
-	local on_spec = {conductor = {
-		state = mesecon.state.on,
-		rules = get_rules,
-		offstate = "mesecons:test_conductor_rot_off",
-	}}
-	mesecon.register_node("mesecons:test_conductor_rot", {
-		description = "Rotatable Test Conductor",
-		on_rotate = mesecon.on_rotate_horiz,
-	}, {mesecons = off_spec}, {mesecons = on_spec})
-end
-
--- Utility node: this is used to test multiple conductors within a single node.
-do
-	local mesecons_spec = {conductor = {
-		rules = {
-			{{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 = -1, y = 0, z = 0}},
-		},
-		states = {
-			"mesecons:test_multiconductor_off", "mesecons:test_multiconductor_001",
-			"mesecons:test_multiconductor_010", "mesecons:test_multiconductor_011",
-			"mesecons:test_multiconductor_100", "mesecons:test_multiconductor_101",
-			"mesecons:test_multiconductor_110", "mesecons:test_multiconductor_on",
-		},
-	}}
-	for _, state in ipairs(mesecons_spec.conductor.states) do
-		minetest.register_node(state, {
-			description = "Test Multiconductor",
-			mesecons = mesecons_spec,
-		})
-	end
-end
-
-mesecon._test_autoconnects = {}
-mesecon.register_autoconnect_hook("test", function(pos, node)
-	table.insert(mesecon._test_autoconnects, {pos, node})
-end)
-
-function mesecon._test_dig(pos)
-	local node = minetest.get_node(pos)
-	minetest.remove_node(pos)
-	mesecon.on_dignode(pos, node)
-end
-
-function mesecon._test_place(pos, node)
-	world.set_node(pos, node)
-	mesecon.on_placenode(pos, minetest.get_node(pos))
-end
-
-function mesecon._test_reset()
-	-- First let circuits settle by simulating many globalsteps.
-	for i = 1, 10 do
-		mineunit:execute_globalstep(60)
-	end
-	mesecon.queue.actions = {}
-	mesecon._test_effector_events = {}
-	mesecon._test_autoconnects = {}
-end
-
-mineunit:execute_globalstep(mesecon.setting("resumetime", 4) + 1)

.test_fixtures/mesecons_fpga.lua

@@ -1,59 +0,0 @@
-mineunit("player")
-
-fixture("mesecons")
-fixture("mesecons_gamecompat")
-
-local registered_on_player_receive_fields = {}
-local old_register_on_player_receive_fields = minetest.register_on_player_receive_fields
-function minetest.register_on_player_receive_fields(func)
-	old_register_on_player_receive_fields(func)
-	table.insert(registered_on_player_receive_fields, func)
-end
-
-mineunit:set_current_modname("mesecons_fpga")
-mineunit:set_modpath("mesecons_fpga", "../mesecons_fpga")
-sourcefile("../mesecons_fpga/init")
-
-local fpga_user = Player("mesecons_fpga_user")
-
-function mesecon._test_program_fpga(pos, program)
-	local node = minetest.get_node(pos)
-	assert.equal("mesecons_fpga:fpga", node.name:sub(1, 18))
-
-	local fields = {program = true}
-	for i, instr in ipairs(program) do
-		-- Translate the instruction into formspec fields.
-		local op1, act, op2, dst
-		if #instr == 3 then
-			act, op2, dst = unpack(instr)
-		else
-			assert.equal(4, #instr)
-			op1, act, op2, dst = unpack(instr)
-		end
-		fields[i .. "op1"] = op1
-		fields[i .. "act"] = (" "):rep(4 - #act) .. act
-		fields[i .. "op2"] = op2
-		fields[i .. "dst"] = dst
-	end
-
-	minetest.registered_nodes[node.name].on_rightclick(pos, node, fpga_user)
-
-	for _, func in ipairs(registered_on_player_receive_fields) do
-		if func(fpga_user, "mesecons:fpga", fields) then
-			break
-		end
-	end
-end
-
-function mesecon._test_copy_fpga_program(pos)
-	fpga_user:get_inventory():set_stack("main", 1, "mesecons_fpga:programmer")
-	local pt = {type = "node", under = vector.new(pos), above = vector.offset(pos, 0, 1, 0)}
-	fpga_user:do_place(pt)
-	return fpga_user:get_wielded_item()
-end
-
-function mesecon._test_paste_fpga_program(pos, tool)
-	fpga_user:get_inventory():set_stack("main", 1, tool)
-	local pt = {type = "node", under = vector.new(pos), above = vector.offset(pos, 0, 1, 0)}
-	fpga_user:do_use(pt)
-end

.test_fixtures/mesecons_gamecompat.lua

@@ -1,5 +0,0 @@
-fixture("mesecons")
-
-mineunit:set_current_modname("mesecons_gamecompat")
-mineunit:set_modpath("mesecons_gamecompat", "../mesecons_gamecompat")
-sourcefile("../mesecons_gamecompat/init")

.test_fixtures/mesecons_luacontroller.lua

@@ -1,12 +0,0 @@
-fixture("mesecons")
-fixture("mesecons_gamecompat")
-
-mineunit:set_current_modname("mesecons_luacontroller")
-mineunit:set_modpath("mesecons_luacontroller", "../mesecons_luacontroller")
-sourcefile("../mesecons_luacontroller/init")
-
-function mesecon._test_program_luac(pos, code)
-	local node = minetest.get_node(pos)
-	assert.equal("mesecons_luacontroller:luacontroller", node.name:sub(1, 36))
-	return minetest.registered_nodes[node.name].mesecons.luacontroller.set_program(pos, code)
-end

.test_fixtures/mesecons_mvps.lua

@@ -1,45 +0,0 @@
-mineunit("protection")
-
-fixture("mesecons")
-
-mineunit:set_current_modname("mesecons_mvps")
-mineunit:set_modpath("mesecons_mvps", "../mesecons_mvps")
-sourcefile("../mesecons_mvps/init")
-
-minetest.register_node("mesecons_mvps:test_stopper", {
-	description = "Test Stopper",
-})
-mesecon.register_mvps_stopper("mesecons_mvps:test_stopper")
-
-minetest.register_node("mesecons_mvps:test_stopper_cond", {
-	description = "Test Stopper (Conditional)",
-})
-mesecon.register_mvps_stopper("mesecons_mvps:test_stopper_cond", function(node)
-	return node.param2 == 0
-end)
-
-minetest.register_node("mesecons_mvps:test_sticky", {
-	description = "Test Sticky",
-	mvps_sticky = function(pos)
-		local connected = {}
-		for i, rule in ipairs(mesecon.rules.alldirs) do
-			connected[i] = vector.add(pos, rule)
-		end
-		return connected
-	end,
-})
-
-mesecon._test_moves = {}
-minetest.register_node("mesecons_mvps:test_on_move", {
-	description = "Test Moveable",
-	mesecon = {
-		on_mvps_move = function(pos, node, oldpos, meta)
-			table.insert(mesecon._test_moves, {pos, node, oldpos, meta})
-		end
-	},
-})
-local old_reset = mesecon._test_reset
-function mesecon._test_reset()
-	mesecon._test_moves = {}
-	old_reset()
-end

.test_fixtures/screwdriver.lua

@@ -1,6 +0,0 @@
-mineunit:set_current_modname("screwdriver")
-
-screwdriver = {}
-
-screwdriver.ROTATE_FACE = 1
-screwdriver.ROTATE_AXIS = 2

LICENSE.txt

@@ -1,12 +1,6 @@
 The LGPLv3 applies to all code in this project.
 The CC-BY-SA-3.0 license applies to textures and any other content in this project which is not source code.
 
-The file mesecons_detector/textures/mesecons_detector_side.png is an unmodified copy of
-"default_steel_block.png" by Jean-Patrick Guerrero <https://github.com/kilbith>, which can be found at
-<https://github.com/minetest/minetest_game/blob/9528c0f8b93d6934930e99c3c116df275fb0e4bc/mods/default/textures/default_steel_block.png>.
-"default_steel_block.png" is licensed under a CC BY-SA 3.0 license. This license can be found later in this document, and can also be found at
-<https://creativecommons.org/licenses/by-sa/3.0/>. The artwork is reportedly copyright (C) 2010-2018 kilbith.
-
 =================================================================
 
 GNU LESSER GENERAL PUBLIC LICENSE

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?
 ---------------------
@@ -74,10 +72,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"
-    ]
-}

mesecons/actionqueue.lua

@@ -1,140 +1,96 @@
---[[
+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,
-		func = func,
+				params=mesecon.tablecopy(params or {}),
-		params = mesecon.tablecopy(params or {}),
+				time=time,
-		time = time,
+				owcheck=(overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
-		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 highestp = -1
+	local highesti
+	for i, ac in ipairs(actions) do
+		if ac.priority > highestp then
+			highestp = ac.priority
+			highesti = i
+		end
+	end
 
-local function globalstep_func(dtime)
+	return highesti
-	local actions = queue.actions
+end
-	-- split into two categories:
-	-- actions_now: actions to execute now
-	-- queue.actions: actions to execute later
-	local actions_now = {}
-	queue.actions = {}
 
-	for _, ac in ipairs(actions) do
+local m_time = 0
+local resumetime = mesecon.setting("resumetime", 4)
+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 return end
+	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
-			-- action ac is to be executed later
+			ac.time = ac.time - dtime -- executed later
-			-- ~> insert into queue.actions
+			table.insert(mesecon.queue.actions, ac)
-			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
+	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
-	-- some constructions might depend on the execution order, hence we first
+		local hp = get_highest_priority(actions_now)
-	-- execute the actions that had a lower index in actions_now
+		mesecon.queue:execute(actions_now[hp])
-	local old_action_order = {}
+		table.remove(actions_now, hp)
-	for i, ac in ipairs(actions_now) do
-		old_action_order[ac] = i
 	end
-	table.sort(actions_now, function(ac1, ac2)
+end)
-		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
+function mesecon.queue:execute(action)
-	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
-			return
-		end
-		-- replace this globalstep function
-		minetest.registered_globalsteps[globalstep_func_index] = globalstep_func
-	end)
-end
-
-function queue:execute(action)
 	-- ignore if action queue function name doesn't exist,
 	-- (e.g. in case the action queue savegame was written by an old mesecons version)
-	if self.funcs[action.func] then
+	if mesecon.queue.funcs[action.func] then
-		self.funcs[action.func](action.pos, unpack(action.params))
+		mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
 	end
 end
 
@@ -142,8 +98,8 @@ 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,2 @@
+default
+screwdriver?

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

@@ -99,6 +99,7 @@ mesecon.queue:add_function("receptor_off", function (pos, rules)
 		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
 			mesecon.vm_begin()
+			mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
 
 			-- 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
@@ -117,6 +118,8 @@ function mesecon.receptor_off(pos, rules)
 end
 
 
+print("[OK] Mesecons")
+
 -- Deprecated stuff
 -- To be removed in future releases
 dofile(minetest.get_modpath("mesecons").."/legacy.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)
 
@@ -46,9 +46,6 @@
 -- mesecon.rotate_rules_down(rules)
 -- These functions return rules that have been rotated in the specific direction
 
--- See fifo_queue.lua for documentation.
-mesecon.fifo_queue = dofile(minetest.get_modpath("mesecons").."/fifo_queue.lua")
-
 -- General
 function mesecon.get_effector(nodename)
 	if  minetest.registered_nodes[nodename]
@@ -95,8 +92,8 @@ function mesecon.get_any_inputrules(node)
 end
 
 function mesecon.get_any_rules(node)
-	return mesecon.merge_rule_sets(mesecon.get_any_inputrules(node),
+	return mesecon.mergetable(mesecon.get_any_inputrules(node) or {},
-		mesecon.get_any_outputrules(node))
+		mesecon.get_any_outputrules(node) or {})
 end
 
 -- Receptors
@@ -319,7 +316,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)
@@ -335,7 +332,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)
@@ -369,98 +366,37 @@ 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 = mesecon.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[1] do
+		local f = table.remove(frontiers, 1)
 		local node = mesecon.get_node_force(f.pos)
 
 		if not node then
 			-- Area does not exist; do nothing
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
+		elseif mesecon.is_conductor_off(node, f.link) then
-		elseif mesecon.is_conductor(node.name) then
 			local rules = mesecon.conductor_get_rules(node)
 
-			if mesecon.is_conductor_off(node, f.link) then
+			-- Call turnon on neighbors
-				-- Call turnon on neighbors
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
-				for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = vector.add(f.pos, r)
-					local np = vector.add(f.pos, r)
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
-					if not pos_can_be_skipped[minetest.hash_node_position(np)] then
+					table.insert(frontiers, {pos = np, link = l})
-						for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
-							frontiers:add({pos = np, link = l})
-						end
-					end
 				end
-
-				mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link), light_update_conductors[node.name] ~= nil)
 			end
 
-			-- Only conductors with flat rules can be reliably skipped later
+			mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link))
-			if not rules[1] or rules[1].x then
-				pos_can_be_skipped[minetest.hash_node_position(f.pos)] = 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
@@ -483,51 +419,37 @@ end
 --	depth = indicates order in which signals wire fired, higher is later
 -- }
 function mesecon.turnoff(pos, link)
-	find_light_update_conductors()
+	local frontiers = {{pos = pos, link = link}}
-
-	local frontiers = mesecon.fifo_queue.new()
-	frontiers:add({pos = pos, link = link})
 	local signals = {}
-	local pos_can_be_skipped = {}
 
 	local depth = 1
-	for f in frontiers:iter() do
+	while frontiers[1] do
+		local f = table.remove(frontiers, 1)
 		local node = mesecon.get_node_force(f.pos)
 
 		if not node then
 			-- Area does not exist; do nothing
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
+		elseif mesecon.is_conductor_on(node, f.link) then
-		elseif mesecon.is_conductor(node.name) then
 			local rules = mesecon.conductor_get_rules(node)
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = vector.add(f.pos, r)
 
-			if mesecon.is_conductor_on(node, f.link) then
+				-- Check if an onstate receptor is connected. If that is the case,
-				for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				-- abort this turnoff process by returning false. `receptor_off` will
-					local np = vector.add(f.pos, r)
+				-- discard all the changes that we made in the voxelmanip:
-
+				for _, l in ipairs(mesecon.rules_link_rule_all_inverted(f.pos, r)) do
-					if not pos_can_be_skipped[minetest.hash_node_position(np)] then
+					if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
-						-- Check if an onstate receptor is connected. If that is the case,
+						return false
-						-- abort this turnoff process by returning false. `receptor_off` will
-						-- discard all the changes that we made in the voxelmanip:
-						if mesecon.rules_link_rule_all_inverted(f.pos, r)[1] then
-							if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
-								return false
-							end
-						end
-
-						-- Call turnoff on neighbors
-						for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
-							frontiers:add({pos = np, link = l})
-						end
 					end
 				end
 
-				mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link), light_update_conductors[node.name] ~= nil)
+				-- Call turnoff on neighbors
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
+					table.insert(frontiers, {pos = np, link = l})
+				end
 			end
 
-			-- Only conductors with flat rules can be reliably skipped later
+			mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link))
-			if not rules[1] or rules[1].x then
-				pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
-			end
 		elseif mesecon.is_effector(node.name) then
 			table.insert(signals, {
 				pos = f.pos,
@@ -535,19 +457,14 @@ function mesecon.turnoff(pos, link)
 				link = f.link,
 				depth = depth
 			})
-		else
-			pos_can_be_skipped[minetest.hash_node_position(f.pos)] = true
 		end
 		depth = depth + 1
 	end
 
 	for _, sig in ipairs(signals) do
-		-- If sig.depth is 1, it has not yet been checked that the power source is actually off.
+		mesecon.changesignal(sig.pos, sig.node, sig.link, mesecon.state.off, sig.depth)
-		if sig.depth > 1 or not mesecon.is_powered(sig.pos, sig.link) then
+		if mesecon.is_effector_on(sig.node.name) and not mesecon.is_powered(sig.pos) then
-			mesecon.changesignal(sig.pos, sig.node, sig.link, mesecon.state.off, sig.depth)
+			mesecon.deactivate(sig.pos, sig.node, sig.link, 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
 	end
 
@@ -631,3 +548,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

@@ -11,4 +11,87 @@ local old_forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
 for hash, _ in pairs(old_forceloaded_blocks) do
 	minetest.forceload_free_block(unhash_blockpos(hash))
 end
-os.remove(minetest.get_worldpath().."/mesecon_forceloaded")
+os.remove(minetest.get_worldpath()..DIR_DELIM.."mesecon_forceloaded")
+
+-- LBMs to convert old pistons to use facedir instead of separate up/down nodes
+minetest.register_lbm({
+	label = "Convert up pistons to use facedir",
+	name = ":mesecons_pistons:update_up_pistons",
+	nodenames = {"mesecons_pistons:piston_up_normal_on","mesecons_pistons:piston_up_normal_off",
+			"mesecons_pistons:piston_up_sticky_on","mesecons_pistons:piston_up_sticky_off"},
+	action = function(pos, node)
+		if string.find(node.name, "sticky") then
+			if string.sub(node.name, -3, -1) == "_on" then
+				node.name = "mesecons_pistons:piston_sticky_on"
+			else
+				node.name = "mesecons_pistons:piston_sticky_off"
+			end
+		else
+			if string.sub(node.name, -3, -1) == "_on" then
+				node.name = "mesecons_pistons:piston_normal_on"
+			else
+				node.name = "mesecons_pistons:piston_normal_off"
+			end
+		end
+		local dir = {x=0, y=-1, z=0}
+		node.param2 = minetest.dir_to_facedir(dir, true)
+		minetest.swap_node(pos, node)
+	end
+})
+
+minetest.register_lbm({
+	label = "Convert down pistons to use facedir",
+	name = ":mesecons_pistons:update_down_pistons",
+	nodenames = {"mesecons_pistons:piston_down_normal_on","mesecons_pistons:piston_down_normal_off",
+			"mesecons_pistons:piston_down_sticky_on","mesecons_pistons:piston_down_sticky_off"},
+	action = function(pos, node)
+		if string.find(node.name, "sticky") then
+			if string.sub(node.name, -3, -1) == "_on" then
+				node.name = "mesecons_pistons:piston_sticky_on"
+			else
+				node.name = "mesecons_pistons:piston_sticky_off"
+			end
+		else
+			if string.sub(node.name, -3, -1) == "_on" then
+				node.name = "mesecons_pistons:piston_normal_on"
+			else
+				node.name = "mesecons_pistons:piston_normal_off"
+			end
+		end
+		local dir = {x=0, y=1, z=0}
+		node.param2 = minetest.dir_to_facedir(dir, true)
+		minetest.swap_node(pos, node)
+	end
+})
+
+minetest.register_lbm({
+	label = "Convert up piston pushers to use facedir",
+	name = ":mesecons_pistons:update_up_pushers",
+	nodenames = {"mesecons_pistons:piston_up_pusher_normal", "mesecons_pistons:piston_up_pusher_sticky"},
+	action = function(pos, node)
+		if string.find(node.name, "sticky") then
+			node.name = "mesecons_pistons:piston_pusher_sticky"
+		else
+			node.name = "mesecons_pistons:piston_pusher_normal"
+		end
+		local dir = {x=0, y=-1, z=0}
+		node.param2 = minetest.dir_to_facedir(dir, true)
+		minetest.swap_node(pos, node)
+	end
+})
+
+minetest.register_lbm({
+	label = "Convert down piston pushers to use facedir",
+	name = ":mesecons_pistons:update_down_pushers",
+	nodenames = {"mesecons_pistons:piston_down_pusher_normal", "mesecons_pistons:piston_down_pusher_sticky"},
+	action = function(pos, node)
+		if string.find(node.name, "sticky") then
+			node.name = "mesecons_pistons:piston_pusher_sticky"
+		else
+			node.name = "mesecons_pistons:piston_pusher_normal"
+		end
+		local dir = {x=0, y=1, z=0}
+		node.param2 = minetest.dir_to_facedir(dir, true)
+		minetest.swap_node(pos, node)
+	end
+})

mesecons/locale/mesecons.de.tr

@@ -1,3 +0,0 @@
-# textdomain: mesecons
-
-Mesecons=Mesecons

mesecons/locale/mesecons.eo.tr

@@ -1,4 +0,0 @@
-# textdomain: mesecons
-
-### oldwires.lua ###
-Mesecons=Mesekonduktilo

mesecons/locale/template.txt

@@ -1,4 +0,0 @@
-# textdomain: mesecons
-
-### oldwires.lua ###
-Mesecons=

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

@@ -1,19 +1,17 @@
-local S = minetest.get_translator(minetest.get_current_modname())
-
 minetest.register_node("mesecons:mesecon_off", {
 	drawtype = "raillike",
 	tiles = {"jeija_mesecon_off.png", "jeija_mesecon_curved_off.png", "jeija_mesecon_t_junction_off.png", "jeija_mesecon_crossing_off.png"},
 	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},
-	description= S("Mesecons"),
+    	description="Mesecons",
 	mesecons = {conductor={
 		state = mesecon.state.off,
 		onstate = "mesecons:mesecon_on"
@@ -24,7 +22,7 @@ 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",
@@ -32,7 +30,7 @@ minetest.register_node("mesecons:mesecon_on", {
 	},
 	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
 	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,87 +1,61 @@
 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 = -1, y =  0, z =  0},
+ {x=-1, y=0,  z=0},
-	{x =  0, y =  0, z =  1},
+ {x=0,  y=0,  z=1},
-	{x =  1, y =  1, z =  0},
+ {x=1,  y=1,  z=0},
-	{x =  1, y = -1, z =  0},
+ {x=1,  y=-1, z=0},
-	{x = -1, y =  1, z =  0},
+ {x=-1, y=1,  z=0},
-	{x = -1, y = -1, z =  0},
+ {x=-1, y=-1, z=0},
-	{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},
+ {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},
+ {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}}
 
-mesecon.rules.buttonlike = {
+mesecon.rules.flat =
-	{x = 1,  y =  0, z =  0},
+{{x = 1, y = 0, z = 0},
-	{x = 1,  y =  1, z =  0},
+ {x =-1, y = 0, z = 0},
-	{x = 1,  y = -1, z =  0},
+ {x = 0, y = 0, z = 1},
-	{x = 1,  y = -1, z =  1},
+ {x = 0, y = 0, z =-1}}
-	{x = 1,  y = -1, z = -1},
-	{x = 2,  y =  0, z =  0},
-}
 
-mesecon.rules.flat = {
+mesecon.rules.alldirs =
-	{x =  1, y = 0, z =  0},
+{{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= 1,  z= 0},
-	{x =  0, y = 0, z = -1},
+ {x= 0, y=-1,  z= 0},
-}
+ {x= 0, y= 0,  z= 1},
-
+ {x= 0, y= 0,  z=-1}}
-mesecon.rules.alldirs = {
-	{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},
-}
-
-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 not dir then return {} end
-
-	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 rules = mesecon.rules.buttonlike
 	local dir = minetest.facedir_to_dir(node.param2)
-	return rules_from_dir(rules_buttonlike, dir)
+	if dir.x == 1 then
+		-- No action needed
+	elseif dir.z == -1 then
+		rules=mesecon.rotate_rules_left(rules)
+	elseif dir.x == -1 then
+		rules=mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
+	elseif dir.z == 1 then
+		rules=mesecon.rotate_rules_right(rules)
+	elseif dir.y == -1 then
+		rules=mesecon.rotate_rules_up(rules)
+	elseif dir.y == 1 then
+		rules=mesecon.rotate_rules_down(rules)
+	end
+	return rules
 end
 
 mesecon.state.on = "on"

mesecons/services.lua

@@ -2,7 +2,6 @@
 
 mesecon.on_placenode = function(pos, node)
 	mesecon.execute_autoconnect_hooks_now(pos, node)
-	node = minetest.get_node(pos) -- Update the node in case it was just changed.
 
 	-- Receptors: Send on signal when active
 	if mesecon.is_receptor_on(node.name) then
@@ -12,20 +11,17 @@ mesecon.on_placenode = function(pos, node)
 	-- Conductors: Send turnon signal when powered or replace by respective offstate conductor
 	-- if placed conductor is an onstate one
 	if mesecon.is_conductor(node.name) then
-		local conductor = mesecon.get_conductor(node.name)
-		if conductor.state ~= mesecon.state.off then
-			-- Turn the conductor off.
-			node.name = conductor.offstate or conductor.states[1]
-			minetest.swap_node(pos, node)
-		end
 		local sources = mesecon.is_powered(pos)
 		if sources then
-			mesecon.vm_begin()
+			-- 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.vm_commit()
+			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
+		elseif mesecon.is_conductor_on(node) then
+			minetest.swap_node(pos, {name = mesecon.get_conductor_off(node)})
 		end
 	end
 
@@ -66,74 +62,42 @@ mesecon.on_dignode = function(pos, node)
 	mesecon.execute_autoconnect_hooks_queue(pos, node)
 end
 
-function mesecon.on_blastnode(pos)
-	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)
+-- "Shim" for simple rotation, will result in the following item in nodedefs using it:
-	cooldown_timer = cooldown_timer + dtime
+-- "on_rotate = screwdriver.rotate_simple" if screwdriver mod is installed
-	if cooldown_timer < COOLDOWN_STEP then
+-- "on_rotate = nil" (essentially not present) if screwdriver mod is missing
-		return -- don't overload the CPU
+
-	end
+if screwdriver then
-	local cooldown = COOLDOWN_MULTIPLIER * cooldown_timer
+	mesecon.rotate_simple = screwdriver.rotate_simple
-	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/spec/action_spec.lua

@@ -1,62 +0,0 @@
-require("mineunit")
-
-fixture("mesecons")
-
-describe("action queue", function()
-	local layout = {
-		{{x =  1, y = 0, z = 0}, "mesecons:test_receptor_off"},
-		{{x =  0, y = 0, z = 0}, "mesecons:test_conductor_off"},
-		{{x = -1, y = 0, z = 0}, "mesecons:test_conductor_off"},
-		{{x =  0, y = 1, z = 0}, "mesecons:test_effector"},
-		{{x = -1, y = 1, z = 0}, "mesecons:test_effector"},
-	}
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("executes in order", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal(2, #mesecon._test_effector_events)
-		assert.same({"on", layout[4][1]}, mesecon._test_effector_events[1])
-		assert.same({"on", layout[5][1]}, mesecon._test_effector_events[2])
-
-		world.set_node(layout[1][1], "mesecons:test_receptor_off")
-		mesecon.receptor_off(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal(4, #mesecon._test_effector_events)
-		assert.same({"off", layout[4][1]}, mesecon._test_effector_events[3])
-		assert.same({"off", layout[5][1]}, mesecon._test_effector_events[4])
-	end)
-
-	it("discards outdated/overwritten node events", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		world.set_node(layout[1][1], "mesecons:test_receptor_off")
-		mesecon.receptor_off(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal(0, #mesecon._test_effector_events)
-	end)
-
-	it("delays actions", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.queue:add_action(layout[1][1], "receptor_on", {mesecon.rules.alldirs}, 1, nil)
-		mineunit:execute_globalstep(0.1)
-		mineunit:execute_globalstep(1)
-		assert.equal(0, #mesecon._test_effector_events)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal(0, #mesecon._test_effector_events)
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal(2, #mesecon._test_effector_events)
-	end)
-end)

mesecons/spec/mineunit.conf

@@ -1 +0,0 @@
-fixture_paths = {"../.test_fixtures"}

mesecons/spec/service_spec.lua

@@ -1,192 +0,0 @@
-require("mineunit")
-
-fixture("mesecons")
-fixture("screwdriver")
-
-describe("placement/digging service", function()
-	local layout = {
-		{{x =  1, y = 0, z = 0}, "mesecons:test_receptor_on"},
-		{{x =  0, y = 0, z = 0}, "mesecons:test_conductor_on"},
-		{{x = -1, y = 0, z = 0}, "mesecons:test_conductor_on"},
-		{{x =  0, y = 1, z = 0}, "mesecons:test_effector"},
-		{{x = -2, y = 0, z = 0}, "mesecons:test_effector"},
-		{{x =  2, y = 0, z = 0}, "mesecons:test_effector"},
-	}
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("updates components when a receptor changes", function()
-		-- Dig then replace a receptor and check that the connected effectors changed.
-
-		mesecon._test_dig(layout[1][1])
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[2][1]).name)
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal(3, #mesecon._test_effector_events)
-
-		mesecon._test_place(layout[1][1], "mesecons:test_receptor_on")
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[2][1]).name)
-		mineunit:execute_globalstep() -- Execute activate/change action
-		assert.equal(6, #mesecon._test_effector_events)
-	end)
-
-	it("updates components when a conductor changes", function()
-		-- Dig then replace a powered conductor and check that the connected effectors changed.
-
-		mesecon._test_dig(layout[2][1])
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[3][1]).name)
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal(2, #mesecon._test_effector_events)
-
-		mesecon._test_place(layout[2][1], "mesecons:test_conductor_off")
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[2][1]).name)
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal(4, #mesecon._test_effector_events)
-	end)
-
-	it("updates effectors on placement", function()
-		local pos = {x = 0, y = 0, z = 1}
-		mesecon._test_place(pos, "mesecons:test_effector")
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal(tonumber("10100000", 2), world.get_node(pos).param2)
-	end)
-
-	it("updates multiconductors on placement", function()
-		local pos = {x = 0, y = 0, z = 1}
-		mesecon._test_place(pos, "mesecons:test_multiconductor_off")
-		assert.equal("mesecons:test_multiconductor_010", world.get_node(pos).name)
-	end)
-
-	it("turns off conductors on placement", function()
-		local pos = {x = 3, y = 0, z = 0}
-		mesecon._test_place(pos, "mesecons:test_conductor_on")
-		assert.equal("mesecons:test_conductor_off", world.get_node(pos).name)
-	end)
-
-	it("turns off multiconductors on placement", function()
-		local pos = {x = 3, y = 0, z = 0}
-		mesecon._test_place(pos, "mesecons:test_multiconductor_on")
-		assert.equal("mesecons:test_multiconductor_off", world.get_node(pos).name)
-	end)
-
-	it("triggers autoconnect hooks", function()
-		mesecon._test_dig(layout[2][1])
-		mineunit:execute_globalstep() -- Execute delayed hook
-		assert.equal(1, #mesecon._test_autoconnects)
-
-		mesecon._test_place(layout[2][1], layout[2][2])
-		assert.equal(2, #mesecon._test_autoconnects)
-	end)
-end)
-
-describe("overheating service", function()
-	local layout = {
-		{{x = 0, y = 0, z = 0}, "mesecons:test_receptor_off"},
-		{{x = 1, y = 0, z = 0}, "mesecons:test_effector"},
-		{{x = 2, y = 0, z = 0}, "mesecons:test_receptor_on"},
-	}
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("tracks heat", function()
-		mesecon.do_overheat(layout[2][1])
-		assert.equal(1, mesecon.get_heat(layout[2][1]))
-		mesecon.do_cooldown(layout[2][1])
-		assert.equal(0, mesecon.get_heat(layout[2][1]))
-	end)
-
-	it("cools over time", function()
-		mesecon.do_overheat(layout[2][1])
-		assert.equal(1, mesecon.get_heat(layout[2][1]))
-		mineunit:execute_globalstep(60)
-		mineunit:execute_globalstep(60)
-		mineunit:execute_globalstep(60)
-		assert.equal(0, mesecon.get_heat(layout[2][1]))
-	end)
-
-	it("tracks movement", function()
-		local oldpos = layout[2][1]
-		local pos = vector.offset(oldpos, 0, 1, 0)
-		mesecon.do_overheat(oldpos)
-		mesecon.move_hot_nodes({{pos = pos, oldpos = oldpos}})
-		assert.equal(0, mesecon.get_heat(oldpos))
-		assert.equal(1, mesecon.get_heat(pos))
-	end)
-
-	it("causes overheating", function()
-		-- Switch the first receptor on and off until it overheats/breaks a receptor.
-		repeat
-			if mesecon.flipstate(layout[1][1], minetest.get_node(layout[1][1])) == "on" then
-				mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-			else
-				mesecon.receptor_off(layout[1][1], mesecon.rules.alldirs)
-			end
-			mineunit:execute_globalstep(0) -- Execute receptor_on/receptor_off/activate/deactivate/change actions
-		until minetest.get_node(layout[2][1]).name ~= "mesecons:test_effector"
-		assert.same({"overheat", layout[2][1]}, mesecon._test_effector_events[#mesecon._test_effector_events])
-		assert.equal(0, mesecon.get_heat(layout[2][1]))
-	end)
-end)
-
-describe("screwdriver service", function()
-	local layout = {
-		{{x =  0, y = 0, z =  0}, "mesecons:test_conductor_rot_on"},
-		{{x =  1, y = 0, z =  0}, "mesecons:test_receptor_on"},
-		{{x = -1, y = 0, z =  0}, "mesecons:test_conductor_on"},
-		{{x =  0, y = 0, z =  1}, "mesecons:test_receptor_on"},
-		{{x =  0, y = 0, z = -1}, "mesecons:test_conductor_off"},
-	}
-
-	local function rotate(new_param2)
-		local pos = layout[1][1]
-		local node = world.get_node(pos)
-		local on_rotate = minetest.registered_nodes[node.name].on_rotate
-		on_rotate(pos, node, nil, screwdriver.ROTATE_FACE, new_param2)
-	end
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("updates conductors", function()
-		-- Rotate a conductor and see that the circuit state changes.
-		rotate(1)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[3][1]).name)
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[5][1]).name)
-		rotate(2)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[5][1]).name)
-		rotate(3)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[3][1]).name)
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[5][1]).name)
-		rotate(0)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[5][1]).name)
-	end)
-end)

mesecons/spec/state_spec.lua

@@ -1,147 +0,0 @@
-require("mineunit")
-
-fixture("mesecons")
-
-describe("state", function()
-	local layout = {
-		{{x =  1, y =  0, z = 0}, "mesecons:test_receptor_off"},
-		{{x =  0, y =  1, z = 0}, "mesecons:test_receptor_off"},
-		{{x =  0, y =  0, z = 0}, "mesecons:test_conductor_off"},
-		{{x = -1, y =  0, z = 0}, "mesecons:test_effector"},
-		{{x =  2, y =  0, z = 0}, "mesecons:test_effector"},
-		{{x =  0, y = -1, z = 0}, "mesecons:test_effector"},
-	}
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("turns on", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		assert.equal(tonumber("10000001", 2), world.get_node(layout[4][1]).param2)
-		assert.equal(tonumber("10000010", 2), world.get_node(layout[5][1]).param2)
-		assert.equal(tonumber("10000100", 2), world.get_node(layout[6][1]).param2)
-
-		world.set_node(layout[2][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[2][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		mineunit:execute_globalstep() -- Execute activate/change actions
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		assert.equal(tonumber("10000001", 2), world.get_node(layout[4][1]).param2)
-		assert.equal(tonumber("10000010", 2), world.get_node(layout[5][1]).param2)
-		assert.equal(tonumber("10000100", 2), world.get_node(layout[6][1]).param2)
-	end)
-
-	it("turns off", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		world.set_node(layout[2][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mesecon.receptor_on(layout[2][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on actions
-
-		world.set_node(layout[1][1], "mesecons:test_receptor_off")
-		mesecon.receptor_off(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_off and activate/change actions
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal("mesecons:test_conductor_on", world.get_node(layout[3][1]).name)
-		assert.equal(tonumber("10000001", 2), world.get_node(layout[4][1]).param2)
-		assert.equal(tonumber("00000000", 2), world.get_node(layout[5][1]).param2)
-		assert.equal(tonumber("10000100", 2), world.get_node(layout[6][1]).param2)
-
-		world.set_node(layout[2][1], "mesecons:test_receptor_off")
-		mesecon.receptor_off(layout[2][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_off action
-		mineunit:execute_globalstep() -- Execute deactivate/change actions
-		assert.equal("mesecons:test_conductor_off", world.get_node(layout[3][1]).name)
-		assert.equal(tonumber("00000000", 2), world.get_node(layout[4][1]).param2)
-		assert.equal(tonumber("00000000", 2), world.get_node(layout[5][1]).param2)
-		assert.equal(tonumber("00000000", 2), world.get_node(layout[6][1]).param2)
-	end)
-end)
-
-describe("rotation", function()
-	local layout = {
-		{{x =  0, y = 0, z =  0}, "mesecons:test_receptor_off"},
-		{{x =  1, y = 0, z =  0}, {name = "mesecons:test_conductor_rot_off", param2 = 0}},
-		{{x =  0, y = 0, z =  1}, {name = "mesecons:test_conductor_rot_off", param2 = 1}},
-		{{x = -1, y = 0, z =  0}, {name = "mesecons:test_conductor_rot_off", param2 = 2}},
-		{{x =  0, y = 0, z = -1}, {name = "mesecons:test_conductor_rot_off", param2 = 3}},
-	}
-
-	before_each(function()
-		for _, entry in ipairs(layout) do
-			world.set_node(entry[1], entry[2])
-		end
-	end)
-
-	after_each(function()
-		mesecon._test_reset()
-		world.clear()
-	end)
-
-	it("works", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_conductor_rot_on", world.get_node(layout[2][1]).name)
-		assert.equal("mesecons:test_conductor_rot_on", world.get_node(layout[3][1]).name)
-		assert.equal("mesecons:test_conductor_rot_on", world.get_node(layout[4][1]).name)
-		assert.equal("mesecons:test_conductor_rot_on", world.get_node(layout[5][1]).name)
-	end)
-end)
-
-describe("multiconductor", function()
-	local layout = {
-		{{x =  1, y = 0, z =  0}, "mesecons:test_receptor_off"},
-		{{x =  0, y = 1, z =  0}, "mesecons:test_receptor_off"},
-		{{x =  0, y = 0, z =  1}, "mesecons:test_receptor_off"},
-		{{x =  0, y = 0, z =  0}, "mesecons:test_multiconductor_off"},
-	}
-
-	before_each(function()
-		world.layout(layout)
-	end)
-
-	after_each(function()
-		world.clear()
-		mesecon._test_reset()
-	end)
-
-	it("separates its subparts", function()
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_multiconductor_001", world.get_node(layout[4][1]).name)
-
-		world.set_node(layout[2][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[2][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_multiconductor_011", world.get_node(layout[4][1]).name)
-
-		world.set_node(layout[3][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[3][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_multiconductor_on", world.get_node(layout[4][1]).name)
-	end)
-
-	it("loops through itself", function()
-		-- Make a loop.
-		world.set_node({x = 0, y = -1, z = 0}, "mesecons:test_conductor_off")
-		world.set_node({x = -1, y = -1, z = 0}, "mesecons:test_conductor_off")
-		world.set_node({x = -1, y = 0, z = 0}, "mesecons:test_conductor_off")
-
-		world.set_node(layout[1][1], "mesecons:test_receptor_on")
-		mesecon.receptor_on(layout[1][1], mesecon.rules.alldirs)
-		mineunit:execute_globalstep() -- Execute receptor_on action
-		assert.equal("mesecons:test_multiconductor_101", world.get_node(layout[4][1]).name)
-	end)
-end)

mesecons/util.lua

@@ -6,95 +6,6 @@ function mesecon.move_node(pos, newpos)
 	minetest.get_meta(pos):from_table(meta)
 end
 
--- An on_rotate callback for mesecons components.
-function mesecon.on_rotate(pos, node, _, _, new_param2)
-	local new_node = {name = node.name, param1 = node.param1, param2 = new_param2}
-	minetest.swap_node(pos, new_node)
-	mesecon.on_dignode(pos, node)
-	mesecon.on_placenode(pos, new_node)
-	minetest.check_for_falling(pos)
-	return true
-end
-
--- An on_rotate callback for components which stay horizontal.
-function mesecon.on_rotate_horiz(pos, node, user, mode, new_param2)
-	if not minetest.global_exists("screwdriver") or mode ~= screwdriver.ROTATE_FACE then
-		return false
-	end
-	return mesecon.on_rotate(pos, node, user, mode, new_param2)
-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
-
--- Returns a rules getter function that returns different rules depending on the node's horizontal rotation.
--- If param2 % 4 == 0, then the rules returned by the getter are a copy of base_rules.
-function mesecon.horiz_rules_getter(base_rules)
-	local rotations = {mesecon.tablecopy(base_rules)}
-	for i = 2, 4 do
-		local right_rules = rotations[i - 1]
-		if not right_rules[1] or right_rules[1].x then
-			-- flat rules
-			rotations[i] = mesecon.rotate_rules_left(right_rules)
-		else
-			-- not flat
-			rotations[i] = {}
-			for j, rules in ipairs(right_rules) do
-				rotations[i][j] = mesecon.rotate_rules_left(rules)
-			end
-		end
-	end
-	return function(node)
-		return rotations[node.param2 % 4 + 1]
-	end
-end
-
 function mesecon.flattenrules(allrules)
 --[[
 	{
@@ -203,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
 
@@ -227,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
 	end
-	return obj
+
+	return newtable
 end
 
--- Returns whether two values are equal.
--- In tables, keys are compared for identity but values are compared recursively.
--- 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
@@ -269,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)
@@ -325,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()
@@ -334,7 +214,7 @@ 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
@@ -356,17 +236,15 @@ end
 --
 -- Contents of the table are:
 -- “vm” → the VoxelManipulator
+-- “va” → the VoxelArea
+-- “data” → the data array
+-- “param1” → the param1 array
+-- “param2” → the param2 array
 -- “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
@@ -375,8 +253,6 @@ local vm_update_light = false
 -- 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
@@ -385,19 +261,18 @@ 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:set_data(tbl.data)
+			vm:write_to_map()
 			vm:update_map()
 		end
 	end
 	vm_cache = nil
-	vm_node_cache = nil
 end
 
 -- Finishes a VoxelManipulator-based transaction, freeing the VMs and throwing
 -- 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.
@@ -405,7 +280,10 @@ 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}
+		local vm = minetest.get_voxel_manip(pos, pos)
+		local min_pos, max_pos = vm:get_emerged_area()
+		local va = VoxelArea:new{MinEdge = min_pos, MaxEdge = max_pos}
+		tbl = {vm = vm, va = va, data = vm:get_data(), param1 = vm:get_light_data(), param2 = vm:get_param2_data(), dirty = false}
 		vm_cache[hash] = tbl
 	end
 	return tbl
@@ -414,34 +292,25 @@ 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 tbl = vm_get_or_create_entry(pos)
-	local node = vm_node_cache[hash]
+	local index = tbl.va:indexp(pos)
-	if not node then
+	local node_value = tbl.data[index]
-		node = vm_get_or_create_entry(pos).vm:get_node_at(pos)
+	if node_value == core.CONTENT_IGNORE then
-		vm_node_cache[hash] = node
+		return nil
+	else
+		local node_param1 = tbl.param1[index]
+		local node_param2 = tbl.param2[index]
+		return {name = minetest.get_name_from_content_id(node_value), param1 = node_param1, param2 = node_param2}
 	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.
---
+function mesecon.vm_swap_node(pos, name)
--- 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 index = tbl.va:indexp(pos)
-	local node = vm_node_cache[hash]
+	tbl.data[index] = minetest.get_content_id(name)
-	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
 
@@ -477,11 +346,9 @@ end
 --
 -- This function can only be used to change the node’s name, not its parameters
 -- or metadata.
---
+function mesecon.swap_node_force(pos, name)
--- 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)
+		return mesecon.vm_swap_node(pos, name)
 	else
 		-- This serves to both ensure the mapblock is loaded and also hand us
 		-- the old node table so we can preserve param2.

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

@@ -1,7 +1,5 @@
 -- The BLINKY_PLANT
 
-local S = minetest.get_translator(minetest.get_current_modname())
-
 local toggle_timer = function (pos)
 	local timer = minetest.get_node_timer(pos)
 	if timer:is_started() then
@@ -22,25 +20,18 @@ local on_timer = function (pos)
 end
 
 mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
-	description= S("Blinky Plant"),
+	description="Blinky Plant",
 	drawtype = "plantlike",
 	inventory_image = "jeija_blinky_plant_off.png",
 	paramtype = "light",
-	is_ground_content = false,
 	walkable = false,
-	sounds = mesecon.node_sound.leaves,
+	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
 		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/locale/mesecons_blinkyplant.de.tr

@@ -1,2 +0,0 @@
-# textdomain: mesecons_blinkyplant
-Blinky Plant=Blinkpflanze

mesecons_blinkyplant/locale/mesecons_blinkyplant.eo.tr

@@ -1,4 +0,0 @@
-# textdomain: mesecons_blinkyplant
-
-### init.lua ###
-Blinky Plant=Palpebruma Planto

mesecons_blinkyplant/locale/template.txt

@@ -1,4 +0,0 @@
-# textdomain: mesecons_blinkyplant
-
-### init.lua ###
-Blinky Plant=

mesecons_blinkyplant/mod.conf

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

mesecons_button/depends.txt

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

mesecons_button/init.lua

@@ -1,35 +1,29 @@
 -- WALL BUTTON
 -- A button that when pressed emits power for 1 second
 -- and then turns off again
-local S = minetest.get_translator(minetest.get_current_modname())
 
 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
+		minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
+		minetest.sound_play("mesecons_button_pop", {pos=pos})
+		local rules = mesecon.rules.buttonlike_get(node)
+		mesecon.receptor_off(pos, rules)
 	end
-	minetest.swap_node(pos, {name = "mesecons_button:button_off", param2 = node.param2})
-	minetest.sound_play("mesecons_button_pop", { pos = pos }, true)
-	local rules = mesecon.rules.buttonlike_get(node)
-	mesecon.receptor_off(pos, rules)
 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",
 	tiles = {
-		"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
-		"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
-		"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
-		"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
-		"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
-		"jeija_wall_button_off.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,
@@ -46,19 +40,18 @@ minetest.register_node("mesecons_button:button_off", {
 	}
 	},
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
-	description = S("Button"),
+	description = "Button",
 	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 = mesecon.node_sound.stone,
+	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,15 +63,13 @@ minetest.register_node("mesecons_button:button_on", {
 		"jeija_wall_button_sides.png",
 		"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 = minetest.LIGHT_MAX-7,
+	light_source = default.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",
@@ -93,19 +84,17 @@ minetest.register_node("mesecons_button:button_on", {
     },
 	groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
 	drop = 'mesecons_button:button_off',
-	description = S("Button"),
+	description = "Button",
-	sounds = mesecon.node_sound.stone,
+	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
 		state = mesecon.state.on,
 		rules = mesecon.rules.buttonlike_get
-	}},
+	}}
-	on_timer = mesecon.button_turnoff,
-	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_craft({
 	output = "mesecons_button:button_off 2",
 	recipe = {
-		{"group:mesecon_conductor_craftable","mesecons_gamecompat:stone"},
+		{"group:mesecon_conductor_craftable","default:stone"},
 	}
 })

mesecons_button/locale/mesecons_button.de.tr

@@ -1,2 +0,0 @@
-# textdomain: mesecons_button
-Button=Taster

mesecons_button/locale/mesecons_button.eo.tr

@@ -1,4 +0,0 @@
-# textdomain: mesecons_button
-
-### init.lua ###
-Button=Butono

mesecons_button/locale/template.txt

@@ -1,4 +0,0 @@
-# textdomain: mesecons_button
-
-### init.lua ###
-Button=

mesecons_button/mod.conf

@@ -1,2 +0,0 @@
-name = mesecons_button
-depends = mesecons, mesecons_gamecompat, 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

@@ -1,8 +1,6 @@
-local S = minetest.get_translator(minetest.get_current_modname())
-
 minetest.register_chatcommand("say", {
 	params = "<text>",
-	description = S("Say <text> as the server"),
+	description = "Say <text> as the server",
 	privs = {server=true},
 	func = function(name, param)
 		minetest.chat_send_all(name .. ": " .. param)
@@ -11,8 +9,7 @@ minetest.register_chatcommand("say", {
 
 minetest.register_chatcommand("tell", {
 	params = "<name> <text>",
-	description = S("Say <text> to <name> privately"),
+	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
@@ -28,7 +25,7 @@ minetest.register_chatcommand("tell", {
 
 minetest.register_chatcommand("hp", {
 	params = "<name> <value>",
-	description = S("Set health of <name> to <value> hitpoints"),
+	description = "Set health of <name> to <value> hitpoints",
 	privs = {ban=true},
 	func = function(name, param)
 		local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")
@@ -81,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
@@ -113,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()
@@ -177,30 +174,26 @@ 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 = S("Command Block"),
+	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,
 	on_receive_fields = receive_fields,
 	can_dig = can_dig,
-	sounds = mesecon.node_sound.stone,
+	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",
@@ -208,9 +201,8 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
 	after_place_node = after_place,
 	on_receive_fields = receive_fields,
 	can_dig = can_dig,
-	sounds = mesecon.node_sound.stone,
+	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_off = commandblock_action_off
-	}},
+	}}
-	on_blast = mesecon.on_blastnode,
 })

mesecons_commandblock/locale/mesecons_commandblock.de.tr

@@ -1,5 +0,0 @@
-# textdomain: mesecons_commandblock
-Say <text> as the server=<Text> als Server sagen
-Say <text> to <name> privately=<Text> an <Name> privat senden
-Set health of <name> to <value> hitpoints=Gesundheit von <Name> auf <Wert> Trefferpunkte setzen
-Command Block=Befehlsblock

mesecons_commandblock/locale/mesecons_commandblock.eo.tr

@@ -1,7 +0,0 @@
-# textdomain: mesecons_commandblock
-
-### init.lua ###
-Say <text> as the server=Diru <teksto> kiel la servilo
-Say <text> to <name> privately=Diru <teksto> al <nomo> private
-Set health of <name> to <value> hitpoints=Agordu sanon de <nomo> al <valoro>
-Command Block=Komando-Bloko

mesecons_commandblock/locale/template.txt

@@ -1,7 +0,0 @@
-# textdomain: mesecons_commandblock
-
-### init.lua ###
-Say <text> as the server=
-Say <text> to <name> privately=
-Set health of <name> to <value> hitpoints=
-Command Block=

mesecons_commandblock/mod.conf

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

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

@@ -1,9 +1,19 @@
-local S = minetest.get_translator(minetest.get_current_modname())
-
 -- Function that get the input/output rules of the delayer
-local delayer_get_output_rules = mesecon.horiz_rules_getter({{x = 1, y = 0, z = 0}})
+local delayer_get_output_rules = function(node)
+	local rules = {{x = 0, y = 0, z = 1}}
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
 
-local delayer_get_input_rules = mesecon.horiz_rules_getter({{x = -1, y = 0, z = 0}})
+local delayer_get_input_rules = function(node)
+	local rules = {{x = 0, y = 0, z = -1}}
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
 
 -- Functions that are called after the delay time
 
@@ -23,9 +33,19 @@ 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 delaytime
+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
 
 local boxes = {
 	 { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
@@ -41,10 +61,19 @@ local boxes = {
 	 { 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 = {
+	description = "Delayer",
 	drawtype = "nodebox",
-	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or nil,
+	tiles = {
+		"mesecons_delayer_off_"..tostring(i)..".png",
+		"mesecons_delayer_bottom.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_sides_off.png",
+		"mesecons_delayer_sides_off.png"
+		},
+	inventory_image = "mesecons_delayer_off_1.png",
+	wield_image = "mesecons_delayer_off_1.png",
 	walkable = true,
 	selection_box = {
 		type = "fixed",
@@ -54,46 +83,26 @@ local def = {
 		type = "fixed",
 		fixed = boxes
 	},
+	groups = groups,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
-	is_ground_content = false,
+	is_ground_content = true,
-	delayer_time = delaytime[i],
+	drop = 'mesecons_delayer:delayer_off_1',
-	sounds = mesecon.node_sound.stone,
+	on_punch = function (pos, node)
-	on_blast = mesecon.on_blastnode,
+		if node.name=="mesecons_delayer:delayer_off_1" then
-	drop = "mesecons_delayer:delayer_off_1",
+			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})
--- Deactivated delayer definition defaults
+		elseif node.name=="mesecons_delayer:delayer_off_3" then
-local off_groups = {bendy=2,snappy=1,dig_immediate=2}
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_4", param2=node.param2})
-if i > 1 then
+		elseif node.name=="mesecons_delayer:delayer_off_4" then
-	off_groups.not_in_creative_inventory = 1
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_1", param2=node.param2})
-end
-
-local off_state = {
-	description = S("Delayer"),
-	tiles = {
-		"mesecons_delayer_off_"..tostring(i)..".png",
-		"mesecons_delayer_bottom.png",
-		"mesecons_delayer_ends_off.png",
-		"mesecons_delayer_ends_off.png",
-		"mesecons_delayer_sides_off.png",
-		"mesecons_delayer_sides_off.png"
-	},
-	inventory_image = "mesecons_delayer_off_1.png",
-	wield_image = "mesecons_delayer_off_1.png",
-	groups = off_groups,
-	on_punch = function(pos, node, puncher)
-		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
-			return
 		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 =
 		{
@@ -105,16 +114,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 = S("You hacker you"),
+	description = "You hacker you",
+	drawtype = "nodebox",
 	tiles = {
 		"mesecons_delayer_on_"..tostring(i)..".png",
 		"mesecons_delayer_bottom.png",
@@ -122,18 +128,34 @@ local on_state = {
 		"mesecons_delayer_ends_on.png",
 		"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 =
@@ -146,19 +168,14 @@ 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({
 	output = "mesecons_delayer:delayer_off_1",
 	recipe = {
 		{"mesecons_torch:mesecon_torch_on", "group:mesecon_conductor_craftable", "mesecons_torch:mesecon_torch_on"},
-		{"mesecons_gamecompat:cobble","mesecons_gamecompat:cobble", "mesecons_gamecompat:cobble"},
+		{"default:cobble","default:cobble", "default:cobble"},
 	}
 })

mesecons_delayer/locale/mesecons_delayer.de.tr

@@ -1,3 +0,0 @@
-# textdomain: mesecons_delayer
-Delayer=Verzögerer
-You hacker you=Du Hacker, Du

mesecons_delayer/locale/mesecons_delayer.eo.tr

@@ -1,5 +0,0 @@
-# textdomain: mesecons_delayer
-
-### init.lua ###
-Delayer=Prokrasto
-You hacker you=Vi hakisto

mesecons_delayer/locale/template.txt

@@ -1,5 +0,0 @@
-# textdomain: mesecons_delayer
-
-### init.lua ###
-Delayer=
-You hacker you=

mesecons_delayer/mod.conf

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

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.