From 4405552dc5e1d4f02d7061d617290b79a8bdc42d Mon Sep 17 00:00:00 2001 From: geoff Date: Sun, 8 Nov 2015 12:53:52 -0600 Subject: [PATCH 1/4] updated swap_node call to match mesecons --- mods/mesecons_wireless/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/mesecons_wireless/init.lua b/mods/mesecons_wireless/init.lua index f63cd36..41c9635 100644 --- a/mods/mesecons_wireless/init.lua +++ b/mods/mesecons_wireless/init.lua @@ -83,8 +83,8 @@ minetest.register_node("mesecons_wireless:emitter", { local channel = meta:get_string("channel") local w = get_wireless_receivers(channel) for _,i in ipairs(w) do - mesecon:receptor_on(i) - mesecon:swap_node(i, "mesecons_wireless:receiver_on") + mesecon.receptor_on(i) + minetest.swap_node(i, {name="mesecons_wireless:receiver_on"}) end end, action_off = function(pos) @@ -92,8 +92,8 @@ minetest.register_node("mesecons_wireless:emitter", { local channel = meta:get_string("channel") local w = get_wireless_receivers(channel) for _,i in ipairs(w) do - mesecon:receptor_off(i) - mesecon:swap_node(i, "mesecons_wireless:receiver") + mesecon.receptor_off(i) + minetest.swap_node(i, {name="mesecons_wireless:receiver"}) end end, } From bdd5abb029ff2cf9aed0a213d443f9503e14a542 Mon Sep 17 00:00:00 2001 From: geoff Date: Tue, 10 Nov 2015 18:40:59 -0600 Subject: [PATCH 2/4] updated mesecons refs to match swap_node changes --- mods/digilines_converters/init.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mods/digilines_converters/init.lua b/mods/digilines_converters/init.lua index 804d1ed..5a9e66a 100644 --- a/mods/digilines_converters/init.lua +++ b/mods/digilines_converters/init.lua @@ -1,6 +1,6 @@ local function rotate_rules(node, rules) for rotations = 1, node.param2 do - rules = mesecon:rotate_rules_left(rules) + rules = mesecon.rotate_rules_left(rules) end return rules end @@ -18,11 +18,11 @@ local on_digiline_receive = function (pos, node, channel, msg) local chan = minetest.get_meta(pos):get_string("channel") if channel == chan then if node.name == "digilines_converters:d2m_converter_off" and msg == "on" then - mesecon:swap_node(pos, "digilines_converters:d2m_converter_on") - mesecon:receptor_on(pos, rotate_rules(node, {{x=1,y=0,z=0}})) + minetest.swap_node(pos, {name="digilines_converters:d2m_converter_on"}) + mesecon.receptor_on(pos, rotate_rules(node, {{x=1,y=0,z=0}})) elseif node.name == "digilines_converters:d2m_converter_on" and msg == "off" then - mesecon:swap_node(pos, "digilines_converters:d2m_converter_off") - mesecon:receptor_off(pos, rotate_rules(node, {{x=1,y=0,z=0}})) + minetest.swap_node(pos, {name="digilines_converters:d2m_converter_off"}) + mesecon.receptor_off(pos, rotate_rules(node, {{x=1,y=0,z=0}})) end end end @@ -36,7 +36,7 @@ minetest.register_node("digilines_converters:d2m_converter_off", { sunlight_propagates = true, groups = {dig_immediate=2, mesecon=2}, node_box = converter_nbx, - digiline = + digiline = { effector = { rules = function(node) @@ -75,7 +75,7 @@ minetest.register_node("digilines_converters:d2m_converter_on", { sunlight_propagates = true, groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1}, node_box = converter_nbx, - digiline = + digiline = { effector = { rules = function(node) @@ -113,7 +113,7 @@ minetest.register_node("digilines_converters:m2d_converter_off", { sunlight_propagates = true, groups = {dig_immediate=2, mesecon=2}, node_box = converter_nbx, - digiline = + digiline = { receptor = { @@ -131,7 +131,7 @@ minetest.register_node("digilines_converters:m2d_converter_off", { action_on = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") digiline:receptor_send(pos, rotate_rules(node, {{x=-1,y=0,z=0}}), c, "on") - mesecon:swap_node(pos, "digilines_converters:m2d_converter_on") + minetest.swap_node(pos, {name="digilines_converters:m2d_converter_on"}) end, action_off = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") @@ -160,7 +160,7 @@ minetest.register_node("digilines_converters:m2d_converter_on", { drop = "digilines_converters:m2d_converter_off", groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1}, node_box = converter_nbx, - digiline = + digiline = { receptor = { @@ -182,7 +182,7 @@ minetest.register_node("digilines_converters:m2d_converter_on", { action_off = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") digiline:receptor_send(pos, rotate_rules(node, {{x=-1,y=0,z=0}}), c, "off") - mesecon:swap_node(pos, "digilines_converters:m2d_converter_off") + minetest.swap_node(pos, {name="digilines_converters:m2d_converter_off"}) end, }, }, From 8efcfd2759274a8a183ae4338ee89f77d9619170 Mon Sep 17 00:00:00 2001 From: geoff Date: Tue, 10 Nov 2015 19:03:18 -0600 Subject: [PATCH 3/4] fixed the resetting rotation from previous commit --- mods/digilines_converters/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/digilines_converters/init.lua b/mods/digilines_converters/init.lua index 5a9e66a..36acdd9 100644 --- a/mods/digilines_converters/init.lua +++ b/mods/digilines_converters/init.lua @@ -18,10 +18,10 @@ local on_digiline_receive = function (pos, node, channel, msg) local chan = minetest.get_meta(pos):get_string("channel") if channel == chan then if node.name == "digilines_converters:d2m_converter_off" and msg == "on" then - minetest.swap_node(pos, {name="digilines_converters:d2m_converter_on"}) + minetest.swap_node(pos, {name="digilines_converters:d2m_converter_on", param2 = node.param2}) mesecon.receptor_on(pos, rotate_rules(node, {{x=1,y=0,z=0}})) elseif node.name == "digilines_converters:d2m_converter_on" and msg == "off" then - minetest.swap_node(pos, {name="digilines_converters:d2m_converter_off"}) + minetest.swap_node(pos, {name="digilines_converters:d2m_converter_off", param2 = node.param2}) mesecon.receptor_off(pos, rotate_rules(node, {{x=1,y=0,z=0}})) end end From 1f37e75746ae7e87e523120f14b74f8770ecd3da Mon Sep 17 00:00:00 2001 From: geoff Date: Tue, 10 Nov 2015 19:41:21 -0600 Subject: [PATCH 4/4] missed callback occurrences --- mods/digilines_converters/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/digilines_converters/init.lua b/mods/digilines_converters/init.lua index 36acdd9..6286a7d 100644 --- a/mods/digilines_converters/init.lua +++ b/mods/digilines_converters/init.lua @@ -131,7 +131,7 @@ minetest.register_node("digilines_converters:m2d_converter_off", { action_on = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") digiline:receptor_send(pos, rotate_rules(node, {{x=-1,y=0,z=0}}), c, "on") - minetest.swap_node(pos, {name="digilines_converters:m2d_converter_on"}) + minetest.swap_node(pos, {name="digilines_converters:m2d_converter_on", param2 = node.param2}) end, action_off = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") @@ -182,7 +182,7 @@ minetest.register_node("digilines_converters:m2d_converter_on", { action_off = function(pos, node) local c = minetest.get_meta(pos):get_string("channel") digiline:receptor_send(pos, rotate_rules(node, {{x=-1,y=0,z=0}}), c, "off") - minetest.swap_node(pos, {name="digilines_converters:m2d_converter_off"}) + minetest.swap_node(pos, {name="digilines_converters:m2d_converter_off", param2 = node.param2}) end, }, },