minor tweaks to various dofile() calls, moved one from tubes.lua to init.lua

2 files changed, 13 insertions, 11 deletions

diff --git a/init.lua b/init.lua
index 5165d8f..e662bc4 100644
--- a/init.lua
+++ b/init.lua
@@ -366,14 +366,17 @@ end
 end
 end
 
-dofile(minetest.get_modpath("pipeworks").."/tubes.lua")
-dofile(minetest.get_modpath("pipeworks").."/devices.lua")
-dofile(minetest.get_modpath("pipeworks").."/autoplace.lua")
-dofile(minetest.get_modpath("pipeworks").."/crafts.lua")
-dofile(minetest.get_modpath("pipeworks").."/flowing_logic.lua")
-dofile(minetest.get_modpath("pipeworks").."/compat.lua")
-dofile(minetest.get_modpath("pipeworks").."/item_transport.lua")
-dofile(minetest.get_modpath("pipeworks").."/autocrafter.lua")
+local modpath = minetest.get_modpath("pipeworks")
+
+dofile(modpath.."/tubes.lua")
+dofile(modpath.."/teleport_tube.lua")
+dofile(modpath.."/devices.lua")
+dofile(modpath.."/autoplace.lua")
+dofile(modpath.."/crafts.lua")
+dofile(modpath.."/flowing_logic.lua")
+dofile(modpath.."/compat.lua")
+dofile(modpath.."/item_transport.lua")
+dofile(modpath.."/autocrafter.lua")
 
 minetest.register_alias("pipeworks:deployer_off", "technic:deployer_off")
 minetest.register_alias("pipeworks:deployer_on", "technic:deployer_on")
diff --git a/tubes.lua b/tubes.lua
index 018da3d..7ea3410 100644
--- a/tubes.lua
+++ b/tubes.lua
@@ -509,7 +509,6 @@ minetest.register_abm({nodenames={"group:sand_tube"},interval=1,chance=1,
 				object:remove()
 			end
 		end
-	end})
+	end
+})
 
-modpath=minetest.get_modpath("pipeworks")
-dofile(modpath.."/teleport_tube.lua")