From 167ab93905a8206be2a5f4d9619c4b9f710bb211 Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Tue, 14 Jun 2022 20:49:21 +0200 Subject: [PATCH] Maintenance: Remove depends.txt and error on old MT versions --- technic/machines/switching_station.lua | 268 +++++++++++++++++++++++++++++------------------------ 1 files changed, 146 insertions(+), 122 deletions(-) diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua index 6f561e4..84d9a43 100644 --- a/technic/machines/switching_station.lua +++ b/technic/machines/switching_station.lua @@ -2,6 +2,7 @@ technic.networks = {} technic.cables = {} +technic.redundant_warn = {} local mesecons_path = minetest.get_modpath("mesecons") local digilines_path = minetest.get_modpath("digilines") @@ -44,11 +45,13 @@ meta:set_string("active", 1) meta:set_string("channel", "switching_station"..minetest.pos_to_string(pos)) meta:set_string("formspec", "field[channel;Channel;${channel}]") + technic.redundant_warn.poshash = nil end, after_dig_node = function(pos) minetest.forceload_free_block(pos) pos.y = pos.y - 1 minetest.forceload_free_block(pos) + technic.redundant_warn.poshash = nil end, on_receive_fields = function(pos, formname, fields, sender) if not fields.channel then @@ -86,57 +89,73 @@ -------------------------------------------------- -- Functions to traverse the electrical network -------------------------------------------------- +local function flatten(map) + local list = {} + for key, value in pairs(map) do + list[#list + 1] = value + end + return list +end -- Add a wire node to the LV/MV/HV network -local add_new_cable_node = function(nodes, pos, network_id) - technic.cables[minetest.hash_node_position(pos)] = network_id - -- Ignore if the node has already been added - for i = 1, #nodes do - if pos.x == nodes[i].x and - pos.y == nodes[i].y and - pos.z == nodes[i].z then - return false - end +-- Returns: indicator whether the cable is new in the network +local hash_node_position = minetest.hash_node_position +local function add_network_node(nodes, pos, network_id) + local node_id = hash_node_position(pos) + technic.cables[node_id] = network_id + if nodes[node_id] then + return false end - table.insert(nodes, {x=pos.x, y=pos.y, z=pos.z, visited=1}) + nodes[node_id] = pos return true end --- Generic function to add found connected nodes to the right classification array -local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, from_below, network_id) - technic.get_or_load_node(pos) - local meta = minetest.get_meta(pos) - local name = minetest.get_node(pos).name - - if technic.is_tier_cable(name, tier) then - add_new_cable_node(all_nodes, pos,network_id) - elseif machines[name] then - --dprint(name.." is a "..machines[name]) - meta:set_string(tier.."_network",minetest.pos_to_string(sw_pos)) - if machines[name] == technic.producer then - add_new_cable_node(PR_nodes, pos, network_id) - elseif machines[name] == technic.receiver then - add_new_cable_node(RE_nodes, pos, network_id) - elseif machines[name] == technic.producer_receiver then - add_new_cable_node(PR_nodes, pos, network_id) - add_new_cable_node(RE_nodes, pos, network_id) - elseif machines[name] == "SPECIAL" and - (pos.x ~= sw_pos.x or pos.y ~= sw_pos.y or pos.z ~= sw_pos.z) and - from_below then - -- Another switching station -> disable it - add_new_cable_node(SP_nodes, pos, network_id) - meta:set_int("active", 0) - elseif machines[name] == technic.battery then - add_new_cable_node(BA_nodes, pos, network_id) - end - - meta:set_int(tier.."_EU_timeout", 2) -- Touch node +local function add_cable_node(nodes, pos, network_id, queue) + if add_network_node(nodes, pos, network_id) then + queue[#queue + 1] = pos end end +-- Generic function to add found connected nodes to the right classification array +local check_node_subp = function(network, pos, machines, sw_pos, from_below, network_id, queue) + technic.get_or_load_node(pos) + local name = minetest.get_node(pos).name + + if technic.is_tier_cable(name, network.tier) then + add_cable_node(network.all_nodes, pos, network_id, queue) + return + end + + local eu_type = machines[name] + if not eu_type then + return + end + + --dprint(name.." is a "..machines[name]) + local meta = minetest.get_meta(pos) + meta:set_string(network.tier.."_network", minetest.pos_to_string(sw_pos)) + + if eu_type == technic.producer then + add_network_node(network.PR_nodes, pos, network_id) + elseif eu_type == technic.receiver then + add_network_node(network.RE_nodes, pos, network_id) + elseif eu_type == technic.producer_receiver then + add_network_node(network.PR_nodes, pos, network_id) + add_network_node(network.RE_nodes, pos, network_id) + elseif eu_type == technic.battery then + add_network_node(network.BA_nodes, pos, network_id) + elseif eu_type == "SPECIAL" and from_below and + not vector.equals(pos, sw_pos) then + -- Another switching station -> disable it + add_network_node(network.SP_nodes, pos, network_id) + meta:set_int("active", 0) + end + + meta:set_int(network.tier.."_EU_timeout", 2) -- Touch node +end + -- Traverse a network given a list of machines and a cable type name -local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, i, machines, tier, sw_pos, network_id) - local pos = all_nodes[i] +local traverse_network = function(network, pos, machines, sw_pos, network_id, queue) local positions = { {x=pos.x+1, y=pos.y, z=pos.z}, {x=pos.x-1, y=pos.y, z=pos.z}, @@ -144,9 +163,8 @@ {x=pos.x, y=pos.y-1, z=pos.z}, {x=pos.x, y=pos.y, z=pos.z+1}, {x=pos.x, y=pos.y, z=pos.z-1}} - --print("ON") for i, cur_pos in pairs(positions) do - check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id) + check_node_subp(network, cur_pos, machines, sw_pos, i == 3, network_id, queue) end end @@ -157,33 +175,51 @@ end end -local get_network = function(sw_pos, pos1, tier) - local cached = technic.networks[minetest.hash_node_position(pos1)] +local get_network = function(sw_pos, cable_pos, tier) + local network_id = minetest.hash_node_position(cable_pos) + local cached = technic.networks[network_id] if cached and cached.tier == tier then + -- Re-use cached system data touch_nodes(cached.PR_nodes, tier) touch_nodes(cached.BA_nodes, tier) touch_nodes(cached.RE_nodes, tier) for _, pos in ipairs(cached.SP_nodes) do + -- Disable all other switching stations (again) local meta = minetest.get_meta(pos) meta:set_int("active", 0) - meta:set_string("active_pos", minetest.serialize(sw_pos)) end return cached.PR_nodes, cached.BA_nodes, cached.RE_nodes end - local i = 1 - local PR_nodes = {} - local BA_nodes = {} - local RE_nodes = {} - local SP_nodes = {} - local all_nodes = {pos1} - repeat - traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, - i, technic.machines[tier], tier, sw_pos, minetest.hash_node_position(pos1)) - i = i + 1 - until all_nodes[i] == nil - technic.networks[minetest.hash_node_position(pos1)] = {tier = tier, PR_nodes = PR_nodes, - RE_nodes = RE_nodes, BA_nodes = BA_nodes, SP_nodes = SP_nodes, all_nodes = all_nodes} - return PR_nodes, BA_nodes, RE_nodes + + local machines = technic.machines[tier] + local network = { + tier = tier, + PR_nodes = {}, + BA_nodes = {}, + RE_nodes = {}, + SP_nodes = {}, + all_nodes = {} + } + -- Traverse the network step by step starting from the node underneath the switching station + local queue = {} + add_cable_node(network.all_nodes, cable_pos, network_id, queue) + while next(queue) do + local to_visit = {} + for _, pos in ipairs(queue) do + traverse_network(network, pos, machines, sw_pos, network_id, to_visit) + end + queue = to_visit + end + + -- Convert { [hash] = pos, ... } to { pos, ... } + network.PR_nodes = flatten(network.PR_nodes) + network.BA_nodes = flatten(network.BA_nodes) + network.RE_nodes = flatten(network.RE_nodes) + network.SP_nodes = flatten(network.SP_nodes) + network.all_nodes = flatten(network.all_nodes) + technic.networks[network_id] = network + + return network.PR_nodes, network.BA_nodes, network.RE_nodes end ----------------------------------------------- @@ -193,78 +229,73 @@ technic.powerctrl_state = true minetest.register_chatcommand("powerctrl", { - params = "state", + params = "[on/off]", description = "Enables or disables technic's switching station ABM", privs = { basic_privs = true }, func = function(name, state) - if state == "on" then - technic.powerctrl_state = true - else - technic.powerctrl_state = false - end + technic.powerctrl_state = (state:trim():lower() == "on") + minetest.chat_send_player(name, "Technic switching station: " .. + (technic.powerctrl_state and "on" or "off")) end }) +-- Run `technic_run` on all nodes in the power grid +local function run_nodes(list, run_stage) + for _, pos in ipairs(list) do + technic.get_or_load_node(pos) + local node = minetest.get_node_or_nil(pos) + if node and node.name then + local nodedef = minetest.registered_nodes[node.name] + if nodedef and nodedef.technic_run then + nodedef.technic_run(pos, node, run_stage) + end + end + end +end + minetest.register_abm({ nodenames = {"technic:switching_station"}, - label = "Switching Station", -- allows the mtt profiler to profile this abm individually + label = "Switching Station", -- name for the Minetest mod profiler interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) if not technic.powerctrl_state then return end - local meta = minetest.get_meta(pos) - local meta1 = nil - local pos1 = {} - local PR_EU = 0 -- EUs from PR nodes - local BA_PR_EU = 0 -- EUs from BA nodes (discharching) - local BA_RE_EU = 0 -- EUs to BA nodes (charging) - local RE_EU = 0 -- EUs to RE nodes - - local tier = "" - local PR_nodes - local BA_nodes - local RE_nodes + local meta = minetest.get_meta(pos) + local meta1 + local PR_nodes, BA_nodes, RE_nodes local machine_name = S("Switching Station") -- Which kind of network are we on: - pos1 = {x=pos.x, y=pos.y-1, z=pos.z} + local cable_pos = {x=pos.x, y=pos.y-1, z=pos.z} --Disable if necessary if meta:get_int("active") ~= 1 then minetest.forceload_free_block(pos) - minetest.forceload_free_block(pos1) + minetest.forceload_free_block(cable_pos) meta:set_string("infotext",S("%s Already Present"):format(machine_name)) + + local poshash = minetest.hash_node_position(pos) + + if not technic.redundant_warn[poshash] then + technic.redundant_warn[poshash] = true + print("[TECHNIC] Warning: redundant switching station found near "..minetest.pos_to_string(pos)) + end return end - local name = minetest.get_node(pos1).name + local name = minetest.get_node(cable_pos).name local tier = technic.get_cable_tier(name) if tier then -- Forceload switching station minetest.forceload_block(pos) - minetest.forceload_block(pos1) - PR_nodes, BA_nodes, RE_nodes = get_network(pos, pos1, tier) + minetest.forceload_block(cable_pos) + PR_nodes, BA_nodes, RE_nodes = get_network(pos, cable_pos, tier) else --dprint("Not connected to a network") meta:set_string("infotext", S("%s Has No Network"):format(machine_name)) minetest.forceload_free_block(pos) - minetest.forceload_free_block(pos1) + minetest.forceload_free_block(cable_pos) return - end - - -- Run all the nodes - local function run_nodes(list, run_stage) - for _, pos2 in ipairs(list) do - technic.get_or_load_node(pos2) - local node2 = minetest.get_node(pos2) - local nodedef - if node2 and node2.name then - nodedef = minetest.registered_nodes[node2.name] - end - if nodedef and nodedef.technic_run then - nodedef.technic_run(pos2, node2, run_stage) - end - end end run_nodes(PR_nodes, technic.producer) @@ -316,25 +347,19 @@ end --dprint("Total RE demand:"..RE_eu_demand) - -- Get all the power from the BA nodes - local BA_eu_supply = 0 + -- Batteries + local BA_eu_supply, BA_eu_demand = 0, 0 for _, pos1 in pairs(BA_nodes) do meta1 = minetest.get_meta(pos1) BA_eu_supply = BA_eu_supply + meta1:get_int(eu_supply_str) - end - --dprint("Total BA supply:"..BA_eu_supply) - - -- Get all the demand from the BA nodes - local BA_eu_demand = 0 - for _, pos1 in pairs(BA_nodes) do - meta1 = minetest.get_meta(pos1) BA_eu_demand = BA_eu_demand + meta1:get_int(eu_demand_str) end + --dprint("Total BA supply:"..BA_eu_supply) --dprint("Total BA demand:"..BA_eu_demand) - meta:set_string("infotext", - S("@1. Supply: @2 Demand: @3", - machine_name, technic.pretty_num(PR_eu_supply), technic.pretty_num(RE_eu_demand))) + meta:set_string("infotext", S("@1. Supply: @2 Demand: @3", + machine_name, technic.EU_string(PR_eu_supply), + technic.EU_string(RE_eu_demand))) -- If mesecon signal and power supply or demand changed then -- send them via digilines. @@ -350,8 +375,8 @@ end -- Data that will be used by the power monitor - meta:set_int("supply",PR_eu_supply) - meta:set_int("demand",RE_eu_demand) + meta:set_int("supply", PR_eu_supply) + meta:set_int("demand", RE_eu_demand) -- If the PR supply is enough for the RE demand supply them all if PR_eu_supply >= RE_eu_demand then @@ -438,19 +463,19 @@ interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) for tier, machines in pairs(technic.machines) do if machines[node.name] and switching_station_timeout_count(pos, tier) then local nodedef = minetest.registered_nodes[node.name] - if nodedef and nodedef.technic_disabled_machine_name then - node.name = nodedef.technic_disabled_machine_name - minetest.swap_node(pos, node) - elseif nodedef and nodedef.technic_on_disable then - nodedef.technic_on_disable(pos, node) - end if nodedef then local meta = minetest.get_meta(pos) meta:set_string("infotext", S("%s Has No Network"):format(nodedef.description)) + end + if nodedef and nodedef.technic_disabled_machine_name then + node.name = nodedef.technic_disabled_machine_name + minetest.swap_node(pos, node) + end + if nodedef and nodedef.technic_on_disable then + nodedef.technic_on_disable(pos, node) end end end @@ -464,7 +489,6 @@ interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) local pos1 = {x=pos.x,y=pos.y-1,z=pos.z} local tier = technic.get_cable_tier(minetest.get_node(pos1).name) if not tier then return end -- Gitblit v1.8.0