summaryrefslogtreecommitdiff
path: root/new_flow_logic
diff options
context:
space:
mode:
authorthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-10-01 16:54:24 +0100
committerthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-10-01 16:54:24 +0100
commit0fb0eab7235db267aece1cecee7c1d6a1a5b42a1 (patch)
tree3332a2a7a0649b11302c36451ba3ee1cc3a36d78 /new_flow_logic
parentf3cd1b61d771824ed9f42b32caa95ae08538bb64 (diff)
downloadpipeworks-0fb0eab7235db267aece1cecee7c1d6a1a5b42a1.tar
pipeworks-0fb0eab7235db267aece1cecee7c1d6a1a5b42a1.tar.gz
pipeworks-0fb0eab7235db267aece1cecee7c1d6a1a5b42a1.tar.bz2
pipeworks-0fb0eab7235db267aece1cecee7c1d6a1a5b42a1.tar.xz
pipeworks-0fb0eab7235db267aece1cecee7c1d6a1a5b42a1.zip
move pipe node registration for new flow logic closer to their definition in pipes.lua
Diffstat (limited to 'new_flow_logic')
-rw-r--r--new_flow_logic/flowable_node_registry_install.lua4
-rw-r--r--new_flow_logic/register_local_pipes.lua2
2 files changed, 4 insertions, 2 deletions
diff --git a/new_flow_logic/flowable_node_registry_install.lua b/new_flow_logic/flowable_node_registry_install.lua
index f83f8ad..ac305dc 100644
--- a/new_flow_logic/flowable_node_registry_install.lua
+++ b/new_flow_logic/flowable_node_registry_install.lua
@@ -24,8 +24,8 @@ end
local regwarning = function(kind, nodename)
local tail = ""
- if pipeworks.enable_new_flow_logic then tail = " but new_flow_logic not enabled" end
- pipeworks.logger("[pipeworks] "..kind.." flow logic registry requested for "..nodename..tail)
+ if not pipeworks.enable_new_flow_logic then tail = " but new_flow_logic not enabled" end
+ pipeworks.logger(kind.." flow logic registry requested for "..nodename..tail)
end
-- Register a node as a simple flowable.
diff --git a/new_flow_logic/register_local_pipes.lua b/new_flow_logic/register_local_pipes.lua
index b8cb7f0..5128d47 100644
--- a/new_flow_logic/register_local_pipes.lua
+++ b/new_flow_logic/register_local_pipes.lua
@@ -30,12 +30,14 @@ 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)