Replace mesecon:<some_function> with mesecon.<some_function> for greater

flexibility and because it was never inteded to be OOP in the first
place.

mesecon.receptor_on and mesecon.receptor_off are provided by wrappers
(mesecon:receptor_on/off) for compatibility, but will be removed. Mod
programmers that use mesecons: Please update!

Also, fix microcontroller polluting the global namespace and remove some
deprecated stuff.

1 files changed, 18 insertions, 18 deletions

diff --git a/mesecons/services.lua b/mesecons/services.lua
index 0cf94d2..97043d3 100644
--- a/mesecons/services.lua
+++ b/mesecons/services.lua
@@ -4,44 +4,44 @@ mesecon.on_placenode = function (pos, node)
 	mesecon.update_autoconnect(pos, node)
 
 	-- Receptors: Send on signal when active
-	if mesecon:is_receptor_on(node.name) then
-		mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
+	if mesecon.is_receptor_on(node.name) then
+		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 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 = {x = pos.x - s.x, y = pos.y - s.y, z = pos.z - s.z}
-				mesecon:turnon(pos, rule)
+				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)})
+			--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
-		if mesecon:is_powered(pos) then
-			mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "on", 1)
-			mesecon:activate(pos, node, nil, 1)
+	if mesecon.is_effector(node.name) then
+		if mesecon.is_powered(pos) then
+			mesecon.changesignal(pos, node, mesecon.effector_get_rules(node), "on", 1)
+			mesecon.activate(pos, node, nil, 1)
 		else
-			mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "off", 1)
-			mesecon:deactivate(pos, node, nil, 1)
+			mesecon.changesignal(pos, node, mesecon.effector_get_rules(node), "off", 1)
+			mesecon.deactivate(pos, node, nil, 1)
 		end
 	end
 end
 
 mesecon.on_dignode = function (pos, node)
-	if mesecon:is_conductor_on(node) then
-		mesecon:receptor_off(pos, mesecon:conductor_get_rules(node))
-	elseif mesecon:is_receptor_on(node.name) then
-		mesecon:receptor_off(pos, mesecon:receptor_get_rules(node))
+	if mesecon.is_conductor_on(node) then
+		mesecon.receptor_off(pos, mesecon.conductor_get_rules(node))
+	elseif mesecon.is_receptor_on(node.name) then
+		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
 	end
 	mesecon.queue:add_action(pos, "update_autoconnect", {node})
 end