Merge branch 'mesecons_in_nodedef'

Conflicts:
	mesecons/internal.lua

1 files changed, 50 insertions, 67 deletions

diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index dd8819d..282e305 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -1,7 +1,19 @@
 -- WALL BUTTON
+-- A button that when pressed emits power for 1 second
+-- and then turns off again
+
+mesecon.button_turnoff = function (pos)
+	local node = minetest.env:get_node(pos)
+	if node.name=="mesecons_button:button_on" then --has not been dug
+		mesecon:swap_node(pos, "mesecons_button:button_off")
+		local rules = mesecon.rules.buttonlike_get(node)
+		mesecon:receptor_off(pos, rules)
+	end
+end
+
 minetest.register_node("mesecons_button:button_off", {
-    drawtype = "nodebox",
-    tiles = {
+	drawtype = "nodebox",
+	tiles = {
 	"jeija_wall_button_sides.png",	
 	"jeija_wall_button_sides.png",
 	"jeija_wall_button_sides.png",
@@ -9,25 +21,35 @@ minetest.register_node("mesecons_button:button_off", {
 	"jeija_wall_button_sides.png",
 	"jeija_wall_button_off.png"
 	},
-    paramtype = "light",
-    paramtype2 = "facedir",
-    legacy_wallmounted = true,
-    walkable = false,
-    sunlight_propagates = true,
-    selection_box = {
-        type = "fixed",
-	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
-    },
-    node_box = {
-        type = "fixed",	
-	fixed = {
+	paramtype = "light",
+	paramtype2 = "facedir",
+	legacy_wallmounted = true,
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+	type = "fixed",
+		fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
+	},
+	node_box = {
+		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
 	}
-    },
-    groups = {dig_immediate=2, mesecon = 3, mesecon_needs_receiver = 1},
-    description = "Button",
+	},
+	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
+	description = "Button",
+	on_punch = function (pos, node)
+		mesecon:swap_node(pos, "mesecons_button:button_on")
+      	 	mesecon:receptor_on(pos, mesecon.rules.buttonlike_get(node))
+		minetest.after(1, mesecon.button_turnoff, pos)
+	end,
+	mesecons = {receptor = {
+		state = mesecon.state.off,
+		rules = mesecon.rules.buttonlike_get
+	}}
 })
+
 minetest.register_node("mesecons_button:button_on", {
 	drawtype = "nodebox",
 	tiles = {
@@ -44,68 +66,29 @@ minetest.register_node("mesecons_button:button_on", {
 	walkable = false,
 	light_source = LIGHT_MAX-7,
 	sunlight_propagates = true,
-    selection_box = {
-        type = "fixed",
-	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
-    },
-    node_box = {
-        type = "fixed",
+	selection_box = {
+		type = "fixed",
+		fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
+	},
+	node_box = {
+	type = "fixed",
 	fixed = {
 		{ -6/16, -6/16,  6/16, 6/16, 6/16, 8/16 },
 		{ -4/16, -2/16, 11/32, 4/16, 2/16, 6/16 }
 	}
     },
-	groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon = 3, mesecon_needs_receiver = 1},
+	groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
 	drop = 'mesecons_button:button_off',
 	description = "Button",
+	mesecons = {receptor = {
+		state = mesecon.state.on,
+		rules = mesecon.rules.buttonlike_get
+	}}
 })
 
-minetest.register_on_punchnode(function(pos, node, puncher)
-	if node.name == "mesecons_button:button_off" then
-		minetest.env:add_node(pos, {name="mesecons_button:button_on",param2=node.param2})
-		local rules=mesecon.button_get_rules(node.param2)
-        	mesecon:receptor_on(pos, rules)
-		minetest.after(1, mesecon.button_turnoff, {pos=pos, param2=node.param2})
-	end
-end)
-
-mesecon.button_turnoff = function (params)
-	if minetest.env:get_node(params.pos).name=="mesecons_button:button_on" then
-		minetest.env:add_node(params.pos, {name="mesecons_button:button_off", param2=params.param2})
-		local rules=mesecon.button_get_rules(params.param2)
-		mesecon:receptor_off(params.pos, rules)
-	end
-end
-
-mesecon.button_get_rules = function(param2)
-	local rules=mesecon:get_rules("button")
-	if param2 == 2 then
-		rules=mesecon:rotate_rules_left(rules)
-	end
-	if param2 == 3 then
-		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
-	end
-	if param2 == 0 then
-		rules=mesecon:rotate_rules_right(rules)
-	end
-	return rules
-end
-
 minetest.register_craft({
 	output = '"mesecons_button:button_off" 2',
 	recipe = {
 		{'"group:mesecon_conductor_craftable"','"default:stone"'},
 	}
 })
-
-mesecon:add_rules("button", {
-{x = 1,  y = 0, z = 0},
-{x = 1,  y = 1, z = 0},
-{x = 1,  y =-1, z = 0},
-{x = 1,  y =-1, z = 1},
-{x = 1,  y =-1, z =-1},
-{x = 2,  y = 0, z = 0},})
-
-mesecon:add_receptor_node_off("mesecons_button:button_off", nil, mesecon.button_get_rules)
-mesecon:add_receptor_node("mesecons_button:button_on", nil, mesecon.button_get_rules)
-