mirror of
https://github.com/mt-mods/pipeworks.git
synced 2024-11-08 08:23:59 +01:00
remove register_local_pipes.lua as node registration has been moved to more appropriate files
This commit is contained in:
parent
13383770ef
commit
396a4fdacd
8
init.lua
8
init.lua
@ -121,7 +121,9 @@ dofile(pipeworks.modpath.."/wielder.lua")
|
|||||||
|
|
||||||
local logicdir = "/new_flow_logic/"
|
local logicdir = "/new_flow_logic/"
|
||||||
|
|
||||||
-- note that even with these files the new flow logic is not yet default
|
-- note that even with these files the new flow logic is not yet default.
|
||||||
|
-- registration will take place but no actual ABMs/node logic will be installed,
|
||||||
|
-- unless pipeworks.enable_new_flow_logic has been set.
|
||||||
dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
|
dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
|
||||||
dofile(pipeworks.modpath..logicdir.."abms.lua")
|
dofile(pipeworks.modpath..logicdir.."abms.lua")
|
||||||
dofile(pipeworks.modpath..logicdir.."abm_register.lua")
|
dofile(pipeworks.modpath..logicdir.."abm_register.lua")
|
||||||
@ -130,10 +132,6 @@ dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua")
|
|||||||
if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
|
if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
|
||||||
if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
|
if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
|
||||||
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
|
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
|
||||||
-- individual enable flags also checked in register_local_pipes.lua
|
|
||||||
if pipeworks.enable_new_flow_logic then
|
|
||||||
dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua")
|
|
||||||
end
|
|
||||||
|
|
||||||
if pipeworks.enable_redefines then
|
if pipeworks.enable_redefines then
|
||||||
dofile(pipeworks.modpath.."/compat-chests.lua")
|
dofile(pipeworks.modpath.."/compat-chests.lua")
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
-- registration of pipework's own pipes.
|
|
||||||
-- written 2017 by thetaepsilon
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- global values and thresholds for water behaviour
|
|
||||||
-- TODO: add some way of setting this per-world
|
|
||||||
local thresholds = {}
|
|
||||||
-- limit on pump pressure - will not absorb more than can be taken
|
|
||||||
thresholds.pump_pressure = 2
|
|
||||||
-- activation threshold for spigot
|
|
||||||
-- should not be below 1, as spigot helper code indiscriminately places a water source node if run.
|
|
||||||
thresholds.spigot_min = 1
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local pipes_full_nodenames = pipeworks.pipes_full_nodenames
|
|
||||||
local pipes_empty_nodenames = pipeworks.pipes_empty_nodenames
|
|
||||||
|
|
||||||
local register = pipeworks.flowables.register
|
|
||||||
local flowlogic = pipeworks.flowlogic
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- FIXME: DRY principle for names, move this to devices.lua?
|
|
||||||
-- FIXME: all devices still considered simple
|
|
||||||
local pump_on = "pipeworks:pump_on"
|
|
||||||
local pump_off = "pipeworks:pump_off"
|
|
||||||
local spigot_off = "pipeworks:spigot"
|
|
||||||
local spigot_on = "pipeworks:spigot_pouring"
|
|
||||||
|
|
||||||
if pipeworks.enable_pipes then
|
|
||||||
--[[
|
|
||||||
for _, pipe in ipairs(pipes_full_nodenames) do
|
|
||||||
register.simple(pipe)
|
|
||||||
end
|
|
||||||
for _, pipe in ipairs(pipes_empty_nodenames) do
|
|
||||||
register.simple(pipe)
|
|
||||||
end
|
|
||||||
]]
|
|
||||||
|
|
||||||
if pipeworks.enable_pipe_devices then
|
|
||||||
--register.simple(pump_off)
|
|
||||||
--register.simple(pump_on)
|
|
||||||
--register.simple(spigot_on)
|
|
||||||
--register.simple(spigot_off)
|
|
||||||
|
|
||||||
--register.intake_simple(pump_on, thresholds.pump_pressure)
|
|
||||||
-- TODO: the code doesn't currently care if the spigot is the visually flowing node or not.
|
|
||||||
-- So some mechanism to register on/off states would be nice
|
|
||||||
--register.output(spigot_off, thresholds.spigot_min, flowlogic.helpers.output_spigot)
|
|
||||||
--register.output(spigot_on, thresholds.spigot_min, flowlogic.helpers.output_spigot)
|
|
||||||
end
|
|
||||||
end
|
|
@ -1,6 +1,2 @@
|
|||||||
-- Per-world configuration of pump thresholds
|
|
||||||
This should be relatively trivial to do, just a case of adding another property to the pipeworks global that can be set per-world with pipeworks_settings.txt.
|
|
||||||
This does not appear to be that big a deal right now, as the internal threshold can always be changed.
|
|
||||||
|
|
||||||
-- Internal code to the effect of "is_node_flowable()"
|
-- Internal code to the effect of "is_node_flowable()"
|
||||||
This is basically to implement valves - currently the flow logic will happily balance pipes with neighbour nodes that just happen to have the pressure property in their metadata.
|
This is basically to implement valves - currently the flow logic will happily balance pipes with neighbour nodes that just happen to have the pressure property in their metadata.
|
||||||
|
Loading…
Reference in New Issue
Block a user