Major rewrite of items in tubes

autoplace_tubes.lua

@@ -1,72 +1,38 @@
 -- autorouting for pneumatic tubes
 
-local function in_table(table,element)
-	for _,el in ipairs(table) do
-		if el==element then return true end
-	end
-	return false
-end
-
 local function is_tube(nodename)
-	return in_table(pipeworks.tubenodes,nodename)
-end
-
-if pipeworks == nil then
-	pipeworks = {}
+	return table.contains(pipeworks.tubenodes, nodename)
 end
 
 --a function for determining which side of the node we are on
 local function nodeside(node, tubedir)
-	if node and (node.param2 < 0 or node.param2 > 23) then node.param2 = 0 end
-
-	--get a vector pointing back
-	local backdir = minetest.facedir_to_dir(node.param2)
-
-	--check whether the vector is equivalent to the tube direction; if it is, the tube's on the backside
-	if backdir.x == tubedir.x and backdir.y == tubedir.y and backdir.z == tubedir.z then
-		return "back"
+	if node.param2 < 0 or node.param2 > 23 then
+		node.param2 = 0
 	end
 
-	--check whether the vector is antiparallel with the tube direction; that indicates the front
-	if backdir.x == -tubedir.x and backdir.y == -tubedir.y and backdir.z == -tubedir.z then
+	local backdir = minetest.facedir_to_dir(node.param2)
+	local back = vector.dot(backdir, tubedir)
+	if back == 1 then
+		return "back"
+	elseif back == -1 then
 		return "front"
 	end
 
-	--facedir is defined in terms of the top-bottom axis of the node; we'll take advantage of that
-	local topdir = ({[0]={x=0, y=1, z=0},
-	{x=0, y=0, z=1},
-	{x=0, y=0, z=-1},
-	{x=1, y=0, z=0},
-	{x=-1, y=0, z=0},
-	{x=0, y=-1, z=0}})[math.floor(node.param2/4)]
-
-	--is this the top?
-	if topdir.x == tubedir.x and topdir.y == tubedir.y and topdir.z == tubedir.z then
+	local topdir = minetest.facedir_to_top_dir(node.param2)
+	local top = vector.dot(topdir, tubedir)
+	if top == 1 then
 		return "top"
-	end
-
-	--or the bottom?
-	if topdir.x == -tubedir.x and topdir.y == -tubedir.y and topdir.z == -tubedir.z then
+	elseif top == -1 then
 		return "bottom"
 	end
 
-	--we shall apply some maths to obtain the right-facing vector
-	local rightdir = {x=topdir.y*backdir.z - backdir.y*topdir.z,
-	y=topdir.z*backdir.x - backdir.z*topdir.x,
-	z=topdir.x*backdir.y - backdir.x*topdir.y}
-
-	--is this the right side?
-	if rightdir.x == tubedir.x and rightdir.y == tubedir.y and rightdir.z == tubedir.z then
+	local rightdir = minetest.facedir_to_right_dir(node.param2)
+	local right = vector.dot(rightdir, tubedir)
+	if right == 1 then
 		return "right"
-	end
-
-	--or the left?
-	if rightdir.x == -tubedir.x and rightdir.y == -tubedir.y and rightdir.z == -tubedir.z then
+	else
 		return "left"
 	end
-
-	--we should be done by now; initiate panic mode
-	minetest.log("error", "nodeside has been confused by its parameters; see pipeworks autoplace_tubes.lua, line 78")
 end
 
 local vts = {0, 3, 1, 4, 2, 5}
@@ -78,23 +44,23 @@ local function tube_autoroute(pos)
 	if not is_tube(nctr.name) then return end
 
 	local adjustments = {
-		{ x=-1, y=0, z=0 },
-		{ x=1, y=0, z=0  },
-		{ x=0, y=-1, z=0 },
-		{ x=0, y=1, z=0  },
-		{ x=0, y=0, z=-1 },
-		{ x=0, y=0, z=1 }
+		{x = -1, y =  0, z =  0},
+		{x =  1, y =  0, z =  0},
+		{x =  0, y = -1, z =  0},
+		{x =  0, y =  1, z =  0},
+		{x =  0, y =  0, z = -1},
+		{x =  0, y =  0, z =  1}
 	}
 	-- xm = 1, xp = 2, ym = 3, yp = 4, zm = 5, zp = 6
 
 	local positions = {}
 	local nodes = {}
-	for i,adj in ipairs(adjustments) do
-		positions[i] = {x=pos.x+adj.x, y=pos.y+adj.y, z=pos.z+adj.z}
+	for i, adj in ipairs(adjustments) do
+		positions[i] = vector.add(pos, adj)
 		nodes[i] = minetest.get_node(positions[i])
 	end
 
-	for i,node in ipairs(nodes) do
+	for i, node in ipairs(nodes) do
 		local idef = minetest.registered_nodes[node.name]
 		-- handle the tubes themselves
 		if is_tube(node.name) then
@@ -102,7 +68,9 @@ local function tube_autoroute(pos)
 		-- handle new style connectors
 		elseif idef and idef.tube and idef.tube.connect_sides then
 			local dir = adjustments[i]
-			if idef.tube.connect_sides[nodeside(node, {x=-dir.x, y=-dir.y, z=-dir.z})] then active[i] = 1 end
+			if idef.tube.connect_sides[nodeside(node, vector.multiply(dir, -1))] then
+				active[i] = 1
+			end
 		end
 	end
 
@@ -110,18 +78,17 @@ local function tube_autoroute(pos)
 
 	local nodedef = minetest.registered_nodes[nctr.name]
 	local basename = nodedef.basename
-	local newname
 	if nodedef.style == "old" then
 		local nsurround = ""
-		for i,n in ipairs(active) do
-			nsurround = nsurround .. n
+		for i, n in ipairs(active) do
+			nsurround = nsurround..n
 		end
 		nctr.name = basename.."_"..nsurround
 	elseif nodedef.style == "6d" then
 		local s = 0
-		for i,n in ipairs(active) do
+		for i, n in ipairs(active) do
 			if n == 1 then
-				s = s+2^vts[i]
+				s = s + 2^vts[i]
 			end
 		end
 		nctr.name = basename.."_"..tube_table[s]
@@ -131,14 +98,9 @@ local function tube_autoroute(pos)
 end
 
 function pipeworks.scan_for_tube_objects(pos)
-	if not pos or not pos.x or not pos.y or not pos.z then return end
-	tube_autoroute({ x=pos.x-1, y=pos.y  , z=pos.z   })
-	tube_autoroute({ x=pos.x+1, y=pos.y  , z=pos.z   })
-	tube_autoroute({ x=pos.x  , y=pos.y-1, z=pos.z   })
-	tube_autoroute({ x=pos.x  , y=pos.y+1, z=pos.z   })
-	tube_autoroute({ x=pos.x  , y=pos.y  , z=pos.z-1 })
-	tube_autoroute({ x=pos.x  , y=pos.y  , z=pos.z+1 })
-	tube_autoroute(pos)
+	for side = 0, 6 do
+		tube_autoroute(vector.add(pos, directions.side_to_dir(side)))
+	end
 end
 
 minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
@@ -157,7 +119,7 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
 	end
 end)
 
-if minetest.get_modpath("mesecons_mvps") ~= nil then
+if minetest.get_modpath("mesecons_mvps") then
 	mesecon:register_on_mvps_move(function(moved_nodes)
 		for _, n in ipairs(moved_nodes) do
 			pipeworks.scan_for_tube_objects(n.pos)