Merge remote-tracking branch 'upstream/master'

fixes #680

.github/workflows/check.yml

@@ -0,0 +1,41 @@
+on: [push, pull_request]
+name: "Check"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    name: "Luacheck"
+    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 ./
+
+  mineunit:
+    runs-on: ubuntu-latest
+    name: "Mineunit tests"
+    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

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+on: [push, pull_request]
+name: "Test"
+
+jobs:
+  test:
+    name: "Smoke Test ${{ matrix.cfg.image }}"
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        cfg:
+          - { image: 'registry.gitlab.com/minetest/minetest/server:5.0.1', mtg: false }
+          - { image: 'ghcr.io/minetest/minetest:5.9.0', mtg: true }
+    steps:
+    - uses: actions/checkout@main
+
+    - uses: actions/checkout@main
+      with:
+        repository: 'minetest/minetest_game'
+        path: ./.test/minetest_game
+      if: ${{ matrix.cfg.mtg }}
+
+    - name: Run tests
+      run: ./.test/run.sh
+      env:
+        DOCKER_IMAGE: "${{ matrix.cfg.image }}"

.gitignore

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

.luacheckrc

@@ -0,0 +1,61 @@
+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",
+	"mcl_dyes",
+	"mcl_sounds",
+}
+
+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/minetest.conf

@@ -0,0 +1,3 @@
+mg_name = singlenode
+mesecon.internal_test = true
+random_mod_load_order = true

.test/run.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+tempdir=$(mktemp -d)
+confpath=$tempdir/minetest.conf
+worldpath=$tempdir/world
+trap 'rm -rf "$tempdir" || :' EXIT
+
+[ -f mesecons/mod.conf ] || { echo "Must be run in modpack root folder." >&2; exit 1; }
+
+command -v docker >/dev/null || { echo "Docker is not installed." >&2; exit 1; }
+mtg=.test/minetest_game
+[ -d $mtg ] || echo "A source checkout of minetest_game was not found. This can fail if your docker image does not ship a game." >&2
+
+mkdir "$worldpath"
+cp -v .test/minetest.conf "$confpath"
+chmod -R 777 "$tempdir"
+
+args=(
+	-v "$confpath":/etc/minetest/minetest.conf
+	-v "$tempdir":/var/lib/minetest/.minetest
+	-v "$PWD":/var/lib/minetest/.minetest/world/worldmods/mesecons
+)
+[ -d $mtg ] && args+=(
+	-v "$(realpath $mtg)":/var/lib/minetest/.minetest/games/minetest_game
+)
+args+=("$DOCKER_IMAGE")
+[ -d $mtg ] && args+=(--gameid minetest)
+docker run --rm -i "${args[@]}"
+
+ls -la "$worldpath"
+test -f "$worldpath/mesecon_actionqueue" || exit 1
+exit 0

.test_fixtures/mesecons.lua

@@ -0,0 +1,156 @@
+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

@@ -0,0 +1,59 @@
+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

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

.test_fixtures/mesecons_luacontroller.lua

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,45 @@
+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

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

COPYING.txt

@@ -0,0 +1,30 @@
+The Mesecons Mod for Minetest is
+	Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+See the version control system log for information about other authors.
+
+License of source code
+----------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+This program is free software; you can redistribute the Mesecons Mod and/or
+modify it under the terms of the GNU Lesser General Public License version 3
+published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+
+License of media (textures, sounds and documentation)
+-----------------------------------------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+All textures, sounds and documentation files are licensed under the
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+http://creativecommons.org/licenses/by-sa/3.0/

LICENSE.txt

@@ -1,6 +1,12 @@
 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,23 +12,27 @@ MESECONS by Jeija and contributors
 
 Mezzee-what?
 ------------
-[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](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](https://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 has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics.
 
 OK, I want in.
 --------------
+
 Go get it!
 
-[DOWNLOADS PAGE](http://mesecons.net/downloads.php)
+[![ContentDB](https://content.minetest.net/packages/Jeija/mesecons/shields/downloads/)](https://content.minetest.net/packages/Jeija/mesecons/)
 
-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:
+Install it directly from your client by searching it in the Online Content tab.
+
+**Or** if you've downloaded a ZIP file check out [this page](https://wiki.minetest.net/Mods) over at the official 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.
-3. Open up the Minetest mods folder - usually `/mods/`. If you see the `minetest` or folder inside of that, that is your mod folder instead.
+3. Open up the Minetest mods folder - called `mods`.
 4. Copy the Mesecons folder into the mods folder.
 
 Don't like some parts of Mesecons? Open up the Mesecons folder and delete the subfolder containing the mod you don't want. If you didn't want movestones, for example, all you have to do is delete the `mesecons_movestones` folder and they will no longer be available.
@@ -37,22 +41,25 @@ There are no dependencies - it will work right after installing!
 
 How do I use this thing?
 ------------------------
+
 How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)?
 
-Or maybe a [comprehensive reference](http://mesecons.net/items.php) is your style?
+Or maybe a [comprehensive reference](https://mesecons.net/items.html) is your style?
 
-An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
+An overview for the very newest of new beginners? How does [this one](https://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
 
-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 get more into building? Why not check out the [Mesecons Laboratory](https://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders?
 
-Want to contribute to Mesecons itself? Check out the [source code](https://github.com/Jeija/minetest-mod-mesecons)!
+Want to contribute to Mesecons itself? Check out the [source code](https://github.com/minetest-mods/mesecons)!
 
 Who wrote it anyways?
 ---------------------
-These awesome people made Mesecons possible!
+
+These awesome people made Mesecons possible! (as of 2016)
 
 | Contributor     | Contribution                     |
 | --------------- | -------------------------------- |
+| Hawk777         | Code for VoxelManip caching      |
 | Jat15           | Various tweaks.                  |
 | Jeija           | **Main developer! Everything.**  |
 | Jordach         | Noteblock sounds.                |
@@ -69,10 +76,15 @@ These awesome people made Mesecons possible!
 
 There are also a whole bunch of other people helping with everything from code to testing and feedback. Mesecons would also not be possible without their help!
 
+Check out the [entire contributor list](https://github.com/minetest-mods/mesecons/graphs/contributors) on GitHub.
+
 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). 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 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.
+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.
+
+All code in this project is licensed under the LGPL version 3.
+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

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

documentation.json

@@ -0,0 +1,65 @@
+{
+	"Conductors" : {
+		"Mesecon" : "mesecons_wires/doc/mesecon",
+		"Insulated Wire" : "mesecons_insulated/doc/insulated",
+		"T-Junction" : "mesecons_extrawires/doc/tjunction",
+		"Crossing" : "mesecons_extrawires/doc/crossing",
+		"Corner" : "mesecons_extrawires/doc/corner",
+		"Vertical Wire" : "mesecons_extrawires/doc/vertical",
+		"Mese" : "mesecons_extrawires/doc/mese"
+	},
+	"Receptors" : {
+		"Power Plant" : "mesecons_powerplant/doc/powerplant",
+		"Blinky Plant" : "mesecons_blinkyplant/doc/blinkyplant",
+		"Switch" : "mesecons_switch/doc/switch",
+		"Object Detector" : "mesecons_detector/doc/objectdetector",
+		"Node Detector" : "mesecons_detector/doc/nodedetector",
+		"Wall Lever" : "mesecons_walllever/doc/walllever",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_wood",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_stone",
+		"Water Turbine" : "mesecons_hydroturbine/doc/waterturbine",
+		"Solar Panel" : "mesecons_solarpanel/doc/solarpanel",
+		"Wall Button" : "mesecons_button/doc/button"
+	},
+	"Effectors" : {
+		"Noteblock" : "mesecons_noteblock/doc/noteblock",
+		"Lamp" : "mesecons_lamp/doc/lamp",
+		"Piston" : "mesecons_pistons/doc/piston",
+		"Sticky Piston" : "mesecons_pistons/doc/piston_sticky",
+		"Movestone" : "mesecons_movestones/doc/movestone",
+		"Sticky Movestone" : "mesecons_movestones/doc/movestone_sticky",
+		"Removestone" : "mesecons_random/doc/removestone",
+		"Ghoststone" : "mesecons_random/doc/ghoststone",
+		"Command Block" : "mesecons_commandblock/doc/commandblock",
+		"Lightstones" : {
+			"Dark Grey" : "mesecons_lightstone/doc/lightstone_darkgrey",
+			"Light Grey" : "mesecons_lightstone/doc/lightstone_lightgrey",
+			"Green" : "mesecons_lightstone/doc/lightstone_green",
+			"Red" : "mesecons_lightstone/doc/lightstone_red",
+			"Blue" : "mesecons_lightstone/doc/lightstone_blue",
+			"Yellow" : "mesecons_lightstone/doc/lightstone_yellow"
+		}
+	},
+	"Logic" : {
+		"Luacontroller" : "mesecons_luacontroller/doc/luacontroller",
+		"Microcontroller" : "mesecons_microcontroller/doc/microcontroler",
+		"FPGA" : "mesecons_fpga/doc/fpga",
+		"FPGA Programmer" : "mesecons_fpga/doc/programmer",
+		"Torch" : "mesecons_torch/doc/torch",
+		"Delayer" : "mesecons_delayer/doc/delayer",
+		"Gates" : {
+			"Diode" : "mesecons_gates/doc/diode",
+			"NOT Gate" : "mesecons_gates/doc/not",
+			"AND Gate" : "mesecons_gates/doc/and",
+			"NAND Gate" : "mesecons_gates/doc/nand",
+			"OR Gate" : "mesecons_gates/doc/or",
+			"NOR Gate" : "mesecons_gates/doc/nor",
+			"XOR Gate" : "mesecons_gates/doc/xor"
+		}
+	},
+	"Crafts" : {
+		"Silicon" : "mesecons_materials/doc/silicon",
+		"Glue" : "mesecons_materials/doc/glue",
+		"Fiber" : "mesecons_materials/doc/fiber"
+	}
+}

mesecons/VERSION

@@ -1 +0,0 @@
-0.41 DEV

mesecons/actionqueue.lua

@@ -1,114 +1,143 @@
-mesecon.queue.actions={} -- contains all ActionQueue actions
+--[[
+Mesecons uses something it calls an ActionQueue.
 
-function mesecon.queue:add_function(name, func)
+The ActionQueue holds functions and actions.
-	mesecon.queue.funcs[name] = func
+Functions are added on load time with a specified name.
+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 mesecon.queue:add_action(pos, func, params, time, overwritecheck, priority)
+function 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 = {	pos=mesecon:tablecopy(pos),
+	local action = {
+		pos = mesecon.tablecopy(pos),
 		func = func,
-				params=mesecon:tablecopy(params),
+		params = mesecon.tablecopy(params or {}),
 		time = time,
-				owcheck=(overwritecheck and mesecon:tablecopy(overwritecheck)) or nil,
+		owcheck = (overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
-				priority=priority}
+		priority = priority
+	}
 
-	local toremove = nil
+	 -- check if old action has to be overwritten / removed:
-	-- Otherwise, add the action to the queue
+	if overwritecheck then
-	if overwritecheck then -- check if old action has to be overwritten / removed:
+		for i, ac in ipairs(self.actions) do
-		for i, ac in ipairs(mesecon.queue.actions) do
+			if vector.equals(pos, ac.pos)
-			if(mesecon:cmpPos(pos, ac.pos)
+					and mesecon.cmpAny(overwritecheck, ac.owcheck) then
-			and mesecon:cmpAny(overwritecheck, ac.owcheck)) then
+				-- remove the old action
-				toremove = i
+				table.remove(self.actions, i)
 				break
 			end
 		end
 	end
 
-	if (toremove ~= nil) then
+	table.insert(self.actions, action)
-		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
+-- this makes sure that resuming mesecons circuits when restarting minetest works fine (hm, where do we do this?)
 -- However, even that does not work in some cases, that's why we delay the time the globalsteps
--- start to be execute by 5 seconds
+-- start to be execute by 4 seconds
-local get_highest_priority = function (actions)
-	local highestp = -1, highesti
-	for i, ac in ipairs(actions) do
-		if ac.priority > highestp then
-			highestp = ac.priority
-			highesti = i
-		end
-	end
-
-	return highesti
-end
 
 local m_time = 0
-minetest.register_globalstep(function (dtime)
+local resumetime = mesecon.setting("resumetime", 4)
+
+local function globalstep_func(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
 		m_time = m_time + dtime
-	if (m_time < MESECONS_RESUMETIME) then return end -- don't even try if server has not been running for XY seconds
+		return
-	local actions = mesecon:tablecopy(mesecon.queue.actions)
+	end
+
+	local actions = queue.actions
+	-- split into two categories:
+	-- actions_now: actions to execute now
+	-- queue.actions: actions to execute later
 	local actions_now = {}
+	queue.actions = {}
 
-	mesecon.queue.actions = {}
+	for _, ac in ipairs(actions) do
-
-	-- sort actions into two categories:
-	-- those toexecute now (actions_now) and those to execute later (mesecon.queue.actions)
-	for i, ac in ipairs(actions) do
 		if ac.time > 0 then
-			ac.time = ac.time - dtime -- executed later
+			-- action ac is to be executed later
-			table.insert(mesecon.queue.actions, ac)
+			-- ~> insert into queue.actions
+			ac.time = ac.time - dtime
+			table.insert(queue.actions, ac)
 		else
+			-- action ac is to be executed now
+			-- ~> insert into actions_now
 			table.insert(actions_now, ac)
 		end
 	end
 
-	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
+	-- stable-sort the executed actions after their priority
-		local hp = get_highest_priority(actions_now)
+	-- some constructions might depend on the execution order, hence we first
-		mesecon.queue:execute(actions_now[hp])
+	-- execute the actions that had a lower index in actions_now
-		table.remove(actions_now, hp)
+	local old_action_order = {}
+	for i, ac in ipairs(actions_now) do
+		old_action_order[ac] = i
+	end
+	table.sort(actions_now, function(ac1, ac2)
+		if ac1.priority ~= ac2.priority then
+			return ac1.priority > ac2.priority
+		else
+			return old_action_order[ac1] < old_action_order[ac2]
 		end
 	end)
 
-function mesecon.queue:execute(action)
+	-- execute highest priorities first, until all are executed
-	mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
+	for _, ac in ipairs(actions_now) do
+		queue:execute(ac)
+	end
+end
+
+minetest.register_globalstep(globalstep_func)
+
+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
+		self.funcs[action.func](action.pos, unpack(action.params))
+	end
 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")
-local wpath = minetest.get_worldpath()
-local function file2table(filename)
-	local f = io.open(filename, "r")
-	if f==nil then return {} end
-	local t = f:read("*all")
-	f:close()
-	if t=="" or t==nil then return {} end
-	return minetest.deserialize(t)
-end
-
-local function table2file(filename, table)
-	local f = io.open(filename, "w")
-	f:write(minetest.serialize(table))
-	f:close()
-end
-
-mesecon.queue.actions = file2table(wpath.."/mesecon_actionqueue")
 
 minetest.register_on_shutdown(function()
-	mesecon.queue.actions = table2file(wpath.."/mesecon_actionqueue", mesecon.queue.actions)
+	mesecon.table2file("mesecon_actionqueue", queue.actions)
 end)

mesecons/depends.txt

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

mesecons/fifo_queue.lua

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

mesecons/init.lua

@@ -3,7 +3,7 @@
 -- |  \/  | |___ ____  |___ |      |    | | \  | |____
 -- |      | |        | |    |      |    | |  \ |     |
 -- |      | |___ ____| |___ |____  |____| |   \| ____|
--- by Jeija, Uberi (Temperest), sfan5, VanessaE
+-- by Jeija, Uberi (Temperest), sfan5, VanessaE, Hawk777 and contributors
 --
 --
 --
@@ -11,7 +11,7 @@
 -- See the documentation on the forum for additional information, especially about crafting
 --
 --
--- For developer documentation see the Developers' section on mesecons.TK
+-- For basic development resources, see http://mesecons.net/developers.html
 --
 --
 --
@@ -47,15 +47,14 @@ mesecon.queue.funcs={} -- contains all ActionQueue functions
 -- Settings
 dofile(minetest.get_modpath("mesecons").."/settings.lua")
 
--- Presets (eg default rules)
-dofile(minetest.get_modpath("mesecons").."/presets.lua");
-
-
 -- Utilities like comparing positions,
 -- adding positions and rules,
 -- mostly things that make the source look cleaner
 dofile(minetest.get_modpath("mesecons").."/util.lua");
 
+-- Presets (eg default rules)
+dofile(minetest.get_modpath("mesecons").."/presets.lua");
+
 -- The ActionQueue
 -- Saves all the actions that have to be execute in the future
 dofile(minetest.get_modpath("mesecons").."/actionqueue.lua");
@@ -67,75 +66,68 @@ dofile(minetest.get_modpath("mesecons").."/actionqueue.lua");
 -- like calling action_on/off/change
 dofile(minetest.get_modpath("mesecons").."/internal.lua");
 
--- Deprecated stuff
--- To be removed in future releases
--- Currently there is nothing here
-dofile(minetest.get_modpath("mesecons").."/legacy.lua");
-
 -- API
 -- these are the only functions you need to remember
 
 mesecon.queue:add_function("receptor_on", function (pos, rules)
+	mesecon.vm_begin()
+
 	rules = rules or mesecon.rules.default
 
-	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	-- Call turnon on all linking positions
-	for _, rule in ipairs(mesecon:flattenrules(rules)) do
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon:addPosRule(pos, rule)
+		local np = vector.add(pos, rule)
-		-- if area is not loaded, keep trying
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
-		if minetest.get_node_or_nil(np) == nil then
+		for _, rulename in ipairs(rulenames) do
-			mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+			mesecon.turnon(np, rulename)
-			return
 		end
 	end
 
-	-- execute action
+	mesecon.vm_commit()
-	for _, rule in ipairs(mesecon:flattenrules(rules)) do
-		local np = mesecon:addPosRule(pos, rule)
-		local rulenames = mesecon:rules_link_rule_all(pos, rule)
-		for _, rulename in ipairs(rulenames) do
-			mesecon:turnon(np, rulename)
-		end
-	end
 end)
 
-function mesecon:receptor_on(pos, rules)
+function mesecon.receptor_on(pos, rules)
 	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
 end
 
 mesecon.queue:add_function("receptor_off", function (pos, rules)
 	rules = rules or mesecon.rules.default
 
-	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	-- Call turnoff on all linking positions
-	for _, rule in ipairs(mesecon:flattenrules(rules)) do
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon:addPosRule(pos, rule)
+		local np = vector.add(pos, rule)
-		if minetest.get_node_or_nil(np) == nil then
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
-			mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
-			return
-		end
-	end
-
-	for _, rule in ipairs(mesecon:flattenrules(rules)) do
-		local np = mesecon:addPosRule(pos, rule)
-		local rulenames = mesecon:rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
-			if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
+			mesecon.vm_begin()
-				mesecon:turnoff(np, rulename)
+
+			-- Turnoff returns true if turnoff process was successful, no onstate receptor
+			-- was found along the way. Commit changes that were made in voxelmanip. If turnoff
+			-- returns true, an onstate receptor was found, abort voxelmanip transaction.
+			if (mesecon.turnoff(np, rulename)) then
+				mesecon.vm_commit()
 			else
-				mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
+				mesecon.vm_abort()
 			end
 		end
 	end
 end)
 
-function mesecon:receptor_off(pos, rules)
+function mesecon.receptor_off(pos, rules)
 	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
 end
 
 
-print("[OK] Mesecons")
+-- Deprecated stuff
-
+-- To be removed in future releases
---The actual wires
+dofile(minetest.get_modpath("mesecons").."/legacy.lua");
-dofile(minetest.get_modpath("mesecons").."/wires.lua");
 
 --Services like turnoff receptor on dignode and so on
 dofile(minetest.get_modpath("mesecons").."/services.lua");
+
+-- Automated test run
+if mesecon.setting("internal_test", false) then
+	-- currently does nothing, we only fail if some error happens right on startup
+	minetest.after(5, function()
+		minetest.request_shutdown()
+	end)
+end

mesecons/legacy.lua

@@ -1,32 +1,14 @@
-minetest.swap_node = minetest.swap_node or function(pos, node)
+-- Un-forceload any forceloaded mapblocks from older versions of Mesecons which
-	local data = minetest.get_meta(pos):to_table()
+-- used forceloading instead of VoxelManipulators.
-	minetest.add_node(pos, node)
+local BLOCKSIZE = 16
-	minetest.get_meta(pos):from_table(data)
+
+-- convert block hash --> node position
+local function unhash_blockpos(hash)
+	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
 end
 
-local rules = {}
+local old_forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
-rules.a = {x = -1, y = 0, z =  0, name="A"}
+for hash, _ in pairs(old_forceloaded_blocks) do
-rules.b = {x =  0, y = 0, z =  1, name="B"}
+	minetest.forceload_free_block(unhash_blockpos(hash))
-rules.c = {x =  1, y = 0, z =  0, name="C"}
-rules.d = {x =  0, y = 0, z = -1, name="D"}
-
-function legacy_update_ports(pos)
-	local meta = minetest.get_meta(pos)
-	L = {
-		a = mesecon:is_power_on(mesecon:addPosRule(pos, rules.a),
-			mesecon:invertRule(rules.a)) and
-			mesecon:rules_link(mesecon:addPosRule(pos, rules.a), pos),
-		b = mesecon:is_power_on(mesecon:addPosRule(pos, rules.b),
-			mesecon:invertRule(rules.b)) and
-			mesecon:rules_link(mesecon:addPosRule(pos, rules.b), pos),
-		c = mesecon:is_power_on(mesecon:addPosRule(pos, rules.c),
-			mesecon:invertRule(rules.c)) and
-			mesecon:rules_link(mesecon:addPosRule(pos, rules.c), pos),
-		d = mesecon:is_power_on(mesecon:addPosRule(pos, rules.d),
-			mesecon:invertRule(rules.d)) and
-			mesecon:rules_link(mesecon:addPosRule(pos, rules.d), pos),
-	}
-	local n = (L.a and 1 or 0) + (L.b and 2 or 0) + (L.c and 4 or 0) + (L.d and 8 or 0) + 1
-	meta:set_int("real_portstates", n)
-	return L
 end
+os.remove(minetest.get_worldpath().."/mesecon_forceloaded")

mesecons/locale/mesecons.de.tr

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

mesecons/locale/mesecons.eo.tr

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

mesecons/locale/mesecons.fr.tr

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

mesecons/locale/template.txt

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

mesecons/mod.conf

@@ -0,0 +1,4 @@
+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,17 +1,19 @@
+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 = true,
+	is_ground_content = false,
 	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="Mesecons",
+	description= S("Mesecons"),
 	mesecons = {conductor={
 		state = mesecon.state.off,
 		onstate = "mesecons:mesecon_on"
@@ -22,7 +24,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 = true,
+	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
@@ -30,7 +32,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 = LIGHT_MAX-11,
+	light_source = minetest.LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,
 		offstate = "mesecons:mesecon_off"

mesecons/presets.lua

@@ -1,8 +1,8 @@
 mesecon.rules = {}
 mesecon.state = {}
 
-mesecon.rules.default =
+mesecon.rules.default = {
-{{x=0,  y=0,  z=-1},
+	{x =  0, y =  0, z = -1},
 	{x =  1, y =  0, z =  0},
 	{x = -1, y =  0, z =  0},
 	{x =  0, y =  0, z =  1},
@@ -13,32 +13,75 @@ mesecon.rules.default =
 	{x =  0, y =  1, z =  1},
 	{x =  0, y = -1, z =  1},
 	{x =  0, y =  1, z = -1},
- {x=0,  y=-1, z=-1}}
+	{x =  0, y = -1, z = -1},
+}
 
-mesecon.rules.buttonlike =
+mesecon.rules.floor = mesecon.merge_rule_sets(mesecon.rules.default, {{x = 0, y = -1, z = 0}})
-{{x = 1,  y = 0, 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}}
+	{x = 2,  y =  0, z =  0},
+}
 
-mesecon.rules.flat =
+mesecon.rules.flat = {
-{{x = 1, y = 0, z = 0},
+	{x =  1, y = 0, z =  0},
 	{x = -1, y = 0, z =  0},
 	{x =  0, y = 0, z =  1},
- {x = 0, y = 0, z =-1}}
+	{x =  0, y = 0, z = -1},
+}
+
+mesecon.rules.alldirs = {
+	{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)
-	if node.param2 == 2 then
+	return rules_from_dir(rules_buttonlike, dir)
-		rules=mesecon:rotate_rules_left(rules)
-	elseif node.param2 == 3 then
-		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
-	elseif node.param2 == 0 then
-		rules=mesecon:rotate_rules_right(rules)
-	end
-	return rules
 end
 
 mesecon.state.on = "on"

mesecons/services.lua

@@ -1,76 +1,139 @@
 -- Dig and place services
 
 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
+	if mesecon.is_receptor_on(node.name) then
-		mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
+		mesecon.receptor_on(pos, mesecon.receptor_get_rules(node))
 	end
 
 	-- 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
+	if mesecon.is_conductor(node.name) then
-		if mesecon:is_powered(pos) then
+		local conductor = mesecon.get_conductor(node.name)
-			-- also call receptor_on if itself is powered already, so that neighboring
+		if conductor.state ~= mesecon.state.off then
-			-- conductors will be activated (when pushing an on-conductor with a piston)
+			-- Turn the conductor off.
-			mesecon:turnon (pos)
+			node.name = conductor.offstate or conductor.states[1]
-			mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))
+			minetest.swap_node(pos, node)
-		elseif mesecon:is_conductor_off(node.name) then
+		end
-			minetest.swap_node(pos, {name = mesecon:get_conductor_off(node)})
+		local sources = mesecon.is_powered(pos)
+		if sources then
+			mesecon.vm_begin()
+			for _, s in ipairs(sources) do
+				local rule = vector.subtract(s, pos)
+				mesecon.turnon(pos, rule)
+			end
+			mesecon.vm_commit()
 		end
 	end
 
 	-- Effectors: Send changesignal and activate or deactivate
-	if mesecon:is_effector(node.name) then
+	if mesecon.is_effector(node.name) then
-		if mesecon:is_powered(pos) then
+		local powered_rules = {}
-			mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "on", 1)
+		local unpowered_rules = {}
-			mesecon:activate(pos, node, nil, 1)
+
+		-- for each input rule, check if powered
+		for _, r in ipairs(mesecon.effector_get_rules(node)) do
+			local powered = mesecon.is_powered(pos, r)
+			if powered then table.insert(powered_rules, r)
+			else table.insert(unpowered_rules, r) end
+
+			local state = powered and mesecon.state.on or mesecon.state.off
+			mesecon.changesignal(pos, node, r, state, 1)
+		end
+
+		if (#powered_rules > 0) then
+			for _, r in ipairs(powered_rules) do
+				mesecon.activate(pos, node, r, 1)
+			end
 		else
-			mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "off", 1)
+			for _, r in ipairs(unpowered_rules) do
-			mesecon:deactivate(pos, node, nil, 1)
+				mesecon.deactivate(pos, node, r, 1)
+			end
 		end
 	end
 end
 
 mesecon.on_dignode = function(pos, node)
-	if mesecon:is_conductor_on(node) then
+	if mesecon.is_conductor_on(node) then
-		mesecon:receptor_off(pos, mesecon:conductor_get_rules(node))
+		mesecon.receptor_off(pos, mesecon.conductor_get_rules(node))
-	elseif mesecon:is_receptor_on(node.name) then
+	elseif mesecon.is_receptor_on(node.name) then
-		mesecon:receptor_off(pos, mesecon:receptor_get_rules(node))
+		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
 	end
+
+	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
-mesecon.do_overheat = function(pos)
+function mesecon.do_overheat(pos)
-	local meta = minetest.get_meta(pos)
+	local id = minetest.hash_node_position(pos)
-	local heat = meta:get_int("heat") or 0
+	local heat = (object_heat[id] or 0) + 1
-
+	object_heat[id] = heat
-	heat = heat + 1
+	if heat >= OVERHEAT_MAX then
-	meta:set_int("heat", heat)
+		minetest.log("action", "Node overheats at " .. minetest.pos_to_string(pos))
-
+		object_heat[id] = nil
-	if heat < OVERHEAT_MAX then
-		mesecon.queue:add_action(pos, "cooldown", {}, 1, nil, 0)
-	else
 		return true
 	end
-
 	return false
 end
 
-
+function mesecon.do_cooldown(pos)
-mesecon.queue:add_function("cooldown", function (pos)
+	local id = minetest.hash_node_position(pos)
-	if minetest.get_item_group(minetest.get_node(pos).name, "overheat") == 0 then
+	object_heat[id] = nil
-		return -- node has been moved, this one does not use overheating - ignore
 end
 
-	local meta = minetest.get_meta(pos)
+function mesecon.get_heat(pos)
-	local heat = meta:get_int("heat")
+	local id = minetest.hash_node_position(pos)
-
+	return object_heat[id] or 0
-	if (heat > 0) then
-		meta:set_int("heat", heat - 1)
 end
-end)
+
+function mesecon.move_hot_nodes(moved_nodes)
+	local new_heat = {}
+	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
+		object_heat[id] = heat
+	end
+end
+
+local function global_cooldown(dtime)
+	cooldown_timer = cooldown_timer + dtime
+	if cooldown_timer < COOLDOWN_STEP then
+		return -- don't overload the CPU
+	end
+	local cooldown = COOLDOWN_MULTIPLIER * cooldown_timer
+	cooldown_timer = 0
+	for id, heat in pairs(object_heat) do
+		heat = heat - cooldown
+		if heat <= 0 then
+			object_heat[id] = nil -- free some RAM
+		else
+			object_heat[id] = heat
+		end
+	end
+end
+minetest.register_globalstep(global_cooldown)

mesecons/settings.lua

@@ -1,12 +1,15 @@
 -- SETTINGS
-BLINKY_PLANT_INTERVAL = 3
+function mesecon.setting(setting, default)
-NEW_STYLE_WIRES  = true  	-- true = new nodebox wires, false = old raillike wires
+	if type(default) == "boolean" then
-PRESSURE_PLATE_INTERVAL = 0.1
+		local read = minetest.settings:get_bool("mesecon."..setting)
-OBJECT_DETECTOR_RADIUS = 6
+		if read == nil then
-PISTON_MAXIMUM_PUSH = 15
+			return default
-MOVESTONE_MAXIMUM_PUSH = 100
+		else
-MESECONS_RESUMETIME = 4		-- time to wait when starting the server before
+			return read
-				-- processing the ActionQueue, don't set this too low
+		end
-OVERHEAT_MAX = 20		-- maximum heat of any component that directly sends an output
+	elseif type(default) == "string" then
-				-- signal when the input changes (e.g. luacontroller, gates)
+		return minetest.settings:get("mesecon."..setting) or default
-				-- Unit: actions per second, checks are every 1 second
+	elseif type(default) == "number" then
+		return tonumber(minetest.settings:get("mesecon."..setting) or default)
+	end
+end

mesecons/spec/action_spec.lua

@@ -0,0 +1,62 @@
+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

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

mesecons/spec/service_spec.lua

@@ -0,0 +1,192 @@
+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

@@ -0,0 +1,147 @@
+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

@@ -1,24 +1,101 @@
-function mesecon:move_node(pos, newpos)
+function mesecon.move_node(pos, newpos)
 	local node = minetest.get_node(pos)
 	local meta = minetest.get_meta(pos):to_table()
 	minetest.remove_node(pos)
-	minetest.add_node(newpos, node)
+	minetest.set_node(newpos, node)
 	minetest.get_meta(pos):from_table(meta)
 end
 
---[[ new functions:
+-- An on_rotate callback for mesecons components.
-mesecon:flattenrules(allrules)
+function mesecon.on_rotate(pos, node, _, _, new_param2)
-mesecon:rule2bit(findrule, allrules)
+	local new_node = {name = node.name, param1 = node.param1, param2 = new_param2}
-mesecon:rule2meta(findrule, allrules)
+	minetest.swap_node(pos, new_node)
-dec2bin(n)
+	mesecon.on_dignode(pos, node)
-mesecon:getstate(nodename, states)
+	mesecon.on_placenode(pos, new_node)
-mesecon:getbinstate(nodename, states)
+	minetest.check_for_falling(pos)
-mesecon:get_bit(binary, bit)
+	return true
-mesecon:set_bit(binary, bit, value)
+end
-mesecon:invertRule(r)
---]]
 
-function mesecon:flattenrules(allrules)
+-- 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)
 --[[
 	{
 		{
@@ -53,7 +130,7 @@ function mesecon:flattenrules(allrules)
 --]]
 end
 
-function mesecon:rule2bit(findrule, allrules)
+function mesecon.rule2bit(findrule, allrules)
 	--get the bit of the metarule the rule is in, or bit 1
 	if (allrules[1] and
 	    allrules[1].x) or
@@ -62,35 +139,36 @@ function mesecon:rule2bit(findrule, allrules)
 	end
 	for m,metarule in ipairs( allrules) do
 	for _,    rule in ipairs(metarule ) do
-		if mesecon:cmpPos(findrule, rule) and mesecon:cmpSpecial(findrule, rule) then
+		if vector.equals(findrule, rule) then
 			return m
 		end
 	end
 	end
 end
 
-function mesecon:rule2metaindex(findrule, allrules)
+function mesecon.rule2metaindex(findrule, allrules)
 	--get the metarule the rule is in, or allrules
-
 	if allrules[1].x then
 		return nil
 	end
 
 	if not(findrule) then
-		return mesecon:flattenrules(allrules)
+		return mesecon.flattenrules(allrules)
 	end
 
 	for m, metarule in ipairs( allrules) do
 	for _,     rule in ipairs(metarule ) do
-		if mesecon:cmpPos(findrule, rule) and mesecon:cmpSpecial(findrule, rule) then
+		if vector.equals(findrule, rule) then
 			return m
 		end
 	end
 	end
 end
 
-function mesecon:rule2meta(findrule, allrules)
+function mesecon.rule2meta(findrule, allrules)
-	local index = mesecon:rule2metaindex(findrule, allrules)
+	if #allrules == 0 then return {} end
+
+	local index = mesecon.rule2metaindex(findrule, allrules)
 	if index == nil then
 		if allrules[1].x then
 			return allrules
@@ -101,25 +179,16 @@ function mesecon:rule2meta(findrule, allrules)
 	return allrules[index]
 end
 
-if convert_base then
+function mesecon.dec2bin(n)
-	print(
-		"base2dec is tonumber(num,base1)\n"..
-		"commonlib needs dec2base(num,base2)\n"..
-		"and it needs base2base(num,base1,base2),\n"..
-		"which is dec2base(tonumber(num,base1),base2)"
-	)
-else
-	function dec2bin(n)
 	local x, y = math.floor(n / 2), n % 2
 	if (n > 1) then
-			return dec2bin(x)..y
+		return mesecon.dec2bin(x)..y
 	else
 		return ""..y
 	end
 end
-end
 
-function mesecon:getstate(nodename, states)
+function mesecon.getstate(nodename, states)
 	for state, name in ipairs(states) do
 		if name == nodename then
 			return state
@@ -128,68 +197,327 @@ function mesecon:getstate(nodename, states)
 	error(nodename.." doesn't mention itself in "..dump(states))
 end
 
-function mesecon:getbinstate(nodename, states)
+function mesecon.getbinstate(nodename, states)
-	return dec2bin(mesecon:getstate(nodename, states)-1)
+	return mesecon.dec2bin(mesecon.getstate(nodename, states)-1)
 end
 
-function mesecon:get_bit(binary,bit)
+function mesecon.get_bit(binary,bit)
 	bit = bit or 1
-	local c = binary:len()-(bit-1)
+	local len = binary:len()
+	if bit > len then return false end
+	local c = len-(bit-1)
 	return binary:sub(c,c) == "1"
 end
 
-function mesecon:set_bit(binary,bit,value)
+function mesecon.set_bit(binary,bit,value)
 	if value == "1" then
-		if not mesecon:get_bit(binary,bit) then
+		if not mesecon.get_bit(binary,bit) then
-			return dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
+			return mesecon.dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
 		end
 	elseif value == "0" then
-		if mesecon:get_bit(binary,bit) then
+		if mesecon.get_bit(binary,bit) then
-			return dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
+			return mesecon.dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
 		end
 	end
 	return binary
 
 end
 
-function mesecon:invertRule(r)
+function mesecon.invertRule(r)
-	return {x = -r.x, y = -r.y, z = -r.z, sx = r.sx, sy = r.sy, sz = r.sz}
+	return vector.multiply(r, -1)
 end
 
-function mesecon:addPosRule(p, r)
+function mesecon.tablecopy(obj) -- deep copy
-	return {x = p.x + r.x, y = p.y + r.y, z = p.z + r.z}
+	if type(obj) == "table" then
+		return table.copy(obj)
+	end
+	return obj
 end
 
-function mesecon:cmpPos(p1, p2)
+-- Returns whether two values are equal.
-	return (p1.x == p2.x and p1.y == p2.y and p1.z == p2.z)
+-- In tables, keys are compared for identity but values are compared recursively.
-end
+-- There is no protection from infinite recursion.
-
+function mesecon.cmpAny(t1, t2)
-function mesecon:cmpSpecial(r1, r2)
-	return (r1.sx == r2.sx and r1.sy == r2.sy and r1.sz == r2.sz)
-end
-
-function mesecon:tablecopy(table) -- deep table copy
-	if type(table) ~= "table" then return table end -- no need to copy
-	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 newtable
-end
-
-function mesecon:cmpAny(t1, t2)
 	if type(t1) ~= type(t2) then return false end
-	if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end
+	if type(t1) ~= "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
+		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.
+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
+		rval[k] = dest[k] or mesecon.tablecopy(v)
+	end
+	for i, v in ipairs(source) do
+		table.insert(rval, mesecon.tablecopy(v))
+	end
+
+	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_off = mesecon.merge_tables(spec_common, spec_off);
+
+	minetest.register_node(name .. "_on", spec_on)
+	minetest.register_node(name .. "_off", spec_off)
+end
+
+-- swap onstate and offstate nodes, returns new state
+function mesecon.flipstate(pos, node)
+	local nodedef = minetest.registered_nodes[node.name]
+	local newstate
+	if (nodedef.__mesecon_state == "on") then newstate = "off" end
+	if (nodedef.__mesecon_state == "off") then newstate = "on" end
+
+	minetest.swap_node(pos, {name = nodedef.__mesecon_basename .. "_" .. newstate,
+		param2 = node.param2})
+
+	return newstate
+end
+
+-- File writing / reading utilities
+local wpath = minetest.get_worldpath()
+function mesecon.file2table(filename)
+	local f = io.open(wpath.."/"..filename, "r")
+	if f == nil then return {} end
+	local t = f:read("*all")
+	f:close()
+	if t == "" or t == nil then return {} end
+	return minetest.deserialize(t)
+end
+
+function mesecon.table2file(filename, table)
+	local f = io.open(wpath.."/"..filename, "w")
+	f:write(minetest.serialize(table))
+	f:close()
+end
+
+-- Block position "hashing" (convert to integer) functions for voxelmanip cache
+local BLOCKSIZE = 16
+
+-- convert node position --> block hash
+local function hash_blockpos(pos)
+	return minetest.hash_node_position({
+		x = math.floor(pos.x/BLOCKSIZE),
+		y = math.floor(pos.y/BLOCKSIZE),
+		z = math.floor(pos.z/BLOCKSIZE)
+	})
+end
+
+-- Maps from a hashed mapblock position (as returned by hash_blockpos) to a
+-- table.
+--
+-- Contents of the table are:
+-- “vm” → the VoxelManipulator
+-- “dirty” → true if data has been modified
+--
+-- Nil if no VM-based transaction is in progress.
+local vm_cache = nil
+
+-- Cache from node position hashes to nodes (represented as tables).
+local vm_node_cache = nil
+
+-- Whether the current transaction will need a light update afterward.
+local vm_update_light = false
+
+-- Starts a VoxelManipulator-based transaction.
+--
+-- During a VM transaction, calls to vm_get_node and vm_swap_node operate on a
+-- cached copy of the world loaded via VoxelManipulators. That cache can later
+-- be committed to the real map by means of vm_commit or discarded by means of
+-- vm_abort.
+function mesecon.vm_begin()
+	vm_cache = {}
+	vm_node_cache = {}
+	vm_update_light = false
+end
+
+-- Finishes a VoxelManipulator-based transaction, freeing the VMs and map data
+-- and writing back any modified areas.
+function mesecon.vm_commit()
+	for hash, tbl in pairs(vm_cache) do
+		if tbl.dirty then
+			local vm = tbl.vm
+			vm:write_to_map(vm_update_light)
+			vm:update_map()
+		end
+	end
+	vm_cache = nil
+	vm_node_cache = nil
+end
+
+-- Finishes a VoxelManipulator-based transaction, freeing the VMs and throwing
+-- away any modified areas.
+function mesecon.vm_abort()
+	vm_cache = nil
+	vm_node_cache = nil
+end
+
+-- Gets the cache entry covering a position, populating it if necessary.
+local function vm_get_or_create_entry(pos)
+	local hash = hash_blockpos(pos)
+	local tbl = vm_cache[hash]
+	if not tbl then
+		tbl = {vm = minetest.get_voxel_manip(pos, pos), dirty = false}
+		vm_cache[hash] = tbl
+	end
+	return tbl
+end
+
+-- Gets the node at a given position during a VoxelManipulator-based
+-- transaction.
+function mesecon.vm_get_node(pos)
+	local hash = minetest.hash_node_position(pos)
+	local node = vm_node_cache[hash]
+	if not node then
+		node = vm_get_or_create_entry(pos).vm:get_node_at(pos)
+		vm_node_cache[hash] = node
+	end
+	return node.name ~= "ignore" and {name = node.name, param1 = node.param1, param2 = node.param2} or nil
+end
+
+-- Sets a node’s name during a VoxelManipulator-based transaction.
+--
+-- Existing param1, param2, and metadata are left alone.
+--
+-- The swap will necessitate a light update unless update_light equals false.
+function mesecon.vm_swap_node(pos, name, update_light)
+	-- If one node needs a light update, all VMs should use light updates to
+	-- prevent newly calculated light from being overwritten by other VMs.
+	vm_update_light = vm_update_light or update_light ~= false
+
+	local tbl = vm_get_or_create_entry(pos)
+	local hash = minetest.hash_node_position(pos)
+	local node = vm_node_cache[hash]
+	if not node then
+		node = tbl.vm:get_node_at(pos)
+		vm_node_cache[hash] = node
+	end
+	node.name = name
+	tbl.vm:set_node_at(pos, node)
+	tbl.dirty = true
+end
+
+-- Gets the node at a given position, regardless of whether it is loaded or
+-- not, respecting a transaction if one is in progress.
+--
+-- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
+-- the server’s main map data cache and then accessed from there.
+--
+-- Inside a VM transaction, the transaction’s VM cache is used.
+function mesecon.get_node_force(pos)
+	if vm_cache then
+		return mesecon.vm_get_node(pos)
+	else
+		local node = minetest.get_node_or_nil(pos)
+		if node == nil then
+			-- Node is not currently loaded; use a VoxelManipulator to prime
+			-- the mapblock cache and try again.
+			minetest.get_voxel_manip(pos, pos)
+			node = minetest.get_node_or_nil(pos)
+		end
+		return node
+	end
+end
+
+-- Swaps the node at a given position, regardless of whether it is loaded or
+-- not, respecting a transaction if one is in progress.
+--
+-- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
+-- the server’s main map data cache and then accessed from there.
+--
+-- Inside a VM transaction, the transaction’s VM cache is used.
+--
+-- This function can only be used to change the node’s name, not its parameters
+-- or metadata.
+--
+-- The swap will necessitate a light update unless update_light equals false.
+function mesecon.swap_node_force(pos, name, update_light)
+	if vm_cache then
+		return mesecon.vm_swap_node(pos, name, update_light)
+	else
+		-- This serves to both ensure the mapblock is loaded and also hand us
+		-- the old node table so we can preserve param2.
+		local node = mesecon.get_node_force(pos)
+		node.name = name
+		minetest.swap_node(pos, node)
+	end
+end
+
+-- Autoconnect Hooks
+-- Nodes like conductors may change their appearance and their connection rules
+-- right after being placed or after being dug, e.g. the default wires use this
+-- to automatically connect to linking nodes after placement.
+-- After placement, the update function will be executed immediately so that the
+-- possibly changed rules can be taken into account when recalculating the circuit.
+-- After digging, the update function will be queued and executed after
+-- recalculating the circuit. The update function must take care of updating the
+-- node at the given position itself, but also all of the other nodes the given
+-- position may have (had) a linking connection to.
+mesecon.autoconnect_hooks = {}
+
+-- name: A unique name for the hook, e.g. "foowire". Used to name the actionqueue function.
+-- fct: The update function with parameters function(pos, node)
+function mesecon.register_autoconnect_hook(name, fct)
+	mesecon.autoconnect_hooks[name] = fct
+	mesecon.queue:add_function("autoconnect_hook_"..name, fct)
+end
+
+function mesecon.execute_autoconnect_hooks_now(pos, node)
+	for _, fct in pairs(mesecon.autoconnect_hooks) do
+		fct(pos, node)
+	end
+end
+
+function mesecon.execute_autoconnect_hooks_queue(pos, node)
+	for name in pairs(mesecon.autoconnect_hooks) do
+		mesecon.queue:add_action(pos, "autoconnect_hook_"..name, {node})
+	end
+end

mesecons/wires.lua

@@ -1,280 +0,0 @@
--- naming scheme: wire:(xp)(zp)(xm)(zm)_on/off
--- The conditions in brackets define whether there is a mesecon at that place or not
--- 1 = there is one; 0 = there is none
--- y always means y+
-
-box_center = {-1/16, -.5, -1/16, 1/16, -.5+1/16, 1/16}
-box_bump1 =  { -2/16, -8/16,  -2/16, 2/16, -13/32, 2/16 }
-
-box_xp = {1/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
-box_zp = {-1/16, -.5, 1/16, 1/16, -.5+1/16, 8/16}
-box_xm = {-8/16, -.5, -1/16, -1/16, -.5+1/16, 1/16}
-box_zm = {-1/16, -.5, -8/16, 1/16, -.5+1/16, -1/16}
-
-box_xpy = {.5-1/16, -.5+1/16, -1/16, .5, .4999+1/16, 1/16}
-box_zpy = {-1/16, -.5+1/16, .5-1/16, 1/16, .4999+1/16, .5}
-box_xmy = {-.5, -.5+1/16, -1/16, -.5+1/16, .4999+1/16, 1/16}
-box_zmy = {-1/16, -.5+1/16, -.5, 1/16, .4999+1/16, -.5+1/16}
-
--- Registering the wires
-
-for xp=0, 1 do
-for zp=0, 1 do
-for xm=0, 1 do
-for zm=0, 1 do
-for xpy=0, 1 do
-for zpy=0, 1 do
-for xmy=0, 1 do
-for zmy=0, 1 do
-	if (xpy == 1 and xp == 0) or (zpy == 1 and zp == 0) 
-	or (xmy == 1 and xm == 0) or (zmy == 1 and zm == 0) then break end
-
-	local groups
-	local nodeid = 	tostring(xp )..tostring(zp )..tostring(xm )..tostring(zm )..
-			tostring(xpy)..tostring(zpy)..tostring(xmy)..tostring(zmy)
-
-	if nodeid == "00000000" then
-		groups = {dig_immediate = 3, mesecon_conductor_craftable=1}
-		wiredesc = "Mesecon"
-	else
-		groups = {dig_immediate = 3, not_in_creative_inventory = 1}
-		wiredesc = "Mesecons Wire (ID: "..nodeid..")"
-	end
-
-	local nodebox = {}
-	local adjx = false
-	local adjz = false
-	if xp == 1 then table.insert(nodebox, box_xp) adjx = true end
-	if zp == 1 then table.insert(nodebox, box_zp) adjz = true end
-	if xm == 1 then table.insert(nodebox, box_xm) adjx = true end
-	if zm == 1 then table.insert(nodebox, box_zm) adjz = true end
-	if xpy == 1 then table.insert(nodebox, box_xpy) end
-	if zpy == 1 then table.insert(nodebox, box_zpy) end
-	if xmy == 1 then table.insert(nodebox, box_xmy) end
-	if zmy == 1 then table.insert(nodebox, box_zmy) end
-
-	if adjx and adjz and (xp + zp + xm + zm > 2) then
-		table.insert(nodebox, box_bump1)
-		tiles_off = {
-			"wires_bump_off.png",
-			"wires_bump_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png"
-		}
-		tiles_on = {
-			"wires_bump_on.png",
-			"wires_bump_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png"
-		}
-	else
-		table.insert(nodebox, box_center)
-		tiles_off = {
-			"wires_off.png",
-			"wires_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png"
-		}
-		tiles_on = {
-			"wires_on.png",
-			"wires_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png"
-		}
-	end
-
-	if nodeid == "00000000" then
-		nodebox = {-8/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
-	end
-
-	minetest.register_node("mesecons:wire_"..nodeid.."_off", {
-		description = wiredesc,
-		drawtype = "nodebox",
-		tiles = tiles_off,
---		inventory_image = "wires_inv.png",
---		wield_image = "wires_inv.png",
-		inventory_image = "jeija_mesecon_off.png",
-		wield_image = "jeija_mesecon_off.png",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		selection_box = {
-              		type = "fixed",
-			fixed = {-.5, -.5, -.5, .5, -.5+4/16, .5}
-		},
-		node_box = {
-			type = "fixed",
-			fixed = nodebox
-		},
-		groups = groups,
-		walkable = false,
-		stack_max = 99,
-		drop = "mesecons:wire_00000000_off",
-		mesecons = {conductor={
-			state = mesecon.state.off,
-			onstate = "mesecons:wire_"..nodeid.."_on"
-		}}
-	})
-
-	minetest.register_node("mesecons:wire_"..nodeid.."_on", {
-		description = "Wire ID:"..nodeid,
-		drawtype = "nodebox",
-		tiles = tiles_on,
---		inventory_image = "wires_inv.png",
---		wield_image = "wires_inv.png",
-		inventory_image = "jeija_mesecon_off.png",
-		wield_image = "jeija_mesecon_off.png",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		selection_box = {
-              		type = "fixed",
-			fixed = {-.5, -.5, -.5, .5, -.5+4/16, .5}
-		},
-		node_box = {
-			type = "fixed",
-			fixed = nodebox
-		},
-		groups = {dig_immediate = 3, mesecon = 2, not_in_creative_inventory = 1},
-		walkable = false,
-		stack_max = 99,
-		drop = "mesecons:wire_00000000_off",
-		mesecons = {conductor={
-			state = mesecon.state.on,
-			offstate = "mesecons:wire_"..nodeid.."_off"
-		}}
-	})
-end
-end
-end
-end
-end
-end
-end
-end
-
--- Updating the wires:
--- Place the right connection wire
-
-local update_on_place_dig = function (pos, node)
-	if minetest.registered_nodes[node.name]
-	and minetest.registered_nodes[node.name].mesecons then
-		mesecon:update_autoconnect(pos)
-	end
-end
-
-minetest.register_on_placenode(update_on_place_dig)
-minetest.register_on_dignode(update_on_place_dig)
-
-function mesecon:update_autoconnect(pos, secondcall, replace_old)
-	local xppos = {x=pos.x+1, y=pos.y, z=pos.z}
-	local zppos = {x=pos.x, y=pos.y, z=pos.z+1}
-	local xmpos = {x=pos.x-1, y=pos.y, z=pos.z}
-	local zmpos = {x=pos.x, y=pos.y, z=pos.z-1}
-
-	local xpympos = {x=pos.x+1, y=pos.y-1, z=pos.z}
-	local zpympos = {x=pos.x, y=pos.y-1, z=pos.z+1}
-	local xmympos = {x=pos.x-1, y=pos.y-1, z=pos.z}
-	local zmympos = {x=pos.x, y=pos.y-1, z=pos.z-1}
-
-	local xpypos = {x=pos.x+1, y=pos.y+1, z=pos.z}
-	local zpypos = {x=pos.x, y=pos.y+1, z=pos.z+1}
-	local xmypos = {x=pos.x-1, y=pos.y+1, z=pos.z}
-	local zmypos = {x=pos.x, y=pos.y+1, z=pos.z-1}
-
-	if secondcall == nil then
-		mesecon:update_autoconnect(xppos, true)
-		mesecon:update_autoconnect(zppos, true)
-		mesecon:update_autoconnect(xmpos, true)
-		mesecon:update_autoconnect(zmpos, true)
-
-		mesecon:update_autoconnect(xpypos, true)
-		mesecon:update_autoconnect(zpypos, true)
-		mesecon:update_autoconnect(xmypos, true)
-		mesecon:update_autoconnect(zmypos, true)
-
-		mesecon:update_autoconnect(xpympos, true)
-		mesecon:update_autoconnect(zpympos, true)
-		mesecon:update_autoconnect(xmympos, true)
-		mesecon:update_autoconnect(zmympos, true)
-	end
-
-	nodename = minetest.get_node(pos).name
-	if string.find(nodename, "mesecons:wire_") == nil and not replace_old then return nil end
-
-	if mesecon:rules_link_anydir(pos, xppos) then xp = 1 else xp = 0 end
-	if mesecon:rules_link_anydir(pos, xmpos) then xm = 1 else xm = 0 end
-	if mesecon:rules_link_anydir(pos, zppos) then zp = 1 else zp = 0 end
-	if mesecon:rules_link_anydir(pos, zmpos) then zm = 1 else zm = 0 end
-
-	if mesecon:rules_link_anydir(pos, xpympos) then xp = 1 end
-	if mesecon:rules_link_anydir(pos, xmympos) then xm = 1 end
-	if mesecon:rules_link_anydir(pos, zpympos) then zp = 1 end
-	if mesecon:rules_link_anydir(pos, zmympos) then zm = 1 end
-
-	if mesecon:rules_link_anydir(pos, xpypos) then xpy = 1 else xpy = 0 end
-	if mesecon:rules_link_anydir(pos, zpypos) then zpy = 1 else zpy = 0 end
-	if mesecon:rules_link_anydir(pos, xmypos) then xmy = 1 else xmy = 0 end
-	if mesecon:rules_link_anydir(pos, zmypos) then zmy = 1 else zmy = 0 end
-
-	if xpy == 1 then xp = 1 end
-	if zpy == 1 then zp = 1 end
-	if xmy == 1 then xm = 1 end
-	if zmy == 1 then zm = 1 end
-
-	local nodeid = 	tostring(xp )..tostring(zp )..tostring(xm )..tostring(zm )..
-			tostring(xpy)..tostring(zpy)..tostring(xmy)..tostring(zmy)
-
-	
-	if string.find(nodename, "_off") ~= nil then
-		minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
-	else
-		minetest.set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
-	end
-end
-
-if not minetest.registered_nodes["default:stone_with_mese"] then --before MESE update, use old recipes
-	minetest.register_craft({
-		output = "mesecons:wire_00000000_off 18",
-		recipe = {
-			{"default:mese"},
-		}
-	})
-else
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 2",
-		recipe = "default:mese_crystal_fragment",
-		cooktime = 3,
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 18",
-		recipe = "default:mese_crystal",
-		cooktime = 15,
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 162",
-		recipe = "default:mese",
-		cooktime = 30,
-	})
-
-end
-
-minetest.register_craft({
-	type = "cooking",
-	output = "mesecons:wire_00000000_off 16",
-	recipe = "default:mese_crystal",
-})

mesecons_alias/depends.txt

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

mesecons_alias/mod.conf

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

mesecons_blinkyplant/depends.txt

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

mesecons_blinkyplant/doc/blinkyplant/description.html

@@ -0,0 +1,2 @@
+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,102 +1,60 @@
 -- The BLINKY_PLANT
-minetest.register_node("mesecons_blinkyplant:blinky_plant", {
-	drawtype = "plantlike",
-	visual_scale = 1,
-	tiles = {"jeija_blinky_plant_off.png"},
-	inventory_image = "jeija_blinky_plant_off.png",
-	walkable = false,
-	groups = {dig_immediate=3, not_in_creative_inventory=1},
-	drop="mesecons_blinkyplant:blinky_plant_off 1",
-    description="Deactivated Blinky Plant",
-	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},
-	},
-	mesecons = {receptor = {
-		state = mesecon.state.off
-	}},
-	on_rightclick = function(pos, node, clicker)
-        minetest.set_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
-    end	
-})
 
-minetest.register_node("mesecons_blinkyplant:blinky_plant_off", {
+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
+		timer:stop()
+	else
+		timer:start(mesecon.setting("blinky_plant_interval", 3))
+	end
+end
+
+local on_timer = function (pos)
+	local node = minetest.get_node(pos)
+	if(mesecon.flipstate(pos, node) == "on") then
+		mesecon.receptor_on(pos)
+	else
+		mesecon.receptor_off(pos)
+	end
+	toggle_timer(pos)
+end
+
+mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
+	description= S("Blinky Plant"),
 	drawtype = "plantlike",
-	visual_scale = 1,
-	tiles = {"jeija_blinky_plant_off.png"},
 	inventory_image = "jeija_blinky_plant_off.png",
 	paramtype = "light",
+	is_ground_content = false,
 	walkable = false,
-	groups = {dig_immediate=3, mesecon=2},
+	sounds = mesecon.node_sound.leaves,
-    description="Blinky Plant",
-	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},
 	},
-	mesecons = {receptor = {
+	on_timer = on_timer,
-		state = mesecon.state.off
+	on_rightclick = function(pos, _, clicker)
-	}},
+		if minetest.is_protected(pos, clicker and clicker:get_player_name() or "") then
-	on_rightclick = function(pos, node, clicker)
+			return
-        minetest.set_node(pos, {name="mesecons_blinkyplant:blinky_plant"})
 		end
-})
 
-minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
+		toggle_timer(pos)
-	drawtype = "plantlike",
+	end,
-	visual_scale = 1,
+	on_construct = toggle_timer
+},{
+	tiles = {"jeija_blinky_plant_off.png"},
+	groups = {dig_immediate=3},
+	mesecons = {receptor = { state = mesecon.state.off }}
+},{
 	tiles = {"jeija_blinky_plant_on.png"},
-	inventory_image = "jeija_blinky_plant_off.png",
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
-	paramtype = "light",
+	mesecons = {receptor = { state = mesecon.state.on }}
-	walkable = false,
-	groups = {dig_immediate=3, not_in_creative_inventory=1, mesecon=2},
-	drop="mesecons_blinkyplant:blinky_plant_off 1",
-	light_source = LIGHT_MAX-7,
-	description = "Blinky Plant",
-	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},
-	},
-	mesecons = {receptor = {
-		state = mesecon.state.on
-	}},
-	on_rightclick = function(pos, node, clicker)
-		minetest.set_node(pos, {name = "mesecons_blinkyplant:blinky_plant"})
-		mesecon:receptor_off(pos)
-	end
 })
 
 minetest.register_craft({
 	output = "mesecons_blinkyplant:blinky_plant_off 1",
-	recipe = {
+	recipe = {	{"","group:mesecon_conductor_craftable",""},
 			{"","group:mesecon_conductor_craftable",""},
-	{"","group:mesecon_conductor_craftable",""},
+			{"group:sapling","group:sapling","group:sapling"}}
-	{"default:sapling","default:sapling","default:sapling"},
-	}
-})
-
-minetest.register_abm(
-	{nodenames = {"mesecons_blinkyplant:blinky_plant_off"},
-	interval = BLINKY_PLANT_INTERVAL,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		--minetest.remove_node(pos)
-		minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
-		nodeupdate(pos)	
-		mesecon:receptor_on(pos)
-	end,
-})
-
-minetest.register_abm({
-	nodenames = {"mesecons_blinkyplant:blinky_plant_on"},
-	interval = BLINKY_PLANT_INTERVAL,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		--minetest.remove_node(pos)
-		minetest.add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
-		nodeupdate(pos)	
-		mesecon:receptor_off(pos)
-	end,
 })

mesecons_blinkyplant/locale/mesecons_blinkyplant.de.tr

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

mesecons_blinkyplant/locale/mesecons_blinkyplant.eo.tr

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

mesecons_blinkyplant/locale/mesecons_blinkyplant.fr.tr

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

mesecons_blinkyplant/locale/template.txt

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

mesecons_blinkyplant/mod.conf

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

mesecons_button/depends.txt

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

mesecons_button/doc/button/description.html

@@ -0,0 +1 @@
+This receptor can be attached to walls. It turns on for 1 second if it's punched.

mesecons_button/init.lua

@@ -1,17 +1,21 @@
 -- 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 not been dug
+	if node.name ~= "mesecons_button:button_on" then -- has been dug
+		return
+	end
 	minetest.swap_node(pos, {name = "mesecons_button:button_off", param2 = node.param2})
-		minetest.sound_play("mesecons_button_pop", {pos=pos})
+	minetest.sound_play("mesecons_button_pop", { pos = pos }, true)
 	local rules = mesecon.rules.buttonlike_get(node)
-		mesecon:receptor_off(pos, rules)
+	mesecon.receptor_off(pos, rules)
-	end
 end
 
+local use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or nil
+
 minetest.register_node("mesecons_button:button_off", {
 	drawtype = "nodebox",
 	tiles = {
@@ -22,10 +26,13 @@ minetest.register_node("mesecons_button:button_off", {
 		"jeija_wall_button_sides.png",
 		"jeija_wall_button_off.png"
 	},
+	use_texture_alpha = use_texture_alpha,
 	paramtype = "light",
 	paramtype2 = "facedir",
+	is_ground_content = false,
 	legacy_wallmounted = true,
 	walkable = false,
+	on_rotate = mesecon.buttonlike_onrotate,
 	sunlight_propagates = true,
 	selection_box = {
 	type = "fixed",
@@ -39,18 +46,19 @@ minetest.register_node("mesecons_button:button_off", {
 	}
 	},
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
-	description = "Button",
+	description = S("Button"),
-	on_punch = function (pos, node)
+	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))
+		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
-		minetest.sound_play("mesecons_button_push", {pos=pos})
+		minetest.sound_play("mesecons_button_push", { pos = pos }, true)
-		minetest.after(1, mesecon.button_turnoff, pos)
+		minetest.get_node_timer(pos):start(1)
 	end,
-	sounds = default.node_sound_stone_defaults(),
+	sounds = mesecon.node_sound.stone,
 	mesecons = {receptor = {
 		state = mesecon.state.off,
 		rules = mesecon.rules.buttonlike_get
-	}}
+	}},
+	on_blast = mesecon.on_blastnode,
 })
 
 minetest.register_node("mesecons_button:button_on", {
@@ -63,11 +71,14 @@ minetest.register_node("mesecons_button:button_on", {
 		"jeija_wall_button_sides.png",
 		"jeija_wall_button_on.png"
 	},
+	use_texture_alpha = use_texture_alpha,
 	paramtype = "light",
 	paramtype2 = "facedir",
+	is_ground_content = false,
 	legacy_wallmounted = true,
 	walkable = false,
-	light_source = LIGHT_MAX-7,
+	on_rotate = false,
+	light_source = minetest.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",
@@ -82,17 +93,19 @@ 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 = "Button",
+	description = S("Button"),
-	sounds = default.node_sound_stone_defaults(),
+	sounds = mesecon.node_sound.stone,
 	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","default:stone"},
+		{"group:mesecon_conductor_craftable","mesecons_gamecompat:stone"},
 	}
 })

mesecons_button/locale/mesecons_button.de.tr

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

mesecons_button/locale/mesecons_button.eo.tr

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

mesecons_button/locale/mesecons_button.fr.tr

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

mesecons_button/locale/template.txt

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