From 4775d98fb7e12f7210cf778351767828e551011d Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Thu, 20 Oct 2022 20:08:56 +0200 Subject: [PATCH] Unify and simplify LED/Lamp node definition --- technic/machines/supply_converter.lua | 136 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 119 insertions(+), 17 deletions(-) diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 15c761d..826c94f 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -7,11 +7,19 @@ -- Once the receiver side is powered it will deliver power to the other side. -- Unused power is wasted just like any other producer! +local digilines_path = minetest.get_modpath("digilines") + local S = technic.getter + +local cable_entry = "^technic_cable_connection_overlay.png" local function set_supply_converter_formspec(meta) local formspec = "size[5,2.25]".. "field[0.3,0.5;2,1;power;"..S("Input Power")..";"..meta:get_int("power").."]" + if digilines_path then + formspec = formspec.. + "field[2.3,0.5;3,1;channel;Digiline Channel;"..meta:get_string("channel").."]" + end -- The names for these toggle buttons are explicit about which -- state they'll switch to, so that multiple presses (arising -- from the ambiguity between lag and a missed press) only make @@ -34,13 +42,14 @@ local power = nil if fields.power then power = tonumber(fields.power) or 0 - power = 100 * math.floor(power / 100) power = math.max(power, 0) power = math.min(power, 10000) + power = 100 * math.floor(power / 100) if power == meta:get_int("power") then power = nil end end if power then meta:set_int("power", power) end - if fields.enable then meta:set_int("enabled", 1) end + if fields.channel then meta:set_string("channel", fields.channel) end + if fields.enable then meta:set_int("enabled", 1) end if fields.disable then meta:set_int("enabled", 0) end if fields.mesecon_mode_0 then meta:set_int("mesecon_mode", 0) end if fields.mesecon_mode_1 then meta:set_int("mesecon_mode", 1) end @@ -58,13 +67,72 @@ } } -local run = function(pos, node) - local remain = 0.9 + +local digiline_def = { + receptor = {action = function() end}, + effector = { + action = function(pos, node, channel, msg) + if type(msg) ~= "string" then + return + end + local meta = minetest.get_meta(pos) + if channel ~= meta:get_string("channel") then + return + end + msg = msg:lower() + if msg == "get" then + digilines.receptor_send(pos, digilines.rules.default, channel, { + enabled = meta:get_int("enabled"), + power = meta:get_int("power"), + mesecon_mode = meta:get_int("mesecon_mode") + }) + return + elseif msg == "off" then + meta:set_int("enabled", 0) + elseif msg == "on" then + meta:set_int("enabled", 1) + elseif msg == "toggle" then + local onn = meta:get_int("enabled") + onn = 1-onn -- Mirror onn with pivot 0.5, so switch between 1 and 0. + meta:set_int("enabled", onn) + elseif msg:sub(1, 5) == "power" then + local power = tonumber(msg:sub(7)) + if not power then + return + end + power = math.max(power, 0) + power = math.min(power, 10000) + power = 100 * math.floor(power / 100) + meta:set_int("power", power) + elseif msg:sub(1, 12) == "mesecon_mode" then + meta:set_int("mesecon_mode", tonumber(msg:sub(14))) + else + return + end + set_supply_converter_formspec(meta) + end + }, +} + +local run = function(pos, node, run_stage) + -- run only in producer stage. + if run_stage == technic.receiver then + return + end + + local efficiency = 0.9 -- Machine information local machine_name = S("Supply Converter") local meta = minetest.get_meta(pos) - local enabled = meta:get_int("enabled") ~= 0 and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0) - local demand = enabled and meta:get_int("power") or 10000 + local enabled = meta:get_string("enabled") + if enabled == "" then + -- Backwards compatibility + minetest.registered_nodes["technic:supply_converter"].on_construct(pos) + enabled = true + else + enabled = enabled == "1" + end + enabled = enabled and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0) local pos_up = {x=pos.x, y=pos.y+1, z=pos.z} local pos_down = {x=pos.x, y=pos.y-1, z=pos.z} @@ -75,12 +143,36 @@ local to = technic.get_cable_tier(name_down) if from and to then - local input = meta:get_int(from.."_EU_input") - meta:set_int(from.."_EU_demand", demand) - meta:set_int(from.."_EU_supply", 0) - meta:set_int(to.."_EU_demand", 0) - meta:set_int(to.."_EU_supply", input * remain) - meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name, technic.pretty_num(input), from, technic.pretty_num(input * remain), to)) + -- Get the "to" network switching station for EU demand calculation + local network_hash = technic.cables[minetest.hash_node_position(pos_down)] + local network = network_hash and minetest.get_position_from_hash(network_hash) + local sw_pos = network and {x=network.x,y=network.y+1,z=network.z} + local timeout = 0 + for tier in pairs(technic.machines) do + -- Supply converter must be connected to a network + timeout = math.max(meta:get_int(tier.."_EU_timeout"), timeout) + end + if timeout > 0 and sw_pos and minetest.get_node(sw_pos).name == "technic:switching_station" then + local sw_meta = minetest.get_meta(sw_pos) + local demand = 0 + if enabled then + -- Reverse evaluate the required machine and round to a nice number + demand = 100 * math.ceil((sw_meta:get_int("demand") / efficiency) / 100) + -- Do not draw more than the limit + demand = math.min(demand, meta:get_int("power")) + end + + local input = meta:get_int(from.."_EU_input") -- actual input + meta:set_int(from.."_EU_demand", demand) -- desired input + meta:set_int(from.."_EU_supply", 0) + meta:set_int(to.."_EU_demand", 0) + meta:set_int(to.."_EU_supply", input * efficiency) + meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name, + technic.EU_string(input), from, + technic.EU_string(input * efficiency), to)) + else + meta:set_string("infotext",S("%s Has No Network"):format(machine_name)) + end else meta:set_string("infotext", S("%s Has Bad Cabling"):format(machine_name)) if to then @@ -96,9 +188,14 @@ minetest.register_node("technic:supply_converter", { description = S("Supply Converter"), - tiles = {"technic_supply_converter_top.png", "technic_supply_converter_bottom.png", - "technic_supply_converter_side.png", "technic_supply_converter_side.png", - "technic_supply_converter_side.png", "technic_supply_converter_side.png"}, + tiles = { + "technic_supply_converter_tb.png"..cable_entry, + "technic_supply_converter_tb.png"..cable_entry, + "technic_supply_converter_side.png", + "technic_supply_converter_side.png", + "technic_supply_converter_side.png", + "technic_supply_converter_side.png" + }, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_all_tiers=1}, connect_sides = {"top", "bottom"}, @@ -107,6 +204,9 @@ on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Supply Converter")) + if digilines_path then + meta:set_string("channel", "supply_converter"..minetest.pos_to_string(pos)) + end meta:set_int("power", 10000) meta:set_int("enabled", 1) meta:set_int("mesecon_mode", 0) @@ -114,6 +214,7 @@ set_supply_converter_formspec(meta) end, mesecons = mesecons, + digiline = digiline_def, technic_run = run, technic_on_disable = run, }) @@ -121,10 +222,11 @@ minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, + {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) for tier, machines in pairs(technic.machines) do -- Gitblit v1.8.0