From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001
From: Maciej 'agaran' Pijanka <agaran@pld-linux.org>
Date: Thu, 16 Mar 2017 00:00:22 +0100
Subject: [PATCH] Do not run converters twice.
---
technic/machines/switching_station.lua | 124 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua
index 33dff2b..8ace874 100644
--- a/technic/machines/switching_station.lua
+++ b/technic/machines/switching_station.lua
@@ -32,15 +32,16 @@
-- This way the supplies are separated per network.
technic.networks = {}
+technic.cables = {}
local S = technic.getter
minetest.register_craft({
output = "technic:switching_station",
recipe = {
- {"", "technic:lv_transformer", ""},
- {"default:copper_ingot", "technic:machine_casing", "default:copper_ingot"},
- {"technic:lv_cable0", "technic:lv_cable0", "technic:lv_cable0"}
+ {"", "technic:lv_transformer", ""},
+ {"default:copper_ingot", "technic:machine_casing", "default:copper_ingot"},
+ {"technic:lv_cable", "technic:lv_cable", "technic:lv_cable"}
}
})
@@ -49,18 +50,18 @@
tiles = {"technic_water_mill_top_active.png", "technic_water_mill_top_active.png",
"technic_water_mill_top_active.png", "technic_water_mill_top_active.png",
"technic_water_mill_top_active.png", "technic_water_mill_top_active.png"},
- groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
+ groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_all_tiers=1},
+ connect_sides = {"bottom"},
sounds = default.node_sound_wood_defaults(),
- drawtype = "nodebox",
- paramtype = "light",
- node_box = {
- type = "fixed",
- fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
- },
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Switching Station"))
meta:set_string("active", 1)
+ end,
+ after_dig_node = function(pos)
+ minetest.forceload_free_block(pos)
+ pos.y = pos.y - 1
+ minetest.forceload_free_block(pos)
end,
})
@@ -69,7 +70,8 @@
--------------------------------------------------
-- Add a wire node to the LV/MV/HV network
-local add_new_cable_node = function(nodes, pos)
+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
@@ -82,37 +84,32 @@
return true
end
-local load_position = function(pos)
- if minetest.get_node_or_nil(pos) then return end
- local vm = VoxelManip()
- local MinEdge, MaxEdge = vm:read_from_map(pos, pos)
-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)
- load_position(pos)
+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)
+ 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)
+ add_new_cable_node(PR_nodes, pos, network_id)
elseif machines[name] == technic.receiver then
- add_new_cable_node(RE_nodes, pos)
+ add_new_cable_node(RE_nodes, pos, network_id)
elseif machines[name] == technic.producer_receiver then
- add_new_cable_node(PR_nodes, pos)
- add_new_cable_node(RE_nodes, pos)
+ 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) then
+ (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)
+ add_new_cable_node(SP_nodes, pos, network_id)
meta:set_int("active", 0)
- meta:set_string("active_pos", minetest.serialize(sw_pos))
elseif machines[name] == technic.battery then
- add_new_cable_node(BA_nodes, pos)
+ add_new_cable_node(BA_nodes, pos, network_id)
end
meta:set_int(tier.."_EU_timeout", 2) -- Touch node
@@ -120,7 +117,7 @@
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)
+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 positions = {
{x=pos.x+1, y=pos.y, z=pos.z},
@@ -131,7 +128,7 @@
{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)
+ check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id)
end
end
@@ -163,11 +160,11 @@
local all_nodes = {pos1}
repeat
traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes,
- i, technic.machines[tier], tier, sw_pos)
+ 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}
+ RE_nodes = RE_nodes, BA_nodes = BA_nodes, SP_nodes = SP_nodes, all_nodes = all_nodes}
return PR_nodes, BA_nodes, RE_nodes
end
@@ -176,6 +173,7 @@
-----------------------------------------------
minetest.register_abm({
nodenames = {"technic:switching_station"},
+ label = "Switching Station", -- allows the mtt profiler to profile this abm individually
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
@@ -192,48 +190,51 @@
local BA_nodes
local RE_nodes
local machine_name = S("Switching Station")
-
- if meta:get_int("active") ~= 1 then
- meta:set_int("active", 1)
- local active_pos = minetest.deserialize(meta:get_string("active_pos"))
- if active_pos then
- local meta1 = minetest.get_meta(active_pos)
- meta:set_string("infotext", S("%s (Slave)"):format(meta1:get_string("infotext")))
- end
- return
- end
-- Which kind of network are we on:
pos1 = {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)
+ meta:set_string("infotext",S("%s Already Present"):format(machine_name))
+ return
+ end
+
local name = minetest.get_node(pos1).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)
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)
return
end
-- Run all the nodes
- local function run_nodes(list)
+ local function run_nodes(list, run_stage)
for _, pos2 in ipairs(list) do
- load_position(pos2)
+ 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)
+ nodedef.technic_run(pos2, node2, run_stage)
end
end
end
- run_nodes(PR_nodes)
- run_nodes(RE_nodes)
- run_nodes(BA_nodes)
+ run_nodes(PR_nodes, technic.producer)
+ run_nodes(RE_nodes, technic.receiver)
+ run_nodes(BA_nodes, technic.battery)
-- Strings for the meta data
local eu_demand_str = tier.."_EU_demand"
@@ -297,8 +298,12 @@
--dprint("Total BA demand:"..BA_eu_demand)
meta:set_string("infotext",
- S("%s. Supply: %d Demand: %d"):format(
- machine_name, PR_eu_supply, RE_eu_demand))
+ S("@1. Supply: @2 Demand: @3",
+ machine_name, technic.pretty_num(PR_eu_supply), technic.pretty_num(RE_eu_demand)))
+
+ -- Data that will be used by the power monitor
+ 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
@@ -361,6 +366,7 @@
meta1 = minetest.get_meta(pos1)
meta1:set_int(eu_input_str, 0)
end
+
end,
})
@@ -383,6 +389,7 @@
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]
@@ -401,6 +408,23 @@
end,
})
+--Re-enable disabled switching station if necessary, similar to the timeout above
+minetest.register_abm({
+ nodenames = {"technic:switching_station"},
+ 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
+ if switching_station_timeout_count(pos, tier) then
+ local meta = minetest.get_meta(pos)
+ meta:set_int("active",1)
+ end
+ end,
+})
+
for tier, machines in pairs(technic.machines) do
-- SPECIAL will not be traversed
technic.register_machine(tier, "technic:switching_station", "SPECIAL")
--
Gitblit v1.8.0