From 15a95bbf381dd16639278d310add09328909895d Mon Sep 17 00:00:00 2001 From: DS-Minetest Date: Wed, 18 Sep 2019 01:13:20 +0200 Subject: [PATCH 1/5] add static middle vertical wire --- mesecons_extrawires/mod.conf | 2 +- mesecons_extrawires/vertical.lua | 187 ++++++++++++++++++++++++------- 2 files changed, 148 insertions(+), 41 deletions(-) diff --git a/mesecons_extrawires/mod.conf b/mesecons_extrawires/mod.conf index 5632d87..1e4d675 100644 --- a/mesecons_extrawires/mod.conf +++ b/mesecons_extrawires/mod.conf @@ -1,3 +1,3 @@ name = mesecons_extrawires -depends = default, mesecons +depends = default, mesecons, mesecons_insulated optional_depends = screwdriver diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index 1543194..a078040 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -38,38 +38,82 @@ local bottom_rules = { {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] - and minetest.registered_nodes[node.name].is_vertical_conductor then - local node_above = minetest.get_node(vector.add(pos, vertical_rules[1])) - local node_below = minetest.get_node(vector.add(pos, vertical_rules[2])) - - local above = minetest.registered_nodes[node_above.name] - 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 - - 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" - elseif above and not below then -- above only: bottom - newname = newname .. "bottom_off" - elseif not above and below then -- below only: top - newname = newname .. "top_off" - else -- no vertical wire above, no vertical wire below: use bottom - newname = newname .. "bottom_off" - end - - minetest.set_node(pos, {name = newname}) - mesecon.on_placenode(pos, {name = newname}) +local static_middle_rules_unrotated_normal = { + {x=1, y=0, z=0}, + {x=-1, y=0, z=0}, + {x=0, y=0, z=1}, + {x=0, y=0, z=-1}, + {x=0, y=1, z=0}, + {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above + {x=0, y=-1, z=0}, +} +local static_middle_rules_unrotated_minimum = { + {x=0, y=1, z=0}, + {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above + {x=0, y=-1, z=0}, +} +local function static_middle_rules(node) + if node.param2 == 1 then + return static_middle_rules_unrotated_normal + end + -- rotate static_middle_rules_unrotated_minimum + local r = mesecon.rotate_rules_up(static_middle_rules_unrotated_minimum) + if node.param2 == 0 then -- upside down + return mesecon.rotate_rules_up(r) + elseif node.param2 == 2 then + return mesecon.rotate_rules_left(mesecon.rotate_rules_left(r)) + elseif node.param2 == 3 then + return r + elseif node.param2 == 4 then + return mesecon.rotate_rules_left(r) + else + return mesecon.rotate_rules_right(r) end end -local vertical_update = function (pos, node) +local function is_dynamic_vertical_wire(node) + local nodedef = minetest.registered_nodes[node.name] + return nodedef and nodedef.is_vertical_conductor +end + +local function is_vertical_conductor(node) + if node.name ~= "mesecons_extrawires:vertical_static_middle_off" and + node.name ~= "mesecons_extrawires:vertical_static_middle_on" then + return is_dynamic_vertical_wire(node) + end + return node.param2 == 1 or node.param2 == 0 +end + +local function vertical_updatepos(pos) + local node = minetest.get_node(pos) + if not is_dynamic_vertical_wire(node) then + return + end + local node_above = minetest.get_node(vector.add(pos, vertical_rules[1])) + local node_below = minetest.get_node(vector.add(pos, vertical_rules[2])) + + local above = is_vertical_conductor(node_above) + local below = is_vertical_conductor(node_below) + + 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" + elseif above and not below then -- above only: bottom + newname = newname .. "bottom_off" + elseif not above and below then -- below only: top + newname = newname .. "top_off" + else -- no vertical wire above, no vertical wire below: use bottom + newname = newname .. "bottom_off" + end + + minetest.set_node(pos, {name = newname}) + mesecon.on_placenode(pos, {name = newname}) +end + +local function vertical_update(pos) vertical_updatepos(pos) -- this one vertical_updatepos(vector.add(pos, vertical_rules[1])) -- above vertical_updatepos(vector.add(pos, vertical_rules[2])) -- below @@ -90,17 +134,17 @@ mesecon.register_node("mesecons_extrawires:vertical", { after_place_node = vertical_update, after_dig_node = vertical_update, sounds = default.node_sound_defaults(), -},{ +}, { tiles = {"mesecons_wire_off.png"}, - groups = {dig_immediate=3}, + 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}, + groups = {dig_immediate = 3, not_in_creative_inventory = 1}, mesecons = {conductor = { state = mesecon.state.on, offstate = "mesecons_extrawires:vertical_off", @@ -116,7 +160,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", { paramtype = "light", is_ground_content = false, sunlight_propagates = true, - groups = {dig_immediate=3, not_in_creative_inventory=1}, + groups = {dig_immediate = 3, not_in_creative_inventory = 1}, selection_box = top_box, node_box = top_box, is_vertical_conductor = true, @@ -124,14 +168,14 @@ mesecon.register_node("mesecons_extrawires:vertical_top", { after_place_node = vertical_update, after_dig_node = vertical_update, sounds = default.node_sound_defaults(), -},{ +}, { 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, @@ -156,15 +200,17 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", { after_place_node = vertical_update, after_dig_node = vertical_update, sounds = default.node_sound_defaults(), -},{ - tiles = {"mesecons_wire_off.png"}, +}, { + tiles = {"mesecons_wire_off.png", "jeija_insulated_wire_sides_off.png", + "mesecons_wire_off.png"}, mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_extrawires:vertical_bottom_on", rules = bottom_rules, }} -},{ - tiles = {"mesecons_wire_on.png"}, +}, { + tiles = {"mesecons_wire_on.png", "jeija_insulated_wire_sides_on.png", + "mesecons_wire_on.png"}, mesecons = {conductor = { state = mesecon.state.on, offstate = "mesecons_extrawires:vertical_bottom_off", @@ -172,6 +218,53 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", { }} }) +-- Static vertical wire middle +mesecon.register_node("mesecons_extrawires:vertical_static_middle", { + description = "Static middle vertical mesecon", + drawtype = "nodebox", + walkable = false, + paramtype = "light", + paramtype2 = "wallmounted", -- yes, rotatable + place_param2 = 1, -- but no automatic rotation + node_placement_prediction = "", -- also no client-side automatic rotation + is_ground_content = false, + sunlight_propagates = true, + selection_box = bottom_box, + node_box = bottom_box, + after_place_node = vertical_update, + after_dig_node = vertical_update, + sounds = default.node_sound_defaults(), + on_rotate = minetest.global_exists("screwdriver") and function(pos, node, _, mode, _) + if mode == screwdriver.ROTATE_FACE then -- left click + node.param2 = node.param2 + 1 + else -- right click + node.param2 = node.param2 - 1 + end + node.param2 = node.param2 % 6 + minetest.swap_node(pos, node) + vertical_update(pos) + return true + end, +}, { + groups = {dig_immediate = 3}, + tiles = {"mesecons_wire_off.png"}, + mesecons = {conductor = { + state = mesecon.state.off, + onstate = "mesecons_extrawires:vertical_static_middle_on", + rules = static_middle_rules, + }} +}, { + groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + tiles = {"mesecons_wire_on.png"}, + mesecons = {conductor = { + state = mesecon.state.on, + offstate = "mesecons_extrawires:vertical_static_middle_off", + rules = static_middle_rules, + }} +}) + + +-- crafting minetest.register_craft({ output = "mesecons_extrawires:vertical_off 3", recipe = { @@ -185,3 +278,17 @@ minetest.register_craft({ output = "mesecons:wire_00000000_off", recipe = {{"mesecons_extrawires:vertical_off"}} }) + +minetest.register_craft({ + output = "mesecons_extrawires:vertical_static_middle_off 5", + recipe = { + {"", "mesecons_extrawires:vertical_off", ""}, + {"", "mesecons_extrawires:vertical_off", ""}, + {"mesecons_extrawires:vertical_off", "mesecons_extrawires:vertical_off", "mesecons_extrawires:vertical_off"} + } +}) + +minetest.register_craft({ + output = "mesecons_extrawires:vertical_off", + recipe = {{"mesecons_extrawires:vertical_static_middle_off"}} +}) From 2cdf3fc79b5529f00c2402c902b5ed74bd685bbd Mon Sep 17 00:00:00 2001 From: DS-Minetest Date: Wed, 18 Sep 2019 15:46:49 +0200 Subject: [PATCH 2/5] rotate rules on mod load --- mesecons_extrawires/vertical.lua | 62 +++++++++++++++----------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index a078040..064616f 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -38,37 +38,33 @@ local bottom_rules = { {x=0, y=2, z=0} -- receive power from pressure plate / detector / ... 2 nodes above } -local static_middle_rules_unrotated_normal = { - {x=1, y=0, z=0}, - {x=-1, y=0, z=0}, - {x=0, y=0, z=1}, - {x=0, y=0, z=-1}, - {x=0, y=1, z=0}, - {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above - {x=0, y=-1, z=0}, -} -local static_middle_rules_unrotated_minimum = { - {x=0, y=1, z=0}, - {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above - {x=0, y=-1, z=0}, -} -local function static_middle_rules(node) - if node.param2 == 1 then - return static_middle_rules_unrotated_normal - end - -- rotate static_middle_rules_unrotated_minimum - local r = mesecon.rotate_rules_up(static_middle_rules_unrotated_minimum) - if node.param2 == 0 then -- upside down - return mesecon.rotate_rules_up(r) - elseif node.param2 == 2 then - return mesecon.rotate_rules_left(mesecon.rotate_rules_left(r)) - elseif node.param2 == 3 then - return r - elseif node.param2 == 4 then - return mesecon.rotate_rules_left(r) - else - return mesecon.rotate_rules_right(r) - end +local static_middle_rules = {} +do + -- not rotated, plate can connect to normal wire + static_middle_rules[1] = { + {x=1, y=0, z=0}, + {x=-1, y=0, z=0}, + {x=0, y=0, z=1}, + {x=0, y=0, z=-1}, + {x=0, y=1, z=0}, + {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above + {x=0, y=-1, z=0}, + } + + -- otherwise rotate these rules + local r = mesecon.rotate_rules_up({ + {x=0, y=1, z=0}, + {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above + {x=0, y=-1, z=0}, + }) + static_middle_rules[0] = mesecon.rotate_rules_up(r) + static_middle_rules[2] = mesecon.rotate_rules_left(mesecon.rotate_rules_left(r)) + static_middle_rules[3] = r + static_middle_rules[4] = mesecon.rotate_rules_left(r) + static_middle_rules[5] = mesecon.rotate_rules_right(r) +end +local function static_middle_rules_get(node) + return static_middle_rules[node.param2] or {} end local function is_dynamic_vertical_wire(node) @@ -251,7 +247,7 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_extrawires:vertical_static_middle_on", - rules = static_middle_rules, + rules = static_middle_rules_get, }} }, { groups = {dig_immediate = 3, not_in_creative_inventory = 1}, @@ -259,7 +255,7 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { mesecons = {conductor = { state = mesecon.state.on, offstate = "mesecons_extrawires:vertical_static_middle_off", - rules = static_middle_rules, + rules = static_middle_rules_get, }} }) From 3eca5fc2f834cbd56c9552d3a4b1c616a90f9877 Mon Sep 17 00:00:00 2001 From: DS-Minetest Date: Wed, 18 Sep 2019 15:51:08 +0200 Subject: [PATCH 3/5] update with on_placenode on rotate --- mesecons_extrawires/vertical.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index 064616f..5f8d2fc 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -239,6 +239,7 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { node.param2 = node.param2 % 6 minetest.swap_node(pos, node) vertical_update(pos) + mesecon.on_placenode(pos, node) return true end, }, { From 57eb72dd4d88eaf20af54786546bc2bf0bd1660b Mon Sep 17 00:00:00 2001 From: DS-Minetest Date: Wed, 18 Sep 2019 16:07:24 +0200 Subject: [PATCH 4/5] better nodebox -> unrotated = param2==0 --- mesecons_extrawires/vertical.lua | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index 5f8d2fc..30f352e 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -16,6 +16,15 @@ local bottom_box = { } } + -- like bottom_box, but mirrored iny y-direction because of wallmounted +local static_middle_box = { + type = "fixed", + fixed = { + {-8/16, 7/16, -8/16, 8/16, 8/16, 8/16}, + {-1/16, -8/16, -1/16, 1/16, 7/16, 1/16}, + } +} + local vertical_rules = { {x=0, y=1, z=0}, {x=0, y=-1, z=0} @@ -41,7 +50,7 @@ local bottom_rules = { local static_middle_rules = {} do -- not rotated, plate can connect to normal wire - static_middle_rules[1] = { + static_middle_rules[0] = { {x=1, y=0, z=0}, {x=-1, y=0, z=0}, {x=0, y=0, z=1}, @@ -57,11 +66,11 @@ do {x=0, y=2, z=0}, -- receive power from pressure plate / detector / ... 2 nodes above {x=0, y=-1, z=0}, }) - static_middle_rules[0] = mesecon.rotate_rules_up(r) - static_middle_rules[2] = mesecon.rotate_rules_left(mesecon.rotate_rules_left(r)) - static_middle_rules[3] = r - static_middle_rules[4] = mesecon.rotate_rules_left(r) - static_middle_rules[5] = mesecon.rotate_rules_right(r) + static_middle_rules[1] = mesecon.rotate_rules_up(r) + static_middle_rules[2] = r + static_middle_rules[3] = mesecon.rotate_rules_left(mesecon.rotate_rules_left(r)) + static_middle_rules[4] = mesecon.rotate_rules_right(r) + static_middle_rules[5] = mesecon.rotate_rules_left(r) end local function static_middle_rules_get(node) return static_middle_rules[node.param2] or {} @@ -77,7 +86,7 @@ local function is_vertical_conductor(node) node.name ~= "mesecons_extrawires:vertical_static_middle_on" then return is_dynamic_vertical_wire(node) end - return node.param2 == 1 or node.param2 == 0 + return node.param2 == 0 or node.param2 == 1 end local function vertical_updatepos(pos) @@ -221,12 +230,12 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { walkable = false, paramtype = "light", paramtype2 = "wallmounted", -- yes, rotatable - place_param2 = 1, -- but no automatic rotation + place_param2 = 0, -- but no automatic rotation node_placement_prediction = "", -- also no client-side automatic rotation is_ground_content = false, sunlight_propagates = true, - selection_box = bottom_box, - node_box = bottom_box, + selection_box = static_middle_box, + node_box = static_middle_box, after_place_node = vertical_update, after_dig_node = vertical_update, sounds = default.node_sound_defaults(), From 5ab1d87d874ceba270fef442b5452fa72f96b583 Mon Sep 17 00:00:00 2001 From: Desour Date: Sun, 28 Jun 2020 14:47:01 +0200 Subject: [PATCH 5/5] Do not allow rotation of active wire --- mesecons_extrawires/vertical.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index 30f352e..0f3aaca 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -239,6 +239,10 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { after_place_node = vertical_update, after_dig_node = vertical_update, sounds = default.node_sound_defaults(), + on_rotate = false, +}, { + groups = {dig_immediate = 3}, + tiles = {"mesecons_wire_off.png"}, on_rotate = minetest.global_exists("screwdriver") and function(pos, node, _, mode, _) if mode == screwdriver.ROTATE_FACE then -- left click node.param2 = node.param2 + 1 @@ -251,9 +255,6 @@ mesecon.register_node("mesecons_extrawires:vertical_static_middle", { mesecon.on_placenode(pos, node) return true end, -}, { - groups = {dig_immediate = 3}, - tiles = {"mesecons_wire_off.png"}, mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_extrawires:vertical_static_middle_on",