From 774e1d43759a418a43b126c00c60edc3d0d6c319 Mon Sep 17 00:00:00 2001 From: Milan2018 Date: Tue, 27 Apr 2021 12:16:40 +0200 Subject: [PATCH] Update 'pipeworks/init.lua' --- pipeworks/init.lua | 66 +++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/pipeworks/init.lua b/pipeworks/init.lua index 51ad3e0..0781079 100644 --- a/pipeworks/init.lua +++ b/pipeworks/init.lua @@ -1,4 +1,10 @@ mesecon=mesecon or {} +local function pdefile(n,...) + local ok,err=pcall(defile,n,...) + if not ok then + minetest.after(60,minetest.chat_send_all,"*** Error: "..err) + end +end -- Pipeworks mod by Vanessa Ezekowitz - 2013-07-13 -- @@ -13,7 +19,7 @@ local DEBUG = false pipeworks.worldpath = minetest.get_worldpath() pipeworks.modpath = minetest.get_modpath("pipeworks") -dofile(pipeworks.modpath.."/default_settings.lua") +pdofile(pipeworks.modpath.."/default_settings.lua") -- Read the external config file if it exists. local worldsettingspath = pipeworks.worldpath.."/pipeworks_settings.txt" local worldsettingsfile = io.open(worldsettingspath, "r") @@ -103,48 +109,48 @@ end -- early auto-detection for finite water mode if not explicitly disabled if pipeworks.toggles.finite_water == nil then - dofile(pipeworks.modpath.."/autodetect-finite-water.lua") + pdofile(pipeworks.modpath.."/autodetect-finite-water.lua") end -dofile(pipeworks.modpath.."/common.lua") -dofile(pipeworks.modpath.."/models.lua") -dofile(pipeworks.modpath.."/autoplace_pipes.lua") -dofile(pipeworks.modpath.."/autoplace_tubes.lua") -dofile(pipeworks.modpath.."/luaentity.lua") -dofile(pipeworks.modpath.."/item_transport.lua") -dofile(pipeworks.modpath.."/flowing_logic.lua") -dofile(pipeworks.modpath.."/crafts.lua") -dofile(pipeworks.modpath.."/tube_registration.lua") -dofile(pipeworks.modpath.."/routing_tubes.lua") -dofile(pipeworks.modpath.."/sorting_tubes.lua") -dofile(pipeworks.modpath.."/vacuum_tubes.lua") -dofile(pipeworks.modpath.."/signal_tubes.lua") -dofile(pipeworks.modpath.."/decorative_tubes.lua") -dofile(pipeworks.modpath.."/filter-injector.lua") -dofile(pipeworks.modpath.."/trashcan.lua") -dofile(pipeworks.modpath.."/wielder.lua") +pdofile(pipeworks.modpath.."/common.lua") +pdofile(pipeworks.modpath.."/models.lua") +pdofile(pipeworks.modpath.."/autoplace_pipes.lua") +pdofile(pipeworks.modpath.."/autoplace_tubes.lua") +pdofile(pipeworks.modpath.."/luaentity.lua") +pdofile(pipeworks.modpath.."/item_transport.lua") +pdofile(pipeworks.modpath.."/flowing_logic.lua") +pdofile(pipeworks.modpath.."/crafts.lua") +pdofile(pipeworks.modpath.."/tube_registration.lua") +pdofile(pipeworks.modpath.."/routing_tubes.lua") +pdofile(pipeworks.modpath.."/sorting_tubes.lua") +pdofile(pipeworks.modpath.."/vacuum_tubes.lua") +pdofile(pipeworks.modpath.."/signal_tubes.lua") +pdofile(pipeworks.modpath.."/decorative_tubes.lua") +pdofile(pipeworks.modpath.."/filter-injector.lua") +pdofile(pipeworks.modpath.."/trashcan.lua") +pdofile(pipeworks.modpath.."/wielder.lua") local logicdir = "/pressure_logic/" -- 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 the toggle flag is specifically enabled in the per-world settings flag. -dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua") -dofile(pipeworks.modpath..logicdir.."abms.lua") -dofile(pipeworks.modpath..logicdir.."abm_register.lua") -dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua") +pdofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua") +pdofile(pipeworks.modpath..logicdir.."abms.lua") +pdofile(pipeworks.modpath..logicdir.."abm_register.lua") +pdofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua") -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_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end +if pipeworks.enable_pipes then pdofile(pipeworks.modpath.."/pipes.lua") end +if pipeworks.enable_teleport_tube then pdofile(pipeworks.modpath.."/teleport_tube.lua") end +if pipeworks.enable_pipe_devices then pdofile(pipeworks.modpath.."/devices.lua") end if pipeworks.enable_redefines then - dofile(pipeworks.modpath.."/compat-chests.lua") - dofile(pipeworks.modpath.."/compat-furnaces.lua") + pdofile(pipeworks.modpath.."/compat-chests.lua") + pdofile(pipeworks.modpath.."/compat-furnaces.lua") end -if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua") end +if pipeworks.enable_autocrafter then pdofile(pipeworks.modpath.."/autocrafter.lua") end if pipeworks.enable_lua_tube and (minetest.get_modpath("mesecons") or minetest.get_modpath("digilines")) then - dofile(pipeworks.modpath.."/lua_tube.lua") + pdofile(pipeworks.modpath.."/lua_tube.lua") end minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")