Fix issue #135

COPYING.txt

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

README.md

@@ -22,7 +22,7 @@ OK, I want in.
 --------------
 Go get it!
 
-[DOWNLOAD IT NOW](https://github.com/Jeija/minetest-mod-mesecons/archive/master.zip)
+[DOWNLOADS PAGE](http://mesecons.net/downloads.php)
 
 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:
 
@@ -39,7 +39,7 @@ 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.html) is your style?
+Or maybe a [comprehensive reference](http://mesecons.net/items.php) 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?
 
@@ -53,7 +53,6 @@ These awesome people made Mesecons possible!
 
 | Contributor     | Contribution                     |
 | --------------- | -------------------------------- |
-| Hawk777         | Code for VoxelManip caching      |
 | Jat15           | Various tweaks.                  |
 | Jeija           | **Main developer! Everything.**  |
 | Jordach         | Noteblock sounds.                |

documentation.json

@@ -1,64 +0,0 @@
-{
-	"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",
-		"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

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

mesecons/actionqueue.lua

@@ -1,105 +0,0 @@
-mesecon.queue.actions={} -- contains all ActionQueue actions
-
-function mesecon.queue:add_function(name, func)
-	mesecon.queue.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)
-	-- 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),
-				func=func,
-				params=mesecon.tablecopy(params or {}),
-				time=time,
-				owcheck=(overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
-				priority=priority}
-
-	local toremove = nil
-	-- Otherwise, add the action to the queue
-	if overwritecheck then -- check if old action has to be overwritten / removed:
-		for i, ac in ipairs(mesecon.queue.actions) do
-			if(vector.equals(pos, ac.pos)
-			and mesecon.cmpAny(overwritecheck, ac.owcheck)) then
-				toremove = i
-				break
-			end
-		end
-	end
-
-	if (toremove ~= nil) then
-		table.remove(mesecon.queue.actions, toremove)
-	end
-
-	table.insert(mesecon.queue.actions, action)
-end
-
--- execute the stored functions on a globalstep
--- if however, the pos of a function is not loaded (get_node_or_nil == nil), do NOT execute the function
--- this makes sure that resuming mesecons circuits when restarting minetest works fine
--- 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
-local get_highest_priority = function (actions)
-	local highestp = -1
-	local highesti
-	for i, ac in ipairs(actions) do
-		if ac.priority > highestp then
-			highestp = ac.priority
-			highesti = i
-		end
-	end
-
-	return highesti
-end
-
-local m_time = 0
-local resumetime = mesecon.setting("resumetime", 4)
-minetest.register_globalstep(function (dtime)
-	m_time = m_time + dtime
-	-- don't even try if server has not been running for XY seconds; resumetime = time to wait
-	-- after starting the server before processing the ActionQueue, don't set this too low
-	if (m_time < resumetime) then return end
-	local actions = mesecon.tablecopy(mesecon.queue.actions)
-	local actions_now={}
-
-	mesecon.queue.actions = {}
-
-	-- sort actions into two categories:
-	-- those toexecute now (actions_now) and those to execute later (mesecon.queue.actions)
-	for i, ac in ipairs(actions) do
-		if ac.time > 0 then
-			ac.time = ac.time - dtime -- executed later
-			table.insert(mesecon.queue.actions, ac)
-		else
-			table.insert(actions_now, ac)
-		end
-	end
-
-	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
-		local hp = get_highest_priority(actions_now)
-		mesecon.queue:execute(actions_now[hp])
-		table.remove(actions_now, hp)
-	end
-end)
-
-function mesecon.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 mesecon.queue.funcs[action.func] then
-		mesecon.queue.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
-mesecon.queue.actions = mesecon.file2table("mesecon_actionqueue")
-
-minetest.register_on_shutdown(function()
-	mesecon.table2file("mesecon_actionqueue", mesecon.queue.actions)
-end)

mesecons/depends.txt

@@ -1,2 +1 @@
 default
-screwdriver?

mesecons/init.lua

@@ -3,7 +3,7 @@
 -- |  \/  | |___ ____  |___ |      |    | | \  | |____
 -- |      | |        | |    |      |    | |  \ |     |
 -- |      | |___ ____| |___ |____  |____| |   \| ____|
--- by Jeija, Uberi (Temperest), sfan5, VanessaE, Hawk777 and contributors
+-- by Jeija, Uberi (Temperest), sfan5, VanessaE
 --
 --
 --
@@ -11,7 +11,7 @@
 -- See the documentation on the forum for additional information, especially about crafting
 --
 --
--- For basic development resources, see http://mesecons.net/developers.html
+-- For developer documentation see the Developers' section on mesecons.TK
 --
 --
 --
@@ -30,7 +30,7 @@
 --		action_change = function
 --		rules = rules/get_rules
 --	},
---	conductor =
+--	conductor = 
 --	{
 --		state = mesecon.state.on/off
 --		offstate = opposite state (for state = on only)
@@ -39,26 +39,53 @@
 --	}
 --}
 
+
 -- PUBLIC VARIABLES
 mesecon={} -- contains all functions and all global variables
-mesecon.queue={} -- contains the ActionQueue
+mesecon.actions_on={} -- Saves registered function callbacks for mesecon on | DEPRECATED
-mesecon.queue.funcs={} -- contains all ActionQueue functions
+mesecon.actions_off={} -- Saves registered function callbacks for mesecon off | DEPRECATED
+mesecon.actions_change={} -- Saves registered function callbacks for mesecon change | DEPRECATED
+mesecon.receptors={} --  saves all information about receptors  | DEPRECATED
+mesecon.effectors={} --  saves all information about effectors  | DEPRECATED
+mesecon.conductors={} -- saves all information about conductors | DEPRECATED
+
+
+local wpath = minetest.get_worldpath()
+local function read_file(fn)
+	local f = io.open(fn, "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 write_file(fn, tbl)
+	local f = io.open(fn, "w")
+	f:write(minetest.serialize(tbl))
+	f:close()
+end
+
+mesecon.to_update = read_file(wpath.."/mesecon_to_update")
+mesecon.r_to_update = read_file(wpath.."/mesecon_r_to_update")
+
+minetest.register_on_shutdown(function()
+	write_file(wpath.."/mesecon_to_update",mesecon.to_update)
+	write_file(wpath.."/mesecon_r_to_update",mesecon.r_to_update)
+end)
 
 -- 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");
-
 -- Internal stuff
 -- This is the most important file
 -- it handles signal transmission and basically everything else
@@ -66,63 +93,64 @@ 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)
+function mesecon:receptor_on_i(pos, rules)
-	mesecon.vm_begin()
-
 	rules = rules or mesecon.rules.default
 
-	-- 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)
+		local rulenames = mesecon:rules_link_rule_all(pos, rule)
-		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
-			mesecon.turnon(np, rulename)
+			mesecon:turnon(np, rulename)
 		end
 	end
-
-	mesecon.vm_commit()
-end)
-
-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)
+function mesecon:receptor_on(pos, rules)
+	if MESECONS_GLOBALSTEP then
+		rules = rules or mesecon.rules.default
+		mesecon.r_to_update[#mesecon.r_to_update+1]={pos=pos, rules=rules, action="on"}
+	else
+		mesecon:receptor_on_i(pos, rules)
+	end
+end
+
+function mesecon:receptor_off_i(pos, rules)
 	rules = rules or mesecon.rules.default
-
+	for _, rule in ipairs(mesecon:flattenrules(rules)) do
-	-- Call turnoff on all linking positions
+		local np = mesecon:addPosRule(pos, rule)
-	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local rulenames = mesecon:rules_link_rule_all(pos, rule)
-		local np = vector.add(pos, rule)
-		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
-			mesecon.vm_begin()
+			if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
-			mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
+				mesecon:turnoff(np, rulename)
-
-			-- Turnoff returns true if turnoff process was successful, no onstate receptor
-			-- was found along the way. Commit changes that were made in voxelmanip. If turnoff
-			-- returns true, an onstate receptor was found, abort voxelmanip transaction.
-			if (mesecon.turnoff(np, rulename)) then
-				mesecon.vm_commit()
 			else
-				mesecon.vm_abort()
+				mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off)
 			end
 		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)
+	if MESECONS_GLOBALSTEP then
+		rules = rules or mesecon.rules.default
+		mesecon.r_to_update[#mesecon.r_to_update+1]={pos=pos, rules=rules, action="off"}
+	else
+		mesecon:receptor_off_i(pos, rules)
+	end
 end
 
 
 print("[OK] Mesecons")
 
--- Deprecated stuff
+--The actual wires
--- To be removed in future releases
+dofile(minetest.get_modpath("mesecons").."/wires.lua");
-dofile(minetest.get_modpath("mesecons").."/legacy.lua");
 
 --Services like turnoff receptor on dignode and so on
 dofile(minetest.get_modpath("mesecons").."/services.lua");

mesecons/legacy.lua

@@ -1,97 +1,5 @@
--- Un-forceload any forceloaded mapblocks from older versions of Mesecons which
+minetest.swap_node = minetest.swap_node or function(pos, node)
--- used forceloading instead of VoxelManipulators.
+	local data = minetest.get_meta(pos):to_table()
-local BLOCKSIZE = 16
+	minetest.add_node(pos, node)
-
+	minetest.get_meta(pos):from_table(data)
--- convert block hash --> node position
+end
-local function unhash_blockpos(hash)
-	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
-end
-
-local old_forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
-for hash, _ in pairs(old_forceloaded_blocks) do
-	minetest.forceload_free_block(unhash_blockpos(hash))
-end
-os.remove(minetest.get_worldpath()..DIR_DELIM.."mesecon_forceloaded")
-
--- LBMs to convert old pistons to use facedir instead of separate up/down nodes
-minetest.register_lbm({
-	label = "Convert up pistons to use facedir",
-	name = ":mesecons_pistons:update_up_pistons",
-	nodenames = {"mesecons_pistons:piston_up_normal_on","mesecons_pistons:piston_up_normal_off",
-			"mesecons_pistons:piston_up_sticky_on","mesecons_pistons:piston_up_sticky_off"},
-	action = function(pos, node)
-		if string.find(node.name, "sticky") then
-			if string.sub(node.name, -3, -1) == "_on" then
-				node.name = "mesecons_pistons:piston_sticky_on"
-			else
-				node.name = "mesecons_pistons:piston_sticky_off"
-			end
-		else
-			if string.sub(node.name, -3, -1) == "_on" then
-				node.name = "mesecons_pistons:piston_normal_on"
-			else
-				node.name = "mesecons_pistons:piston_normal_off"
-			end
-		end
-		local dir = {x=0, y=-1, z=0}
-		node.param2 = minetest.dir_to_facedir(dir, true)
-		minetest.swap_node(pos, node)
-	end
-})
-
-minetest.register_lbm({
-	label = "Convert down pistons to use facedir",
-	name = ":mesecons_pistons:update_down_pistons",
-	nodenames = {"mesecons_pistons:piston_down_normal_on","mesecons_pistons:piston_down_normal_off",
-			"mesecons_pistons:piston_down_sticky_on","mesecons_pistons:piston_down_sticky_off"},
-	action = function(pos, node)
-		if string.find(node.name, "sticky") then
-			if string.sub(node.name, -3, -1) == "_on" then
-				node.name = "mesecons_pistons:piston_sticky_on"
-			else
-				node.name = "mesecons_pistons:piston_sticky_off"
-			end
-		else
-			if string.sub(node.name, -3, -1) == "_on" then
-				node.name = "mesecons_pistons:piston_normal_on"
-			else
-				node.name = "mesecons_pistons:piston_normal_off"
-			end
-		end
-		local dir = {x=0, y=1, z=0}
-		node.param2 = minetest.dir_to_facedir(dir, true)
-		minetest.swap_node(pos, node)
-	end
-})
-
-minetest.register_lbm({
-	label = "Convert up piston pushers to use facedir",
-	name = ":mesecons_pistons:update_up_pushers",
-	nodenames = {"mesecons_pistons:piston_up_pusher_normal", "mesecons_pistons:piston_up_pusher_sticky"},
-	action = function(pos, node)
-		if string.find(node.name, "sticky") then
-			node.name = "mesecons_pistons:piston_pusher_sticky"
-		else
-			node.name = "mesecons_pistons:piston_pusher_normal"
-		end
-		local dir = {x=0, y=-1, z=0}
-		node.param2 = minetest.dir_to_facedir(dir, true)
-		minetest.swap_node(pos, node)
-	end
-})
-
-minetest.register_lbm({
-	label = "Convert down piston pushers to use facedir",
-	name = ":mesecons_pistons:update_down_pushers",
-	nodenames = {"mesecons_pistons:piston_down_pusher_normal", "mesecons_pistons:piston_down_pusher_sticky"},
-	action = function(pos, node)
-		if string.find(node.name, "sticky") then
-			node.name = "mesecons_pistons:piston_pusher_sticky"
-		else
-			node.name = "mesecons_pistons:piston_pusher_normal"
-		end
-		local dir = {x=0, y=1, z=0}
-		node.param2 = minetest.dir_to_facedir(dir, true)
-		minetest.swap_node(pos, node)
-	end
-})

mesecons/oldwires.lua

@@ -30,7 +30,7 @@ minetest.register_node("mesecons:mesecon_on", {
 	},
 	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
 	drop = "mesecons:mesecon_off 1",
-	light_source = default.LIGHT_MAX-11,
+	light_source = LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,
 		offstate = "mesecons:mesecon_off"

mesecons/presets.lua

@@ -15,13 +15,11 @@ mesecon.rules.default =
  {x=0,  y=1,  z=-1},
  {x=0,  y=-1, z=-1}}
 
-mesecon.rules.pplate = mesecon.mergetable(mesecon.rules.default, {{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 = 1,  y =-1, z =-1},
  {x = 2,  y = 0, z = 0}}
 
@@ -30,30 +28,15 @@ mesecon.rules.flat =
  {x =-1, y = 0, z = 0},
  {x = 0, y = 0, z = 1},
  {x = 0, y = 0, z =-1}}
-
+ 
-mesecon.rules.alldirs =
-{{x= 1, y= 0,  z= 0},
- {x=-1, y= 0,  z= 0},
- {x= 0, y= 1,  z= 0},
- {x= 0, y=-1,  z= 0},
- {x= 0, y= 0,  z= 1},
- {x= 0, y= 0,  z=-1}}
-
 mesecon.rules.buttonlike_get = function(node)
 	local rules = mesecon.rules.buttonlike
-	local dir = minetest.facedir_to_dir(node.param2)
+	if node.param2 == 2 then
-	if dir.x == 1 then
+		rules=mesecon:rotate_rules_left(rules)
-		-- No action needed
+	elseif node.param2 == 3 then
-	elseif dir.z == -1 then
+		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
-		rules=mesecon.rotate_rules_left(rules)
+	elseif node.param2 == 0 then
-	elseif dir.x == -1 then
+		rules=mesecon:rotate_rules_right(rules)
-		rules=mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
-	elseif dir.z == 1 then
-		rules=mesecon.rotate_rules_right(rules)
-	elseif dir.y == -1 then
-		rules=mesecon.rotate_rules_up(rules)
-	elseif dir.y == 1 then
-		rules=mesecon.rotate_rules_down(rules)
 	end
 	return rules
 end

mesecons/services.lua

@@ -1,103 +1,38 @@
--- Dig and place services
+mesecon.on_placenode = function (pos, node)
-
+	if mesecon:is_receptor_on(node.name) then
-mesecon.on_placenode = function(pos, node)
+		mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
-	mesecon.execute_autoconnect_hooks_now(pos, node)
+	elseif mesecon:is_powered(pos) then
-
+		if mesecon:is_conductor(node.name) then
-	-- Receptors: Send on signal when active
+			mesecon:turnon (pos)
-	if mesecon.is_receptor_on(node.name) then
+			--mesecon:receptor_on (pos, mesecon:conductor_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
-		local sources = mesecon.is_powered(pos)
-		if sources then
-			-- also call receptor_on if itself is powered already, so that neighboring
-			-- conductors will be activated (when pushing an on-conductor with a piston)
-			for _, s in ipairs(sources) do
-				local rule = vector.subtract(pos, s)
-				mesecon.turnon(pos, rule)
-			end
-			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
-		elseif mesecon.is_conductor_on(node) then
-			minetest.swap_node(pos, {name = mesecon.get_conductor_off(node)})
-		end
-	end
-
-	-- Effectors: Send changesignal and activate or deactivate
-	if mesecon.is_effector(node.name) then
-		local powered_rules = {}
-		local unpowered_rules = {}
-
-		-- 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
-			for _, r in ipairs(unpowered_rules) do
+			mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "on")
-				mesecon.deactivate(pos, node, r, 1)
+			mesecon:activate(pos, node)
-			end
 		end
+	elseif mesecon:is_conductor_on(node) then
+		minetest.swap_node(pos, {name = mesecon:get_conductor_off(node)})
+	elseif mesecon:is_effector_on (node.name) then
+		mesecon:deactivate(pos, node)
 	end
 end
 
-mesecon.on_dignode = function(pos, node)
+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_i(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
 
+minetest.register_abm({
+	nodenames = {"group:overheat"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local meta = minetest.get_meta(pos)
+		meta:set_int("heat",0)
+	end,
+})
+
 minetest.register_on_placenode(mesecon.on_placenode)
 minetest.register_on_dignode(mesecon.on_dignode)
-
--- Overheating service for fast circuits
-
--- returns true if heat is too high
-mesecon.do_overheat = function(pos)
-	local meta = minetest.get_meta(pos)
-	local heat = meta:get_int("heat") or 0
-
-	heat = heat + 1
-	meta:set_int("heat", heat)
-
-	if heat < mesecon.setting("overheat_max", 20) then
-		mesecon.queue:add_action(pos, "cooldown", {}, 1, nil, 0)
-	else
-		return true
-	end
-
-	return false
-end
-
-
-mesecon.queue:add_function("cooldown", function (pos)
-	local meta = minetest.get_meta(pos)
-	local heat = meta:get_int("heat")
-
-	if (heat > 0) then
-		meta:set_int("heat", heat - 1)
-	end
-end)
-
--- "Shim" for simple rotation, will result in the following item in nodedefs using it:
--- "on_rotate = screwdriver.rotate_simple" if screwdriver mod is installed
--- "on_rotate = nil" (essentially not present) if screwdriver mod is missing
-
-if screwdriver then
-	mesecon.rotate_simple = screwdriver.rotate_simple
-end

mesecons/settings.lua

@@ -1,15 +1,9 @@
--- SETTINGS
+-- SETTINGS
-function mesecon.setting(setting, default)
+BLINKY_PLANT_INTERVAL = 3
-	if type(default) == "boolean" then
+NEW_STYLE_WIRES  = true  -- true = new nodebox wires, false = old raillike wires
-		local read = minetest.setting_getbool("mesecon."..setting)
+PRESSURE_PLATE_INTERVAL = 0.1
-		if read == nil then
+OBJECT_DETECTOR_RADIUS = 6
-			return default
+PISTON_MAXIMUM_PUSH = 15
-		else
+MOVESTONE_MAXIMUM_PUSH = 100
-			return read
+MESECONS_GLOBALSTEP = true	-- true = receptors/effectors won't be updated
-		end
+				-- until next globalstep, decreases server load
-	elseif type(default) == "string" then
-		return minetest.setting_get("mesecon."..setting) or default
-	elseif type(default) == "number" then
-		return tonumber(minetest.setting_get("mesecon."..setting) or default)
-	end
-end

mesecons/util.lua

@@ -1,12 +1,24 @@
-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.set_node(newpos, node)
+	minetest.add_node(newpos, node)
 	minetest.get_meta(pos):from_table(meta)
 end
 
-function mesecon.flattenrules(allrules)
+--[[ new functions:
+mesecon:flattenrules(allrules)
+mesecon:rule2bit(findrule, allrules)
+mesecon:rule2meta(findrule, allrules)
+dec2bin(n)
+mesecon:getstate(nodename, states)
+mesecon:getbinstate(nodename, states)
+mesecon:get_bit(binary, bit)
+mesecon:set_bit(binary, bit, value)
+mesecon:invertRule(r)
+--]]
+
+function mesecon:flattenrules(allrules)
 --[[
 	{
 		{
@@ -41,7 +53,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
@@ -50,36 +62,35 @@ function mesecon.rule2bit(findrule, allrules)
 	end
 	for m,metarule in ipairs( allrules) do
 	for _,    rule in ipairs(metarule ) do
-		if vector.equals(findrule, rule) then
+		if mesecon:cmpPos(findrule, rule) and mesecon:cmpSpecial(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 vector.equals(findrule, rule) then
+		if mesecon:cmpPos(findrule, rule) and mesecon:cmpSpecial(findrule, rule) then
 			return m
 		end
 	end
 	end
 end
 
-function mesecon.rule2meta(findrule, allrules)
+function mesecon:rule2meta(findrule, allrules)
-	if #allrules == 0 then return {} end
+	local index = mesecon:rule2metaindex(findrule, allrules)
-
-	local index = mesecon.rule2metaindex(findrule, allrules)
 	if index == nil then
 		if allrules[1].x then
 			return allrules
@@ -90,16 +101,25 @@ function mesecon.rule2meta(findrule, allrules)
 	return allrules[index]
 end
 
-function mesecon.dec2bin(n)
+if convert_base then
-	local x, y = math.floor(n / 2), n % 2
+	print(
-	if (n > 1) then
+		"base2dec is tonumber(num,base1)\n"..
-		return mesecon.dec2bin(x)..y
+		"commonlib needs dec2base(num,base2)\n"..
-	else
+		"and it needs base2base(num,base1,base2),\n"..
-		return ""..y
+		"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
+		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
@@ -108,41 +128,52 @@ 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 mesecon.dec2bin(mesecon.getstate(nodename, states)-1)
+	return 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)
 	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 mesecon.dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
+			return 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 mesecon.dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
+			return dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
 		end
 	end
 	return binary
-
+	
 end
 
-function mesecon.invertRule(r)
+function mesecon:invertRule(r)
-	return vector.multiply(r, -1)
+	return {x = -r.x, y = -r.y, z = -r.z, sx = r.sx, sy = r.sy, sz = r.sz}
 end
 
-function mesecon.tablecopy(table) -- deep table copy
+function mesecon:addPosRule(p, r)
-	if type(table) ~= "table" then return table end -- no need to copy
+	return {x = p.x + r.x, y = p.y + r.y, z = p.z + r.z}
+end
+
+function mesecon:cmpPos(p1, p2)
+	return (p1.x == p2.x and p1.y == p2.y and p1.z == p2.z)
+end
+
+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
 	local newtable = {}
 
 	for idx, item in pairs(table) do
 		if type(item) == "table" then
-			newtable[idx] = mesecon.tablecopy(item)
+			newtable[idx] = mesecon:tablecopy(item)
 		else
 			newtable[idx] = item
 		end
@@ -150,241 +181,3 @@ function mesecon.tablecopy(table) -- deep table copy
 
 	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
-
-	for i, e in pairs(t1) do
-		if not mesecon.cmpAny(e, t2[i]) then return false end
-	end
-
-	return true
-end
-
--- does not overwrite values; number keys (ipairs) are appended, not overwritten
-function mesecon.mergetable(source, dest)
-	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
-
-function mesecon.register_node(name, spec_common, spec_off, spec_on)
-	spec_common.drop = spec_common.drop or name .. "_off"
-	spec_common.__mesecon_basename = name
-	spec_on.__mesecon_state = "on"
-	spec_off.__mesecon_state = "off"
-
-	spec_on = mesecon.mergetable(spec_common, spec_on);
-	spec_off = mesecon.mergetable(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..DIR_DELIM..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..DIR_DELIM..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
--- “va” → the VoxelArea
--- “data” → the data array
--- “param1” → the param1 array
--- “param2” → the param2 array
--- “dirty” → true if data has been modified
---
--- Nil if no VM-based transaction is in progress.
-local vm_cache = nil
-
--- 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 = {}
-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:set_data(tbl.data)
-			vm:write_to_map()
-			vm:update_map()
-		end
-	end
-	vm_cache = nil
-end
-
--- Finishes a VoxelManipulator-based transaction, freeing the VMs and throwing
--- away any modified areas.
-function mesecon.vm_abort()
-	vm_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
-		local vm = minetest.get_voxel_manip(pos, pos)
-		local min_pos, max_pos = vm:get_emerged_area()
-		local va = VoxelArea:new{MinEdge = min_pos, MaxEdge = max_pos}
-		tbl = {vm = vm, va = va, data = vm:get_data(), param1 = vm:get_light_data(), param2 = vm:get_param2_data(), dirty = false}
-		vm_cache[hash] = tbl
-	end
-	return tbl
-end
-
--- Gets the node at a given position during a VoxelManipulator-based
--- transaction.
-function mesecon.vm_get_node(pos)
-	local tbl = vm_get_or_create_entry(pos)
-	local index = tbl.va:indexp(pos)
-	local node_value = tbl.data[index]
-	if node_value == core.CONTENT_IGNORE then
-		return nil
-	else
-		local node_param1 = tbl.param1[index]
-		local node_param2 = tbl.param2[index]
-		return {name = minetest.get_name_from_content_id(node_value), param1 = node_param1, param2 = node_param2}
-	end
-end
-
--- Sets a node’s name during a VoxelManipulator-based transaction.
---
--- Existing param1, param2, and metadata are left alone.
-function mesecon.vm_swap_node(pos, name)
-	local tbl = vm_get_or_create_entry(pos)
-	local index = tbl.va:indexp(pos)
-	tbl.data[index] = minetest.get_content_id(name)
-	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.
-function mesecon.swap_node_force(pos, name)
-	if vm_cache then
-		return mesecon.vm_swap_node(pos, name)
-	else
-		-- This serves to both ensure the mapblock is loaded and also hand us
-		-- the old node table so we can preserve param2.
-		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

@@ -0,0 +1,280 @@
+-- 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_blinkyplant/doc/blinkyplant/description.html

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

mesecons_blinkyplant/init.lua

@@ -1,51 +1,102 @@
 -- The BLINKY_PLANT
-
+minetest.register_node("mesecons_blinkyplant:blinky_plant", {
-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="Blinky Plant",
 	drawtype = "plantlike",
+	visual_scale = 1,
+	tiles = {"jeija_blinky_plant_off.png"},
 	inventory_image = "jeija_blinky_plant_off.png",
-	paramtype = "light",
 	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},
 	},
-	on_timer = on_timer,
+	mesecons = {receptor = {
-	on_rightclick = toggle_timer,
+		state = mesecon.state.off
-	on_construct = toggle_timer
+	}},
-},{
+	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", {
+	drawtype = "plantlike",
+	visual_scale = 1,
 	tiles = {"jeija_blinky_plant_off.png"},
-	groups = {dig_immediate=3},
+	inventory_image = "jeija_blinky_plant_off.png",
-	mesecons = {receptor = { state = mesecon.state.off }}
+	paramtype = "light",
-},{
+	walkable = false,
+	groups = {dig_immediate=3, mesecon=2},
+    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.off
+	}},
+	on_rightclick = function(pos, node, clicker)
+        minetest.set_node(pos, {name="mesecons_blinkyplant:blinky_plant"})
+    end
+})
+
+minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
+	drawtype = "plantlike",
+	visual_scale = 1,
 	tiles = {"jeija_blinky_plant_on.png"},
-	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	inventory_image = "jeija_blinky_plant_off.png",
-	mesecons = {receptor = { state = mesecon.state.on }}
+	paramtype = "light",
+	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 = {	{"","group:mesecon_conductor_craftable",""},
+	recipe = {
-			{"","group:mesecon_conductor_craftable",""},
+	{"","group:mesecon_conductor_craftable",""},
-			{"group:sapling","group:sapling","group:sapling"}}
+	{"","group:mesecon_conductor_craftable",""},
+	{"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_button/doc/button/description.html

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

mesecons_button/init.lua

@@ -8,14 +8,14 @@ mesecon.button_turnoff = function (pos)
 		minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
 		minetest.sound_play("mesecons_button_pop", {pos=pos})
 		local rules = mesecon.rules.buttonlike_get(node)
-		mesecon.receptor_off(pos, rules)
+		mesecon:receptor_off(pos, rules)
 	end
 end
 
 minetest.register_node("mesecons_button:button_off", {
 	drawtype = "nodebox",
 	tiles = {
-	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",	
 	"jeija_wall_button_sides.png",
 	"jeija_wall_button_sides.png",
 	"jeija_wall_button_sides.png",
@@ -26,14 +26,13 @@ minetest.register_node("mesecons_button:button_off", {
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
-	on_rotate = mesecon.buttonlike_onrotate,
 	sunlight_propagates = true,
 	selection_box = {
 	type = "fixed",
 		fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
 	},
 	node_box = {
-		type = "fixed",
+		type = "fixed",	
 		fixed = {
 		{ -6/16, -6/16, 6/16, 6/16, 6/16, 8/16 },	-- the thin plate behind the button
 		{ -4/16, -2/16, 4/16, 4/16, 2/16, 6/16 }	-- the button itself
@@ -41,9 +40,9 @@ minetest.register_node("mesecons_button:button_off", {
 	},
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
 	description = "Button",
-	on_rightclick = function (pos, node)
+	on_punch = 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.after(1, mesecon.button_turnoff, pos)
 	end,
@@ -68,8 +67,7 @@ minetest.register_node("mesecons_button:button_on", {
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
-	on_rotate = false,
+	light_source = LIGHT_MAX-7,
-	light_source = default.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",

mesecons_commandblock/doc/commandblock/description.html

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

mesecons_commandblock/init.lua

@@ -1,208 +1,210 @@
-minetest.register_chatcommand("say", {
+minetest.register_chatcommand("say", {
-	params = "<text>",
+	params = "<text>",
-	description = "Say <text> as the server",
+	description = "Say <text> as the server",
-	privs = {server=true},
+	privs = {server=true},
-	func = function(name, param)
+	func = function(name, param)
-		minetest.chat_send_all(name .. ": " .. param)
+		minetest.chat_send_all(name .. ": " .. param)
-	end
+	end
-})
+})
-
+
-minetest.register_chatcommand("tell", {
+minetest.register_chatcommand("tell", {
-	params = "<name> <text>",
+	params = "<name> <text>",
-	description = "Say <text> to <name> privately",
+	description = "Say <text> to <name> privately",
-	func = function(name, param)
+	func = function(name, param)
-		local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")
+		local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")
-		if found == nil then
+		if found == nil then
-			minetest.chat_send_player(name, "Invalid usage: " .. param)
+			minetest.chat_send_player(name, "Invalid usage: " .. param)
-			return
+			return
-		end
+		end
-		if not minetest.get_player_by_name(target) then
+		if not minetest.get_player_by_name(target) then
-			minetest.chat_send_player(name, "Invalid target: " .. target)
+			minetest.chat_send_player(name, "Invalid target: " .. target)
-		end
+		end
-		minetest.chat_send_player(target, name .. " whispers: " .. message, false)
+		minetest.chat_send_player(target, name .. " whispers: " .. message, false)
-	end
+	end
-})
+})
-
+
-minetest.register_chatcommand("hp", {
+minetest.register_chatcommand("tellme", {
-	params = "<name> <value>",
+	params = "<text>",
-	description = "Set health of <name> to <value> hitpoints",
+	description = "Say <text> to yourself",
-	privs = {ban=true},
+	func = function(name, param)
-	func = function(name, param)
+		minetest.chat_send_player(name, param, false)
-		local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")
+	end
-		if found == nil then
+})
-			minetest.chat_send_player(name, "Invalid usage: " .. param)
+
-			return
+minetest.register_chatcommand("hp", {
-		end
+	params = "<name> <value>",
-		local player = minetest.get_player_by_name(target)
+	description = "Set health of <name> to <value> hitpoints",
-		if player then
+	privs = {ban=true},
-			player:set_hp(value)
+	func = function(name, param)
-		else
+		local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")
-			minetest.chat_send_player(name, "Invalid target: " .. target)
+		if found == nil then
-		end
+			minetest.chat_send_player(name, "Invalid usage: " .. param)
-	end
+			return
-})
+		end
-
+		local player = minetest.get_player_by_name(target)
-local function initialize_data(meta)
+		if player then
-	local commands = minetest.formspec_escape(meta:get_string("commands"))
+			player:set_hp(value)
-	meta:set_string("formspec",
+		else
-		"invsize[9,5;]" ..
+			minetest.chat_send_player(name, "Invalid target: " .. target)
-		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
+		end
-		"label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..
+	end
-		"button_exit[3.3,4.5;2,1;submit;Submit]")
+})
-	local owner = meta:get_string("owner")
+
-	if owner == "" then
+local initialize_data = function(meta, player, command, param)
-		owner = "not owned"
+	meta:set_string("formspec",
-	else
+		"invsize[9,6;]" ..
-		owner = "owned by " .. owner
+		"field[1,1;7.5,1;player;Player;" .. player .. "]" ..
-	end
+		"button[1.3,2;2,1;nearest;Nearest]" ..
-	meta:set_string("infotext", "Command Block\n" ..
+		"button[3.3,2;2,1;farthest;Farthest]" ..
-		"(" .. owner .. ")\n" ..
+		"button[5.3,2;2,1;random;Random]" ..
-		"Commands: "..commands)
+		"field[1,4;2,1;command;Command;" .. command .. "]" ..
-end
+		"field[3,4;5.5,1;param;Parameter;" .. param .. "]" ..
-
+		"button_exit[3.3,5;2,1;submit;Submit]")
-local function construct(pos)
+	local owner = meta:get_string("owner")
-	local meta = minetest.get_meta(pos)
+	if owner == "" then
-
+		owner = "not owned"
-	meta:set_string("commands", "tell @nearest Commandblock unconfigured")
+	else
-
+		owner = "owned by " .. owner
-	meta:set_string("owner", "")
+	end
-
+	meta:set_string("infotext", "Command Block\n" ..
-	initialize_data(meta)
+		"(" .. owner .. ")\n" ..
-end
+		"Command: /" .. command .. " " .. param)
-
+end
-local function after_place(pos, placer)
+
-	if placer then
+local construct = function(pos)
-		local meta = minetest.get_meta(pos)
+	local meta = minetest.get_meta(pos)
-		meta:set_string("owner", placer:get_player_name())
+
-		initialize_data(meta)
+	meta:set_string("player", "@nearest")
-	end
+	meta:set_string("command", "time")
-end
+	meta:set_string("param", "7000")
-
+
-local function receive_fields(pos, formname, fields, sender)
+	meta:set_string("owner", "")
-	if not fields.submit then
+
-		return
+	initialize_data(meta, "@nearest", "time", "7000")
-	end
+end
-	local meta = minetest.get_meta(pos)
+
-	local owner = meta:get_string("owner")
+local after_place = function(pos, placer)
-	if owner ~= "" and sender:get_player_name() ~= owner then
+	if placer then
-		return
+		local meta = minetest.get_meta(pos)
-	end
+		meta:set_string("owner", placer:get_player_name())
-	meta:set_string("commands", fields.commands)
+		initialize_data(meta, "@nearest", "time", "7000")
-
+	end
-	initialize_data(meta)
+end
-end
+
-
+local receive_fields = function(pos, formname, fields, sender)
-local function resolve_commands(commands, pos)
+	if fields.quit then
-	local players = minetest.get_connected_players()
+		return
-
+	end
-	-- No players online: remove all commands containing
+	local meta = minetest.get_meta(pos)
-	-- @nearest, @farthest and @random
+	if fields.nearest then
-	if #players == 0 then
+		initialize_data(meta, "@nearest", fields.command, fields.param)
-		commands = commands:gsub("[^\r\n]+", function (line)
+	elseif fields.farthest then
-			if line:find("@nearest") then return "" end
+		initialize_data(meta, "@farthest", fields.command, fields.param)
-			if line:find("@farthest") then return "" end
+	elseif fields.random then
-			if line:find("@random") then return "" end
+		initialize_data(meta, "@random", fields.command, fields.param)
-			return line
+	else --fields.submit or pressed enter
-		end)
+		meta:set_string("player", fields.player)
-		return commands
+		meta:set_string("command", fields.command)
-	end
+		meta:set_string("param", fields.param)
-
+
-	local nearest, farthest = nil, nil
+		initialize_data(meta, fields.player, fields.command, fields.param)
-	local min_distance, max_distance = math.huge, -1
+	end
-	for index, player in pairs(players) do
+end
-		local distance = vector.distance(pos, player:getpos())
+
-		if distance < min_distance then
+local resolve_player = function(name, pos)
-			min_distance = distance
+	local get_distance = function(pos1, pos2)
-			nearest = player:get_player_name()
+		return math.sqrt((pos1.x - pos2.x) ^ 2 + (pos1.y - pos2.y) ^ 2 + (pos1.z - pos2.z) ^ 2)
-		end
+	end
-		if distance > max_distance then
+
-			max_distance = distance
+	if name == "@nearest" then
-			farthest = player:get_player_name()
+		local min_distance = math.huge
-		end
+		for index, player in ipairs(minetest.get_connected_players()) do
-	end
+			local distance = get_distance(pos, player:getpos())
-	local random = players[math.random(#players)]:get_player_name()
+			if distance < min_distance then
-	commands = commands:gsub("@nearest", nearest)
+				min_distance = distance
-	commands = commands:gsub("@farthest", farthest)
+				name = player:get_player_name()
-	commands = commands:gsub("@random", random)
+			end
-	return commands
+		end
-end
+	elseif name == "@farthest" then
-
+		local max_distance = -1
-local function commandblock_action_on(pos, node)
+		for index, player in ipairs(minetest.get_connected_players()) do
-	if node.name ~= "mesecons_commandblock:commandblock_off" then
+			local distance = get_distance(pos, player:getpos())
-		return
+			if distance > max_distance then
-	end
+				max_distance = distance
-
+				name = player:get_player_name()
-	minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})
+			end
-
+		end
-	local meta = minetest.get_meta(pos)
+	elseif name == "@random" then
-	local owner = meta:get_string("owner")
+		local players = minetest.get_connected_players()
-	if owner == "" then
+		local player = players[math.random(#players)]
-		return
+		name = player:get_player_name()
-	end
+	end
-
+	return name
-	local commands = resolve_commands(meta:get_string("commands"), pos)
+end
-	for _, command in pairs(commands:split("\n")) do
+
-		local pos = command:find(" ")
+local commandblock_action_on = function(pos, node)
-		local cmd, param = command, ""
+	if node.name ~= "mesecons_commandblock:commandblock_off" then
-		if pos then
+		return
-			cmd = command:sub(1, pos - 1)
+	end
-			param = command:sub(pos + 1)
+
-		end
+	minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})
-		local cmddef = minetest.chatcommands[cmd]
+
-		if not cmddef then
+	local meta = minetest.get_meta(pos)
-			minetest.chat_send_player(owner, "The command "..cmd.." does not exist")
+	local command = minetest.chatcommands[meta:get_string("command")]
-			return
+	if command == nil then
-		end
+		return
-		local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs)
+	end
-		if not has_privs then
+	local owner = meta:get_string("owner")
-			minetest.chat_send_player(owner, "You don't have permission "
+	if owner == "" then
-					.."to run "..cmd
+		return
-					.." (missing privileges: "
+	end
-					..table.concat(missing_privs, ", ")..")")
+	local has_privs, missing_privs = minetest.check_player_privs(owner, command.privs)
-			return
+	if not has_privs then
-		end
+		minetest.chat_send_player(owner, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
-		cmddef.func(owner, param)
+		return
-	end
+	end
-end
+	local player = resolve_player(meta:get_string("player"), pos)
-
+	command.func(player, meta:get_string("param"))
-local function commandblock_action_off(pos, node)
+end
-	if node.name == "mesecons_commandblock:commandblock_on" then
+
-		minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})
+local commandblock_action_off = function(pos, node)
-	end
+	if node.name == "mesecons_commandblock:commandblock_on" then
-end
+		minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})
-
+	end
-local function can_dig(pos, player)
+end
-	local meta = minetest.get_meta(pos)
+
-	local owner = meta:get_string("owner")
+minetest.register_node("mesecons_commandblock:commandblock_off", {
-	return owner == "" or owner == player:get_player_name()
+	description = "Command Block",
-end
+	tiles = {"jeija_commandblock_off.png"},
-
+	inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
-minetest.register_node("mesecons_commandblock:commandblock_off", {
+	groups = {cracky=2, mesecon_effector_off=1},
-	description = "Command Block",
+	on_construct = construct,
-	tiles = {"jeija_commandblock_off.png"},
+	after_place_node = after_place,
-	inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
+	on_receive_fields = receive_fields,
-	groups = {cracky=2, mesecon_effector_off=1},
+	can_dig = function(pos,player)
-	on_construct = construct,
+		local owner = minetest.get_meta(pos):get_string("owner")
-	after_place_node = after_place,
+		return owner == "" or owner == player:get_player_name()
-	on_receive_fields = receive_fields,
+	end,
-	can_dig = can_dig,
+	sounds = default.node_sound_stone_defaults(),
-	sounds = default.node_sound_stone_defaults(),
+	mesecons = {effector = {
-	mesecons = {effector = {
+		action_on = commandblock_action_on
-		action_on = commandblock_action_on
+	}}
-	}}
+})
-})
+
-
+minetest.register_node("mesecons_commandblock:commandblock_on", {
-minetest.register_node("mesecons_commandblock:commandblock_on", {
+	tiles = {"jeija_commandblock_on.png"},
-	tiles = {"jeija_commandblock_on.png"},
+	groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},
-	groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},
+	light_source = 10,
-	light_source = 10,
+	drop = "mesecons_commandblock:commandblock_off",
-	drop = "mesecons_commandblock:commandblock_off",
+	on_construct = construct,
-	on_construct = construct,
+	after_place_node = after_place,
-	after_place_node = after_place,
+	on_receive_fields = receive_fields,
-	on_receive_fields = receive_fields,
+	can_dig = function(pos,player)
-	can_dig = can_dig,
+		local owner = minetest.get_meta(pos):get_string("owner")
-	sounds = default.node_sound_stone_defaults(),
+		return owner == "" or owner == player:get_player_name()
-	mesecons = {effector = {
+	end,
-		action_off = commandblock_action_off
+	sounds = default.node_sound_stone_defaults(),
-	}}
+	mesecons = {effector = {
-})
+		action_off = commandblock_action_off
+	}}
+})

mesecons_compatibility/init.lua

@@ -0,0 +1,167 @@
+doors = {}
+
+-- Registers a door - REDEFINITION ONLY | DOORS MOD MUST HAVE BEEN LOADED BEFORE
+--  name: The name of the door
+--  def: a table with the folowing fields:
+--    description
+--    inventory_image
+--    groups
+--    tiles_bottom: the tiles of the bottom part of the door {front, side}
+--    tiles_top: the tiles of the bottom part of the door {front, side}
+--    If the following fields are not defined the default values are used
+--    node_box_bottom
+--    node_box_top
+--    selection_box_bottom
+--    selection_box_top
+--    only_placer_can_open: if true only the player who placed the door can
+--                          open it
+
+function doors:register_door(name, def)
+	def.groups.not_in_creative_inventory = 1
+	
+	local box = {{-0.5, -0.5, -0.5,   0.5, 0.5, -0.5+1.5/16}}
+	
+	if not def.node_box_bottom then
+		def.node_box_bottom = box
+	end
+	if not def.node_box_top then
+		def.node_box_top = box
+	end
+	if not def.selection_box_bottom then
+		def.selection_box_bottom= box
+	end
+	if not def.selection_box_top then
+		def.selection_box_top = box
+	end
+	
+	local tt = def.tiles_top
+	local tb = def.tiles_bottom
+	
+	local function after_dig_node(pos, name)
+		if minetest.get_node(pos).name == name then
+			minetest.remove_node(pos)
+		end
+	end
+
+	local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+		pos.y = pos.y+dir
+		if not minetest.get_node(pos).name == check_name then
+			return
+		end
+		local p2 = minetest.get_node(pos).param2
+		p2 = params[p2+1]
+		
+		local meta = minetest.get_meta(pos):to_table()
+		minetest.set_node(pos, {name=replace_dir, param2=p2})
+		minetest.get_meta(pos):from_table(meta)
+		
+		pos.y = pos.y-dir
+		meta = minetest.get_meta(pos):to_table()
+		minetest.set_node(pos, {name=replace, param2=p2})
+		minetest.get_meta(pos):from_table(meta)
+	end
+
+	local function on_mesecons_signal_open (pos, node)
+		on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+	end
+
+	local function on_mesecons_signal_close (pos, node)
+		on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+	end
+	
+	local function check_player_priv(pos, player)
+		if not def.only_placer_can_open then
+			return true
+		end
+		local meta = minetest.get_meta(pos)
+		local pn = player:get_player_name()
+		return meta:get_string("doors_owner") == pn
+	end
+	
+	minetest.register_node(":"..name.."_b_1", {
+		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		drop = name,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_bottom
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_bottom
+		},
+		groups = def.groups,
+		
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y+1
+			after_dig_node(pos, name.."_t_1")
+		end,
+		
+		on_rightclick = function(pos, node, puncher)
+			if check_player_priv(pos, puncher) then
+				on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+			end
+		end,
+
+		mesecons = {effector = {
+			action_on  = on_mesecons_signal_open
+		}},
+		
+		can_dig = check_player_priv,
+	})
+	
+	minetest.register_node(":"..name.."_b_2", {
+		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		drop = name,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = def.node_box_bottom
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selection_box_bottom
+		},
+		groups = def.groups,
+		
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			pos.y = pos.y+1
+			after_dig_node(pos, name.."_t_2")
+		end,
+		
+		on_rightclick = function(pos, node, puncher)
+			if check_player_priv(pos, puncher) then
+				on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+			end
+		end,
+
+		mesecons = {effector = {
+			action_off = on_mesecons_signal_close
+		}},
+		
+		can_dig = check_player_priv,
+	})
+end
+
+doors:register_door("doors:door_wood", {
+	description = "Wooden Door",
+	inventory_image = "door_wood.png",
+	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
+	tiles_bottom = {"door_wood_b.png", "door_brown.png"},
+	tiles_top = {"door_wood_a.png", "door_brown.png"},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+doors:register_door("doors:door_steel", {
+	description = "Steel Door",
+	inventory_image = "door_steel.png",
+	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
+	tiles_bottom = {"door_steel_b.png", "door_grey.png"},
+	tiles_top = {"door_steel_a.png", "door_grey.png"},
+	only_placer_can_open = true,
+	sounds = default.node_sound_stone_defaults(),
+})

mesecons_delayer/doc/delayer/description.html

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

mesecons_delayer/init.lua

@@ -2,7 +2,7 @@
 local delayer_get_output_rules = function(node)
 	local rules = {{x = 0, y = 0, z = 1}}
 	for i = 0, node.param2 do
-		rules = mesecon.rotate_rules_left(rules)
+		rules = mesecon:rotate_rules_left(rules)
 	end
 	return rules
 end
@@ -10,32 +10,42 @@ end
 local delayer_get_input_rules = function(node)
 	local rules = {{x = 0, y = 0, z = -1}}
 	for i = 0, node.param2 do
-		rules = mesecon.rotate_rules_left(rules)
+		rules = mesecon:rotate_rules_left(rules)
 	end
 	return rules
 end
 
 -- Functions that are called after the delay time
 
+local delayer_turnon = function(params)
+	local rules = delayer_get_output_rules(params.node)
+	mesecon:receptor_on(params.pos, rules)
+end
+
+local delayer_turnoff = function(params)
+	local rules = delayer_get_output_rules(params.node)
+	mesecon:receptor_off(params.pos, rules)
+end
+
 local delayer_activate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
 	local time = def.delayer_time
 	minetest.swap_node(pos, {name = def.delayer_onstate, param2=node.param2})
-	mesecon.queue:add_action(pos, "receptor_on", {delayer_get_output_rules(node)}, time, nil)
+	minetest.after(time, delayer_turnon , {pos = pos, node = node})
 end
 
 local delayer_deactivate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
 	local time = def.delayer_time
 	minetest.swap_node(pos, {name = def.delayer_offstate, param2=node.param2})
-	mesecon.queue:add_action(pos, "receptor_off", {delayer_get_output_rules(node)}, time, nil)
+	minetest.after(time, delayer_turnoff, {pos = pos, node = node})
 end
 
 -- Register the 2 (states) x 4 (delay times) delayers
 
 for i = 1, 4 do
 local groups = {}
-if i == 1 then
+if i == 1 then 
 	groups = {bendy=2,snappy=1,dig_immediate=2}
 else
 	groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1}
@@ -47,8 +57,7 @@ elseif	i == 2 then delaytime = 0.3
 elseif	i == 3 then delaytime = 0.5
 elseif	i == 4 then delaytime = 1.0 end
 
-local boxes = {
+boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
-	 { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
 
 	 { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 },		-- the jeweled "on" indicator
 	 { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 },
@@ -58,8 +67,7 @@ local boxes = {
 
 	 { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 },		-- the timer indicator
 	 { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 },		-- the two wire stubs
-	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }
+	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }}
-}
 
 minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
 	description = "Delayer",

mesecons_detector/doc/nodedetector/description.html

@@ -1,6 +0,0 @@
-The node detector is a receptor. It changes its state when either any node
-or a specific node is detected. Right-click it to set a nodename to scan for.
-It can also receive digiline signals. You can either send "GET" and it will
-respond with the detected nodename or you can send any other string and it will
-set this string as the node to scan for.
-Nodenames must include the mod they reside in, so for instance default:dirt, not just dirt.

mesecons_detector/doc/objectdetector/description.html

@@ -1,3 +0,0 @@
-The object detector is a receptor. It changes its state when a player approaches.
-Right-click it to set a name to scan for.
-It can also receive digiline signals which are the name to scan for on the specified channel in the right-click menu.

mesecons_detector/init.lua

@@ -1,19 +1,18 @@
-local GET_COMMAND = "GET"
-
 -- Object detector
 -- Detects players in a certain radius
 -- The radius can be specified in mesecons/settings.lua
 
-local function object_detector_make_formspec(pos)
+local object_detector_make_formspec = function (pos)
-	minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" ..
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec", "size[9,2.5]" ..
 		"field[0.3,  0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
-		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]")
-		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local function object_detector_on_receive_fields(pos, _, fields)
+local object_detector_on_receive_fields = function(pos, formname, fields)
-	if not fields.scanname or not fields.digiline_channel then return end
+	if fields.quit then
-
+		return
+	end
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
 	meta:set_string("digiline_channel", fields.digiline_channel)
@@ -21,35 +20,25 @@ local function object_detector_on_receive_fields(pos, _, fields)
 end
 
 -- returns true if player was found, false if not
-local function object_detector_scan(pos)
+local object_detector_scan = function (pos)
-	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
+	local objs = minetest.get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
-
+	for k, obj in pairs(objs) do
-	-- abort if no scan results were found
+		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
-	if next(objs) == nil then return false end
+		local scanname = minetest.get_meta(pos):get_string("scanname")
-
+		if (isname == scanname and isname ~= "") or (isname  ~= "" and scanname == "") then -- player with scanname found or not scanname specified
-	local scanname = minetest.get_meta(pos):get_string("scanname")
+			return true
-	local every_player = scanname == ""
-	for _, obj in pairs(objs) do
-		-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
-		local foundname = obj:get_player_name()
-
-		if foundname ~= "" then
-			-- return true if scanning for any player or if specific playername was detected
-			if scanname == "" or foundname == scanname then
-				return true
-			end
 		end
 	end
-
 	return false
 end
 
 -- set player name when receiving a digiline signal on a specific channel
-local object_detector_digiline = {
+object_detector_digiline = {
 	effector = {
-		action = function(pos, node, channel, msg)
+		action = function (pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
-			if channel == meta:get_string("digiline_channel") then
+			local active_channel = meta:get_string("digiline_channel")
+			if channel == active_channel then
 				meta:set_string("scanname", msg)
 				object_detector_make_formspec(pos)
 			end
@@ -64,8 +53,7 @@ minetest.register_node("mesecons_detector:object_detector_off", {
 	groups = {cracky=3},
 	description="Player Detector",
 	mesecons = {receptor = {
-		state = mesecon.state.off,
+		state = mesecon.state.off
-		rules = mesecon.rules.pplate
 	}},
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
@@ -80,8 +68,7 @@ minetest.register_node("mesecons_detector:object_detector_on", {
 	groups = {cracky=3,not_in_creative_inventory=1},
 	drop = 'mesecons_detector:object_detector_off',
 	mesecons = {receptor = {
-		state = mesecon.state.on,
+		state = mesecon.state.on
-		rules = mesecon.rules.pplate
 	}},
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
@@ -98,169 +85,26 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_abm({
+minetest.register_abm(
-	nodenames = {"mesecons_detector:object_detector_off"},
+	{nodenames = {"mesecons_detector:object_detector_off"},
-	interval = 1,
+	interval = 1.0,
 	chance = 1,
-	action = function(pos, node)
+	action = function(pos)
-		if not object_detector_scan(pos) then return end
+		if object_detector_scan(pos) then
-
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_on"})
-		node.name = "mesecons_detector:object_detector_on"
+			mesecon:receptor_on(pos)
-		minetest.swap_node(pos, node)
+		end
-		mesecon.receptor_on(pos, mesecon.rules.pplate)
 	end,
 })
 
-minetest.register_abm({
+minetest.register_abm(
-	nodenames = {"mesecons_detector:object_detector_on"},
+	{nodenames = {"mesecons_detector:object_detector_on"},
-	interval = 1,
+	interval = 1.0,
 	chance = 1,
-	action = function(pos, node)
+	action = function(pos)
-		if object_detector_scan(pos) then return end
+		if not object_detector_scan(pos) then
-
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_off"})
-		node.name = "mesecons_detector:object_detector_off"
+			mesecon:receptor_off(pos)
-		minetest.swap_node(pos, node)
+		end
-		mesecon.receptor_off(pos, mesecon.rules.pplate)
-	end,
-})
-
--- Node detector
--- Detects the node in front of it
-
-local function node_detector_make_formspec(pos)
-	minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" ..
-		"field[0.3,  0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
-		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
-		"button_exit[7,0.75;2,3;;Save]")
-end
-
-local function node_detector_on_receive_fields(pos, _, fields)
-	if not fields.scanname or not fields.digiline_channel then return end
-
-	local meta = minetest.get_meta(pos)
-	meta:set_string("scanname", fields.scanname)
-	meta:set_string("digiline_channel", fields.digiline_channel)
-	node_detector_make_formspec(pos)
-end
-
--- returns true if node was found, false if not
-local function node_detector_scan(pos)
-	local node = minetest.get_node_or_nil(pos)
-	if not node then return end
-
-	local frontname = minetest.get_node(
-		vector.subtract(pos, minetest.facedir_to_dir(node.param2))
-	).name
-	local scanname = minetest.get_meta(pos):get_string("scanname")
-
-	return (frontname == scanname) or
-		(frontname ~= "air" and frontname ~= "ignore" and scanname == "")
-end
-
--- set player name when receiving a digiline signal on a specific channel
-local node_detector_digiline = {
-	effector = {
-		action = function(pos, node, channel, msg)
-			local meta = minetest.get_meta(pos)
-			if channel ~= meta:get_string("digiline_channel") then return end
-
-			if msg == GET_COMMAND then
-				local nodename = minetest.get_node(
-					vector.subtract(pos, minetest.facedir_to_dir(node.param2))
-				).name
-
-				digiline:receptor_send(pos, digiline.rules.default, channel, nodename)
-			else
-				meta:set_string("scanname", msg)
-				node_detector_make_formspec(pos)
-			end
-		end,
-	},
-	receptor = {}
-}
-
-local function after_place_node_detector(pos, placer)
-	local placer_pos = placer:getpos()
-	if not placer_pos then
-		return
-	end
-
-	--correct for the player's height
-	if placer:is_player() then
-		placer_pos.y = placer_pos.y + 1.625
-	end
-
-	--correct for 6d facedir
-	local node = minetest.get_node(pos)
-	node.param2 = minetest.dir_to_facedir(vector.subtract(pos, placer_pos), true)
-	minetest.set_node(pos, node)
-end
-
-minetest.register_node("mesecons_detector:node_detector_off", {
-	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = {cracky=3},
-	description="Node Detector",
-	mesecons = {receptor = {
-		state = mesecon.state.off
-	}},
-	on_construct = node_detector_make_formspec,
-	on_receive_fields = node_detector_on_receive_fields,
-	after_place_node = after_place_node_detector,
-	sounds = default.node_sound_stone_defaults(),
-	digiline = node_detector_digiline
-})
-
-minetest.register_node("mesecons_detector:node_detector_on", {
-	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_on.png"},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = {cracky=3,not_in_creative_inventory=1},
-	drop = 'mesecons_detector:node_detector_off',
-	mesecons = {receptor = {
-		state = mesecon.state.on
-	}},
-	on_construct = node_detector_make_formspec,
-	on_receive_fields = node_detector_on_receive_fields,
-	after_place_node = after_place_node_detector,
-	sounds = default.node_sound_stone_defaults(),
-	digiline = node_detector_digiline
-})
-
-minetest.register_craft({
-	output = 'mesecons_detector:node_detector_off',
-	recipe = {
-		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
-		{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-	}
-})
-
-minetest.register_abm({
-	nodenames = {"mesecons_detector:node_detector_off"},
-	interval = 1,
-	chance = 1,
-	action = function(pos, node)
-		if not node_detector_scan(pos) then return end
-
-		node.name = "mesecons_detector:node_detector_on"
-		minetest.swap_node(pos, node)
-		mesecon.receptor_on(pos)
-	end,
-})
-
-minetest.register_abm({
-	nodenames = {"mesecons_detector:node_detector_on"},
-	interval = 1,
-	chance = 1,
-	action = function(pos, node)
-		if node_detector_scan(pos) then return end
-
-		node.name = "mesecons_detector:node_detector_off"
-		minetest.swap_node(pos, node)
-		mesecon.receptor_off(pos)
 	end,
 })

mesecons_doors/init.lua

@@ -1,129 +0,0 @@
--- Modified, from minetest_game/mods/doors/init.lua
-local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
-	pos.y = pos.y + dir
-	if not minetest.get_node(pos).name == check_name then
-		return
-	end
-	local p2 = minetest.get_node(pos).param2
-	p2 = params[p2 + 1]
-
-	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
-
-	pos.y = pos.y - dir
-	minetest.swap_node(pos, {name = replace, param2 = p2})
-
-	if (minetest.get_meta(pos):get_int("right") ~= 0) == (params[1] ~= 3) then
-		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
-	else
-		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
-	end
-end
-
-local function meseconify_door(name)
-	if minetest.registered_items[name .. "_b_1"] then
-		-- old style double-node doors
-		local function toggle_state1 (pos, node)
-			on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
-		end
-
-		local function toggle_state2 (pos, node)
-			on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
-		end
-
-		minetest.override_item(name.."_b_1", {
-			mesecons = {effector = {
-				action_on = toggle_state1,
-				action_off = toggle_state1,
-				rules = mesecon.rules.pplate
-			}}
-		})
-
-		minetest.override_item(name.."_b_2", {
-			mesecons = {effector = {
-				action_on = toggle_state2,
-				action_off = toggle_state2,
-				rules = mesecon.rules.pplate
-			}}
-		})
-	elseif minetest.registered_items[name .. "_a"] then
-		-- new style mesh node based doors
-		local override = {
-			mesecons = {effector = {
-				action_on = function(pos, node)
-					local door = doors.get(pos)
-					if door then
-						door:open()
-					end
-				end,
-				action_off = function(pos, node)
-					local door = doors.get(pos)
-					if door then
-						door:close()
-					end
-				end,
-				rules = mesecon.rules.pplate
-			}}
-		}
-		minetest.override_item(name .. "_a", override)
-		minetest.override_item(name .. "_b", override)
-	end
-end
-
-meseconify_door("doors:door_wood")
-meseconify_door("doors:door_steel")
-meseconify_door("doors:door_glass")
-meseconify_door("doors:door_obsidian_glass")
-
--- Trapdoor
-local function trapdoor_switch(pos, node)
-	local state = minetest.get_meta(pos):get_int("state")
-
-	if state == 1 then
-		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
-		minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
-	else
-		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
-		minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
-	end
-
-	minetest.get_meta(pos):set_int("state", state == 1 and 0 or 1)
-end
-
-if doors and doors.get then
-	local override = {
-		mesecons = {effector = {
-			action_on = function(pos, node)
-				local door = doors.get(pos)
-				if door then
-					door:open()
-				end
-			end,
-			action_off = function(pos, node)
-				local door = doors.get(pos)
-				if door then
-					door:close()
-				end
-			end,
-		}},
-	}
-	minetest.override_item("doors:trapdoor", override)
-	minetest.override_item("doors:trapdoor_open", override)
-	minetest.override_item("doors:trapdoor_steel", override)
-	minetest.override_item("doors:trapdoor_steel_open", override)
-else
-	if minetest.registered_nodes["doors:trapdoor"] then
-		minetest.override_item("doors:trapdoor", {
-			mesecons = {effector = {
-				action_on = trapdoor_switch,
-				action_off = trapdoor_switch
-			}},
-		})
-
-		minetest.override_item("doors:trapdoor_open", {
-			mesecons = {effector = {
-				action_on = trapdoor_switch,
-				action_off = trapdoor_switch
-			}},
-		})
-	end
-end

mesecons_extrawires/corner.lua

@@ -10,12 +10,12 @@ local corner_selectionbox = {
 }
 
 local corner_get_rules = function (node)
-	local rules =
+	local rules = 
 	{{x = 1,  y = 0,  z =  0},
 	 {x = 0,  y = 0,  z = -1}}
 
 	for i = 0, node.param2 do
-		rules = mesecon.rotate_rules_left(rules)
+		rules = mesecon:rotate_rules_left(rules)
 	end
 
 	return rules
@@ -37,10 +37,9 @@ minetest.register_node("mesecons_extrawires:corner_on", {
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
 	node_box = corner_nodebox,
-	on_rotate = mesecon.rotate_simple,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:corner_off",
-	mesecons = {conductor =
+	mesecons = {conductor = 
 	{
 		state = mesecon.state.on,
 		rules = corner_get_rules,
@@ -50,7 +49,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
 
 minetest.register_node("mesecons_extrawires:corner_off", {
 	drawtype = "nodebox",
-	description = "Insulated Mesecon Corner",
+	description = "Mesecon Corner",
 	tiles = {
 		"jeija_insulated_wire_curved_tb_off.png",
 		"jeija_insulated_wire_curved_tb_off.png^[transformR270",
@@ -65,9 +64,8 @@ minetest.register_node("mesecons_extrawires:corner_off", {
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
 	node_box = corner_nodebox,
-	on_rotate = mesecon.rotate_simple,
 	groups = {dig_immediate = 3},
-	mesecons = {conductor =
+	mesecons = {conductor = 
 	{
 		state = mesecon.state.off,
 		rules = corner_get_rules,

mesecons_extrawires/crossover.lua

@@ -1,4 +1,4 @@
-local function crossover_get_rules(node)
+function crossover_get_rules(node)
 	return {
 		{--first wire
 			{x=-1,y=0,z=0},
@@ -19,20 +19,29 @@ local crossover_states = {
 }
 
 minetest.register_node("mesecons_extrawires:crossover_off", {
-	description = "Insulated Mesecon Crossover",
+	description = "Insulated Crossover",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
-		"jeija_insulated_wire_sides_off.png",
 		"jeija_insulated_wire_ends_off.png"
 	},
 	paramtype = "light",
 	walkable = false,
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1},
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -44,19 +53,31 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
 minetest.register_node("mesecons_extrawires:crossover_01", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
-		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_01x.png",
-		"jeija_insulated_wire_ends_off.png"
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01z.png",
+		"jeija_insulated_wire_ends_01z.png"
 	},
 	paramtype = "light",
 	walkable = false,
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1, not_in_creative_inventory=1},
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -68,19 +89,31 @@ minetest.register_node("mesecons_extrawires:crossover_01", {
 minetest.register_node("mesecons_extrawires:crossover_10", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
-		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
-		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
-		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_10x.png",
-		"jeija_insulated_wire_ends_on.png"
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10z.png",
+		"jeija_insulated_wire_ends_10z.png"
 	},
 	paramtype = "light",
 	walkable = false,
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1, not_in_creative_inventory=1},
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -92,19 +125,31 @@ minetest.register_node("mesecons_extrawires:crossover_10", {
 minetest.register_node("mesecons_extrawires:crossover_on", {
 	description = "You hacker you!",
 	drop = "mesecons_extrawires:crossover_off",
-	drawtype = "mesh",
+	drawtype = "nodebox",
-	mesh = "mesecons_extrawires_crossover.b3d",
 	tiles = {
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
 		"jeija_insulated_wire_ends_on.png",
-		"jeija_insulated_wire_sides_on.png",
-		"jeija_insulated_wire_sides_on.png",
 		"jeija_insulated_wire_ends_on.png"
 	},
 	paramtype = "light",
 	walkable = false,
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1, not_in_creative_inventory=1},
 	mesecons = {
 		conductor = {
 			states = crossover_states,

mesecons_extrawires/doc/corner/description.html

@@ -1 +0,0 @@
-Insulated corners are conductors that only conduct between the inputs (also not up or down). When placing they always point to the left in direction of your vision.

mesecons_extrawires/doc/crossing/description.html

@@ -1 +0,0 @@
-Insulated crossing are conductors that conduct two signals between the opposing sides, the signals are insulated to each other.

mesecons_extrawires/doc/mese/description.html

@@ -1 +0,0 @@
-The basic prerequesite for mesecons, can be crafted into wires and other stuff. Have a look at the <a href="http://wiki.minetest.net/Mese">Minetest Wiki</a> for more information. Mese is a conductor. It conducts in all six directions: Up/Down/Left/Right/Forward/Backward

mesecons_extrawires/doc/tjunction/description.html

@@ -1 +0,0 @@
-Insulated T-Junctions are conductors that only conduct between the inputs (also not up or down).

mesecons_extrawires/doc/vertical/description.html

@@ -1 +0,0 @@
-Vertical Mesecons only conduct up and down. Plates appear at the ends, at that place they also conduct to the side.

mesecons_extrawires/mesewire.lua

@@ -8,7 +8,12 @@ local mesewire_rules =
 	{x = 0, y = 0, z =-1},
 }
 
-minetest.override_item("default:mese", {
+minetest.register_node(":default:mese", {
+	description = "Mese Block",
+	tiles = {minetest.registered_nodes["default:mese"].tiles[1]},
+	is_ground_content = true,
+	groups = {cracky=1},
+	sounds = default.node_sound_stone_defaults(),
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:mese_powered",
@@ -16,21 +21,15 @@ minetest.override_item("default:mese", {
 	}}
 })
 
--- Copy node definition of powered mese from normal mese
+minetest.register_node("mesecons_extrawires:mese_powered", {
--- and brighten texture tiles to indicate mese is powered
+	tiles = {minetest.registered_nodes["default:mese"].tiles[1].."^[brighten"},
-local powered_def = mesecon.mergetable(minetest.registered_nodes["default:mese"], {
+	is_ground_content = true,
-	drop = "default:mese",
+	groups = {cracky=1, not_in_creative_inventory = 1},
-	light_source = 5,
+	sounds = default.node_sound_stone_defaults(),
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "default:mese",
 		rules = mesewire_rules
 	}},
-	groups = {cracky = 1, not_in_creative_inventory = 1}
+	drop = "default:mese"
 })
-
-for i, v in pairs(powered_def.tiles) do
-	powered_def.tiles[i] = v .. "^[brighten"
-end
-
-minetest.register_node("mesecons_extrawires:mese_powered", powered_def)

mesecons_extrawires/tjunction.lua

@@ -10,13 +10,13 @@ local tjunction_selectionbox = {
 }
 
 local tjunction_get_rules = function (node)
-	local rules =
+	local rules = 
 	{{x = 0,  y = 0,  z =  1},
 	 {x = 1,  y = 0,  z =  0},
 	 {x = 0,  y = 0,  z = -1}}
 
 	for i = 0, node.param2 do
-		rules = mesecon.rotate_rules_left(rules)
+		rules = mesecon:rotate_rules_left(rules)
 	end
 
 	return rules
@@ -38,10 +38,9 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
 	sunlight_propagates = true,
 	selection_box = tjunction_selectionbox,
 	node_box = tjunction_nodebox,
-	on_rotate = mesecon.rotate_simple,
+	groups = {dig_immediate = 3, mesecon_conductor_craftable=1, not_in_creative_inventory = 1},
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:tjunction_off",
-	mesecons = {conductor =
+	mesecons = {conductor = 
 	{
 		state = mesecon.state.on,
 		rules = tjunction_get_rules,
@@ -51,7 +50,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
 
 minetest.register_node("mesecons_extrawires:tjunction_off", {
 	drawtype = "nodebox",
-	description = "Insulated Mesecon T-junction",
+	description = "T-junction",
 	tiles = {
 		"jeija_insulated_wire_tjunction_tb_off.png",
 		"jeija_insulated_wire_tjunction_tb_off.png^[transformR180",
@@ -66,9 +65,8 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
 	sunlight_propagates = true,
 	selection_box = tjunction_selectionbox,
 	node_box = tjunction_nodebox,
-	on_rotate = mesecon.rotate_simple,
+	groups = {dig_immediate = 3, mesecon_conductor_craftable=1},
-	groups = {dig_immediate = 3},
+	mesecons = {conductor = 
-	mesecons = {conductor =
 	{
 		state = mesecon.state.off,
 		rules = tjunction_get_rules,

mesecons_extrawires/vertical.lua

@@ -18,7 +18,7 @@ local bottom_box = {
 
 local vertical_rules = {
 	{x=0, y=1, z=0},
-	{x=0, y=-1, z=0}
+	{x=0, y=-1, z=0},
 }
 
 local top_rules = {
@@ -26,7 +26,7 @@ local top_rules = {
 	{x=-1,y=0, z=0},
 	{x=0,y=0, z=1},
 	{x=0,y=0, z=-1},
-	{x=0,y=-1, z=0}
+	{x=0,y=-1, z=0},
 }
 
 local bottom_rules = {
@@ -35,138 +35,167 @@ local bottom_rules = {
 	{x=0, y=0, z=1},
 	{x=0, y=0, z=-1},
 	{x=0, y=1, z=0},
-	{x=0, y=2, z=0} -- receive power from pressure plate / detector / ... 2 nodes above
 }
 
 local vertical_updatepos = function (pos)
 	local node = minetest.get_node(pos)
-	if minetest.registered_nodes[node.name]
+	if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].is_vertical_conductor then
-	and minetest.registered_nodes[node.name].is_vertical_conductor then
+		local node_above = minetest.get_node(mesecon:addPosRule(pos, vertical_rules[1]))
-		local node_above = minetest.get_node(vector.add(pos, vertical_rules[1]))
+		local node_below = minetest.get_node(mesecon:addPosRule(pos, vertical_rules[2]))
-		local node_below = minetest.get_node(vector.add(pos, vertical_rules[2]))
+		local namestate = minetest.registered_nodes[node.name].vertical_conductor_state
 
-		local above = minetest.registered_nodes[node_above.name]
+		local above = minetest.registered_nodes[node_above.name] and minetest.registered_nodes[node_above.name].is_vertical_conductor
-			and minetest.registered_nodes[node_above.name].is_vertical_conductor
+		local below = minetest.registered_nodes[node_below.name] and minetest.registered_nodes[node_below.name].is_vertical_conductor
-		local below = minetest.registered_nodes[node_below.name]
-			and minetest.registered_nodes[node_below.name].is_vertical_conductor
 
-		mesecon.on_dignode(pos, node)
-
-		-- Always place offstate conductor and let mesecon.on_placenode take care
-		local newname = "mesecons_extrawires:vertical_"
 		if above and below then -- above and below: vertical mesecon
-			newname = newname .. "off"
+			minetest.add_node(pos, {name = "mesecons_extrawires:vertical_" .. namestate})
 		elseif above and not below then -- above only: bottom
-			newname = newname .. "bottom_off"
+			minetest.add_node(pos, {name = "mesecons_extrawires:vertical_bottom_" .. namestate})
 		elseif not above and below then -- below only: top
-			newname = newname .. "top_off"
+			minetest.add_node(pos, {name = "mesecons_extrawires:vertical_top_" .. namestate})
-		else -- no vertical wire above, no vertical wire below: use bottom
+		else -- no vertical wire above, no vertical wire below: use default wire
-			newname = newname .. "bottom_off"
+			minetest.add_node(pos, {name = "mesecons_extrawires:vertical_" .. namestate})
 		end
-
-		minetest.set_node(pos, {name = newname})
-		mesecon.on_placenode(pos, {name = newname})
 	end
 end
 
 local vertical_update = function (pos, node)
 	vertical_updatepos(pos) -- this one
-	vertical_updatepos(vector.add(pos, vertical_rules[1])) -- above
+	vertical_updatepos(mesecon:addPosRule(pos, vertical_rules[1])) -- above
-	vertical_updatepos(vector.add(pos, vertical_rules[2])) -- below
+	vertical_updatepos(mesecon:addPosRule(pos, vertical_rules[2])) -- below
 end
 
 -- Vertical wire
-mesecon.register_node("mesecons_extrawires:vertical", {
+minetest.register_node("mesecons_extrawires:vertical_on", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
+	tiles = {"wires_vertical_on.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
 	selection_box = vertical_box,
 	node_box = vertical_box,
-	on_rotate = false,
 	is_vertical_conductor = true,
-	drop = "mesecons_extrawires:vertical_off",
+	vertical_conductor_state = "on",
-	after_place_node = vertical_update,
-	after_dig_node = vertical_update
-},{
-	tiles = {"mesecons_wire_off.png"},
-	groups = {dig_immediate=3},
-	mesecons = {conductor = {
-		state = mesecon.state.off,
-		onstate = "mesecons_extrawires:vertical_on",
-		rules = vertical_rules,
-	}}
-},{
-	tiles = {"mesecons_wire_on.png"},
-	groups = {dig_immediate=3, not_in_creative_inventory=1},
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "mesecons_extrawires:vertical_off",
 		rules = vertical_rules,
-	}}
+	}},
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update,
+})
+
+minetest.register_node("mesecons_extrawires:vertical_off", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	tiles = {"wires_vertical_off.png"},
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {dig_immediate=3},
+	selection_box = vertical_box,
+	node_box = vertical_box,
+	is_vertical_conductor = true,
+	vertical_conductor_state = "off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:vertical_on",
+		rules = vertical_rules,
+	}},
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update,
 })
 
 -- Vertical wire top
-mesecon.register_node("mesecons_extrawires:vertical_top", {
+minetest.register_node("mesecons_extrawires:vertical_top_on", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
+	tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
 	groups = {dig_immediate=3, not_in_creative_inventory=1},
 	selection_box = top_box,
 	node_box = top_box,
-	on_rotate = false,
 	is_vertical_conductor = true,
-	drop = "mesecons_extrawires:vertical_off",
+	vertical_conductor_state = "on",
-	after_place_node = vertical_update,
-	after_dig_node = vertical_update
-},{
-	tiles = {"mesecons_wire_off.png"},
-	mesecons = {conductor = {
-		state = mesecon.state.off,
-		onstate = "mesecons_extrawires:vertical_top_on",
-		rules = top_rules,
-	}}
-},{
-	tiles = {"mesecons_wire_on.png"},
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "mesecons_extrawires:vertical_top_off",
 		rules = top_rules,
-	}}
+	}},
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update,
+})
+
+minetest.register_node("mesecons_extrawires:vertical_top_off", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	selection_box = top_box,
+	node_box = top_box,
+	is_vertical_conductor = true,
+	vertical_conductor_state = "off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:vertical_top_on",
+		rules = top_rules,
+	}},
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update,
 })
 
 -- Vertical wire bottom
-mesecon.register_node("mesecons_extrawires:vertical_bottom", {
+minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
+	tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	vertical_conductor_state = "on",
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	selection_box = bottom_box,
+	node_box = bottom_box,
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_bottom_off",
+		rules = bottom_rules,
+	}},
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update,
+})
+
+minetest.register_node("mesecons_extrawires:vertical_bottom_off", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	selection_box = bottom_box,
 	node_box = bottom_box,
-	on_rotate = false,
 	is_vertical_conductor = true,
-	drop = "mesecons_extrawires:vertical_off",
+	vertical_conductor_state = "off",
-	after_place_node = vertical_update,
-	after_dig_node = vertical_update
-},{
-	tiles = {"mesecons_wire_off.png"},
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_bottom_on",
 		rules = bottom_rules,
-	}}
+	}},
-},{
+	drop = "mesecons_extrawires:vertical_off",
-	tiles = {"mesecons_wire_on.png"},
+	after_place_node = vertical_update,
-	mesecons = {conductor = {
+	after_dig_node = vertical_update,
-		state = mesecon.state.on,
-		offstate = "mesecons_extrawires:vertical_bottom_off",
-		rules = bottom_rules,
-	}}
 })
 
 minetest.register_craft({

mesecons_fpga/depends.txt

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

mesecons_fpga/doc/fpga/description.html

@@ -1,5 +0,0 @@
-FPGAs can be used to chain multiple logic gates together in a compact manner.
-They come with 4 I/O ports and 10 internal registers,
-which can then be connected with eachother to form logic circuits.<br />
-Supported gate types: <b>AND</b>, <b>OR</b>, <b>NOT</b>, <b>XOR</b>, <b>NAND</b>, <b>XNOR</b>, <b>Buffer</b> (=)<br />
-I/O ports: <b>A B C D</b>; Registers: numbered <b>0</b> to <b>9</b>

mesecons_fpga/doc/programmer/description.html

@@ -1,3 +0,0 @@
-The FPGA programmer can be used to copy gate configurations from one FPGA to another.<br />
-Shift+Right-Click an FPGA to read its configuration and "remember" it.
-Left-click (punch) FPGAs to write the saved configuration to them.

mesecons_fpga/init.lua

@@ -1,375 +0,0 @@
-local plg = {}
-plg.rules = {}
-
-local lcore = dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/logic.lua")
-dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/tool.lua")(plg)
-
-
-plg.register_nodes = function(template)
-	-- each loop is for one of the 4 IO ports
-	for a = 0, 1 do
-	for b = 0, 1 do
-	for c = 0, 1 do
-	for d = 0, 1 do
-		local ndef = table.copy(template)
-		local nodename = "mesecons_fpga:fpga"
-				.. tostring(d) .. tostring(c) .. tostring(b) .. tostring(a)
-
-		-- build top texture string
-		local texture = "jeija_fpga_top.png"
-		if a == 1 then texture = texture .. "^jeija_microcontroller_LED_A.png" end
-		if b == 1 then texture = texture .. "^jeija_microcontroller_LED_B.png" end
-		if c == 1 then texture = texture .. "^jeija_microcontroller_LED_C.png" end
-		if d == 1 then texture = texture .. "^jeija_microcontroller_LED_D.png" end
-		ndef.tiles[1] = texture
-		ndef.inventory_image = texture
-
-		if (a + b + c + d) > 0 then
-			ndef.groups["not_in_creative_inventory"] = 1
-		end
-
-		-- interaction with mesecons (input / output)
-		local rules_out = {}
-		if a == 1 then table.insert(rules_out, {x = -1, y = 0, z =  0}) end
-		if b == 1 then table.insert(rules_out, {x =  0, y = 0, z =  1}) end
-		if c == 1 then table.insert(rules_out, {x =  1, y = 0, z =  0}) end
-		if d == 1 then table.insert(rules_out, {x =  0, y = 0, z = -1}) end
-		plg.rules[nodename] = rules_out
-
-		local rules_in = {}
-		if a == 0 then table.insert(rules_in, {x = -1, y = 0, z =  0}) end
-		if b == 0 then table.insert(rules_in, {x =  0, y = 0, z =  1}) end
-		if c == 0 then table.insert(rules_in, {x =  1, y = 0, z =  0}) end
-		if d == 0 then table.insert(rules_in, {x =  0, y = 0, z = -1}) end
-		ndef.mesecons.effector.rules = rules_in
-
-		if (a + b + c + d) > 0 then
-			ndef.mesecons.receptor = {
-				state = mesecon.state.on,
-				rules = rules_out,
-			}
-		end
-
-		minetest.register_node(nodename, ndef)
-	end
-	end
-	end
-	end
-end
-
-plg.register_nodes({
-	description = "FPGA",
-	drawtype = "nodebox",
-	tiles = {
-		"", -- replaced later
-		"jeija_microcontroller_bottom.png",
-		"jeija_fpga_sides.png",
-		"jeija_fpga_sides.png",
-		"jeija_fpga_sides.png",
-		"jeija_fpga_sides.png"
-	},
-	inventory_image = "", -- replaced later
-	sunlight_propagates = true,
-	paramtype = "light",
-	walkable = true,
-	groups = {dig_immediate = 2, mesecon = 3},
-	drop = "mesecons_fpga:fpga0000",
-	selection_box = {
-		type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
-			{ -5/16, -7/16, -5/16, 5/16, -6/16, 5/16 }, -- circuit board
-			{ -3/16, -6/16, -3/16, 3/16, -5/16, 3/16 }, -- IC
-		}
-	},
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		local is = { {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }
-
-		meta:set_string("instr", lcore.serialize(is))
-		meta:set_int("valid", 0)
-		meta:set_string("formspec", plg.to_formspec_string(is))
-		meta:set_string("infotext", "FPGA")
-	end,
-	on_receive_fields = function(pos, formname, fields, sender)
-		if fields.program == nil then return end -- we only care when the user clicks "Program"
-		local meta = minetest.get_meta(pos)
-		local is = plg.from_formspec_fields(fields)
-
-		meta:set_string("instr", lcore.serialize(is))
-		plg.update_formspec(pos, is)
-	end,
-	sounds = default.node_sound_stone_defaults(),
-	mesecons = {
-		effector = {
-			rules = {}, -- replaced later
-			action_change = function(pos, node, rule, newstate)
-				plg.ports_changed(pos, rule, newstate)
-				plg.update(pos)
-			end
-		}
-	},
-	after_dig_node = function(pos, node)
-		mesecon.receptor_off(pos, plg.rules[node.name])
-	end,
-})
-
-
-plg.to_formspec_string = function(is)
-	local function dropdown_op(x, y, name, val)
-		local s = "dropdown[" .. tostring(x) .. "," .. tostring(y) .. ";"
-				.. "0.75,0.5;" .. name .. ";" -- the height seems to be ignored?
-		s = s .. " ,A,B,C,D,0,1,2,3,4,5,6,7,8,9;"
-		if val == nil then
-			s = s .. "0" -- actually selects no field at all
-		elseif val.type == "io" then
-			local mapping = {
-				["A"] = 1,
-				["B"] = 2,
-				["C"] = 3,
-				["D"] = 4,
-			}
-			s = s .. tostring(1 + mapping[val.port])
-		else -- "reg"
-			s = s .. tostring(6 + val.n)
-		end
-		return s .. "]"
-	end
-	local function dropdown_action(x, y, name, val)
-		local s = "dropdown[" .. tostring(x) .. "," .. tostring(y) .. ";"
-				.. "1.125,0.5;" .. name .. ";" -- the height seems to be ignored?
-		s = s .. " , AND,  OR, NOT, XOR,NAND,   =,XNOR;"
-		if val == nil then
-			return s .. "0]" -- actually selects no field at all
-		end
-		local mapping = {
-			["and"] = 1,
-			["or"] = 2,
-			["not"] = 3,
-			["xor"] = 4,
-			["nand"] = 5,
-			["buf"] = 6,
-			["xnor"] = 7,
-		}
-		return s .. tostring(1 + mapping[val]) .. "]"
-	end
-	local s = "size[9,9]"..
-		"label[3.4,-0.15;FPGA gate configuration]"..
-		"button_exit[7,7.5;2,2.5;program;Program]"..
-		"box[4.2,0.5;0.03,7;#ffffff]"..
-		"label[0.25,0.25;op. 1]"..
-		"label[1.0,0.25;gate type]"..
-		"label[2.125,0.25;op. 2]"..
-		"label[3.15,0.25;dest]"..
-		"label[4.5,0.25;op. 1]"..
-		"label[5.25,0.25;gate type]"..
-		"label[6.375,0.25;op. 2]"..
-		"label[7.4,0.25;dest]"
-	local x = 1 - 0.75
-	local y = 1 - 0.25
-	for i = 1, 14 do
-		local cur = is[i]
-		s = s .. dropdown_op    (x      , y, tostring(i).."op1", cur.op1)
-		s = s .. dropdown_action(x+0.75 , y, tostring(i).."act", cur.action)
-		s = s .. dropdown_op    (x+1.875, y, tostring(i).."op2", cur.op2)
-		s = s .. "label[" .. tostring(x+2.625) .. "," .. tostring(y+0.1) .. "; ->]"
-		s = s .. dropdown_op    (x+2.9  , y, tostring(i).."dst", cur.dst)
-		y = y + 1
-
-		if i == 7 then
-			x = 4.5
-			y = 1 - 0.25
-		end
-	end
-	return s
-end
-
-plg.from_formspec_fields = function(fields)
-	local function read_op(s)
-		if s == nil or s == " " then
-			return nil
-		elseif s == "A" or s == "B" or s == "C" or s == "D" then
-			return {type = "io", port = s}
-		else
-			return {type = "reg", n = tonumber(s)}
-		end
-	end
-	local function read_action(s)
-		if s == nil or s == " " then
-			return nil
-		end
-		local mapping = {
-			["AND"] = "and",
-			["OR"] = "or",
-			["NOT"] = "not",
-			["XOR"] = "xor",
-			["NAND"] = "nand",
-			["="] = "buf",
-			["XNOR"] = "xnor",
-		}
-		s = s:gsub("^%s*", "") -- remove leading spaces
-		return mapping[s]
-	end
-	local is = {}
-	for i = 1, 14 do
-		local cur = {}
-		cur.op1 = read_op(fields[tonumber(i) .. "op1"])
-		cur.action = read_action(fields[tonumber(i) .. "act"])
-		cur.op2 = read_op(fields[tonumber(i) .. "op2"])
-		cur.dst = read_op(fields[tonumber(i) .. "dst"])
-		is[#is + 1] = cur
-	end
-	return is
-end
-
-plg.update_formspec = function(pos, is)
-	if type(is) == "string" then -- serialized string
-		is = lcore.deserialize(is)
-	end
-	local meta = minetest.get_meta(pos)
-	local form = plg.to_formspec_string(is)
-
-	local err = lcore.validate(is)
-	if err == nil then
-		meta:set_int("valid", 1)
-		meta:set_string("infotext", "FPGA (functional)")
-	else
-		meta:set_int("valid", 0)
-		meta:set_string("infotext", "FPGA")
-		local fmsg = minetest.colorize("#ff0000", minetest.formspec_escape(err.msg))
-		form = form .. plg.red_box_around(err.i) ..
-			"label[0.25,8.25;The gate configuration is erroneous in the marked area:]"..
-			"label[0.25,8.5;" .. fmsg .. "]"
-	end
-
-	meta:set_string("formspec", form)
-
-	-- reset ports and run programmed logic
-	plg.setports(pos, false, false, false, false)
-	plg.update(pos)
-end
-
-plg.red_box_around = function(i)
-	local x, y
-	if i > 7 then
-		x = 4.5
-		y = 0.75 + (i - 8)
-	else
-		x = 0.25
-		y = 0.75 + (i - 1)
-	end
-	return string.format("box[%f,%f;3.8,0.8;#ff0000]", x-0.1, y-0.05)
-end
-
-
-plg.update = function(pos)
-	local meta = minetest.get_meta(pos)
-	if meta:get_int("valid") ~= 1 then
-		return
-	end
-
-	local is = lcore.deserialize(meta:get_string("instr"))
-	local A, B, C, D = plg.getports(pos)
-	A, B, C, D = lcore.interpret(is, A, B, C, D)
-	plg.setports(pos, A, B, C, D)
-end
-
-plg.ports_changed = function(pos, rule, newstate)
-	if rule == nil then return end
-	local meta = minetest.get_meta(pos)
-	local states
-
-	local s = meta:get_string("portstates")
-	if s == nil then
-		states = {false, false, false, false}
-	else
-		states = {
-			s:sub(1, 1) == "1",
-			s:sub(2, 2) == "1",
-			s:sub(3, 3) == "1",
-			s:sub(4, 4) == "1",
-		}
-	end
-
-	-- trick to transform rules (see register_node) into port number
-	local portno = ({4, 1, nil, 3, 2})[3 + rule.x + 2*rule.z]
-	states[portno] = (newstate == "on")
-
-	meta:set_string("portstates",
-			(states[1] and "1" or "0") .. (states[2] and "1" or "0") ..
-			(states[3] and "1" or "0") .. (states[4] and "1" or "0")
-	)
-end
-
-plg.getports = function(pos) -- gets merged states of INPUT & OUTPUT
-	local sin, sout
-
-	local s = minetest.get_meta(pos):get_string("portstates")
-	if s == nil then
-		sin = {false, false, false, false}
-	else
-		sin = {
-			s:sub(1, 1) == "1",
-			s:sub(2, 2) == "1",
-			s:sub(3, 3) == "1",
-			s:sub(4, 4) == "1",
-		}
-	end
-
-	local name = minetest.get_node(pos).name
-	assert(name:find("mesecons_fpga:fpga") == 1)
-	local off = #"mesecons_fpga:fpga"
-	sout = {
-		name:sub(off+4, off+4) == "1",
-		name:sub(off+3, off+3) == "1",
-		name:sub(off+2, off+2) == "1",
-		name:sub(off+1, off+1) == "1",
-	}
-
-	return unpack({
-		sin[1] or sout[1],
-		sin[2] or sout[2],
-		sin[3] or sout[3],
-		sin[4] or sout[4],
-	})
-end
-
-plg.setports = function(pos, A, B, C, D) -- sets states of OUTPUT
-	local base = "mesecons_fpga:fpga"
-
-	local name = base
-			.. (D and "1" or "0") .. (C and "1" or "0")
-			.. (B and "1" or "0") .. (A and "1" or "0")
-	minetest.swap_node(pos, {name = name, param2 = minetest.get_node(pos).param2})
-
-	if A ~= nil then
-		local ru = plg.rules[base .. "0001"]
-		if A then mesecon.receptor_on(pos, ru) else mesecon.receptor_off(pos, ru) end
-	end
-	if B ~= nil then
-		local ru = plg.rules[base .. "0010"]
-		if B then mesecon.receptor_on(pos, ru) else mesecon.receptor_off(pos, ru) end
-	end
-	if C ~= nil then
-		local ru = plg.rules[base .. "0100"]
-		if C then mesecon.receptor_on(pos, ru) else mesecon.receptor_off(pos, ru) end
-	end
-	if D ~= nil then
-		local ru = plg.rules[base .. "1000"]
-		if D then mesecon.receptor_on(pos, ru) else mesecon.receptor_off(pos, ru) end
-	end
-end
-
-
-minetest.register_craft({
-	output = "mesecons_fpga:fpga0000 2",
-	recipe = {
-		{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable'},
-		{'mesecons_materials:silicon', 'mesecons_materials:silicon'},
-		{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable'},
-	}
-})

mesecons_fpga/logic.lua

@@ -1,210 +0,0 @@
-local lg = {}
-
--- (de)serialize
-lg.serialize = function(t)
-	local function _op(t)
-		if t == nil then
-			return " "
-		elseif t.type == "io" then
-			return t.port
-		else -- t.type == "reg"
-			return tostring(t.n)
-		end
-	end
-	local function _action(s)
-		if s == nil then
-			return " "
-		end
-		local mapping = {
-			["and"] = "&",
-			["or"] = "|",
-			["not"] = "~",
-			["xor"] = "^",
-			["nand"] = "?", --dunno
-			["buf"] = "_",
-			["xnor"] = "=",
-		}
-		return mapping[s]
-	end
-
-	local s = ""
-	for i = 1, 14 do
-		local cur = t[i]
-		if next(cur) ~= nil then
-			s = s .. _op(cur.op1) .. _action(cur.action) .. _op(cur.op2) .. _op(cur.dst)
-		end
-		s = s .. "/"
-	end
-	return s
-end
-
-lg.deserialize = function(s)
-	local function _op(c)
-		if c == "A" or c == "B" or c == "C" or c == "D" then
-			return {type = "io", port = c}
-		elseif c == " " then
-			return nil
-		else
-			return {type = "reg", n = tonumber(c)}
-		end
-	end
-	local function _action(c)
-		local mapping = {
-			["&"] = "and",
-			["|"] = "or",
-			["~"] = "not",
-			["^"] = "xor",
-			["?"] = "nand",
-			["_"] = "buf",
-			["="] = "xnor",
-			[" "] = nil,
-		}
-		return mapping[c]
-	end
-
-	local ret = {}
-	for part in s:gmatch("(.-)/") do
-		local parsed
-		if part == "" then
-			parsed = {}
-		else
-			parsed = {
-				action = _action( part:sub(2,2) ),
-				op1 = _op( part:sub(1,1) ),
-				op2 = _op( part:sub(3,3) ),
-				dst = _op( part:sub(4,4) ),
-			}
-		end
-		ret[#ret + 1] = parsed
-	end
-	-- More than 14 instructions (write to all 10 regs + 4 outputs)
-	-- will not pass the write-once requirement of the validator
-	assert(#ret == 14)
-	return ret
-end
-
--- validation
-lg.validate_single = function(t, i)
-	local function is_reg_written_to(t, n, max)
-		for i = 1, max-1 do
-			if next(t[i]) ~= nil
-					and t[i].dst and t[i].dst.type == "reg"
-					and t[i].dst.n == n then
-				return true
-			end
-		end
-		return false
-	end
-	local function compare_op(t1, t2, allow_same_io)
-		if t1 == nil or t2 == nil then
-			return false
-		elseif t1.type ~= t2.type then
-			return false
-		end
-		if t1.type == "reg" and t1.n == t2.n then
-			return true
-		elseif t1.type == "io" and t1.port == t2.port then
-			return not allow_same_io
-		end
-		return false
-	end
-	local elem = t[i]
-	-- check for completeness
-	if elem.action == nil then
-		return {i = i, msg = "Gate type required"}
-	elseif elem.action == "not" or elem.action == "buf" then
-		if elem.op1 ~= nil or elem.op2 == nil or elem.dst == nil then
-			return {i = i, msg = "Second operand (only) and destination required"}
-		end
-	else
-		if elem.op1 == nil or elem.op2 == nil or elem.dst == nil then
-			return {i = i, msg = "Operands and destination required"}
-		end
-	end
-	-- check whether operands/destination are identical
-	if compare_op(elem.op1, elem.op2) then
-		return {i = i, msg = "Operands cannot be identical"}
-	end
-	if compare_op(elem.op1, elem.dst, true) or compare_op(elem.op2, elem.dst, true) then
-		return {i = i, msg = "Destination and operands must be different"}
-	end
-	-- check whether operands point to defined registers
-	if elem.op1 ~= nil and elem.op1.type == "reg"
-			and not is_reg_written_to(t, elem.op1.n, i) then
-		return {i = i, msg = "First operand is undefined register"}
-	end
-	if elem.op2.type == "reg" and not is_reg_written_to(t, elem.op2.n, i) then
-		return {i = i, msg = "Second operand is undefined register"}
-	end
-	-- check whether destination points to undefined register
-	if elem.dst.type == "reg" and is_reg_written_to(t, elem.dst.n, i) then
-		return {i = i, msg = "Destination is already used register"}
-	end
-
-	return nil
-end
-
-lg.validate = function(t)
-	for i = 1, 14 do
-		if next(t[i]) ~= nil then
-			local r = lg.validate_single(t, i)
-			if r ~= nil then
-				return r
-			end
-		end
-	end
-	return nil
-end
-
--- interpreter
-lg.interpret = function(t, a, b, c, d)
-	local function _action(s, v1, v2)
-		if s == "and" then
-			return v1 and v2
-		elseif s == "or" then
-			return v1 or v2
-		elseif s == "not" then
-			return not v2
-		elseif s == "xor" then
-			return v1 ~= v2
-		elseif s == "nand" then
-			return not (v1 and v2)
-		elseif s == "buf" then
-			return v2
-		else -- s == "xnor"
-			return v1 == v2
-		end
-	end
-	local function _op(t, regs, io_in)
-		if t.type == "reg" then
-			return regs[t.n]
-		else -- t.type == "io"
-			return io_in[t.port]
-		end
-	end
-
-	local io_in = {A=a, B=b, C=c, D=d}
-	local regs = {}
-	local io_out = {}
-	for i = 1, 14 do
-		local cur = t[i]
-		if next(cur) ~= nil then
-			local v1, v2
-			if cur.op1 ~= nil then
-				v1 = _op(cur.op1, regs, io_in)
-			end
-			v2 = _op(cur.op2, regs, io_in)
-
-			local result = _action(cur.action, v1, v2)
-
-			if cur.dst.type == "reg" then
-				regs[cur.dst.n] = result
-			else -- cur.dst.type == "io"
-				io_out[cur.dst.port] = result
-			end
-		end
-	end
-	return io_out.A, io_out.B, io_out.C, io_out.D
-end
-
-return lg

mesecons_fpga/tool.lua

@@ -1,62 +0,0 @@
-return function(plg)
-
-
-minetest.register_tool("mesecons_fpga:programmer", {
-	description = "FPGA Programmer",
-	inventory_image = "jeija_fpga_programmer.png",
-	stack_max = 1,
-	on_place = function(itemstack, placer, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return itemstack
-		end
-
-		local pos = pointed_thing.under
-		if minetest.get_node(pos).name:find("mesecons_fpga:fpga") ~= 1 then
-			return itemstack
-		end
-
-		local meta = minetest.get_meta(pos)
-		if meta:get_string("instr") == "//////////////" then
-			minetest.chat_send_player(placer:get_player_name(), "This FPGA is unprogrammed.")
-			return itemstack
-		end
-		itemstack:set_metadata(meta:get_string("instr"))
-		minetest.chat_send_player(placer:get_player_name(), "FPGA gate configuration was successfully copied!")
-		
-		return itemstack
-	end,
-	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return itemstack
-		end
-
-		local pos = pointed_thing.under
-		if minetest.get_node(pos).name:find("mesecons_fpga:fpga") ~= 1 then
-			return itemstack
-		end
-
-		local imeta = itemstack:get_metadata()
-		if imeta == "" then
-			minetest.chat_send_player(user:get_player_name(), "Use shift+right-click to copy a gate configuration first.")
-			return itemstack
-		end
-
-		local meta = minetest.get_meta(pos)
-		meta:set_string("instr", imeta)
-		plg.update_formspec(pos, imeta)
-		minetest.chat_send_player(user:get_player_name(), "Gate configuration was successfully written to FPGA!")
-
-		return itemstack
-	end
-})
-
-minetest.register_craft({
-	output = "mesecons_fpga:programmer",
-	recipe = {
-		{'group:mesecon_conductor_craftable'},
-		{'mesecons_materials:silicon'},
-	}
-})
-
-
-end

mesecons_gates/doc/and/description.html

@@ -1 +0,0 @@
-And gates power their output if both inputs (from left and right) are powered.

mesecons_gates/doc/diode/description.html

@@ -1 +0,0 @@
-Mesecon diodes, just like real ones, only transfer power (signals) in one direction only.

mesecons_gates/doc/nand/description.html

@@ -1 +0,0 @@
-Nand gates do not power their output if both inputs (from left and right) are powered, but power it in every other case.

mesecons_gates/doc/nor/description.html

@@ -1 +0,0 @@
-Nor gates only power their output if none of their two inputs is powered. They are basically or gates with a not gate at their output.

mesecons_gates/doc/not/description.html

@@ -1 +0,0 @@
-Not gates invert signals, just like a mesecon torch does, but faster. The input is at the opposite side of the output.

mesecons_gates/doc/or/description.html

@@ -1 +0,0 @@
-Or gates power their output if either of their inputs (or both) are powered. You could basically get the same behaviour with two diodes, but or gates save some space.

mesecons_gates/doc/xor/description.html

@@ -1 +0,0 @@
-XOR gates power their output if only one input is powered, they're off if either both or none of the inputs is powered.

mesecons_gates/init.lua

@@ -1,134 +1,223 @@
-local nodebox = {
+function gate_rotate_rules(node)
-	type = "fixed",
-	fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }},
-}
-
-local function gate_rotate_rules(node, rules)
 	for rotations = 0, node.param2 - 1 do
-		rules = mesecon.rotate_rules_left(rules)
+		rules = mesecon:rotate_rules_left(rules)
 	end
 	return rules
 end
 
-local function gate_get_output_rules(node)
+function gate_get_output_rules(node)
-	return gate_rotate_rules(node, {{x=1, y=0, z=0}})
+	rules = {{x=1, y=0, z=0}}
+	return gate_rotate_rules(node)
 end
 
-local function gate_get_input_rules_oneinput(node)
+function gate_get_input_rules_oneinput(node)
-	return gate_rotate_rules(node, {{x=-1, y=0, z=0}})
+	rules = {{x=-1, y=0, z=0}, {x=1, y=0, z=0}}
+	return gate_rotate_rules(node)
 end
 
-local function gate_get_input_rules_twoinputs(node)
+function gate_get_input_rules_twoinputs(node)
-	return gate_rotate_rules(node, {{x=0, y=0, z=1, name="input1"},
+	rules = {
-		{x=0, y=0, z=-1, name="input2"}})
+	{x=0, y=0, z=1},
+	{x=0, y=0, z=-1},
+	{x=1, y=0, z=0}}
+	return gate_rotate_rules(node)
 end
 
-local function set_gate(pos, node, state)
+function update_gate(pos)
-	local gate = minetest.registered_nodes[node.name]
+	gate = get_gate(pos)
-
+	L = rotate_ports(
-	if mesecon.do_overheat(pos) then
+		yc_get_real_portstates(pos),
-		minetest.remove_node(pos)
+		minetest.get_node(pos).param2
-		mesecon.receptor_off(pos, gate_get_output_rules(node))
+	)
-		minetest.add_item(pos, gate.drop)
+	if gate == "diode" then
-	elseif state then
+		set_gate(pos, L.a)
-		minetest.swap_node(pos, {name = gate.onstate, param2=node.param2})
+	elseif gate == "not" then
-		mesecon.receptor_on(pos, gate_get_output_rules(node))
+		set_gate(pos, not L.a)
-	else
+	elseif gate == "nand" then
-		minetest.swap_node(pos, {name = gate.offstate, param2=node.param2})
+		set_gate(pos, not(L.b and L.d))
-		mesecon.receptor_off(pos, gate_get_output_rules(node))
+	elseif gate == "and" then
+		set_gate(pos, L.b and L.d)
+	elseif gate == "xor" then
+		set_gate(pos, (L.b and not L.d) or (not L.b and L.d))
 	end
 end
 
-local function update_gate(pos, node, link, newstate)
+function set_gate(pos, on)
-	local gate = minetest.registered_nodes[node.name]
+	gate = get_gate(pos)
+	local meta = minetest.get_meta(pos)
+	if on ~= gate_state(pos) then
+		yc_heat(meta)
+		--minetest.after(0.5, yc_cool, meta)
+		if yc_overheat(meta) then
+			pop_gate(pos)
+		else
+			local node = minetest.get_node(pos)
+			if on then
+				minetest.swap_node(pos, {name = "mesecons_gates:"..gate.."_on", param2=node.param2})
+				mesecon:receptor_on(pos,
+				gate_get_output_rules(node))
+			else
+				minetest.swap_node(pos, {name = "mesecons_gates:"..gate.."_off", param2=node.param2})
+				mesecon:receptor_off(pos,
+				gate_get_output_rules(node))
+			end
+		end
+	end
+end
 
+function get_gate(pos)
+	return minetest.registered_nodes[minetest.get_node(pos).name].mesecons_gate
+end
+
+function gate_state(pos)
+	name = minetest.get_node(pos).name
+	return string.find(name, "_on") ~= nil
+end
+
+function pop_gate(pos)
+	gate = get_gate(pos)
+	minetest.remove_node(pos)
+	minetest.after(0.2, yc_overheat_off, pos)
+	minetest.add_item(pos, "mesecons_gates:"..gate.."_off")
+end
+
+function rotate_ports(L, param2)
+	for rotations=0, param2-1 do
+		port = L.a
+		L.a = L.b
+		L.b = L.c
+		L.c = L.d
+		L.d = port
+	end
+	return L
+end
+
+gates = {
+{name = "diode", inputnumber = 1}, 
+{name = "not"  , inputnumber = 1}, 
+{name = "nand" , inputnumber = 2},
+{name = "and"  , inputnumber = 2},
+{name = "xor"  , inputnumber = 2}}
+
+local onoff, drop, nodename, description, groups
+for _, gate in ipairs(gates) do
 	if gate.inputnumber == 1 then
-		set_gate(pos, node, gate.assess(newstate == "on"))
+		get_rules = gate_get_input_rules_oneinput
 	elseif gate.inputnumber == 2 then
-		local meta = minetest.get_meta(pos)
+		get_rules = gate_get_input_rules_twoinputs
-		meta:set_int(link.name, newstate == "on" and 1 or 0)
+	end
+	for on = 0, 1 do
+		nodename = "mesecons_gates:"..gate.name
+		if on == 1 then
+			onoff = "on"
+			drop = nodename.."_off"
+			nodename = nodename.."_"..onoff
+			description = "You hacker you!"
+			groups = {dig_immediate=2, not_in_creative_inventory=1, overheat = 1}
+		else
+			onoff = "off"
+			drop = nil
+			nodename = nodename.."_"..onoff
+			description = gate.name.." Gate"
+			groups = {dig_immediate=2, overheat = 1}
+		end
 
-		local val1 = meta:get_int("input1") == 1
+		tiles = "jeija_microcontroller_bottom.png^"..
-		local val2 = meta:get_int("input2") == 1
+			"jeija_gate_"..onoff..".png^"..
-		set_gate(pos, node, gate.assess(val1, val2))
+			"jeija_gate_"..gate.name..".png"
+
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
+			},
+		}
+
+		local mesecon_state
+		if on == 1 then
+			mesecon_state = mesecon.state.on
+		else
+			mesecon_state = mesecon.state.off
+		end
+
+		minetest.register_node(nodename, {
+			description = description,
+			paramtype = "light",
+			paramtype2 = "facedir",
+			drawtype = "nodebox",
+			tiles = {tiles},
+			inventory_image = tiles,
+			selection_box = node_box,
+			node_box = node_box,
+			walkable = true,
+			on_construct = function(pos)
+				local meta = minetest.get_meta(pos)
+				meta:set_int("heat", 0)
+				update_gate(pos)
+			end,
+			groups = groups,
+			drop = drop,
+			sounds = default.node_sound_stone_defaults(),
+			mesecons_gate = gate.name,
+			mesecons =
+			{
+				receptor =
+				{
+					state = mesecon_state,
+					rules = gate_get_output_rules
+				},
+				effector =
+				{
+					rules = get_rules,
+					action_change = update_gate
+				}
+			}
+		})
 	end
 end
 
-local function register_gate(name, inputnumber, assess, recipe)
+minetest.register_craft({
-	local get_inputrules = inputnumber == 2 and gate_get_input_rules_twoinputs or
+	output = 'mesecons_gates:diode_off',
-		gate_get_input_rules_oneinput
+	recipe = {
-	local description = "Mesecons Logic Gate: "..name
+		{'', '', ''},
+		{'mesecons:mesecon', 'mesecons_torch:mesecon_torch_on', 'mesecons_torch:mesecon_torch_on'},
+		{'', '', ''},
+	},
+})
 
-	local basename = "mesecons_gates:"..name
+minetest.register_craft({
-	mesecon.register_node(basename, {
+	output = 'mesecons_gates:not_off',
-		description = description,
+	recipe = {
-		inventory_image = "jeija_gate_off.png^jeija_gate_"..name..".png",
+		{'', '', ''},
-		paramtype = "light",
+		{'mesecons:mesecon', 'mesecons_torch:mesecon_torch_on', 'mesecons:mesecon'},
-		paramtype2 = "facedir",
+		{'', '', ''},
-		drawtype = "nodebox",
+	},
-		drop = basename.."_off",
+})
-		selection_box = nodebox,
-		node_box = nodebox,
-		walkable = true,
-		sounds = default.node_sound_stone_defaults(),
-		assess = assess,
-		onstate = basename.."_on",
-		offstate = basename.."_off",
-		inputnumber = inputnumber
-	},{
-		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_off.png^"..
-			"jeija_gate_"..name..".png"},
-		groups = {dig_immediate = 2, overheat = 1},
-		mesecons = { receptor = {
-			state = "off",
-			rules = gate_get_output_rules
-		}, effector = {
-			rules = get_inputrules,
-			action_change = update_gate
-		}}
-	},{
-		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_on.png^"..
-			"jeija_gate_"..name..".png"},
-		groups = {dig_immediate = 2, not_in_creative_inventory = 1, overheat = 1},
-		mesecons = { receptor = {
-			state = "on",
-			rules = gate_get_output_rules
-		}, effector = {
-			rules = get_inputrules,
-			action_change = update_gate
-		}}
-	})
 
-	minetest.register_craft({output = basename.."_off", recipe = recipe})
+minetest.register_craft({
-end
+	output = 'mesecons_gates:and_off',
+	recipe = {
+		{'mesecons:mesecon', '', ''},
+		{'', 'mesecons_materials:silicon', 'mesecons:mesecon'},
+		{'mesecons:mesecon', '', ''},
+	},
+})
 
-register_gate("diode", 1, function (input) return input end,
+minetest.register_craft({
-	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons_torch:mesecon_torch_on"}})
+	output = 'mesecons_gates:nand_off',
+	recipe = {
+		{'mesecons:mesecon', '', ''},
+		{'', 'mesecons_materials:silicon', 'mesecons_torch:mesecon_torch_on'},
+		{'mesecons:mesecon', '', ''},
+	},
+})
 
-register_gate("not", 1, function (input) return not input end,
+minetest.register_craft({
-	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons:mesecon"}})
+	output = 'mesecons_gates:xor_off',
+	recipe = {
+		{'mesecons:mesecon', '', ''},
+		{'', 'mesecons_materials:silicon', 'mesecons_materials:silicon'},
+		{'mesecons:mesecon', '', ''},
+	},
+})
 
-register_gate("and", 2, function (val1, val2) return val1 and val2 end,
-	{{"mesecons:mesecon", "", ""},
-	 {"", "mesecons_materials:silicon", "mesecons:mesecon"},
-	 {"mesecons:mesecon", "", ""}})
-
-register_gate("nand", 2, function (val1, val2) return not (val1 and val2) end,
-	{{"mesecons:mesecon", "", ""},
-	 {"", "mesecons_materials:silicon", "mesecons_torch:mesecon_torch_on"},
-	 {"mesecons:mesecon", "", ""}})
-
-register_gate("xor", 2, function (val1, val2) return (val1 or val2) and not (val1 and val2) end,
-	{{"mesecons:mesecon", "", ""},
-	 {"", "mesecons_materials:silicon", "mesecons_materials:silicon"},
-	 {"mesecons:mesecon", "", ""}})
-
-register_gate("nor", 2, function (val1, val2) return not (val1 or val2) end,
-	{{"mesecons:mesecon", "", ""},
-	 {"", "mesecons:mesecon", "mesecons_torch:mesecon_torch_on"},
-	 {"mesecons:mesecon", "", ""}})
-
-register_gate("or", 2, function (val1, val2) return (val1 or val2) end,
-	{{"mesecons:mesecon", "", ""},
-	 {"", "mesecons:mesecon", "mesecons:mesecon"},
-	 {"mesecons:mesecon", "", ""}})