Merge remote-tracking branch 'upstream/master'

Make luacheck happy

See merge request VanessaE/pipeworks!41

.gitlab-ci.yml

@@ -0,0 +1,8 @@
+stages:
+  - test
+
+luacheck:
+ stage: test
+ image: pipelinecomponents/luacheck:latest
+ script:
+  - luacheck .

.luacheckrc

@@ -0,0 +1,24 @@
+unused_args = false
+max_line_length= 240
+redefined = false
+
+globals = {
+	"pipeworks",
+	"luaentity"
+}
+
+read_globals = {
+	-- Stdlib
+	string = {fields = {"split"}},
+	table = {fields = {"copy", "getn"}},
+
+	-- Minetest
+	"vector", "ItemStack",
+	"dump", "minetest",
+	"VoxelManip", "VoxelArea",
+
+	-- mods
+	"default", "mesecon", "digiline",
+	"screwdriver", "unified_inventory"
+
+}

autocrafter.lua

@@ -1,3 +1,4 @@
+local S = minetest.get_translator("pipeworks")
 local autocrafterCache = {}  -- caches some recipe data to avoid to call the slow function minetest.get_craft_result() every second
 
 local craft_time = 1
@@ -16,7 +17,7 @@ end
 local function get_item_info(stack)
 	local name = stack:get_name()
 	local def = minetest.registered_items[name]
-	local description = def and def.description or "Unknown item"
+	local description = def and def.description or S("Unknown item")
 	return description, name
 end
 
@@ -46,7 +47,7 @@ local function autocraft(inventory, craft)
 	end
 	-- consume material
 	for itemname, number in pairs(consumption) do
-		for i = 1, number do -- We have to do that since remove_item does not work if count > stack_max
+		for _ = 1, number do -- We have to do that since remove_item does not work if count > stack_max
 			inventory:remove_item("src", ItemStack(itemname))
 		end
 	end
@@ -66,13 +67,16 @@ local function run_autocrafter(pos, elapsed)
 	local inventory = meta:get_inventory()
 	local craft = get_craft(pos, inventory)
 	local output_item = craft.output.item
+	-- NALC: existence de limitgroup ?
+	local limitcraft = minetest.get_item_group(output_item:get_name(), "limitcraft") or 0
 	-- only use crafts that have an actual result
-	if output_item:is_empty() then
+	-- NALC: ou si l'item n'est pas dans le group limitcraft
-		meta:set_string("infotext", "unconfigured Autocrafter: unknown recipe")
+	if output_item:is_empty() or limitcraft > 0 then
+		meta:set_string("infotext", S("unconfigured Autocrafter: unknown recipe"))
 		return false
 	end
 
-	for step = 1, math.floor(elapsed/craft_time) do
+	for _ = 1, math.floor(elapsed/craft_time) do
 		local continue = autocraft(inventory, craft)
 		if not continue then return false end
 	end
@@ -101,11 +105,10 @@ local function after_recipe_change(pos, inventory)
 	if inventory:is_empty("recipe") then
 		minetest.get_node_timer(pos):stop()
 		autocrafterCache[minetest.hash_node_position(pos)] = nil
-		meta:set_string("infotext", "unconfigured Autocrafter")
+		meta:set_string("infotext", S("unconfigured Autocrafter"))
 		inventory:set_stack("output", 1, "")
 		return
 	end
-	local recipe_changed = false
 	local recipe = inventory:get_list("recipe")
 
 	local hash = minetest.hash_node_position(pos)
@@ -126,7 +129,7 @@ local function after_recipe_change(pos, inventory)
 	craft = craft or get_craft(pos, inventory, hash)
 	local output_item = craft.output.item
 	local description, name = get_item_info(output_item)
-	meta:set_string("infotext", string.format("'%s' Autocrafter (%s)", description, name))
+	meta:set_string("infotext", S("'@1' Autocrafter (@2)", description, name))
 	inventory:set_stack("output", 1, output_item)
 
 	after_inventory_change(pos)
@@ -190,8 +193,8 @@ local function update_meta(meta, enabled)
 			"listring[context;dst]" ..
 			"listring[current_player;main]"
 	if minetest.get_modpath("digilines") then
-		fs = fs.."field[1,3.5;4,1;channel;Channel;${channel}]"
+		fs = fs.."field[1,3.5;4,1;channel;"..S("Channel")..";${channel}]"
-		fs = fs.."button_exit[5,3.2;2,1;save;Save]"
+		fs = fs.."button_exit[5,3.2;2,1;save;"..S("Save").."]"
 	end
 	meta:set_string("formspec",fs)
 
@@ -200,13 +203,13 @@ local function update_meta(meta, enabled)
 	-- this might be more written code, but actually executes less
 	local output = meta:get_inventory():get_stack("output", 1)
 	if output:is_empty() then -- doesn't matter if paused or not
-		meta:set_string("infotext", "unconfigured Autocrafter")
+		meta:set_string("infotext", S("unconfigured Autocrafter"))
 		return false
 	end
 
 	local description, name = get_item_info(output)
-	local infotext = enabled and string.format("'%s' Autocrafter (%s)", description, name)
+	local infotext = enabled and S("'@1' Autocrafter (@2)", description, name)
-				or string.format("paused '%s' Autocrafter", description)
+				or S("paused '@1' Autocrafter", description)
 
 	meta:set_string("infotext", infotext)
 	return enabled
@@ -226,7 +229,7 @@ local function upgrade_autocrafter(pos, meta)
 		update_meta(meta, true)
 
 		if meta:get_string("virtual_items") == "1" then -- we are version 2
-			-- we allready dropped stuff, so lets remove the metadatasetting (we are not being called again for this node)
+			-- we already dropped stuff, so lets remove the metadatasetting (we are not being called again for this node)
 			meta:set_string("virtual_items", "")
 		else -- we are version 1
 			local recipe = inv:get_list("recipe")
@@ -248,7 +251,7 @@ local function upgrade_autocrafter(pos, meta)
 end
 
 minetest.register_node("pipeworks:autocrafter", {
-	description = "Autocrafter",
+	description = S("Autocrafter"),
 	drawtype = "normal",
 	tiles = {"pipeworks_autocrafter.png"},
 	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1},
@@ -388,6 +391,27 @@ minetest.register_node("pipeworks:autocrafter", {
 						end
 					end
 					after_recipe_change(pos,inv)
+				elseif msg == "get_recipe" then
+					local meta = minetest.get_meta(pos)
+					local inv = meta:get_inventory()
+					local recipe = {}
+					for y=0,2,1 do
+						local row = {}
+						for x=1,3,1 do
+							local slot = y*3+x
+							table.insert(row, inv:get_stack("recipe",slot):get_name())
+						end
+						table.insert(recipe, row)
+					end
+					local setchan = meta:get_string("channel")
+					local output = inv:get_stack("output", 1)
+					digiline:receptor_send(pos, digiline.rules.default, setchan, {
+						recipe = recipe,
+						result = {
+							name = output:get_name(),
+							count = output:get_count(),
+						}
+					  })
 				elseif msg == "off" then
 					update_meta(meta, false)
 					minetest.get_node_timer(pos):stop()
@@ -402,6 +426,7 @@ minetest.register_node("pipeworks:autocrafter", {
 		},
 	},
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:autocrafter"
 
 minetest.register_craft( {
 	output = "pipeworks:autocrafter 2",

autoplace_tubes.lua

@@ -53,34 +53,35 @@ local function tube_autoroute(pos)
 	}
 	-- xm = 1, xp = 2, ym = 3, yp = 4, zm = 5, zp = 6
 
-	local positions = {}
+	local adjlist = {} -- this will be used in item_transport
-	local nodes = {}
+
-	for i, adj in ipairs(adjustments) do
+	for i, adj in ipairs(adjustments) do
-		positions[i] = vector.add(pos, adj)
+		local position = vector.add(pos, adj)
-		nodes[i] = minetest.get_node(positions[i])
+		local node = minetest.get_node(position)
-	end
 
-	for i, node in ipairs(nodes) do
 		local idef = minetest.registered_nodes[node.name]
 		-- handle the tubes themselves
 		if is_tube(node.name) then
 			active[i] = 1
+			table.insert(adjlist, adj)
 		-- 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, vector.multiply(adj, -1))] then
-			if idef.tube.connect_sides[nodeside(node, vector.multiply(dir, -1))] then
 				active[i] = 1
+				table.insert(adjlist, adj)
 			end
 		end
 	end
 
+	minetest.get_meta(pos):set_string("adjlist", minetest.serialize(adjlist))
+
 	-- all sides checked, now figure which tube to use.
 
 	local nodedef = minetest.registered_nodes[nctr.name]
 	local basename = nodedef.basename
 	if nodedef.style == "old" then
 		local nsurround = ""
-		for i, n in ipairs(active) do
+		for _, n in ipairs(active) do
 			nsurround = nsurround..n
 		end
 		nctr.name = basename.."_"..nsurround

common.lua

@@ -86,10 +86,9 @@ function pipeworks.table_contains(tbl, element)
 end
 
 function pipeworks.table_extend(tbl, tbl2)
-	local index = #tbl + 1
+	local oldlength = #tbl
-	for _, elt in ipairs(tbl2) do
+	for i = 1,#tbl2 do
-		tbl[index] = elt
+		tbl[oldlength + i] = tbl2[i]
-		index = index + 1
 	end
 end
 
@@ -115,7 +114,7 @@ local fs_helpers = {}
 pipeworks.fs_helpers = fs_helpers
 function fs_helpers.on_receive_fields(pos, fields)
 	local meta = minetest.get_meta(pos)
-	for field, value in pairs(fields) do
+	for field in pairs(fields) do
 		if pipeworks.string_startswith(field, "fs_helpers_cycling:") then
 			local l = field:split(":")
 			local new_value = tonumber(l[2])
@@ -224,7 +223,7 @@ function pipeworks.create_fake_player(def, is_dynamic)
 				return self._inventory:set_stack(def.wield_list,
 					self._wield_index, item)
 			end
-			_wielded_item = ItemStack(item)
+			self._wielded_item = ItemStack(item)
 		end,
 		get_wielded_item = function(self, item)
 			if self._inventory and def.wield_list then
@@ -243,17 +242,18 @@ function pipeworks.create_fake_player(def, is_dynamic)
 		set_bone_position = delay(),
 		hud_change = delay(),
 	}
-	local _trash
 	-- Getter & setter functions
 	p.get_inventory_formspec, p.set_inventory_formspec
 		= get_set_wrap("formspec", is_dynamic)
 	p.get_breath, p.set_breath = get_set_wrap("breath", is_dynamic)
 	p.get_hp, p.set_hp = get_set_wrap("hp", is_dynamic)
 	p.get_pos, p.set_pos = get_set_wrap("pos", is_dynamic)
-	_trash, p.move_to = get_set_wrap("pos", is_dynamic)
 	p.get_wield_index, p.set_wield_index = get_set_wrap("wield_index", true)
 	p.get_properties, p.set_properties = get_set_wrap("properties", false)
 
+	-- For players, move_to and get_pos do the same
+	p.move_to = p.get_pos
+
 	-- Backwards compatibilty
 	p.getpos = p.get_pos
 	p.setpos = p.set_pos

compat-chests.lua

@@ -65,7 +65,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				local node = minetest.get_node(pos)
 
 				open_chests[pn] = nil
-				for k, v in pairs(open_chests) do
+				for _, v in pairs(open_chests) do
 					if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then
 						return true
 					end
@@ -77,10 +77,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 					pipeworks.after_place(pos)
 				end)
 				minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
-			end
+			elseif pipeworks.may_configure(pos, player) then
-
+				-- Pipeworks Switch
-			-- Pipeworks Switch
-			if pipeworks.may_configure(pos, player) and not fields.quit then
 				fs_helpers.on_receive_fields(pos, fields)
 				minetest.show_formspec(player:get_player_name(), "pipeworks:chest_formspec", get_chest_formspec(pos))
 			end
@@ -232,7 +230,7 @@ override.tiles = {
 }
 
 -- Add the extra groups
-for i,v in ipairs({override_protected, override, override_open, override_protected_open}) do
+for _,v in ipairs({override_protected, override, override_open, override_protected_open}) do
 	v.groups.tubedevice = 1
 	v.groups.tubedevice_receiver = 1
 end

compat-furnaces.lua

@@ -1,10 +1,13 @@
-
 -- this file is basically a modified copy of
 -- minetest_game/mods/default/furnaces.lua
 
+-- translation support
+local S = minetest.get_translator("pipeworks")
+local DS = minetest.get_translator("default")
+
 local fs_helpers = pipeworks.fs_helpers
 
-tube_entry = "^pipeworks_tube_connection_stony.png"
+local tube_entry = "^pipeworks_tube_connection_stony.png"
 
 local function active_formspec(fuel_percent, item_percent, pos, meta)
 	local formspec =
@@ -36,7 +39,7 @@ local function active_formspec(fuel_percent, item_percent, pos, meta)
 					pipeworks.button_off,
 					pipeworks.button_on
 				}
-			).."label[0.9,3.51;Allow splitting incoming material (not fuel) stacks from tubes]"
+			).."label[0.9,3.51;"..S("Allow splitting incoming material (not fuel) stacks from tubes").."]"
 	return formspec
 end
 
@@ -67,7 +70,7 @@ local function inactive_formspec(pos, meta)
 				pipeworks.button_off,
 				pipeworks.button_on
 			}
-		).."label[0.9,3.51;Allow splitting incoming material (not fuel) stacks from tubes]"
+		).."label[0.9,3.51;"..S("Allow splitting incoming material (not fuel) stacks from tubes").."]"
 	return formspec
 end
 
@@ -90,7 +93,7 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player)
 	if listname == "fuel" then
 		if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then
 			if inv:is_empty("src") then
-				meta:set_string("infotext", "Furnace is empty")
+				meta:set_string("infotext", DS("Furnace is empty"))
 			end
 			return stack:get_count()
 		else
@@ -219,40 +222,40 @@ local function furnace_node_timer(pos, elapsed)
 	if cookable then
 		item_percent = math.floor(src_time / cooked.time * 100)
 		if item_percent > 100 then
-			item_state = "100% (output full)"
+			item_state = DS("100% (output full)")
 		else
-			item_state = item_percent .. "%"
+			item_state = DS("@1%", item_percent)
 		end
 	else
 		if srclist[1]:is_empty() then
-			item_state = "Empty"
+			item_state = DS("Empty")
 		else
-			item_state = "Not cookable"
+			item_state = DS("Not cookable")
 		end
 	end
 
-	local fuel_state = "Empty"
+	local fuel_state = DS("Empty")
-	local active = "inactive "
+	local active = DS("Furnace inactive")
 	local result = false
 
 	if fuel_totaltime ~= 0 then
-		active = "active "
+		active = DS("Furnace active")
 		local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
-		fuel_state = fuel_percent .. "%"
+		fuel_state = DS("@1%", fuel_percent)
 		formspec = active_formspec(fuel_percent, item_percent, pos, meta)
 		swap_node(pos, "default:furnace_active")
 		-- make sure timer restarts automatically
 		result = true
 	else
 		if not fuellist[1]:is_empty() then
-			fuel_state = "0%"
+			fuel_state = DS("@1%", "0")
 		end
 		swap_node(pos, "default:furnace")
 		-- stop timer on the inactive furnace
 		minetest.get_node_timer(pos):stop()
 	end
 
-	local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
+	local infotext = active.." "..DS("(Item: @1; Fuel: @2)", item_state, fuel_state)
 
 	--
 	-- Set meta values
@@ -271,7 +274,7 @@ end
 --
 
 minetest.register_node(":default:furnace", {
-	description = "Furnace",
+	description = DS("Furnace"),
 	tiles = {
 		"default_furnace_top.png"..tube_entry,
 		"default_furnace_bottom.png"..tube_entry,
@@ -360,7 +363,7 @@ minetest.register_node(":default:furnace", {
 })
 
 minetest.register_node(":default:furnace_active", {
-	description = "Furnace",
+	description = DS("Furnace"),
 	tiles = {
 		"default_furnace_top.png"..tube_entry,
 		"default_furnace_bottom.png"..tube_entry,

decorative_tubes.lua

@@ -1,7 +1,9 @@
+local S = minetest.get_translator("pipeworks")
+
 local straight = function(pos, node, velocity, stack) return {velocity} end
 
 minetest.register_node("pipeworks:steel_block_embedded_tube", {
-	description = "Airtight steelblock embedded tube",
+	description = S("Airtight steelblock embedded tube"),
 	tiles = {
 		"default_steel_block.png", "default_steel_block.png",
 		"default_steel_block.png", "default_steel_block.png",
@@ -26,6 +28,7 @@ minetest.register_node("pipeworks:steel_block_embedded_tube", {
 	after_dig_node = pipeworks.after_dig,
 	on_rotate = pipeworks.on_rotate,
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:steel_block_embedded_tube"
 
 minetest.register_craft( {
 	output = "pipeworks:steel_block_embedded_tube 1",
@@ -43,9 +46,13 @@ local pane_box = {
 		{ -8/16, -8/16, -1/16, 8/16, 8/16, 1/16 } -- pane
 	}
 }
+
+local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
+	and "clip" or true
+
 minetest.register_node("pipeworks:steel_pane_embedded_tube", {
 	drawtype = "nodebox",
-	description = "Airtight panel embedded tube ",
+	description = S("Airtight panel embedded tube"),
 	tiles = {
 		"pipeworks_pane_embedded_tube_sides.png^[transformR90",
 		"pipeworks_pane_embedded_tube_sides.png^[transformR90",
@@ -53,6 +60,7 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", {
 		"pipeworks_pane_embedded_tube_sides.png",
 		"pipeworks_pane_embedded_tube_ends.png", "pipeworks_pane_embedded_tube_ends.png",
 		},
+	use_texture_alpha = texture_alpha_mode,
 	node_box = pane_box,
 	selection_box = pane_box,
 	collision_box = pane_box,
@@ -74,6 +82,7 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", {
 	after_dig_node = pipeworks.after_dig,
 	on_rotate = pipeworks.on_rotate,
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:steel_pane_embedded_tube"
 
 minetest.register_craft( {
 	output = "pipeworks:steel_pane_embedded_tube 1",

depends.txt

@@ -1,6 +0,0 @@
-default
-basic_materials
-screwdriver
-mesecons?
-mesecons_mvps?
-digilines?

description.txt

@@ -1 +0,0 @@
-This mod uses mesh nodes and nodeboxes to supply a complete set of 3D pipes and tubes, along with devices that work with them.

devices.lua

@@ -1,3 +1,4 @@
+local S = minetest.get_translator("pipeworks")
 local new_flow_logic_register = pipeworks.flowables.register
 
 local polys = ""
@@ -9,7 +10,7 @@ function pipeworks.fix_after_rotation(pos, node, user, mode, new_param2)
 
 	if string.find(node.name, "spigot") then new_param2 = new_param2 % 4 end
 
-	newnode = string.gsub(node.name, "_on", "_off")
+	local newnode = string.gsub(node.name, "_on", "_off")
 	minetest.swap_node(pos, { name = newnode, param2 = new_param2 })
 	pipeworks.scan_for_pipe_objects(pos)
 
@@ -35,9 +36,7 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 			local under = pointed_thing.under
 			local fdir = minetest.dir_to_facedir(placer:get_look_dir())
 			local undernode = minetest.get_node(under)
-			local abovenode = minetest.get_node(above)
 			local uname = undernode.name
-			local aname = abovenode.name
 			local isabove = (above.x == under.x) and (above.z == under.z) and (pitch > 0)
 			local pos1 = above
 
@@ -104,6 +103,7 @@ if minetest.get_modpath("mesecons") then
 	}
 end
 
+--[[
 local pipes_devicelist = {
 	"pump",
 	"valve",
@@ -119,14 +119,15 @@ local pipes_devicelist = {
 	"storage_tank_9",
 	"storage_tank_10"
 }
+--]]
 
 -- Now define the nodes.
 
 local states = { "on", "off" }
-local dgroups = ""
 
 for s in ipairs(states) do
 
+	local dgroups
 	if states[s] == "off" then
 		dgroups = {snappy=3, pipe=1}
 	else
@@ -135,14 +136,14 @@ for s in ipairs(states) do
 
 	local pumpname = "pipeworks:pump_"..states[s]
 	minetest.register_node(pumpname, {
-		description = "Pump/Intake Module",
+		description = S("Pump/Intake Module"),
 		drawtype = "mesh",
 		mesh = "pipeworks_pump"..polys..".obj",
 		tiles = { "pipeworks_pump_"..states[s]..".png" },
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = dgroups,
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		pipe_connections = { top = 1 },
 		after_place_node = function(pos)
@@ -178,7 +179,7 @@ for s in ipairs(states) do
 
 	local nodename_valve_empty = "pipeworks:valve_"..states[s].."_empty"
 	minetest.register_node(nodename_valve_empty, {
-		description = "Valve",
+		description = S("Valve"),
 		drawtype = "mesh",
 		mesh = "pipeworks_valve_"..states[s]..polys..".obj",
 		tiles = { "pipeworks_valve.png" },
@@ -186,15 +187,15 @@ for s in ipairs(states) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		selection_box = {
-	             	type = "fixed",
+			type = "fixed",
 			fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 		},
 		collision_box = {
-	             	type = "fixed",
+			type = "fixed",
 			fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 		},
 		groups = dgroups,
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		on_place = pipeworks.rotate_on_place,
 		after_dig_node = function(pos)
@@ -221,10 +222,12 @@ for s in ipairs(states) do
 		new_flow_logic_register.directional_horizonal_rotate(nodename_valve_empty, true)
 	end
 end
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:pump_off"
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:valve_off_empty"
 
 local nodename_valve_loaded = "pipeworks:valve_on_loaded"
 minetest.register_node(nodename_valve_loaded, {
-	description = "Valve",
+	description = S("Valve"),
 	drawtype = "mesh",
 	mesh = "pipeworks_valve_on"..polys..".obj",
 	tiles = { "pipeworks_valve.png" },
@@ -232,15 +235,15 @@ minetest.register_node(nodename_valve_loaded, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	selection_box = {
-             	type = "fixed",
+		type = "fixed",
 		fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 	},
 	collision_box = {
-             	type = "fixed",
+		type = "fixed",
 		fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 	},
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -272,7 +275,7 @@ new_flow_logic_register.directional_horizonal_rotate(nodename_valve_loaded, true
 
 -- FIXME: should this do anything useful in the new flow logic?
 minetest.register_node("pipeworks:grating", {
-	description = "Decorative grating",
+	description = S("Decorative grating"),
 	tiles = {
 		"pipeworks_grating_top.png",
 		"pipeworks_grating_sides.png",
@@ -289,7 +292,7 @@ minetest.register_node("pipeworks:grating", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { top = 1 },
 	after_place_node = function(pos)
@@ -300,12 +303,13 @@ minetest.register_node("pipeworks:grating", {
 	end,
 	on_rotate = false
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:grating"
 
 -- outlet spigot
 
 local nodename_spigot_empty = "pipeworks:spigot"
 minetest.register_node(nodename_spigot_empty, {
-	description = "Spigot outlet",
+	description = S("Spigot outlet"),
 	drawtype = "mesh",
 	mesh = "pipeworks_spigot"..polys..".obj",
 	tiles = { "pipeworks_spigot.png" },
@@ -313,7 +317,7 @@ minetest.register_node(nodename_spigot_empty, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { left=1, right=1, front=1, back=1,
 						 left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@@ -336,7 +340,7 @@ minetest.register_node(nodename_spigot_empty, {
 
 local nodename_spigot_loaded = "pipeworks:spigot_pouring"
 minetest.register_node(nodename_spigot_loaded, {
-	description = "Spigot outlet",
+	description = S("Spigot outlet"),
 	drawtype = "mesh",
 	mesh = "pipeworks_spigot_pouring"..polys..".obj",
 	tiles = {
@@ -355,7 +359,7 @@ minetest.register_node(nodename_spigot_loaded, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { left=1, right=1, front=1, back=1,
 						 left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@@ -377,6 +381,8 @@ minetest.register_node(nodename_spigot_loaded, {
 	drop = "pipeworks:spigot",
 	on_rotate = pipeworks.fix_after_rotation
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:spigot"
+
 -- new flow logic does not currently distinguish between these two visual states.
 -- register both so existing flowing spigots continue to work (even if the visual doesn't match the spigot's behaviour).
 new_flow_logic_register.directional_horizonal_rotate(nodename_spigot_empty, false)
@@ -402,14 +408,14 @@ local panel_cbox = {
 
 local nodename_panel_empty = "pipeworks:entry_panel_empty"
 minetest.register_node(nodename_panel_empty, {
-	description = "Airtight Pipe entry/exit",
+	description = S("Airtight Pipe entry/exit"),
 	drawtype = "mesh",
 	mesh = "pipeworks_entry_panel"..polys..".obj",
 	tiles = { "pipeworks_entry_panel.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -422,14 +428,14 @@ minetest.register_node(nodename_panel_empty, {
 
 local nodename_panel_loaded = "pipeworks:entry_panel_loaded"
 minetest.register_node(nodename_panel_loaded, {
-	description = "Airtight Pipe entry/exit",
+	description = S("Airtight Pipe entry/exit"),
 	drawtype = "mesh",
 	mesh = "pipeworks_entry_panel"..polys..".obj",
 	tiles = { "pipeworks_entry_panel.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -440,6 +446,9 @@ minetest.register_node(nodename_panel_loaded, {
 	drop = "pipeworks:entry_panel_empty",
 	on_rotate = pipeworks.fix_after_rotation
 })
+
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:entry_panel_empty"
+
 -- TODO: AFAIK the two panels have no visual difference, so are redundant under new flow logic - alias?
 new_flow_logic_register.directional_horizonal_rotate(nodename_panel_empty, true)
 new_flow_logic_register.directional_horizonal_rotate(nodename_panel_loaded, true)
@@ -448,7 +457,7 @@ new_flow_logic_register.directional_horizonal_rotate(nodename_panel_loaded, true
 
 local nodename_sensor_empty = "pipeworks:flow_sensor_empty"
 minetest.register_node(nodename_sensor_empty, {
-	description = "Flow Sensor",
+	description = S("Flow Sensor"),
 	drawtype = "mesh",
 	mesh = "pipeworks_flow_sensor"..polys..".obj",
 	tiles = { "pipeworks_flow_sensor_off.png" },
@@ -456,7 +465,7 @@ minetest.register_node(nodename_sensor_empty, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -464,7 +473,7 @@ minetest.register_node(nodename_sensor_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_off(pos, rules) 
+			mesecon.receptor_off(pos, pipeworks.mesecons_rules)
 		end
 	end,
 	selection_box = {
@@ -487,7 +496,7 @@ minetest.register_node(nodename_sensor_empty, {
 
 local nodename_sensor_loaded = "pipeworks:flow_sensor_loaded"
 minetest.register_node(nodename_sensor_loaded, {
-	description = "Flow sensor (on)",
+	description = S("Flow sensor (on)"),
 	drawtype = "mesh",
 	mesh = "pipeworks_flow_sensor"..polys..".obj",
 	tiles = { "pipeworks_flow_sensor_on.png" },
@@ -495,7 +504,7 @@ minetest.register_node(nodename_sensor_loaded, {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -503,7 +512,7 @@ minetest.register_node(nodename_sensor_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, rules) 
+			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
 		end
 	end,
 	selection_box = {
@@ -524,6 +533,8 @@ minetest.register_node(nodename_sensor_loaded, {
 	mesecons = pipereceptor_on,
 	on_rotate = pipeworks.fix_after_rotation
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:flow_sensor_empty"
+
 new_flow_logic_register.directional_horizonal_rotate(nodename_sensor_empty, true)
 new_flow_logic_register.directional_horizonal_rotate(nodename_sensor_loaded, true)
 -- activate flow sensor at roughly half the pressure pumps drive pipes
@@ -536,18 +547,18 @@ new_flow_logic_register.transition_simple_set(sensor_pressure_set, { mesecons=pi
 
 -- TODO flow-logic-stub: these don't currently do anything under the new flow logic.
 for fill = 0, 10 do
-	local filldesc="empty"
+	local filldesc=S("empty")
 	local sgroups = {snappy=3, pipe=1, tankfill=fill+1}
 	local image = nil
 
 	if fill ~= 0 then
-		filldesc=fill.."0% full"
+		filldesc=S("@1% full", 10*fill)
 		sgroups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1}
 		image = "pipeworks_storage_tank_fittings.png"
 	end
 
 	minetest.register_node("pipeworks:expansion_tank_"..fill, {
-		description = "Expansion Tank ("..filldesc..")... You hacker, you.",
+		description = S("Expansion Tank (@1)", filldesc),
 		tiles = {
 			"pipeworks_storage_tank_fittings.png",
 			"pipeworks_storage_tank_fittings.png",
@@ -560,7 +571,7 @@ for fill = 0, 10 do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1},
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:storage_tank_0",
 		pipe_connections = { top = 1, bottom = 1},
@@ -575,7 +586,7 @@ for fill = 0, 10 do
 	})
 
 	minetest.register_node("pipeworks:storage_tank_"..fill, {
-		description = "Fluid Storage Tank ("..filldesc..")",
+		description = S("Fluid Storage Tank (@1)", filldesc),
 		tiles = {
 			"pipeworks_storage_tank_fittings.png",
 			"pipeworks_storage_tank_fittings.png",
@@ -588,7 +599,7 @@ for fill = 0, 10 do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = sgroups,
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:storage_tank_0",
 		pipe_connections = { top = 1, bottom = 1},
@@ -602,19 +613,20 @@ for fill = 0, 10 do
 		on_rotate = false
 	})
 end
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:storage_tank_0"
 
 -- fountainhead
 
 local nodename_fountain_empty = "pipeworks:fountainhead"
 minetest.register_node(nodename_fountain_empty, {
-	description = "Fountainhead",
+	description = S("Fountainhead"),
 	drawtype = "mesh",
 	mesh = "pipeworks_fountainhead"..polys..".obj",
 	tiles = { "pipeworks_fountainhead.png" },
 	sunlight_propagates = true,
 	paramtype = "light",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { bottom = 1 },
 	after_place_node = function(pos)
@@ -625,7 +637,7 @@ minetest.register_node(nodename_fountain_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, rules) 
+			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
 		end
 	end,
 	selection_box = {
@@ -638,17 +650,18 @@ minetest.register_node(nodename_fountain_empty, {
 	},
 	on_rotate = false
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:fountainhead"
 
 local nodename_fountain_loaded = "pipeworks:fountainhead_pouring"
 minetest.register_node(nodename_fountain_loaded, {
-	description = "Fountainhead",
+	description = S("Fountainhead"),
 	drawtype = "mesh",
 	mesh = "pipeworks_fountainhead"..polys..".obj",
 	tiles = { "pipeworks_fountainhead.png" },
 	sunlight_propagates = true,
 	paramtype = "light",
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { bottom = 1 },
 	after_place_node = function(pos)
@@ -660,7 +673,7 @@ minetest.register_node(nodename_fountain_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, rules) 
+			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
 		end
 	end,
 	selection_box = {
@@ -691,14 +704,14 @@ local sp_cbox = {
 
 local nodename_sp_empty = "pipeworks:straight_pipe_empty"
 minetest.register_node(nodename_sp_empty, {
-	description = "Straight-only Pipe",
+	description = S("Straight-only Pipe"),
 	drawtype = "mesh",
 	mesh = "pipeworks_straight_pipe"..polys..".obj",
 	tiles = { "pipeworks_straight_pipe_empty.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -706,19 +719,21 @@ minetest.register_node(nodename_sp_empty, {
 	end,
 	selection_box = sp_cbox,
 	collision_box = sp_cbox,
-	on_rotate = pipeworks.fix_after_rotation
+	on_rotate = pipeworks.fix_after_rotation,
+	check_for_pole = pipeworks.check_for_vert_pipe,
+	check_for_horiz_pole = pipeworks.check_for_horiz_pipe
 })
 
 local nodename_sp_loaded = "pipeworks:straight_pipe_loaded"
 minetest.register_node(nodename_sp_loaded, {
-	description = "Straight-only Pipe",
+	description = S("Straight-only Pipe"),
 	drawtype = "mesh",
 	mesh = "pipeworks_straight_pipe"..polys..".obj",
 	tiles = { "pipeworks_straight_pipe_loaded.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -727,8 +742,11 @@ minetest.register_node(nodename_sp_loaded, {
 	selection_box = sp_cbox,
 	collision_box = sp_cbox,
 	drop = "pipeworks:straight_pipe_empty",
-	on_rotate = pipeworks.fix_after_rotation
+	on_rotate = pipeworks.fix_after_rotation,
+	check_for_pole = pipeworks.check_for_vert_pipe,
+	check_for_horiz_pole = pipeworks.check_for_horiz_pipe
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:straight_pipe_empty"
 
 new_flow_logic_register.directional_horizonal_rotate(nodename_sp_empty, true)
 new_flow_logic_register.directional_horizonal_rotate(nodename_sp_loaded, true)

filter-injector.lua

@@ -1,51 +1,51 @@
+local S = minetest.get_translator("pipeworks")
 local fs_helpers = pipeworks.fs_helpers
 
-local function delay(x)
-	return (function() return x end)
-end
-
 local function set_filter_infotext(data, meta)
-	local infotext = data.wise_desc.." Filter-Injector"
+	local infotext = S("@1 Filter-Injector", data.wise_desc)
 	if meta:get_int("slotseq_mode") == 2 then
-		infotext = infotext .. " (slot #"..meta:get_int("slotseq_index").." next)"
+		infotext = infotext .. " "..S("(slot #@1 next)", meta:get_int("slotseq_index"))
 	end
 	meta:set_string("infotext", infotext)
 end
 
 local function set_filter_formspec(data, meta)
-	local itemname = data.wise_desc.." Filter-Injector"
+	local itemname = S("@1 Filter-Injector", data.wise_desc)
 
 	local formspec
 	if data.digiline then
-		formspec = "size[8,2.7]"..
+		formspec =
-			"item_image[0,0;1,1;pipeworks:"..data.name.."]"..
+			"size[8.5,3]"..
-			"label[1,0;"..minetest.formspec_escape(itemname).."]"..
+			"item_image[0.2,0;1,1;pipeworks:"..data.name.."]"..
-			"field[0.3,1.5;8.0,1;channel;Channel;${channel}]"..
+			"label[1.2,0.2;"..minetest.formspec_escape(itemname).."]"..
-			fs_helpers.cycling_button(meta, "button[0,2;4,1", "slotseq_mode",
+			"field[0.5,1.6;4.6,1;channel;"..S("Channel")..";${channel}]"..
-				{"Sequence slots by Priority",
+			"button[4.8,1.3;1.5,1;set_channel;"..S("Set").."]"..
-				 "Sequence slots Randomly",
+			fs_helpers.cycling_button(meta, "button[0.2,2.3;4.05,1", "slotseq_mode",
-				 "Sequence slots by Rotation"})..
+				{S("Sequence slots by Priority"),
-			fs_helpers.cycling_button(meta, "button[4,2;4,1", "exmatch_mode",
+				 S("Sequence slots Randomly"),
-				{"Exact match - off",
+				 S("Sequence slots by Rotation")})..
-				 "Exact match - on "})
+			fs_helpers.cycling_button(meta, "button[4.25,2.3;4.05,1", "exmatch_mode",
+				{S("Exact match - off"),
+				 S("Exact match - on")})..
+			"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"
 	else
 		local exmatch_button = ""
 		if data.stackwise then
 			exmatch_button =
 				fs_helpers.cycling_button(meta, "button[4,3.5;4,1", "exmatch_mode",
-					{"Exact match - off",
+					{S("Exact match - off"),
-					 "Exact match - on "})
+					 S("Exact match - on")})
 		end
 
 		formspec = "size[8,8.5]"..
 			"item_image[0,0;1,1;pipeworks:"..data.name.."]"..
 			"label[1,0;"..minetest.formspec_escape(itemname).."]"..
-			"label[0,1;Prefer item types:]"..
+			"label[0,1;"..S("Prefer item types:").."]"..
 			"list[context;main;0,1.5;8,2;]"..
 			fs_helpers.cycling_button(meta, "button[0,3.5;4,1", "slotseq_mode",
-				{"Sequence slots by Priority",
+				{S("Sequence slots by Priority"),
-				 "Sequence slots Randomly",
+				 S("Sequence slots Randomly"),
-				 "Sequence slots by Rotation"})..
+				 S("Sequence slots by Rotation")})..
 			exmatch_button..
 			"list[current_player;main;0,4.5;8,4;]" ..
 			"listring[]"
@@ -53,116 +53,6 @@ local function set_filter_formspec(data, meta)
 	meta:set_string("formspec", formspec)
 end
 
--- todo SOON: this function has *way too many* parameters
-local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all,digiline)
-	local sposes = {}
-	if not frominvname or not frominv:get_list(frominvname) then return end
-	for spos,stack in ipairs(frominv:get_list(frominvname)) do
-		local matches
-		if filterfor == "" then
-			matches = stack:get_name() ~= ""
-		else
-			local fname = filterfor.name
-			local fgroup = filterfor.group
-			local fwear = filterfor.wear
-			local fmetadata = filterfor.metadata
-			matches = (not fname                                             -- If there's a name filter,
-			           or stack:get_name() == fname)                         --  it must match.
-
-			          and (not fgroup                                        -- If there's a group filter,
-			               or (type(fgroup) == "string"                      --  it must be a string
-			                   and minetest.get_item_group(                  --  and it must match.
-			                                stack:get_name(), fgroup) ~= 0))
-
-			          and (not fwear                                         -- If there's a wear filter:
-			               or (type(fwear) == "number"                       --  If it's a number,
-			                   and stack:get_wear() == fwear)                --   it must match.
-			               or (type(fwear) == "table"                        --  If it's a table:
-			                   and (not fwear[1]                             --   If there's a lower bound,
-			                        or (type(fwear[1]) == "number"           --    it must be a number
-			                            and fwear[1] <= stack:get_wear()))   --    and it must be <= the actual wear.
-			                   and (not fwear[2]                             --   If there's an upper bound
-			                        or (type(fwear[2]) == "number"           --    it must be a number
-			                            and stack:get_wear() < fwear[2]))))  --    and it must be > the actual wear.
-			                                                                 --  If the wear filter is of any other type, fail.
-			                                                                 --
-			          and (not fmetadata                                     -- If there's a matadata filter,
-			               or (type(fmetadata) == "string"                   --  it must be a string
-			                   and stack:get_metadata() == fmetadata))       --  and it must match.
-		end
-		if matches then table.insert(sposes, spos) end
-	end
-	if #sposes == 0 then return false end
-	if slotseq_mode == 1 then
-		for i = #sposes, 2, -1 do
-			local j = math.random(i)
-			local t = sposes[j]
-			sposes[j] = sposes[i]
-			sposes[i] = t
-		end
-	elseif slotseq_mode == 2 then
-		local headpos = filtmeta:get_int("slotseq_index")
-		table.sort(sposes, function (a, b)
-			if a >= headpos then
-				if b < headpos then return true end
-			else
-				if b >= headpos then return false end
-			end
-			return a < b
-		end)
-	end
-	for _, spos in ipairs(sposes) do
-			local stack = frominv:get_stack(frominvname, spos)
-			local doRemove = stack:get_count()
-			if fromtube.can_remove then
-				doRemove = fromtube.can_remove(frompos, fromnode, stack, dir, frominvname, spos)
-			elseif fromdef.allow_metadata_inventory_take then
-				doRemove = fromdef.allow_metadata_inventory_take(frompos, frominvname,spos, stack, fakePlayer)
-			end
-			-- stupid lack of continue statements grumble
-			if doRemove > 0 then
-				if slotseq_mode == 2 then
-					local nextpos = spos + 1
-					if nextpos > frominv:get_size(frominvname) then
-						nextpos = 1
-					end
-					filtmeta:set_int("slotseq_index", nextpos)
-					set_filter_infotext(data, filtmeta)
-				end
-				local item
-				local count
-				if all then
-					count = math.min(stack:get_count(), doRemove)
-					if filterfor.count and (filterfor.count > 1 or digiline) then
-						if exmatch_mode ~= 0 and filterfor.count > count then
-							return false -- not enough, fail
-						else
-							-- limit quantity to filter amount
-							count = math.min(filterfor.count, count)
-						end
-					end
-				else
-					count = 1
-				end
-				if fromtube.remove_items then
-					-- it could be the entire stack...
-					item = fromtube.remove_items(frompos, fromnode, stack, dir, count, frominvname, spos)
-				else
-					item = stack:take_item(count)
-					frominv:set_stack(frominvname, spos, stack)
-					if fromdef.on_metadata_inventory_take then
-						fromdef.on_metadata_inventory_take(frompos, frominvname, spos, item, fakePlayer)
-					end
-				end
-				local pos = vector.add(frompos, vector.multiply(dir, 1.4))
-				local start_pos = vector.add(frompos, dir)
-				local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item, fakePlayer:get_player_name())
-				return true-- only fire one item, please
-			end
-	end
-	return false
-end
-
 local function punch_filter(data, filtpos, filtnode, msg)
 	local filtmeta = minetest.get_meta(filtpos)
 	local filtinv = filtmeta:get_inventory()
@@ -178,8 +68,6 @@ local function punch_filter(data, filtpos, filtnode, msg)
 	if not fromdef then return end
 	local fromtube = fromdef.tube
 	local input_special_cases = {
-		["technic:mv_furnace"] = "dst",
-		["technic:mv_furnace_active"] = "dst",
 		["technic:mv_electric_furnace"] = "dst",
 		["technic:mv_electric_furnace_active"] = "dst",
 		["technic:mv_alloy_furnace"] = "dst",
@@ -194,7 +82,13 @@ local function punch_filter(data, filtpos, filtnode, msg)
 		["technic:mv_grinder_active"] = "dst",
 		["technic:tool_workshop"] = "src",
 		["technic:mv_freezer"] = "dst",
-		["technic:mv_freezer_active"] = "dst"
+		["technic:mv_freezer_active"] = "dst",
+		["technic:hv_electric_furnace"] = "dst",
+		["technic:hv_electric_furnace_active"] = "dst",
+		["technic:hv_compressor"] = "dst",
+		["technic:hv_compressor_active"] = "dst",
+		["technic:hv_grinder"] = "dst",
+		["technic:hv_grinder_active"] = "dst"
 	}
 
 	-- make sure there's something appropriate to inject the item into
@@ -214,7 +108,7 @@ local function punch_filter(data, filtpos, filtnode, msg)
 	if not (fromtube and fromtube.input_inventory) then return end
 
 	local slotseq_mode
-	local exact_match
+	local exmatch_mode
 
 	local filters = {}
 	if data.digiline then
@@ -251,10 +145,10 @@ local function punch_filter(data, filtpos, filtnode, msg)
 
 			local exmatch = msg.exmatch
 			local t_exmatch = type(exmatch)
-			if t_exmatch == "number" and exmatch >= 0 and exmatch <= 1 then
+			if t_exmatch == "number" and (exmatch == 0 or exmatch == 1) then
-				exact_match = exmatch
+				exmatch_mode = exmatch
 			elseif t_exmatch == "boolean" then
-				exact_match = exmatch and 1 or 0
+				exmatch_mode = exmatch and 1 or 0
 			end
 
 			local slotseq_index = msg.slotseq_index
@@ -271,11 +165,11 @@ local function punch_filter(data, filtpos, filtnode, msg)
 				filtmeta:set_int("slotseq_mode", slotseq_mode)
 			end
 
-			if exact_match ~= nil then
+			if exmatch_mode ~= nil then
-				filtmeta:set_int("exmatch_mode", exact_match)
+				filtmeta:set_int("exmatch_mode", exmatch_mode)
 			end
 
-			if slotseq_mode ~= nil or exact_match ~= nil then
+			if slotseq_mode ~= nil or exmatch_mode ~= nil then
 				set_filter_formspec(data, filtmeta)
 			end
 
@@ -313,8 +207,8 @@ local function punch_filter(data, filtpos, filtnode, msg)
 		slotseq_mode = filtmeta:get_int("slotseq_mode")
 	end
 
-	if exact_match == nil then
+	if exmatch_mode == nil then
-		exact_match = filtmeta:get_int("exmatch_mode")
+		exmatch_mode = filtmeta:get_int("exmatch_mode")
 	end
 
 	local frominv
@@ -328,10 +222,121 @@ local function punch_filter(data, filtpos, filtnode, msg)
 		frominv = frommeta:get_inventory()
 	end
 	if fromtube.before_filter then fromtube.before_filter(frompos) end
+
+	local function grabAndFire(frominvname, filterfor)
+		local sposes = {}
+		if not frominvname or not frominv:get_list(frominvname) then return end
+		for spos,stack in ipairs(frominv:get_list(frominvname)) do
+			local matches
+			if filterfor == "" then
+				matches = stack:get_name() ~= ""
+			else
+				local fname = filterfor.name
+				local fgroup = filterfor.group
+				local fwear = filterfor.wear
+				local fmetadata = filterfor.metadata
+				matches = (not fname                                             -- If there's a name filter,
+				           or stack:get_name() == fname)                         --  it must match.
+
+				          and (not fgroup                                        -- If there's a group filter,
+				               or (type(fgroup) == "string"                      --  it must be a string
+				                   and minetest.get_item_group(                  --  and it must match.
+				                                stack:get_name(), fgroup) ~= 0))
+
+				          and (not fwear                                         -- If there's a wear filter:
+				               or (type(fwear) == "number"                       --  If it's a number,
+				                   and stack:get_wear() == fwear)                --   it must match.
+				               or (type(fwear) == "table"                        --  If it's a table:
+				                   and (not fwear[1]                             --   If there's a lower bound,
+				                        or (type(fwear[1]) == "number"           --    it must be a number
+				                            and fwear[1] <= stack:get_wear()))   --    and it must be <= the actual wear.
+				                   and (not fwear[2]                             --   If there's an upper bound
+				                        or (type(fwear[2]) == "number"           --    it must be a number
+				                            and stack:get_wear() < fwear[2]))))  --    and it must be > the actual wear.
+				                                                                 --  If the wear filter is of any other type, fail.
+
+				          and (not fmetadata                                     -- If there's a metadata filter,
+				               or (type(fmetadata) == "string"                   --  it must be a string
+				                   and stack:get_metadata() == fmetadata))       --  and it must match.
+			end
+			if matches then table.insert(sposes, spos) end
+		end
+		if #sposes == 0 then return false end
+		if slotseq_mode == 1 then
+			for i = #sposes, 2, -1 do
+				local j = math.random(i)
+				local t = sposes[j]
+				sposes[j] = sposes[i]
+				sposes[i] = t
+			end
+		elseif slotseq_mode == 2 then
+			local headpos = filtmeta:get_int("slotseq_index")
+			table.sort(sposes, function (a, b)
+				if a >= headpos then
+					if b < headpos then return true end
+				else
+					if b >= headpos then return false end
+				end
+				return a < b
+			end)
+		end
+		for _, spos in ipairs(sposes) do
+			local stack = frominv:get_stack(frominvname, spos)
+			local doRemove = stack:get_count()
+			if fromtube.can_remove then
+				doRemove = fromtube.can_remove(frompos, fromnode, stack, dir, frominvname, spos)
+			elseif fromdef.allow_metadata_inventory_take then
+				doRemove = fromdef.allow_metadata_inventory_take(frompos, frominvname,spos, stack, fakePlayer)
+			end
+			-- stupid lack of continue statements grumble
+			if doRemove > 0 then
+				if slotseq_mode == 2 then
+					local nextpos = spos + 1
+					if nextpos > frominv:get_size(frominvname) then
+						nextpos = 1
+					end
+					filtmeta:set_int("slotseq_index", nextpos)
+					set_filter_infotext(data, filtmeta)
+				end
+				local item
+				local count
+				if data.stackwise then
+					count = math.min(stack:get_count(), doRemove)
+					if filterfor.count and (filterfor.count > 1 or data.digiline) then
+						if exmatch_mode ~= 0 and filterfor.count > count then
+							return false -- not enough, fail
+						else
+							-- limit quantity to filter amount
+							count = math.min(filterfor.count, count)
+						end
+					end
+				else
+					count = 1
+				end
+				if fromtube.remove_items then
+					-- it could be the entire stack...
+					item = fromtube.remove_items(frompos, fromnode, stack, dir, count, frominvname, spos)
+				else
+					item = stack:take_item(count)
+					frominv:set_stack(frominvname, spos, stack)
+					if fromdef.on_metadata_inventory_take then
+						fromdef.on_metadata_inventory_take(frompos, frominvname, spos, item, fakePlayer)
+					end
+				end
+				local pos = vector.add(frompos, vector.multiply(dir, 1.4))
+				local start_pos = vector.add(frompos, dir)
+				pipeworks.tube_inject_item(pos, start_pos, dir, item,
+					fakePlayer:get_player_name())
+				return true -- only fire one item, please
+			end
+		end
+		return false
+	end
+
 	for _, frominvname in ipairs(type(fromtube.input_inventory) == "table" and fromtube.input_inventory or {fromtube.input_inventory}) do
 		local done = false
 		for _, filterfor in ipairs(filters) do
-			if grabAndFire(data, slotseq_mode, exact_match, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise, data.digiline) then
+			if grabAndFire(frominvname, filterfor) then
 				done = true
 				break
 			end
@@ -344,23 +349,23 @@ end
 for _, data in ipairs({
 	{
 		name = "filter",
-		wise_desc = "Itemwise",
+		wise_desc = S("Itemwise"),
 		stackwise = false,
 	},
 	{
 		name = "mese_filter",
-		wise_desc = "Stackwise",
+		wise_desc = S("Stackwise"),
 		stackwise = true,
 	},
 	{ -- register even if no digilines
 		name = "digiline_filter",
-		wise_desc = "Digiline",
+		wise_desc = S("Digiline"),
 		stackwise = true,
 		digiline = true,
 	},
 }) do
 	local node = {
-		description = data.wise_desc.." Filter-Injector",
+		description = S("@1 Filter-Injector", data.wise_desc),
 		tiles = {
 			"pipeworks_"..data.name.."_top.png",
 			"pipeworks_"..data.name.."_top.png",
@@ -423,10 +428,14 @@ for _, data in ipairs({
 		end
 
 		node.on_receive_fields = function(pos, formname, fields, sender)
-			if not pipeworks.may_configure(pos, sender) then return end
+			if (fields.quit and not fields.key_enter_field)
+			or not pipeworks.may_configure(pos, sender) then
+				return
+			end
+
 			fs_helpers.on_receive_fields(pos, fields)
 
-			if fields.channel then
+			if fields.channel and (fields.key_enter_field == "channel" or fields.set_channel) then
 				minetest.get_meta(pos):set_string("channel", fields.channel)
 			end
 
@@ -470,6 +479,7 @@ for _, data in ipairs({
 
 
 	minetest.register_node("pipeworks:"..data.name, node)
+	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:"..data.name
 end
 
 minetest.register_craft( {

init.lua

@@ -5,11 +5,11 @@
 --
 
 pipeworks = {}
-
+pipeworks.ui_cat_tube_list = {}
-local DEBUG = false
 
 pipeworks.worldpath = minetest.get_worldpath()
 pipeworks.modpath = minetest.get_modpath("pipeworks")
+local S = minetest.get_translator("pipeworks")
 
 dofile(pipeworks.modpath.."/default_settings.lua")
 -- Read the external config file if it exists.
@@ -45,7 +45,7 @@ pipeworks.liquid_texture = "default_water.png"
 pipeworks.button_off   = {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}
 pipeworks.button_on    = {text="", texture="pipeworks_button_on.png",  addopts="false;false;pipeworks_button_interm.png"}
 pipeworks.button_base  = "image_button[0,4.3;1,0.6"
-pipeworks.button_label = "label[0.9,4.31;Allow splitting incoming stacks from tubes]"
+pipeworks.button_label = "label[0.9,4.31;"..S("Allow splitting incoming stacks from tubes").."]"
 
 -- Helper functions
 
@@ -70,8 +70,8 @@ function pipeworks.may_configure(pos, player)
 	local meta = minetest.get_meta(pos)
 	local owner = meta:get_string("owner")
 
-	if owner ~= "" then -- wielders and filters
+	if owner ~= "" and owner == name then -- wielders and filters
-		return owner == name
+		return true
 	end
 	return not minetest.is_protected(pos, name)
 end
@@ -102,6 +102,10 @@ if pipeworks.toggles.finite_water == nil then
 	dofile(pipeworks.modpath.."/autodetect-finite-water.lua")
 end
 
+if minetest.get_modpath("signs_lib") then
+	dofile(pipeworks.modpath.."/signs_compat.lua")
+end
+
 dofile(pipeworks.modpath.."/common.lua")
 dofile(pipeworks.modpath.."/models.lua")
 dofile(pipeworks.modpath.."/autoplace_pipes.lua")
@@ -145,4 +149,16 @@ end
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
-print("Pipeworks loaded!")
+-- Unified Inventory categories integration
+
+if unified_inventory and unified_inventory.registered_categories then
+	if not unified_inventory.registered_categories["automation"] then
+		unified_inventory.register_category("automation", {
+			symbol = "pipeworks:lua_tube000000",
+			label = "Automation components"
+		})
+	end
+	unified_inventory.add_category_items("automation", pipeworks.ui_cat_tube_list)
+end
+
+minetest.log("info", "Pipeworks loaded!")

item_transport.lua

@@ -25,7 +25,7 @@ end
 -- both optional w/ sensible defaults and fallback to normal allow_* function
 -- XXX: possibly change insert_object to insert_item
 
-local adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
+local default_adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
 
 function pipeworks.notvel(tbl, vel)
 	local tbl2={}
@@ -42,7 +42,7 @@ minetest.register_globalstep(function(dtime)
 		return
 	end
 	tube_item_count = {}
-	for id, entity in pairs(luaentity.entities) do
+	for _, entity in pairs(luaentity.entities) do
 		if entity.name == "pipeworks:tubed_item" then
 			local h = minetest.hash_node_position(vector.round(entity._pos))
 			tube_item_count[h] = (tube_item_count[h] or 0) + 1
@@ -55,15 +55,22 @@ end)
 -- tube overload mechanism:
 -- when the tube's item count (tracked in the above tube_item_count table)
 -- exceeds the limit configured per tube, replace it with a broken one.
+
+function pipeworks.break_tube(pos)
+	local node = minetest.get_node(pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("the_tube_was", minetest.serialize(node))
+	minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
+	pipeworks.scan_for_tube_objects(pos)
+end
+
 local crunch_tube = function(pos, cnode, cmeta)
 	if enable_max_limit then
 		local h = minetest.hash_node_position(pos)
 		local itemcount = tube_item_count[h] or 0
 		if itemcount > max_tube_limit then
-			cmeta:set_string("the_tube_was", minetest.serialize(cnode))
+			pipeworks.logger("Warning - a tube at "..minetest.pos_to_string(pos).." broke due to too many items ("..itemcount..")")
-			print("[Pipeworks] Warning - a tube at "..minetest.pos_to_string(pos).." broke due to too many items ("..itemcount..")")
+			pipeworks.break_tube(pos)
-			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
-			pipeworks.scan_for_tube_objects(pos)
 		end
 	end
 end
@@ -80,6 +87,9 @@ local function go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner)
 	if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then
 		can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos, cnode, vel, stack)
 	else
+		local adjlist_string = minetest.get_meta(pos):get_string("adjlist")
+		local adjlist = minetest.deserialize(adjlist_string) or default_adjlist -- backward compat: if not found, use old behavior: all directions
+
 		can_go = pipeworks.notvel(adjlist, vel)
 	end
 	-- can_go() is expected to return an array-like table of candidate offsets.
@@ -191,6 +201,7 @@ minetest.register_entity("pipeworks:tubed_item", {
 
 	from_data = function(self, itemstring)
 		local stack = ItemStack(itemstring)
+		--[[
 		local itemtable = stack:to_table()
 		local itemname = nil
 		if itemtable then
@@ -202,6 +213,7 @@ minetest.register_entity("pipeworks:tubed_item", {
 			item_texture = minetest.registered_items[itemname].inventory_image
 			item_type = minetest.registered_items[itemname].type
 		end
+		--]]
 		self.object:set_properties({
 			is_visible = true,
 			textures = {stack:get_name()}
@@ -388,7 +400,7 @@ if minetest.get_modpath("mesecons_mvps") then
 		for _, n in ipairs(moved_nodes) do
 			moved[minetest.hash_node_position(n.oldpos)] = vector.subtract(n.pos, n.oldpos)
 		end
-		for id, entity in pairs(luaentity.entities) do
+		for _, entity in pairs(luaentity.entities) do
 			if entity.name == "pipeworks:tubed_item" then
 				local pos = entity:get_pos()
 				local rpos = vector.round(pos)

legacy.lua

@@ -1,3 +1,4 @@
+local S = minetest.get_translator("pipeworks")
 
 if not minetest.get_modpath("auto_tree_tap") and
   minetest.get_modpath("technic") then
@@ -20,7 +21,7 @@ if not minetest.get_modpath("auto_tree_tap") and
 	})
 
 	minetest.register_node(":auto_tree_tap:off", {
-		description = "Auto-Tap",
+		description = S("Auto-Tap"),
 		tiles = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png",
 			"pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"},
 		is_ground_content = true,

locale/pipeworks.fr.tr

@@ -0,0 +1,119 @@
+# textdomain: pipeworks
+
+# License: CC-by-SA 4.0
+# Author: Louis Royer <4259825-lroyer@users.noreply.gitlab.com>
+
+## generic interaction
+Set=Fixer
+Close=Fermer
+
+## digilines interfacing
+Channel=Canal
+
+## init
+Allow splitting incoming stacks from tubes=Séparer les piles venant des tubes
+
+## autocrafter
+Unknown item=Item inconnu
+unconfigured Autocrafter: unknown recipe=Autocrafteur non-configuré : recette inconnue
+unconfigured Autocrafter=Autocrafteur non-configuré
+'@1' Autocrafter (@2)=Autocrafteur de '@1' (@2)
+Save=Valider
+paused '@1' Autocrafter=Autocrafteur de '@1' en pause
+Autocrafter=Autocrafteur
+
+## compat-furnaces
+Allow splitting incoming material (not fuel) stacks from tubes=Séparer les piles (sauf le carburant) venant des tubes
+
+## decorative tubes
+Airtight steelblock embedded tube=Tube hermétique intégré à un bloc d’acier
+Airtight panel embedded tube=Tube hermétique intégré à un panneau
+
+## devices
+Pump/Intake Module=Module de pompage et d’admission
+Valve=Vanne
+Decorative grating=Grillage décoratif
+Spigot outlet=Sortie de robinet
+Airtight Pipe entry/exit=Extrémité de tube hermétique
+Flow Sensor=Détecteur de débit
+Flow sensor (on)=Détecteur de débit (actif)
+empty=vide
+@1% full=plein à @1 %
+Expansion Tank (@1)=Réservoir d’expansion (@1)
+Fluid Storage Tank (@1)=Réservoir de liquides (@1)
+Fountainhead=Tête de fontaine
+Straight-only Pipe=Tuyau droit
+
+## filter-injector
+(slot #@1 next)=(slot suivant : #@1)
+@1 Filter-Injector=Filtre-injecteur @1
+Sequence slots by Priority=Ordonner par priorité
+Sequence slots Randomly=Ordonner aléatoirement
+Sequence slots by Rotation=Ordonner en rotation
+Exact match - off=Filtrage inactif
+Exact match - on=Filtrage actif
+Prefer item types:=Items à filtrer :
+Itemwise=par item
+Stackwise=par piles d’items
+Digiline=digiline
+
+## legacy
+Auto-Tap=Robinet d’arbre automatique
+
+## pipes
+Pipe Segment=Segment de tuyau
+Pipe Segment (legacy)=Segment de tuyau (obsolète)
+
+
+## routing tubes
+Pneumatic tube segment=Segment de tuyau pneumatique
+Broken Tube=Tuyau cassé
+High Priority Tube Segment=Segment de tuyau haute priorité
+Accelerating Pneumatic Tube Segment=Segment de tuyau pneumatique accélérante
+Crossing Pneumatic Tube Segment=Intersection de tuyau pneumatique
+One way tube=Tuyau unidirectionnel
+
+## signal tubes
+Detecting Pneumatic Tube Segment on=Segment de tuyau pneumatique avec détecteur (actif)
+Detecting Pneumatic Tube Segment=Segment de tuyau pneumatique avec détecteur
+Digiline Detecting Pneumatic Tube Segment=Segment de tuyau pneumatique avec détecteur digiline
+Digiline Detecting Tube=Tuyau avec détecteur digiline
+Conducting Pneumatic Tube Segment=Segment de tuyau pneumatique conducteur
+Conducting Pneumatic Tube Segment on=Segment de tuyau pneumatique conducteur actif
+Digiline Conducting Pneumatic Tube Segment=Segment de tuyau pneumatique conducteur digiline
+Mesecon and Digiline Conducting Pneumatic Tube Segment=Segment de tuyau pneumatique conducteur mesecon et digiline
+Mesecon and Digiline Conducting Pneumatic Tube Segment on=Segment de tuyau pneumatique conducteur mesecon et digiline (actif)
+
+## sorting tubes
+Sorting Pneumatic Tube Segment=Segment de tuyau pneumatique triant
+Sorting pneumatic tube=Tuyau pneumatique triant
+
+## teleport tube
+Receive=Reception
+Channels are public by default=Les canaux sont publics par défaut
+Use <player>:<channel> for fully private channels=Utilisez <joueur>:<canal> pour un canal entièrement privé
+Use <player>;<channel> for private receivers=Utilisez <joueur>;<canal> pour une réception privée
+Teleporting Pneumatic Tube Segment=Segment de tuyau pneumatique téléporteur
+Teleporting Tube=Tuyau pneumatique téléporteur
+Unconfigured Teleportation Tube=Tuyau téléporteur non-configuré
+Sorry, channel '@1' is reserved for exclusive use by @2=Désolé, le canal '@1' est réservé exclusivement à l’utilisateur @2.
+Sorry, receiving from channel '@1' is reserved for @2=Désolé, la réception depuis le canal '@1' est réservée pour @2.
+Teleportation Tube @1 on '@2'=Tuyau de téléportation @1 sur '@2'
+
+## trashcan
+Trash Can=Poubelle
+
+## tube registration
+Pneumatic tube segment (legacy)=Segment de tuyau pneumatique (obsolète)
+
+## vacuum tubes
+Radius=Rayon
+Vacuuming Pneumatic Tube Segment=Segment de tuyau pneumatique aspirant
+Adjustable Vacuuming Tube=Tuyau pneumatique aspirant réglable
+Adjustable Vacuuming Pneumatic Tube Segment=Segment de tuyau pneumatique aspirant réglable
+Adjustable Vacuuming Pneumatic Tube Segment (@1m)=Segment de tuyau pneumatique aspirant réglable (@1 m)
+
+## wielder
+Node Breaker=Casseur de blocs
+Deployer=Poseur de blocs
+Dispenser=Distributeur

locale/pipeworks.zh_CN.tr

@@ -0,0 +1,117 @@
+# textdomain: pipeworks
+# License: CC-by-SA 4.0
+# Author: pevernow <3450354617@qq.com>
+
+## generic interaction
+Set=
+Cancel=
+
+## digilines interfacing
+Channel=频道
+
+## init
+Allow splitting incoming stacks from tubes=允许从管道中拆分传入堆栈
+
+## autocrafter
+Unknown item=通道
+unconfigured Autocrafter: unknown recipe=未配置的自动工作台: 未知配方
+unconfigured Autocrafter=未配置的自动工作台
+'@1' Autocrafter (@2)=自动工作台 '@1' (@2)
+Save=保存
+paused '@1' Autocrafter=暂停的自动工作台
+Autocrafter=自动工作台
+
+## compat-furnaces
+Allow splitting incoming material (not fuel) stacks from tubes=允许从管子中分离进来的材料（不是燃料）堆
+
+## decorative tubes
+Airtight steelblock embedded tube=密封嵌入式铁块管道
+Airtight panel embedded tube=密封嵌入式片状管道
+
+## devices
+Pump/Intake Module=泵/进气模块
+Valve=阀门
+Decorative grating=Decorative grating
+Spigot outlet=龙头
+Airtight Pipe entry/exit=密闭管进/出
+Flow Sensor=流量传感器
+Flow sensor (on)=流量传感器（上）
+empty=空的
+@1% full=满的@1 %
+Expansion Tank (@1)=扩展水箱 (@1)
+Fluid Storage Tank (@1)=储液罐 (@1)
+Fountainhead=源泉
+Straight-only Pipe=直管
+## filter-injector
+(slot #@1 next)=(下一个插槽 : #@1)
+@1 Filter-Injector=@1取物器
+Sequence slots by Priority=优先顺序排列
+Sequence slots Randomly=随机排列时隙
+Sequence slots by Rotation=旋转顺序槽
+Exact match - off=完全匹配-关闭
+Exact match - on=完全匹配-开启
+Prefer item types:=偏好物品类型 :
+Itemwise=逐项
+Stackwise=堆叠方式
+Digiline=Digiline
+
+## legacy
+Auto-Tap=自动轴阀
+
+## pipes
+Pipe Segment=管道
+Pipe Segment (legacy)=管道（旧版）
+
+
+## routing tubes
+Pneumatic tube segment=普通管道
+Broken Tube=断管
+High Priority Tube Segment=高优先级管段
+Accelerating Pneumatic Tube Segment=加速管道
+Crossing Pneumatic Tube Segment=定向管道
+One way tube=单向管
+
+## signal tubes
+Detecting Pneumatic Tube Segment on=检测管道（运行中）
+Detecting Pneumatic Tube Segment=检测管道
+Digiline Detecting Pneumatic Tube Segment=Digiline检测管道
+Digiline Detecting Tube=Digiline检测管
+Conducting Pneumatic Tube Segment=传导管道
+Conducting Pneumatic Tube Segment on=传导管道（运行中）
+Digiline Conducting Pneumatic Tube Segment=Digiline传导式气动管道
+Mesecon and Digiline Conducting Pneumatic Tube Segment=Mesecon和Digiline传导管道
+Mesecon and Digiline Conducting Pneumatic Tube Segment on=Mesecon和Digiline传导管道（运行中）
+
+## sorting tubes
+Sorting Pneumatic Tube Segment=分类管道
+Sorting pneumatic tube=分类管道
+
+## teleport tube
+Receive=接收
+Channels are public by default=频道默认为公开
+Use <player>:<channel> for fully private channels=将<player>:<channel>用于完全私人的频道
+Use <player>;<channel> for private receivers=使用<player>;<channel>作为私人接收器
+Teleporting Pneumatic Tube Segment=传送管道
+Teleporting Tube=
+Unconfigured Teleportation Tube=未配置的传送管道
+Sorry, channel '@1' is reserved for exclusive use by @2=抱歉，频道‘@1’保留供‘@2’专用
+Sorry, receiving from channel '@1' is reserved for @2=抱歉，从频道'@1'接收的内容已保留给'@2'
+Teleportation Tube @1 on '@2'=传送管'@1'在'@2'上
+
+## trashcan
+Trash Can=垃圾箱
+
+## tube registration
+Pneumatic tube segment (legacy)=普通管道（旧式）
+
+## vacuum tubes
+Radius=
+Vacuuming Pneumatic Tube Segment=拾取管道
+Adjustable Vacuuming Tube=
+Adjustable Vacuuming Pneumatic Tube Segment=高级拾取管道
+Adjustable Vacuuming Pneumatic Tube Segment (@1m)=高级拾取管道(@1m)
+
+## wielder
+Node Breaker=方块破坏器
+Deployer=放置器
+Dispenser=投掷器

locale/template.txt

@@ -0,0 +1,119 @@
+# textdomain: pipeworks
+
+# License: CC-by-SA 4.0
+# Author:
+
+## generic interaction
+Set=
+Cancel=
+
+## digilines interfacing
+Channel=
+
+## init
+Allow splitting incoming stacks from tubes=
+
+## autocrafter
+Unknown item=
+unconfigured Autocrafter: unknown recipe=
+unconfigured Autocrafter=
+'@1' Autocrafter (@2)=
+Save=
+paused '@1' Autocrafter=
+Autocrafter=
+
+## compat-furnaces
+Allow splitting incoming material (not fuel) stacks from tubes=
+
+## decorative tubes
+Airtight steelblock embedded tube=
+Airtight panel embedded tube=
+
+## devices
+Pump/Intake Module=
+Valve=
+Decorative grating=
+Spigot outlet=
+Airtight Pipe entry/exit=
+Flow Sensor=
+Flow sensor (on)=
+empty=
+@1% full=
+Expansion Tank (@1)=
+Fluid Storage Tank (@1)=
+Fountainhead=
+Straight-only Pipe=
+
+## filter-injector
+(slot #@1 next)=
+@1 Filter-Injector=
+Sequence slots by Priority=
+Sequence slots Randomly=
+Sequence slots by Rotation=
+Exact match - off=
+Exact match - on=
+Prefer item types:=
+Itemwise=
+Stackwise=
+Digiline=
+
+## legacy
+Auto-Tap=
+
+## pipes
+Pipe Segment=
+Pipe Segment (legacy)=
+
+
+## routing tubes
+Pneumatic tube segment=
+Broken Tube=
+High Priority Tube Segment=
+Accelerating Pneumatic Tube Segment=
+Crossing Pneumatic Tube Segment=
+One way tube=
+
+## signal tubes
+Detecting Pneumatic Tube Segment on=
+Detecting Pneumatic Tube Segment=
+Digiline Detecting Pneumatic Tube Segment=
+Digiline Detecting Tube=
+Conducting Pneumatic Tube Segment=
+Conducting Pneumatic Tube Segment on=
+Digiline Conducting Pneumatic Tube Segment=
+Mesecon and Digiline Conducting Pneumatic Tube Segment=
+Mesecon and Digiline Conducting Pneumatic Tube Segment on=
+
+## sorting tubes
+Sorting Pneumatic Tube Segment=
+Sorting pneumatic tube=
+
+## teleport tube
+Receive=
+Channels are public by default=
+Use <player>:<channel> for fully private channels=
+Use <player>;<channel> for private receivers=
+Teleporting Pneumatic Tube Segment=
+Teleporting Tube=
+Unconfigured Teleportation Tube=
+Sorry, channel '@1' is reserved for exclusive use by @2=
+Sorry, receiving from channel '@1' is reserved for @2=
+Teleportation Tube @1 on '@2'=
+
+## trashcan
+Trash Can=
+
+## tube registration
+Pneumatic tube segment (legacy)=
+
+## vacuum tubes
+Radius=
+Vacuuming Pneumatic Tube Segment=
+Adjustable Vacuuming Tube=
+Adjustable Vacuuming Pneumatic Tube Segment=
+Adjustable Vacuuming Pneumatic Tube Segment (@1m)=
+
+## wielder
+Node Breaker=
+Deployer=
+Dispenser=

lua_tube.lua

@@ -13,8 +13,10 @@
 -- newport = merge_port_states(state1, state2): just does result = state1 or state2 for every port
 -- set_port(pos, rule, state): activates/deactivates the mesecons according to the port states
 -- set_port_states(pos, ports): Applies new port states to a Luacontroller at pos
--- run(pos): runs the code in the controller at pos
+-- run_inner(pos, code, event): runs code on the controller at pos and event
--- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error messages
+-- reset_formspec(pos, code, errmsg): installs new code and prints error messages, without resetting LCID
+-- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error message
+-- run(pos, event): a wrapper for run_inner which gets code & handles errors via reset_meta
 -- resetn(pos): performs a hardware reset, turns off all ports
 --
 -- The Sandbox
@@ -24,7 +26,7 @@
 -- use too much memory from the sandbox.
 -- You can add more functions to the environment
 -- (see where local env is defined)
--- Something nice to play is is appending minetest.env to it.
+-- Something nice to play is appending minetest.env to it.
 
 local BASENAME = "pipeworks:lua_tube"
 
@@ -77,7 +79,7 @@ local function update_real_port_states(pos, rule_name, new_state)
 	if rule_name.x == nil then
 		for _, rname in ipairs(rule_name) do
 			local port = pos_to_side[rname.x + (2 * rname.y) + (3 * rname.z) + 4]
-			L[port] = (newstate == "on") and 1 or 0
+			L[port] = (new_state == "on") and 1 or 0
 		end
 	else
 		local port = pos_to_side[rule_name.x + (2 * rule_name.y) + (3 * rule_name.z) + 4]
@@ -168,7 +170,7 @@ local function set_port_states(pos, ports)
 		-- Solution / Workaround:
 		-- Remember which output was turned off and ignore next "off" event.
 		local meta = minetest.get_meta(pos)
-		local ign = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+		local ign = minetest.deserialize(meta:get_string("ignore_offevents"), true) or {}
 		if ports.red    and not vports.red    and not mesecon.is_powered(pos, rules.red)    then ign.red    = true end
 		if ports.blue   and not vports.blue   and not mesecon.is_powered(pos, rules.blue)   then ign.blue   = true end
 		if ports.yellow and not vports.yellow and not mesecon.is_powered(pos, rules.yellow) then ign.yellow = true end
@@ -214,7 +216,7 @@ end
 
 local function ignore_event(event, meta)
 	if event.type ~= "off" then return false end
-	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents"), true) or {}
 	if ignore_offevents[event.pin.name] then
 		ignore_offevents[event.pin.name] = nil
 		meta:set_string("ignore_offevents", minetest.serialize(ignore_offevents))
@@ -227,7 +229,11 @@ end
 -------------------------
 
 local function safe_print(param)
+	local string_meta = getmetatable("")
+	local sandbox = string_meta.__index
+	string_meta.__index = string -- Leave string sandbox temporarily
 	print(dump(param))
+	string_meta.__index = sandbox -- Restore string sandbox
 end
 
 local function safe_date()
@@ -267,6 +273,7 @@ local function remove_functions(x)
 	local seen = {}
 
 	local function rfuncs(x)
+		if x == nil then return end
 		if seen[x] then return end
 		seen[x] = true
 		if type(x) ~= "table" then return end
@@ -290,49 +297,174 @@ local function remove_functions(x)
 	return x
 end
 
-local function get_interrupt(pos)
+-- The setting affects API so is not intended to be changeable at runtime
-	-- iid = interrupt id
+local get_interrupt
-	local function interrupt(time, iid)
+if mesecon.setting("luacontroller_lightweight_interrupts", false) then
-		if type(time) ~= "number" then return end
+	-- use node timer
-		local luac_id = minetest.get_meta(pos):get_int("luac_id")
+	get_interrupt = function(pos, itbl, send_warning)
-		mesecon.queue:add_action(pos, "pipeworks:lc_tube_interrupt", {luac_id, iid}, time, iid, 1)
+		return (function(time, iid)
+			if type(time) ~= "number" then error("Delay must be a number") end
+			if iid ~= nil then send_warning("Interrupt IDs are disabled on this server") end
+			table.insert(itbl, function() minetest.get_node_timer(pos):start(time) end)
+		end)
+	end
+else
+	-- use global action queue
+	-- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
+	get_interrupt = function(pos, itbl, send_warning)
+		-- iid = interrupt id
+		local function interrupt(time, iid)
+			-- NOTE: This runs within string metatable sandbox, so don't *rely* on anything of the form (""):y
+			-- Hence the values get moved out. Should take less time than original, so totally compatible
+			if type(time) ~= "number" then error("Delay must be a number") end
+			table.insert(itbl, function ()
+				-- Outside string metatable sandbox, can safely run this now
+				local luac_id = minetest.get_meta(pos):get_int("luac_id")
+				-- Check if IID is dodgy, so you can't use interrupts to store an infinite amount of data.
+				-- Note that this is safe from alter-after-free because this code gets run after the sandbox has ended.
+				-- This runs outside of the timer and *shouldn't* harm perf. unless dodgy data is being sent in the first place
+				iid = remove_functions(iid)
+				local msg_ser = minetest.serialize(iid)
+				if #msg_ser <= mesecon.setting("luacontroller_interruptid_maxlen", 256) then
+					mesecon.queue:add_action(pos, "pipeworks:lc_tube_interrupt", {luac_id, iid}, time, iid, 1)
+				else
+					send_warning("An interrupt ID was too large!")
+				end
+			end)
+		end
+		return interrupt
+	end
+end
+
+-- Given a message object passed to digiline_send, clean it up into a form
+-- which is safe to transmit over the network and compute its "cost" (a very
+-- rough estimate of its memory usage).
+--
+-- The cleaning comprises the following:
+-- 1. Functions (and userdata, though user scripts ought not to get hold of
+--    those in the first place) are removed, because they break the model of
+--    Digilines as a network that carries basic data, and they could exfiltrate
+--    references to mutable objects from one Luacontroller to another, allowing
+--    inappropriate high-bandwidth, no-wires communication.
+-- 2. Tables are duplicated because, being mutable, they could otherwise be
+--    modified after the send is complete in order to change what data arrives
+--    at the recipient, perhaps in violation of the previous cleaning rule or
+--    in violation of the message size limit.
+--
+-- The cost indication is only approximate; it’s not a perfect measurement of
+-- the number of bytes of memory used by the message object.
+--
+-- Parameters:
+-- msg -- the message to clean
+-- back_references -- for internal use only; do not provide
+--
+-- Returns:
+-- 1. The cleaned object.
+-- 2. The approximate cost of the object.
+local function clean_and_weigh_digiline_message(msg, back_references)
+	local t = type(msg)
+	if t == "string" then
+		-- Strings are immutable so can be passed by reference, and cost their
+		-- length plus the size of the Lua object header (24 bytes on a 64-bit
+		-- platform) plus one byte for the NUL terminator.
+		return msg, #msg + 25
+	elseif t == "number" then
+		-- Numbers are passed by value so need not be touched, and cost 8 bytes
+		-- as all numbers in Lua are doubles.
+		return msg, 8
+	elseif t == "boolean" then
+		-- Booleans are passed by value so need not be touched, and cost 1
+		-- byte.
+		return msg, 1
+	elseif t == "table" then
+		-- Tables are duplicated. Check if this table has been seen before
+		-- (self-referential or shared table); if so, reuse the cleaned value
+		-- of the previous occurrence, maintaining table topology and avoiding
+		-- infinite recursion, and charge zero bytes for this as the object has
+		-- already been counted.
+		back_references = back_references or {}
+		local bref = back_references[msg]
+		if bref then
+			return bref, 0
+		end
+		-- Construct a new table by cleaning all the keys and values and adding
+		-- up their costs, plus 8 bytes as a rough estimate of table overhead.
+		local cost = 8
+		local ret = {}
+		back_references[msg] = ret
+		for k, v in pairs(msg) do
+			local k_cost, v_cost
+			k, k_cost = clean_and_weigh_digiline_message(k, back_references)
+			v, v_cost = clean_and_weigh_digiline_message(v, back_references)
+			if k ~= nil and v ~= nil then
+				-- Only include an element if its key and value are of legal
+				-- types.
+				ret[k] = v
+			end
+			-- If we only counted the cost of a table element when we actually
+			-- used it, we would be vulnerable to the following attack:
+			-- 1. Construct a huge table (too large to pass the cost limit).
+			-- 2. Insert it somewhere in a table, with a function as a key.
+			-- 3. Insert it somewhere in another table, with a number as a key.
+			-- 4. The first occurrence doesn’t pay the cost because functions
+			--    are stripped and therefore the element is dropped.
+			-- 5. The second occurrence doesn’t pay the cost because it’s in
+			--    back_references.
+			-- By counting the costs regardless of whether the objects will be
+			-- included, we avoid this attack; it may overestimate the cost of
+			-- some messages, but only those that won’t be delivered intact
+			-- anyway because they contain illegal object types.
+			cost = cost + k_cost + v_cost
+		end
+		return ret, cost
+	else
+		return nil, 0
 	end
-	return interrupt
 end
 
 
-local function get_digiline_send(pos)
+-- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
-	if not digiline then return end
+local function get_digiline_send(pos, itbl, send_warning)
+	if not minetest.global_exists("digilines") then return end
+	local chan_maxlen = mesecon.setting("luacontroller_digiline_channel_maxlen", 256)
+	local maxlen = mesecon.setting("luacontroller_digiline_maxlen", 50000)
 	return function(channel, msg)
+		-- NOTE: This runs within string metatable sandbox, so don't *rely* on anything of the form (""):y
+		--        or via anything that could.
 		-- Make sure channel is string, number or boolean
-		if (type(channel) ~= "string" and type(channel) ~= "number" and type(channel) ~= "boolean") then
+		if type(channel) == "string" then
+			if #channel > chan_maxlen then
+				send_warning("Channel string too long.")
+				return false
+			end
+		elseif (type(channel) ~= "string" and type(channel) ~= "number" and type(channel) ~= "boolean") then
+			send_warning("Channel must be string, number or boolean.")
 			return false
 		end
 
-		-- It is technically possible to send functions over the wire since
+		local msg_cost
-		-- the high performance impact of stripping those from the data has
+		msg, msg_cost = clean_and_weigh_digiline_message(msg)
-		-- been decided to not be worth the added realism.
+		if msg == nil or msg_cost > maxlen then
-		-- Make sure serialized version of the data is not insanely long to
+			send_warning("Message was too complex, or contained invalid data.")
-		-- prevent DoS-like attacks
-		local msg_ser = minetest.serialize(msg)
-		if #msg_ser > mesecon.setting("luacontroller_digiline_maxlen", 50000) then
 			return false
 		end
 
-		minetest.after(0, function()
+		table.insert(itbl, function ()
-			digilines.receptor_send(pos, digiline_rules_luatube, channel, msg)
+			-- Runs outside of string metatable sandbox
+			local luac_id = minetest.get_meta(pos):get_int("luac_id")
+			mesecon.queue:add_action(pos, "pipeworks:lt_digiline_relay", {channel, luac_id, msg})
 		end)
 		return true
 	end
 end
 
-
 local safe_globals = {
+	-- Don't add pcall/xpcall unless willing to deal with the consequences (unless very careful, incredibly likely to allow killing server indirectly)
 	"assert", "error", "ipairs", "next", "pairs", "select",
 	"tonumber", "tostring", "type", "unpack", "_VERSION"
 }
 
-local function create_environment(pos, mem, event)
+local function create_environment(pos, mem, event, itbl, send_warning)
 	-- Make sure the tube hasn't broken.
 	local vports = minetest.registered_nodes[minetest.get_node(pos).name].virtual_portstates
 	if not vports then return {} end
@@ -352,8 +484,8 @@ local function create_environment(pos, mem, event)
 		heat = mesecon.get_heat(pos),
 		heat_max = mesecon.setting("overheat_max", 20),
 		print = safe_print,
-		interrupt = get_interrupt(pos),
+		interrupt = get_interrupt(pos, itbl, send_warning),
-		digiline_send = get_digiline_send(pos),
+		digiline_send = get_digiline_send(pos, itbl, send_warning),
 		string = {
 			byte = string.byte,
 			char = string.char,
@@ -441,10 +573,11 @@ local function create_sandbox(code, env)
 		jit.off(f, true)
 	end
 
+	local maxevents = mesecon.setting("luacontroller_maxevents", 10000)
 	return function(...)
+		-- NOTE: This runs within string metatable sandbox, so the setting's been moved out for safety
 		-- Use instruction counter to stop execution
 		-- after luacontroller_maxevents
-		local maxevents = mesecon.setting("luacontroller_maxevents", 10000)
 		debug.sethook(timeout, "", maxevents)
 		local ok, ret = pcall(f, ...)
 		debug.sethook()  -- Clear hook
@@ -455,7 +588,7 @@ end
 
 
 local function load_memory(meta)
-	return minetest.deserialize(meta:get_string("lc_memory")) or {}
+	return minetest.deserialize(meta:get_string("lc_memory"), true) or {}
 end
 
 
@@ -465,6 +598,7 @@ local function save_memory(pos, meta, mem)
 
 	if (#memstring <= memsize_max) then
 		meta:set_string("lc_memory", memstring)
+		meta:mark_as_private("lc_memory")
 	else
 		print("Error: lua_tube memory overflow. "..memsize_max.." bytes available, "
 				..#memstring.." required. Controller overheats.")
@@ -472,26 +606,42 @@ local function save_memory(pos, meta, mem)
 	end
 end
 
-
+-- Returns success (boolean), errmsg (string), retval(any, return value of the user supplied code)
-local function run(pos, event)
+-- run (as opposed to run_inner) is responsible for setting up meta according to this output
+local function run_inner(pos, code, event)
 	local meta = minetest.get_meta(pos)
-	if overheat(pos) then return end
+	-- Note: These return success, presumably to avoid changing LC ID.
-	if ignore_event(event, meta) then return end
+	if overheat(pos) then return true, "", nil end
+	if ignore_event(event, meta) then return true, "", nil end
 
 	-- Load code & mem from meta
 	local mem  = load_memory(meta)
 	local code = meta:get_string("code")
 
+	-- 'Last warning' label.
+	local warning = ""
+	local function send_warning(str)
+		warning = "Warning: " .. str
+	end
+
 	-- Create environment
-	local env = create_environment(pos, mem, event)
+	local itbl = {}
+	local env = create_environment(pos, mem, event, itbl, send_warning)
 
 	-- Create the sandbox and execute code
 	local f, msg = create_sandbox(code, env)
-	if not f then return false, msg end
+	if not f then return false, msg, nil end
-	local succ, msg = pcall(f)
+	-- Start string true sandboxing
-	if not succ then return false, msg end
+	local onetruestring = getmetatable("")
+	-- If a string sandbox is already up yet inconsistent, something is very wrong
+	assert(onetruestring.__index == string)
+	onetruestring.__index = env.string
+	local success, msg = pcall(f)
+	onetruestring.__index = string
+	-- End string true sandboxing
+	if not success then return false, msg, nil end
 	if type(env.port) ~= "table" then
-		return false, "Ports set are invalid."
+		return false, "Ports set are invalid.", nil
 	end
 
 	-- Actually set the ports
@@ -500,35 +650,81 @@ local function run(pos, event)
 	-- Save memory. This may burn the luacontroller if a memory overflow occurs.
 	save_memory(pos, meta, env.mem)
 
-	return succ, msg
+	-- Execute deferred tasks
+	for _, v in ipairs(itbl) do
+		local failure = v()
+		if failure then
+			return false, failure, nil
+		end
+	end
+	return true, warning, msg
 end
 
-mesecon.queue:add_function("pipeworks:lc_tube_interrupt", function (pos, luac_id, iid)
+local function reset_formspec(meta, code, errmsg)
-	-- There is no lua_tube anymore / it has been reprogrammed / replaced / burnt
+	meta:set_string("code", code)
-	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	meta:mark_as_private("code")
-	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
+	code = minetest.formspec_escape(code or "")
-	run(pos, {type = "interrupt", iid = iid})
+	errmsg = minetest.formspec_escape(tostring(errmsg or ""))
-end)
+	meta:set_string("formspec", "size[12,10]"
+		.."background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"
+		.."label[0.1,8.3;"..errmsg.."]"
+		.."textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"
+		.."image_button[4.75,8.75;2.5,1;jeija_luac_runbutton.png;program;]"
+		.."image_button_exit[11.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"
+		)
+end
 
 local function reset_meta(pos, code, errmsg)
 	local meta = minetest.get_meta(pos)
-	meta:set_string("code", code)
+	reset_formspec(meta, code, errmsg)
-	code = minetest.formspec_escape(code or "")
-	errmsg = minetest.formspec_escape(tostring(errmsg or ""))
-	meta:set_string("formspec", "size[12,10]"..
-		"background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"..
-		"textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"..
-		"image_button[4.75,8.75;2.5,1;jeija_luac_runbutton.png;program;]"..
-		"image_button_exit[11.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"..
-		"label[0.1,9;"..errmsg.."]")
 	meta:set_int("luac_id", math.random(1, 65535))
 end
 
+-- Wraps run_inner with LC-reset-on-error
+local function run(pos, event)
+	local meta = minetest.get_meta(pos)
+	local code = meta:get_string("code")
+	local ok, errmsg, retval = run_inner(pos, code, event)
+	if not ok then
+		reset_meta(pos, code, errmsg)
+	else
+		reset_formspec(meta, code, errmsg)
+	end
+	return ok, errmsg, retval
+end
+
 local function reset(pos)
 	set_port_states(pos, {red = false, blue = false, yellow = false,
 		green = false, black = false, white = false})
 end
 
+local function node_timer(pos)
+	if minetest.registered_nodes[minetest.get_node(pos).name].is_burnt then
+		return false
+	end
+	run(pos, {type="interrupt"})
+	return false
+end
+
+-----------------------
+-- A.Queue callbacks --
+-----------------------
+
+mesecon.queue:add_function("pipeworks:lc_tube_interrupt", function (pos, luac_id, iid)
+	-- There is no lua_tube anymore / it has been reprogrammed / replaced / burnt
+	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
+	run(pos, {type="interrupt", iid = iid})
+end)
+
+mesecon.queue:add_function("pipeworks:lt_digiline_relay", function (pos, channel, luac_id, msg)
+	if not digiline then return end
+	-- This check is only really necessary because in case of server crash, old actions can be thrown into the future
+	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
+	-- The actual work
+	digiline:receptor_send(pos, digiline_rules_luatube, channel, msg)
+end)
 
 -----------------------
 -- Node Registration --
@@ -558,6 +754,7 @@ local digiline = {
 	receptor = {},
 	effector = {
 		action = function(pos, node, channel, msg)
+			msg = clean_and_weigh_digiline_message(msg)
 			run(pos, {type = "digiline", channel = channel, msg = msg})
 		end
 	},
@@ -565,6 +762,18 @@ local digiline = {
 		rules = pipeworks.digilines_rules
 	},
 }
+
+local function get_program(pos)
+	local meta = minetest.get_meta(pos)
+	return meta:get_string("code")
+end
+
+local function set_program(pos, code)
+	reset(pos)
+	reset_meta(pos, code)
+	return run(pos, {type="program"})
+end
+
 local function on_receive_fields(pos, form_name, fields, sender)
 	if not fields.program then
 		return
@@ -574,12 +783,10 @@ local function on_receive_fields(pos, form_name, fields, sender)
 		minetest.record_protection_violation(pos, name)
 		return
 	end
-	reset(pos)
+	local ok, err = set_program(pos, fields.code)
-	reset_meta(pos, fields.code)
+	if not ok then
-	local succ, err = run(pos, {type="program"})
+		-- it's not an error from the server perspective
-	if not succ then
+		minetest.log("action", "Lua controller programming error: " .. tostring(err))
-		print(err)
-		reset_meta(pos, fields.code, err)
 	end
 end
 
@@ -606,82 +813,56 @@ local tiles_base = {
 	"pipeworks_mese_tube_plain_2.png", "pipeworks_mese_tube_plain_1.png",
 	"pipeworks_mese_tube_plain_6.png", "pipeworks_mese_tube_plain_5.png"}
 
+local tiles_on_off = {
+	R__0   = "^pipeworks_lua_tube_port_%s.png",
+	R_90  = "^(pipeworks_lua_tube_port_%s.png^[transformR90)",
+	R180 = "^(pipeworks_lua_tube_port_%s.png^[transformR180)",
+	R270 = "^(pipeworks_lua_tube_port_%s.png^[transformR270)"
+}
+
+local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
+	and "clip" or true
+
 for red    = 0, 1 do -- 0 = off  1 = on
 for blue   = 0, 1 do
 for yellow = 0, 1 do
 for green  = 0, 1 do
 for black  = 0, 1 do
 for white  = 0, 1 do
-	local cid = tostring(white)..tostring(black)..tostring(green)..
+	local cid = white..black..green..yellow..blue..red
-			tostring(yellow)..tostring(blue)..tostring(red)
 	local node_name = BASENAME..cid
+
 	local tiles = table.copy(tiles_base)
-	if red == 1 then
+	-- Red
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
+	tiles[1] = tiles[1]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
+	tiles[2] = tiles[2]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
+	tiles[5] = tiles[5]..tiles_on_off.R270:format(red == 1 and "on" or "off");
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
+	tiles[6] = tiles[6]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
-	else
+	-- Blue
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
+	tiles[1] = tiles[1]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
+	tiles[2] = tiles[2]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
+	tiles[5] = tiles[5]..tiles_on_off.R_90:format(blue == 1 and "on" or "off");
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
+	tiles[6] = tiles[6]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
-	end
+	-- Yellow
-	if blue == 1 then
+	tiles[1] = tiles[1]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
+	tiles[2] = tiles[2]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
+	tiles[5] = tiles[5]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
+	tiles[6] = tiles[6]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
+	-- Green
-	else
+	tiles[3] = tiles[3]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
+	tiles[4] = tiles[4]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
+	tiles[5] = tiles[5]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
+	tiles[6] = tiles[6]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
+	-- Black
-	end
+	tiles[1] = tiles[1]..tiles_on_off.R180:format(black == 1 and "on" or "off");
-	if yellow == 1 then
+	tiles[2] = tiles[2]..tiles_on_off.R__0:format(black == 1 and "on" or "off");
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
+	tiles[3] = tiles[3]..tiles_on_off.R_90:format(black == 1 and "on" or "off");
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
+	tiles[4] = tiles[4]..tiles_on_off.R270:format(black == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
+	-- White
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
+	tiles[1] = tiles[1]..tiles_on_off.R__0:format(white == 1 and "on" or "off");
-	else
+	tiles[2] = tiles[2]..tiles_on_off.R180:format(white == 1 and "on" or "off");
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
+	tiles[3] = tiles[3]..tiles_on_off.R270:format(white == 1 and "on" or "off");
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
+	tiles[4] = tiles[4]..tiles_on_off.R_90:format(white == 1 and "on" or "off");
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-	end
-	if green == 1 then
-		tiles[3] = tiles[3].."^pipeworks_lua_tube_port_on.png"
-		tiles[4] = tiles[4].."^pipeworks_lua_tube_port_on.png"
-		tiles[5] = tiles[5].."^pipeworks_lua_tube_port_on.png"
-		tiles[6] = tiles[6].."^pipeworks_lua_tube_port_on.png"
-	else
-		tiles[3] = tiles[3].."^pipeworks_lua_tube_port_off.png"
-		tiles[4] = tiles[4].."^pipeworks_lua_tube_port_off.png"
-		tiles[5] = tiles[5].."^pipeworks_lua_tube_port_off.png"
-		tiles[6] = tiles[6].."^pipeworks_lua_tube_port_off.png"
-	end
-	if black == 1 then
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-		tiles[2] = tiles[2].."^pipeworks_lua_tube_port_on.png"
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-	else
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-		tiles[2] = tiles[2].."^pipeworks_lua_tube_port_off.png"
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-	end
-	if white == 1 then
-		tiles[1] = tiles[1].."^pipeworks_lua_tube_port_on.png"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-	else
-		tiles[1] = tiles[1].."^pipeworks_lua_tube_port_off.png"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-	end
 
 	local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1}
 	if red + blue + yellow + green + black + white ~= 0 then
@@ -715,14 +896,20 @@ for white  = 0, 1 do
 		receptor = {
 			state = mesecon.state.on,
 			rules = output_rules[cid]
-		}
+		},
+		luacontroller = {
+			get_program = get_program,
+			set_program = set_program,
+		},
 	}
 
 	minetest.register_node(node_name, {
 		description = "Lua controlled Tube",
 		drawtype = "nodebox",
 		tiles = tiles,
+		use_texture_alpha = texture_alpha_mode,
 		paramtype = "light",
+		is_ground_content = false,
 		groups = groups,
 		drop = BASENAME.."000000",
 		sunlight_propagates = true,
@@ -749,6 +936,7 @@ for white  = 0, 1 do
 			pipeworks.after_dig(pos, node)
 		end,
 		is_luacontroller = true,
+		on_timer = node_timer,
 		tubelike = 1,
 		tube = {
 			connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1},
@@ -756,13 +944,13 @@ for white  = 0, 1 do
 			can_go = function(pos, node, velocity, stack)
 				local src = {name = nil}
 				-- add color of the incoming tube explicitly; referring to rules, in case they change later
-				for color, rule in pairs(rules) do
+				for _, rule in pairs(rules) do
 					if (-velocity.x == rule.x and -velocity.y == rule.y and -velocity.z == rule.z) then
 						src.name = rule.name
 						break
 					end
 				end
-				local succ, msg = run(pos, {
+				local succ, _, msg = run(pos, {
 					type = "item",
 					pin = src,
 					itemstring = stack:to_string(),
@@ -780,15 +968,7 @@ for white  = 0, 1 do
 		on_blast = function(pos, intensity)
 			if not intensity or intensity > 1 + 3^0.5 then
 				minetest.remove_node(pos)
-				return {string.format("%s_%s", name, dropname)}
+				return
-			end
-			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
-			pipeworks.scan_for_tube_objects(pos)
-		end,
-		on_blast = function(pos, intensity)
-			if not intensity or intensity > 1 + 3^0.5 then
-				minetest.remove_node(pos)
-				return {string.format("%s_%s", name, dropname)}
 			end
 			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 			pipeworks.scan_for_tube_objects(pos)
@@ -801,6 +981,8 @@ end
 end
 end
 
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = BASENAME.."000000"
+
 ------------------------------------
 -- Overheated Lua controlled Tube --
 ------------------------------------
@@ -834,8 +1016,10 @@ tiles_burnt[4] = tiles_burnt[4].."^(pipeworks_lua_tube_port_burnt.png^[transform
 minetest.register_node(BASENAME .. "_burnt", {
 	drawtype = "nodebox",
 	tiles = tiles_burnt,
+	use_texture_alpha = texture_alpha_mode,
 	is_burnt = true,
 	paramtype = "light",
+	is_ground_content = false,
 	groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1},
 	drop = BASENAME.."000000",
 	sunlight_propagates = true,
@@ -864,7 +1048,7 @@ minetest.register_node(BASENAME .. "_burnt", {
 	on_blast = function(pos, intensity)
 		if not intensity or intensity > 1 + 3^0.5 then
 			minetest.remove_node(pos)
-			return {string.format("%s_%s", name, dropname)}
+			return
 		end
 		minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 		pipeworks.scan_for_tube_objects(pos)

luaentity.lua

@@ -9,16 +9,16 @@ local filename = minetest.get_worldpath().."/luaentities"
 local function read_file()
 	local f = io.open(filename, "r")
 	if f == nil then return {} end
-    	local t = f:read("*all")
+	local t = f:read("*all")
-    	f:close()
+	f:close()
 	if t == "" or t == nil then return {} end
 	return minetest.deserialize(t) or {}
 end
 
 local function write_file(tbl)
 	local f = io.open(filename, "w")
-    	f:write(minetest.serialize(tbl))
+	f:write(minetest.serialize(tbl))
-    	f:close()
+	f:close()
 end
 
 local function read_entities()
@@ -46,6 +46,11 @@ local function read_entities()
 end
 
 local function write_entities()
+	if not luaentity.entities then
+		-- This can happen if crashing on startup, causing another error that
+		-- masks the original one. Return gracefully in that case instead.
+		return
+	end
 	for _, entity in pairs(luaentity.entities) do
 		setmetatable(entity, nil)
 		for _, attached in pairs(entity._attached_entities) do
@@ -313,19 +318,20 @@ end
 function luaentity.get_objects_inside_radius(pos, radius)
 	local objects = {}
 	local index = 1
-	for id, entity in pairs(luaentity.entities) do
+	for _, entity in pairs(luaentity.entities) do
 		if vector.distance(pos, entity:get_pos()) <= radius then
 			objects[index] = entity
 			index = index + 1
 		end
 	end
+	return objects
 end
 
 local move_entities_globalstep_part2 = function(dtime)
 	if not luaentity.entities then
 		luaentity.entities = read_entities()
 	end
-	for id, entity in pairs(luaentity.entities) do
+	for _, entity in pairs(luaentity.entities) do
 		local master = entity._attached_entities_master
 		local master_def = master and entity._attached_entities[master]
 		local master_entity = master_def and master_def.entity
@@ -335,6 +341,8 @@ local move_entities_globalstep_part2 = function(dtime)
 			entity._velocity = master_entity:get_velocity()
 			entity._acceleration = master_entity:get_acceleration()
 		else
+			entity._velocity = entity._velocity or vector.new(0,0,0)
+			entity._acceleration = entity._acceleration or vector.new(0,0,0)
 			entity._pos = vector.add(vector.add(
 				entity._pos,
 				vector.multiply(entity._velocity, dtime)),

mod.conf

@@ -1 +1,5 @@
 name = pipeworks
+description = This mod uses mesh nodes and nodeboxes to supply a complete set of 3D pipes and tubes, along with devices that work with them.
+depends = default, basic_materials, screwdriver
+optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory
+min_minetest_version = 5.2.0

pipes.lua

@@ -1,4 +1,5 @@
 -- This file supplies the steel pipes
+local S = minetest.get_translator("pipeworks")
 
 local REGISTER_COMPATIBILITY = true
 
@@ -10,7 +11,7 @@ local new_flow_logic_register = pipeworks.flowables.register
 local polys = ""
 if pipeworks.enable_lowpoly then polys = "_lowpoly" end
 
-local vti = {4, 3, 2, 1, 6, 5}
+--~ local vti = {4, 3, 2, 1, 6, 5}
 local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}}
 for index, connects in ipairs(cconnects) do
 	local outsel = {}
@@ -29,17 +30,19 @@ for index, connects in ipairs(cconnects) do
 		table.insert(outsel, pipeworks.pipe_selectboxes[v])
 	end
 
+	--[[
 	if #connects == 1 then
 		local v = connects[1]
 		v = v-1 + 2*(v%2) -- Opposite side
 	end
+	--]]
 
 	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
-	local pipedesc = "Pipe segement".." "..dump(connects).."... You hacker, you."
+	local pipedesc = S("Pipe Segment").." "..dump(connects)
 
 	if #connects == 0 then
 		pgroups = {snappy = 3, tube = 1}
-		pipedesc = "Pipe segment"
+		pipedesc = S("Pipe Segment")
 	end
 
 	local outimg_e = { "pipeworks_pipe_plain.png" }
@@ -73,7 +76,7 @@ for index, connects in ipairs(cconnects) do
 			fixed = outsel
 		},
 		groups = pgroups,
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
@@ -82,7 +85,10 @@ for index, connects in ipairs(cconnects) do
 		after_dig_node = function(pos)
 			pipeworks.scan_for_pipe_objects(pos)
 		end,
-		on_rotate = false
+		on_rotate = false,
+		check_for_pole = pipeworks.check_for_vert_pipe,
+		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
+		pipenumber = index
 	})
 
 	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
@@ -104,7 +110,7 @@ for index, connects in ipairs(cconnects) do
 			fixed = outsel
 		},
 		groups = pgroups,
-		sounds = default.node_sound_wood_defaults(),
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
@@ -114,7 +120,10 @@ for index, connects in ipairs(cconnects) do
 		after_dig_node = function(pos)
 			pipeworks.scan_for_pipe_objects(pos)
 		end,
-		on_rotate = false
+		on_rotate = false,
+		check_for_pole = pipeworks.check_for_vert_pipe,
+		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
+		pipenumber = index
 	})
 
 	local emptypipe = "pipeworks:pipe_"..index.."_empty"
@@ -124,7 +133,7 @@ for index, connects in ipairs(cconnects) do
 	new_flow_logic_register.simple(emptypipe)
 	new_flow_logic_register.simple(fullpipe)
 end
-
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:pipe_1_empty"
 
 
 if REGISTER_COMPATIBILITY then
@@ -134,7 +143,7 @@ if REGISTER_COMPATIBILITY then
 		drawtype = "airlike",
 		sunlight_propagates = true,
 		paramtype = "light",
-		description = "Pipe Segment (legacy)",
+		description = S("Pipe Segment (legacy)"),
 		groups = {not_in_creative_inventory = 1, pipe_to_update = 1},
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)

pressure_logic/abms.lua

@@ -29,7 +29,7 @@ end
 
 
 
-local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
+--~ local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
 
 
 
@@ -39,7 +39,7 @@ local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..
 local check_for_liquids_v2 = function(pos, limit)
 	local coords = make_coords_offsets(pos, false)
 	local total = 0
-	for index, tpos in ipairs(coords) do
+	for _, tpos in ipairs(coords) do
 		if total >= limit then break end
 		local name = minetest.get_node(tpos).name
 		if name == "default:water_source" then
@@ -69,11 +69,13 @@ end
 
 
 -- logging is unreliable when something is crashing...
+--[[
 local nilexplode = function(caller, label, value)
 	if value == nil then
 		error(caller..": "..label.." was nil")
 	end
 end
+--]]
 
 
 
@@ -151,7 +153,7 @@ local get_neighbour_positions = function(pos, node)
 
 	-- then, check each possible neighbour to see if they can be reached from this node.
 	local connections = {}
-	for index, offset in ipairs(candidates) do
+	for _, offset in ipairs(candidates) do
 		local npos = vector.add(pos, offset)
 		local neighbour = minetest.get_node(npos)
 		local nodename = neighbour.name
@@ -185,13 +187,12 @@ flowlogic.balance_pressure = function(pos, node, currentpressure)
 	-- local dname = "flowlogic.balance_pressure()@"..formatvec(pos).." "
 	-- check the pressure of all nearby flowable nodes, and average it out.
 
-	-- pressure handles to average over
-	local connections = {}
 	-- unconditionally include self in nodes to average over.
 	-- result of averaging will be returned as new pressure for main flow logic callback
 	local totalv = currentpressure
 	local totalc = 1
 
+	-- pressure handles to average over
 	local connections = get_neighbour_positions(pos, node)
 
 	-- for each neighbour, add neighbour's pressure to the total to balance out
@@ -287,7 +288,7 @@ flowlogic.run_output = function(pos, node, currentpressure, oldpressure, outputd
 	local upper = outputdef.upper
 	local lower = outputdef.lower
 	local result = currentpressure
-	local threshold = nil
+	local threshold
 	if finitemode then threshold = lower else threshold = upper end
 	if currentpressure > threshold then
 		local takenpressure = outputdef.outputfn(pos, node, currentpressure, finitemode)
@@ -316,7 +317,7 @@ flowlogic.run_transition = function(node, currentpressure)
 		local nodename_prev = simplesetdef[1].nodename
 		local result_nodename = node.name
 
-		for index, element in ipairs(simplesetdef) do
+		for _, element in ipairs(simplesetdef) do
 			-- find the highest element that is below the current pressure.
 			local threshold = element.threshold
 			if threshold > currentpressure then
@@ -338,7 +339,9 @@ flowlogic.run_transition = function(node, currentpressure)
 	end
 
 	if not found then
-		pipeworks.logger("flowlogic.run_transition() BUG no transition definitions found! nodename="..nodename.." currentpressure="..tostring(currentpressure))
+		pipeworks.logger("flowlogic.run_transition() BUG no transition " ..
+			"definitions found! node.name=" .. node.name ..
+			" currentpressure=" .. tostring(currentpressure))
 	end
 
 	return result

pressure_logic/flowable_node_registry_install.lua

@@ -26,8 +26,8 @@ local insertbase = function(nodename)
 end
 
 local regwarning = function(kind, nodename)
-	local tail = ""
+	--~ local tail = ""
-	if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
+	--~ if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
 	--pipeworks.logger(kind.." flow logic registry requested for "..nodename..tail)
 end
 
@@ -106,7 +106,7 @@ register.directional_horizonal_rotate = function(nodename, doubleended)
 	end
 	local directionfn = function(node, direction)
 		local result = false
-		for index, endvec in ipairs(getends(node)) do
+		for _, endvec in ipairs(getends(node)) do
 			if vector.equals(direction, endvec) then result = true end
 		end
 		return result

routing_tubes.lua

@@ -1,6 +1,6 @@
-
+local S = minetest.get_translator("pipeworks")
 -- the default tube and default textures
-pipeworks.register_tube("pipeworks:tube", "Pneumatic tube segment")
+pipeworks.register_tube("pipeworks:tube", S("Pneumatic tube segment"))
 minetest.register_craft( {
 	output = "pipeworks:tube_1 6",
 	recipe = {
@@ -10,10 +10,39 @@ minetest.register_craft( {
 	},
 })
 
+-- The hammers that can be used to break/repair tubes
+local allowed_hammers = {
+	"anvil:hammer",
+	"cottages:hammer",
+	"glooptest:hammer_steel",
+	"glooptest:hammer_bronze",
+	"glooptest:hammer_diamond",
+	"glooptest:hammer_mese",
+	"glooptest:hammer_alatro",
+	"glooptest:hammer_arol"
+}
+
+-- Convert the above list to a format that's easier to look up
+for _,hammer in ipairs(allowed_hammers) do
+	allowed_hammers[hammer] = true
+end
+
+-- Check if the player is holding a suitable hammer or not - if they are, apply wear to it
+function pipeworks.check_and_wear_hammer(player)
+	local itemstack = player:get_wielded_item()
+	local wieldname = itemstack:get_name()
+	if allowed_hammers[wieldname] then
+		itemstack:add_wear(1000)
+		player:set_wielded_item(itemstack)
+		return true
+	end
+	return false
+end
+
 local nodecolor = 0xffff3030
 
 pipeworks.register_tube("pipeworks:broken_tube", {
-	description = "Broken Tube (you hacker you)",
+	description = S("Broken Tube"),
 	plain = { { name = "pipeworks_broken_tube_plain.png", backface_culling = false, color = nodecolor } },
 	noctr = { { name = "pipeworks_broken_tube_plain.png", backface_culling = false, color = nodecolor } },
 	ends  = { { name = "pipeworks_broken_tube_end.png",   color = nodecolor } },
@@ -35,30 +64,28 @@ pipeworks.register_tube("pipeworks:broken_tube", {
 			local itemstack = puncher:get_wielded_item()
 			local wieldname = itemstack:get_name()
 			local playername = puncher:get_player_name()
-			print("[Pipeworks] "..playername.." struck a broken tube at "..minetest.pos_to_string(pos))
+			local log_msg = playername.." struck a broken tube at "..minetest.pos_to_string(pos).."\n"
-			if   wieldname == "anvil:hammer"
+			local meta = minetest.get_meta(pos)
-			  or wieldname == "cottages:hammer"
+			local was_node = minetest.deserialize(meta:get_string("the_tube_was"))
-			  or wieldname == "glooptest:hammer_steel"
+			if not was_node then
-			  or wieldname == "glooptest:hammer_bronze"
+				pipeworks.logger(log_msg.."            but it can't be repaired.")
-			  or wieldname == "glooptest:hammer_diamond"
+				return
-			  or wieldname == "glooptest:hammer_mese"
-			  or wieldname == "glooptest:hammer_alatro"
-			  or wieldname == "glooptest:hammer_arol" then
-				local meta = minetest.get_meta(pos)
-				local was_node = minetest.deserialize(meta:get_string("the_tube_was"))
-				if was_node and was_node ~= "" then
-					print("            with "..wieldname.." to repair it.")
-					minetest.swap_node(pos, { name = was_node.name, param2 = was_node.param2 })
-					pipeworks.scan_for_tube_objects(pos)
-					itemstack:add_wear(1000)
-					puncher:set_wielded_item(itemstack)
-					return itemstack
-				else
-					print("            but it can't be repaired.")
-				end
-			else
-				print("            with "..wieldname.." but that tool is too weak.")
 			end
+			if not pipeworks.check_and_wear_hammer(puncher) then
+				if wieldname == "" then
+					pipeworks.logger(log_msg.."            by hand. It's not very effective.")
+					if minetest.settings:get_bool("enable_damage") then
+						minetest.chat_send_player(playername,S("Broken tubes may be a bit sharp. Perhaps try with a hammer?"))
+						puncher:set_hp(puncher:get_hp()-1)
+					end
+				else
+					pipeworks.logger(log_msg.."            with "..wieldname.." but that tool is too weak.")
+				end
+				return
+			end
+			pipeworks.logger(log_msg.."            with "..wieldname.." to repair it.")
+			minetest.swap_node(pos, { name = was_node.name, param2 = was_node.param2 })
+			pipeworks.scan_for_tube_objects(pos)
 		end
 	}
 })
@@ -69,7 +96,7 @@ pipeworks.register_tube("pipeworks:broken_tube", {
 if pipeworks.enable_priority_tube then
 	local color = "#ff3030:128"
 	pipeworks.register_tube("pipeworks:priority_tube", {
-			description = "High Priority Tube Segment",
+			description = S("High Priority Tube Segment"),
 			inventory_image = "pipeworks_tube_inv.png^[colorize:" .. color,
 			plain = { { name = "pipeworks_tube_plain.png", color = nodecolor } },
 			noctr = { { name = "pipeworks_tube_noctr.png", color = nodecolor } },
@@ -91,7 +118,7 @@ end
 
 if pipeworks.enable_accelerator_tube then
 	pipeworks.register_tube("pipeworks:accelerator_tube", {
-			description = "Accelerating Pneumatic Tube Segment",
+			description = S("Accelerating Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_accelerator_tube_inv.png",
 			plain = { "pipeworks_accelerator_tube_plain.png" },
 			noctr = { "pipeworks_accelerator_tube_noctr.png" },
@@ -116,7 +143,7 @@ end
 
 if pipeworks.enable_crossing_tube then
 	pipeworks.register_tube("pipeworks:crossing_tube", {
-			description = "Crossing Pneumatic Tube Segment",
+			description = S("Crossing Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_crossing_tube_inv.png",
 			plain = { "pipeworks_crossing_tube_plain.png" },
 			noctr = { "pipeworks_crossing_tube_noctr.png" },
@@ -138,7 +165,7 @@ end
 
 if pipeworks.enable_one_way_tube then
 	minetest.register_node("pipeworks:one_way_tube", {
-		description = "One way tube",
+		description = S("One way tube"),
 		tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png",
 			"pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"},
 		paramtype2 = "facedir",
@@ -162,7 +189,10 @@ if pipeworks.enable_one_way_tube then
 		after_place_node = pipeworks.after_place,
 		after_dig_node = pipeworks.after_dig,
 		on_rotate = pipeworks.on_rotate,
+		check_for_pole = pipeworks.check_for_vert_tube,
+		check_for_horiz_pole = pipeworks.check_for_horiz_tube
 	})
+	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:one_way_tube"
 	minetest.register_craft({
 		output = "pipeworks:one_way_tube 2",
 		recipe = {

signal_tubes.lua

@@ -1,17 +1,29 @@
+local S = minetest.get_translator("pipeworks")
+
+-- the minetest.after() calls below can sometimes trigger after a tube
+-- breaks, at which point item_exit() is no longer valid, so we have to make
+-- sure that there even IS a callback to run, first.
+
+local function after_break(pos)
+	local name = minetest.get_node(pos).name
+	if minetest.registered_nodes[name].item_exit then
+		minetest.registered_nodes[name].item_exit(pos)
+	end
+end
+
 if pipeworks.enable_detector_tube then
 	local detector_tube_step = 5 * tonumber(minetest.settings:get("dedicated_server_step"))
 	pipeworks.register_tube("pipeworks:detector_tube_on", {
-			description = "Detecting Pneumatic Tube Segment on (you hacker you)",
+			description = S("Detecting Pneumatic Tube Segment on"),
 			inventory_image = "pipeworks_detector_tube_inv.png",
 			plain = { "pipeworks_detector_tube_plain.png" },
 			node_def = {
 				tube = {can_go = function(pos, node, velocity, stack)
 						 local meta = minetest.get_meta(pos)
-						 local name = minetest.get_node(pos).name
 						 local nitems = meta:get_int("nitems")+1
 						 meta:set_int("nitems", nitems)
 						 local saved_pos = vector.new(pos)
-						 minetest.after(detector_tube_step, minetest.registered_nodes[name].item_exit, saved_pos)
+						 minetest.after(detector_tube_step, after_break, saved_pos)
 						 return pipeworks.notvel(pipeworks.meseadjlist,velocity)
 					end},
 				groups = {mesecon = 2, not_in_creative_inventory = 1},
@@ -33,14 +45,12 @@ if pipeworks.enable_detector_tube then
 				on_construct = function(pos)
 					 local meta = minetest.get_meta(pos)
 					 meta:set_int("nitems", 1)
-					 local name = minetest.get_node(pos).name
+					 minetest.after(detector_tube_step, after_break, pos)
-					 local saved_pos = vector.new(pos)
-					 minetest.after(detector_tube_step, minetest.registered_nodes[name].item_exit, saved_pos)
 				end,
 			},
 	})
 	pipeworks.register_tube("pipeworks:detector_tube_off", {
-			description = "Detecting Pneumatic Tube Segment",
+			description = S("Detecting Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_detector_tube_inv.png",
 			plain = { "pipeworks_detector_tube_plain.png" },
 			node_def = {
@@ -70,7 +80,7 @@ end
 local digiline_enabled = minetest.get_modpath("digilines") ~= nil
 if digiline_enabled and pipeworks.enable_digiline_detector_tube then
 	pipeworks.register_tube("pipeworks:digiline_detector_tube", {
-			description = "Digiline Detecting Pneumatic Tube Segment",
+			description = S("Digiline Detecting Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_digiline_detector_tube_inv.png",
 			plain = { "pipeworks_digiline_detector_tube_plain.png" },
 			node_def = {
@@ -79,20 +89,27 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then
 
 						local setchan = meta:get_string("channel")
 
-						digiline:receptor_send(pos, digiline.rules.default, setchan, stack:to_string())
+						digiline:receptor_send(pos, digiline.rules.default, setchan, stack:to_table())
 
 						return pipeworks.notvel(pipeworks.meseadjlist, velocity)
 					end},
 				on_construct = function(pos)
 					local meta = minetest.get_meta(pos)
 					meta:set_string("formspec",
-						"size[8.6,2.2]"..
+						"size[8.5,2.2]"..
-						"field[0.6,0.6;8,1;channel;Channel:;${channel}]"..
+						"image[0.2,0;1,1;pipeworks_digiline_detector_tube_inv.png]"..
-						"image[0.3,1.3;1,1;pipeworks_digiline_detector_tube_inv.png]"..
+						"label[1.2,0.2;"..S("Digiline Detecting Tube").."]"..
-						"label[1.6,1.2;Digiline Detecting Tube]"
+						"field[0.5,1.6;4.6,1;channel;"..S("Channel")..";${channel}]"..
+						"button[4.8,1.3;1.5,1;set_channel;"..S("Set").."]"..
+						"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"
 					)
 				end,
 				on_receive_fields = function(pos, formname, fields, sender)
+					if (fields.quit and not fields.key_enter_field)
+					or (fields.key_enter_field ~= "channel" and not fields.set_channel)
+					or not pipeworks.may_configure(pos, sender) then
+						return
+					end
 					if fields.channel then
 						minetest.get_meta(pos):set_string("channel", fields.channel)
 					end
@@ -122,7 +139,7 @@ end
 
 if pipeworks.enable_conductor_tube then
 	pipeworks.register_tube("pipeworks:conductor_tube_off", {
-			description = "Conducting Pneumatic Tube Segment",
+			description = S("Conducting Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_conductor_tube_inv.png",
 			short = "pipeworks_conductor_tube_short.png",
 			plain = { "pipeworks_conductor_tube_plain.png" },
@@ -136,7 +153,7 @@ if pipeworks.enable_conductor_tube then
 			},
 	})
 	pipeworks.register_tube("pipeworks:conductor_tube_on", {
-			description = "Conducting Pneumatic Tube Segment on (you hacker you)",
+			description = S("Conducting Pneumatic Tube Segment on"),
 			inventory_image = "pipeworks_conductor_tube_inv.png",
 			short = "pipeworks_conductor_tube_short.png",
 			plain = { "pipeworks_conductor_tube_on_plain.png" },
@@ -160,7 +177,7 @@ end
 
 if digiline_enabled and pipeworks.enable_digiline_conductor_tube then
 	pipeworks.register_tube("pipeworks:digiline_conductor_tube", {
-		description = "Digiline Conducting Pneumatic Tube Segment",
+		description = S("Digiline Conducting Pneumatic Tube Segment"),
 		inventory_image = "pipeworks_tube_inv.png^pipeworks_digiline_conductor_tube_inv.png",
 		short = "pipeworks_tube_short.png^pipeworks_digiline_conductor_tube_short.png",
 		plain = {"pipeworks_tube_plain.png^pipeworks_digiline_conductor_tube_plain.png"},
@@ -178,7 +195,7 @@ end
 if digiline_enabled and pipeworks.enable_digiline_conductor_tube and
 		pipeworks.enable_conductor_tube then
 	pipeworks.register_tube("pipeworks:mesecon_and_digiline_conductor_tube_off", {
-		description = "Mesecon and Digiline Conducting Pneumatic Tube Segment",
+		description = S("Mesecon and Digiline Conducting Pneumatic Tube Segment"),
 		inventory_image = "pipeworks_conductor_tube_inv.png^pipeworks_digiline_conductor_tube_inv.png",
 		short = "pipeworks_conductor_tube_short.png^pipeworks_digiline_conductor_tube_short.png",
 		plain = {"pipeworks_conductor_tube_plain.png^pipeworks_digiline_conductor_tube_plain.png"},
@@ -195,7 +212,7 @@ if digiline_enabled and pipeworks.enable_digiline_conductor_tube and
 		},
 	})
 	pipeworks.register_tube("pipeworks:mesecon_and_digiline_conductor_tube_on", {
-		description = "Mesecon and Digiline Conducting Pneumatic Tube Segment on (you hacker you)",
+		description = S("Mesecon and Digiline Conducting Pneumatic Tube Segment on"),
 		inventory_image = "pipeworks_conductor_tube_inv.png^pipeworks_digiline_conductor_tube_inv.png",
 		short = "pipeworks_conductor_tube_short.png^pipeworks_digiline_conductor_tube_short.png",
 		plain = {"pipeworks_conductor_tube_on_plain.png^pipeworks_digiline_conductor_tube_plain.png"},

signs_compat.lua

@@ -0,0 +1,241 @@
+-- This file adds placement rules for signs_lib, if present
+
+local spv = {
+	[4] = true,
+	[6] = true,
+	[8] = true,
+	[10] = true,
+	[13] = true,
+	[15] = true,
+	[17] = true,
+	[19] = true
+}
+
+local sphns = {
+	[1] = true,
+	[3] = true,
+	[5] = true,
+	[7] = true,
+	[9] = true,
+	[11] = true,
+	[21] = true,
+	[23] = true
+}
+
+local sphew = {
+	[0] = true,
+	[2] = true,
+	[12] = true,
+	[14] = true,
+	[16] = true,
+	[18] = true,
+	[20] = true,
+	[22] = true
+}
+
+local owtv = {
+	[5] = true,
+	[7] = true,
+	[9] = true,
+	[11] = true,
+	[12] = true,
+	[14] = true,
+	[16] = true,
+	[18] = true
+}
+
+local owtns = {
+	[0] = true,
+	[2] = true,
+	[4] = true,
+	[6] = true,
+	[8] = true,
+	[10] = true,
+	[20] = true,
+	[22] = true
+}
+
+local owtew = {
+	[1] = true,
+	[3] = true,
+	[13] = true,
+	[15] = true,
+	[17] = true,
+	[19] = true,
+	[21] = true,
+	[23] = true
+}
+
+local vert_n = {
+	[3] = {[5] = true},
+	[6] = {[9] = true, [12] = true, [16] = true},
+	[7] = {[9] = true, [11] = true},
+}
+
+local vert_e = {
+	[3] = {[5] = true},
+	[6] = {[5] = true, [9] = true, [16] = true},
+	[7] = {[7] = true, [11] = true},
+}
+
+local vert_s = {
+	[3] = {[5] = true},
+	[6] = {[5] = true, [12] = true, [16] = true},
+	[7] = {[5] = true, [7] = true},
+}
+
+local vert_w = {
+	[3] = {[5] = true},
+	[6] = {[5] = true, [9] = true, [12] = true},
+	[7] = {[5] = true, [9] = true},
+}
+
+local horiz_n = {
+	[3] = {[0] = true},
+	[6] = {[0] = true, [4] = true, [20] = true},
+	[7] = {[2] = true, [10] = true},
+	[8] = {[0] = true},
+	[9] = {[2] = true},
+}
+
+local horiz_e = {
+	[3] = {[1] = true},
+	[6] = {[1] = true, [17] = true, [21] = true},
+	[7] = {[3] = true, [19] = true},
+	[8] = {[1] = true},
+	[9] = {[3] = true},
+}
+
+local horiz_s = {
+	[3] = {[0] = true},
+	[6] = {[0] = true, [8] = true, [20] = true},
+	[7] = {[0] = true, [4] = true},
+	[8] = {[0] = true},
+	[9] = {[0] = true},
+}
+
+local horiz_w = {
+	[3] = {[1] = true},
+	[6] = {[1] = true, [13] = true, [21] = true},
+	[7] = {[1] = true, [13] = true},
+	[8] = {[1] = true},
+	[9] = {[1] = true},
+}
+
+local function get_sign_dir(node, def)
+	if (node.param2 == 4 and def.paramtype2 == "wallmounted")
+	  or (node.param2 == 0 and def.paramtype2 ~= "wallmounted") then
+		return {["N"] = true}
+	elseif (node.param2 == 2 and def.paramtype2 == "wallmounted")
+	  or (node.param2 == 1 and def.paramtype2 ~= "wallmounted") then
+		return {["E"] = true}
+	elseif (node.param2 == 5 and def.paramtype2 == "wallmounted")
+	  or (node.param2 == 2 and def.paramtype2 ~= "wallmounted") then
+		return {["S"] = true}
+	elseif node.param2 == 3 then
+		return {["W"] = true}
+	end
+	return {}
+end
+
+--[[
+In the functions below:
+
+ pos: the (real) position of the placed sign
+ node: the sign node itself
+ def: its definition
+
+ ppos: the position of the pointed node (pipe/tube)
+ pnode: the node itself
+ pdef: its definition
+
+--]]
+
+
+-- pipes
+
+function pipeworks.check_for_vert_pipe(pos, node, def, ppos, pnode, pdef)
+	local signdir = get_sign_dir(node, def)
+	local pipenumber = pdef.pipenumber
+	local pipedir = pnode.param2
+	if string.find(pnode.name, "straight_pipe") and spv[pipedir] then
+		return true
+	elseif signdir["N"] and vert_n[pipenumber] and vert_n[pipenumber][pipedir] then
+		return true
+	elseif signdir["E"] and vert_e[pipenumber] and vert_e[pipenumber][pipedir] then
+		return true
+	elseif signdir["S"] and vert_s[pipenumber] and vert_s[pipenumber][pipedir] then
+		return true
+	elseif signdir["W"] and vert_w[pipenumber] and vert_w[pipenumber][pipedir] then
+		return true
+	end
+end
+
+function pipeworks.check_for_horiz_pipe(pos, node, def, ppos, pnode, pdef)
+	local signdir = get_sign_dir(node, def)
+	local pipenumber = pdef.pipenumber
+	local pipedir = pnode.param2
+	if string.find(pnode.name, "straight_pipe") then
+		if (signdir["N"] or signdir["S"]) and sphns[pipedir] then
+			return true
+		elseif (signdir["E"] or signdir["W"]) and sphew[pipedir] then
+			return true
+		end
+	elseif signdir["N"] and horiz_n[pipenumber] and horiz_n[pipenumber][pipedir] then
+		return true
+	elseif signdir["E"] and horiz_e[pipenumber] and horiz_e[pipenumber][pipedir] then
+		return true
+	elseif signdir["S"] and horiz_s[pipenumber] and horiz_s[pipenumber][pipedir] then
+		return true
+	elseif signdir["W"] and horiz_w[pipenumber] and horiz_w[pipenumber][pipedir] then
+		return true
+	end
+end
+
+-- tubes
+
+function pipeworks.check_for_vert_tube(pos, node, def, ppos, pnode, pdef)
+	local signdir = get_sign_dir(node, def)
+	local tubenumber = pdef.tubenumber
+	local tubedir = pnode.param2
+	if pnode.name == "pipeworks:one_way_tube" and owtv[tubedir] then
+		return true
+	elseif tubenumber == 2 and (tubedir == 5 or tubedir == 7) then -- it's a stub pointing up or down
+		return true
+	elseif signdir["N"] and vert_n[tubenumber] and vert_n[tubenumber][tubedir] then
+		return true
+	elseif signdir["E"] and vert_e[tubenumber] and vert_e[tubenumber][tubedir] then
+		return true
+	elseif signdir["S"] and vert_s[tubenumber] and vert_s[tubenumber][tubedir] then
+		return true
+	elseif signdir["W"] and vert_w[tubenumber] and vert_w[tubenumber][tubedir] then
+		return true
+	end
+end
+
+function pipeworks.check_for_horiz_tube(pos, node, def, ppos, pnode, pdef)
+	local signdir = get_sign_dir(node, def)
+	local tubenumber = pdef.tubenumber
+	local tubedir = pnode.param2
+	if tubenumber == 2 then -- it'a a stub pointing sideways
+		if (tubedir == 0 or tubedir == 2) and (signdir["N"] or signdir["S"]) then
+			return true
+		elseif (tubedir == 1 or tubedir == 3) and (signdir["E"] or signdir["W"]) then
+			return true
+		end
+	elseif pnode.name == "pipeworks:one_way_tube" then
+		if (signdir["N"] or signdir["S"]) and owtns[tubedir] then
+			return true
+		elseif (signdir["E"] or signdir["W"]) and owtew[tubedir] then
+			return true
+		end
+	elseif signdir["N"] and horiz_n[tubenumber] and horiz_n[tubenumber][tubedir] then
+		return true
+	elseif signdir["E"] and horiz_e[tubenumber] and horiz_e[tubenumber][tubedir] then
+		return true
+	elseif signdir["S"] and horiz_s[tubenumber] and horiz_s[tubenumber][tubedir] then
+		return true
+	elseif signdir["W"] and horiz_w[tubenumber] and horiz_w[tubenumber][tubedir] then
+		return true
+	end
+end

sorting_tubes.lua

@@ -1,3 +1,4 @@
+local S = minetest.get_translator("pipeworks")
 local fs_helpers = pipeworks.fs_helpers
 
 if pipeworks.enable_mese_tube then
@@ -55,7 +56,7 @@ if pipeworks.enable_mese_tube then
 	end
 
 	pipeworks.register_tube("pipeworks:mese_tube", {
-			description = "Sorting Pneumatic Tube Segment",
+			description = S("Sorting Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_mese_tube_inv.png",
 			noctr = {"pipeworks_mese_tube_noctr_1.png", "pipeworks_mese_tube_noctr_2.png", "pipeworks_mese_tube_noctr_3.png",
 				"pipeworks_mese_tube_noctr_4.png", "pipeworks_mese_tube_noctr_5.png", "pipeworks_mese_tube_noctr_6.png"},
@@ -107,7 +108,7 @@ if pipeworks.enable_mese_tube then
 						inv:set_size("line"..tostring(i), 6*1)
 					end
 					update_formspec(pos)
-					meta:set_string("infotext", "Sorting pneumatic tube")
+					meta:set_string("infotext", S("Sorting pneumatic tube"))
 				end,
 				on_punch = update_formspec,
 				on_receive_fields = function(pos, formname, fields, sender)

teleport_tube.lua

@@ -1,3 +1,4 @@
+local S = minetest.get_translator("pipeworks")
 local filename=minetest.get_worldpath() .. "/teleport_tubes"
 
 local tp_tube_db = nil -- nil forces a read
@@ -22,7 +23,7 @@ end
 local function migrate_tube_db()
 		local tmp_db = {}
 		tp_tube_db.version = nil
-		for key, val in pairs(tp_tube_db) do
+		for _, val in pairs(tp_tube_db) do
 			if(val.channel ~= "") then -- skip unconfigured tubes
 				tmp_db[hash(val)] = val
 			end
@@ -126,20 +127,26 @@ end
 local function update_meta(meta, can_receive)
 	meta:set_int("can_receive", can_receive and 1 or 0)
 	local cr_state = can_receive and "on" or "off"
-	meta:set_string("formspec","size[8.6,2.2]"..
+	local itext = S("Channels are public by default").."\n"..
-			"field[0.6,0.6;7,1;channel;Channel:;${channel}]"..
+		S("Use <player>:<channel> for fully private channels").."\n"..
-			"label[7.3,0;Receive]"..
+		S("Use <player>\\;<channel> for private receivers")
-			"image_button[7.3,0.3;1,0.6;pipeworks_button_" .. cr_state .. ".png;cr" .. (can_receive and 0 or 1) .. ";;;false;pipeworks_button_interm.png]"..
+
-			"image[0.3,1.3;1,1;pipeworks_teleport_tube_inv.png]"..
+	meta:set_string("formspec",
-			"label[1.6,1.2;channels are public by default]" ..
+		"size[8.5,3.5]"..
-			"label[1.6,1.5;use <player>:<channel> for fully private channels]" ..
+		"image[0.2,o;1,1;pipeworks_teleport_tube_inv.png]"..
-			"label[1.6,1.8;use <player>\\;<channel> for private receivers]" ..
+		"label[1.2,0.2;"..S("Teleporting Tube").."]"..
-			default.gui_bg..
+		"field[0.5,1.6;4.6,1;channel;"..S("Channel")..";${channel}]"..
-			default.gui_bg_img)
+		"button[4.8,1.3;1.5,1;set_channel;"..S("Set").."]"..
+		"label[7.0,0;"..S("Receive").."]"..
+		"image_button[7.0,0.5;1,0.6;pipeworks_button_" .. cr_state .. ".png;cr" .. (can_receive and 0 or 1) .. ";;;false;pipeworks_button_interm.png]"..
+		"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"..
+		"label[0.2,2.3;"..itext.."]"..
+		default.gui_bg..
+		default.gui_bg_img)
 end
 
 pipeworks.register_tube("pipeworks:teleport_tube", {
-	description = "Teleporting Pneumatic Tube Segment",
+	description = S("Teleporting Pneumatic Tube Segment"),
 	inventory_image = "pipeworks_teleport_tube_inv.png",
 	noctr = { "pipeworks_teleport_tube_noctr.png" },
 	plain = { "pipeworks_teleport_tube_plain.png" },
@@ -169,10 +176,11 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 		on_construct = function(pos)
 			local meta = minetest.get_meta(pos)
 			update_meta(meta, true)
-			meta:set_string("infotext", "unconfigured Teleportation Tube")
+			meta:set_string("infotext", S("Unconfigured Teleportation Tube"))
 		end,
 		on_receive_fields = function(pos,formname,fields,sender)
 			if not fields.channel -- ignore escaping or clientside manipulation of the form
+			or (fields.quit and not fields.key_enter_field)
 			or not pipeworks.may_configure(pos, sender) then
 				return
 			end
@@ -189,12 +197,14 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 				if name and mode and name ~= sender_name then
 					--channels starting with '[name]:' can only be used by the named player
 					if mode == ":" then
-						minetest.chat_send_player(sender_name, "Sorry, channel '"..new_channel.."' is reserved for exclusive use by "..name)
+						minetest.chat_send_player(sender_name, S("Sorry, channel '@1' is reserved for exclusive use by @2",
+							new_channel, name))
 						return
 
 					--channels starting with '[name];' can be used by other players, but cannot be received from
 					elseif mode == ";" and (fields.cr1 or (can_receive ~= 0 and not fields.cr0)) then
-						minetest.chat_send_player(sender_name, "Sorry, receiving from channel '"..new_channel.."' is reserved for "..name)
+						minetest.chat_send_player(sender_name, S("Sorry, receiving from channel '@1' is reserved for @2",
+							new_channel, name))
 						return
 					end
 				end
@@ -204,7 +214,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 
 			-- was the channel changed?
 			local channel = meta:get_string("channel")
-			if new_channel ~= channel then
+			if new_channel ~= channel and (fields.key_enter_field == "channel" or fields.set_channel) then
 				channel = new_channel
 				meta:set_string("channel", channel)
 				dirty = true
@@ -226,11 +236,11 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 				if channel ~= "" then
 					set_tube(pos, channel, can_receive)
 					local cr_description = (can_receive == 1) and "sending and receiving" or "sending"
-					meta:set_string("infotext", string.format("Teleportation Tube %s on '%s'", cr_description, channel))
+					meta:set_string("infotext", S("Teleportation Tube @1 on '@2'", cr_description, channel))
 				else
 					-- remove empty channel tubes, to not have to search through them
 					remove_tube(pos)
-					meta:set_string("infotext", "unconfigured Teleportation Tube")
+					meta:set_string("infotext", S("Unconfigured Teleportation Tube"))
 				end
 			end
 		end,
@@ -258,3 +268,11 @@ if minetest.get_modpath("mesecons_mvps") ~= nil then
 		end
 	end)
 end
+
+-- Expose teleport tube database API for other mods
+pipeworks.tptube = {
+	hash = hash,
+	save_tube_db = save_tube_db,
+	get_db = function() return tp_tube_db or read_tube_db() end,
+	tp_tube_db_version = tp_tube_db_version
+}

trashcan.lua

@@ -1,5 +1,6 @@
+local S = minetest.get_translator("pipeworks")
 minetest.register_node("pipeworks:trashcan", {
-	description = "Trash Can", 
+	description = S("Trash Can"),
 	drawtype = "normal",
 	tiles = {
 		"pipeworks_trashcan_bottom.png",
@@ -22,7 +23,7 @@ minetest.register_node("pipeworks:trashcan", {
 		meta:set_string("formspec",
 				"size[8,7]"..
 				"item_image[0,0;1,1;pipeworks:trashcan]"..
-				"label[1,0;Trash Can]"..
+				"label[1,0;"..S("Trash Can").."]"..
 				"list[context;trash;3.5,1;1,1;]"..
 				default.gui_bg..
 				default.gui_bg_img..
@@ -30,7 +31,7 @@ minetest.register_node("pipeworks:trashcan", {
 				default.get_hotbar_bg(0,3) ..
 				"list[current_player;main;0,3;8,4;]" ..
 				"listring[]")
-		meta:set_string("infotext", "Trash Can")
+		meta:set_string("infotext", S("Trash Can"))
 		meta:get_inventory():set_size("trash", 1)
 	end,
 	after_place_node = pipeworks.after_place,
@@ -39,6 +40,7 @@ minetest.register_node("pipeworks:trashcan", {
 		minetest.get_meta(pos):get_inventory():set_stack(listname, index, ItemStack(""))
 	end,
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:trashcan"
 
 minetest.register_craft({
 	output = "pipeworks:trashcan",

tube_registration.lua

@@ -1,4 +1,5 @@
 -- This file supplies the various kinds of pneumatic tubes
+local S = minetest.get_translator("pipeworks")
 
 local tubenodes = {}
 pipeworks.tubenodes = tubenodes
@@ -25,6 +26,11 @@ local texture_mt = {
 	end
 }
 
+-- This will remove any semi-transparent pixels
+-- because that is still buggy in Minetest, force this as default
+local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
+	and "clip" or true
+
 local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, ends, short, inv, special, connects, style)
 	noctrs = noctrs or default_noctrs
 	setmetatable(noctrs, texture_mt)
@@ -56,8 +62,8 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 	end
 
 	local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1}
-	local tubedesc = string.format("%s %s... You hacker, you.", desc, dump(connects))
+	local tubedesc = string.format("%s %s", desc, dump(connects))
-	local iimg = plain[1]
+	local iimg = type(plain[1]) == "table" and plain[1].name or plain[1]
 	local wscale = {x = 1, y = 1, z = 1}
 
 	if #connects == 0 then
@@ -81,6 +87,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 		description = tubedesc,
 		drawtype = "nodebox",
 		tiles = outimgs,
+		use_texture_alpha = texture_alpha_mode,
 		sunlight_propagates = true,
 		inventory_image = iimg,
 		wield_image = iimg,
@@ -106,6 +113,18 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 			connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1},
 			priority = 50
 		},
+		on_punch = function(pos, node, player, pointed)
+			local playername = player:get_player_name()
+			if minetest.is_protected(pos, playername) and not minetest.check_player_privs(playername, {protection_bypass=true}) then
+				return minetest.node_punch(pos, node, player, pointed)
+			end
+			if pipeworks.check_and_wear_hammer(player) then
+				local wieldname = player:get_wielded_item():get_name()
+				pipeworks.logger(string.format("%s struck a tube at %s with %s to break it.", playername, minetest.pos_to_string(pos), wieldname))
+				pipeworks.break_tube(pos)
+			end
+			return minetest.node_punch(pos, node, player, pointed)
+		end,
 		after_place_node = pipeworks.after_place,
 		after_dig_node = pipeworks.after_dig,
 		on_rotate = false,
@@ -116,7 +135,10 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 			end
 			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 			pipeworks.scan_for_tube_objects(pos)
-		end
+		end,
+		check_for_pole = pipeworks.check_for_vert_tube,
+		check_for_horiz_pole = pipeworks.check_for_horiz_tube,
+		tubenumber = tonumber(tname)
 	}
 	if style == "6d" then
 		nodedef.paramtype2 = "facedir"
@@ -178,6 +200,7 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
 		end
 		end
 		end
+		pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = name.."_000000"
 	else
 		-- 6d tubes: uses only 10 nodes instead of 64, but the textures must be rotated
 		local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}}
@@ -194,12 +217,13 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
 				wield_image = inv,
 				paramtype = "light",
 				sunlight_propagates = true,
-				description = "Pneumatic tube segment (legacy)",
+				description = S("Pneumatic tube segment (legacy)"),
 				after_place_node = pipeworks.after_place,
 				groups = {not_in_creative_inventory = 1, tube_to_update = 1, tube = 1},
 				tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}},
 				drop = name.."_1",
 			})
+			pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = name.."_1"
 			table.insert(tubenodes, cname)
 			for xm = 0, 1 do
 			for xp = 0, 1 do

vacuum_tubes.lua

@@ -1,6 +1,7 @@
+local S = minetest.get_translator("pipeworks")
 if pipeworks.enable_sand_tube then
 	pipeworks.register_tube("pipeworks:sand_tube", {
-		description = "Vacuuming Pneumatic Tube Segment",
+		description = S("Vacuuming Pneumatic Tube Segment"),
 		inventory_image = "pipeworks_sand_tube_inv.png",
 		short = "pipeworks_sand_tube_short.png",
 		noctr = {"pipeworks_sand_tube_noctr.png"},
@@ -28,7 +29,7 @@ end
 
 if pipeworks.enable_mese_sand_tube then
 	pipeworks.register_tube("pipeworks:mese_sand_tube", {
-			description = "Adjustable Vacuuming Pneumatic Tube Segment",
+			description = S("Adjustable Vacuuming Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_mese_sand_tube_inv.png",
 			short = "pipeworks_mese_sand_tube_short.png",
 			noctr = {"pipeworks_mese_sand_tube_noctr.png"},
@@ -39,22 +40,31 @@ if pipeworks.enable_mese_sand_tube then
 				on_construct = function(pos)
 					local meta = minetest.get_meta(pos)
 					meta:set_int("dist", 0)
-					meta:set_string("formspec", "size[2.1,0.8]"..
+					meta:set_string("formspec",
-							"image[0,0;1,1;pipeworks_mese_sand_tube_inv.png]"..
+						"size[6.0,2.2]"..
-							"field[1.3,0.4;1,1;dist;radius;${dist}]"..
+						"image[0.2,0;1,1;pipeworks_mese_sand_tube_inv.png]"..
-							default.gui_bg..
+						"label[1.2,0.2;"..S("Adjustable Vacuuming Tube").."]"..
-							default.gui_bg_img)
+						"field[0.5,1.6;2.1,1;dist;"..S("Radius")..";${dist}]"..
-					meta:set_string("infotext", "Adjustable Vacuuming Pneumatic Tube Segment")
+						"button[2.3,1.3;1.5,1;set_dist;"..S("Set").."]"..
+						"button_exit[3.8,1.3;2,1;close;"..S("Close").."]"..
+						default.gui_bg..
+						default.gui_bg_img)
+					meta:set_string("infotext", S("Adjustable Vacuuming Pneumatic Tube Segment"))
 				end,
 				on_receive_fields = function(pos,formname,fields,sender)
-					if not pipeworks.may_configure(pos, sender) then return end
+					if (fields.quit and not fields.key_enter_field)
+					or (fields.key_enter_field ~= "dist" and not fields.set_dist)
+					or not pipeworks.may_configure(pos, sender) then
+						return
+					end
+
 					local meta = minetest.get_meta(pos)
 					local dist = tonumber(fields.dist)
 					if dist then
 						dist = math.max(0, dist)
 						dist = math.min(8, dist)
 						meta:set_int("dist", dist)
-						meta:set_string("infotext", ("Adjustable Vacuuming Pneumatic Tube Segment (%dm)"):format(dist))
+						meta:set_string("infotext", S("Adjustable Vacuuming Pneumatic Tube Segment (@1m)", dist))
 					end
 				end,
 			},

wielder.lua

@@ -1,16 +1,13 @@
+local S = minetest.get_translator("pipeworks")
 local assumed_eye_pos = vector.new(0, 1.5, 0)
 
-local function vector_copy(v)
-	return { x = v.x, y = v.y, z = v.z }
-end
-
 local function delay(x)
 	return (function() return x end)
 end
 
 local function set_wielder_formspec(data, meta)
 	meta:set_string("formspec",
-			"invsize[8,"..(6+data.wield_inv_height)..";]"..
+			"size[8,"..(6+data.wield_inv_height)..";]"..
 			"item_image[0,0;1,1;"..data.name_base.."_off]"..
 			"label[1,0;"..minetest.formspec_escape(data.description).."]"..
 			"list[current_name;"..minetest.formspec_escape(data.wield_inv_name)..";"..((8-data.wield_inv_width)*0.5)..",1;"..data.wield_inv_width..","..data.wield_inv_height..";]"..
@@ -39,7 +36,7 @@ local can_tool_dig_node = function(nodename, toolcaps, toolname)
 		-- but a player holding one can - the game seems to fall back to the hand.
 		-- fall back to checking the hand's properties if the tool isn't the correct one.
 		local hand_caps = minetest.registered_items[""].tool_capabilities
-		diggable = minetest.get_dig_params(nodegroups, hand_caps)
+		diggable = minetest.get_dig_params(nodegroups, hand_caps).diggable
 	end
 	return diggable
 end
@@ -259,7 +256,7 @@ if pipeworks.enable_node_breaker then
 	local wield_inv_name = "pick"
 	data = {
 		name_base = name_base,
-		description = "Node Breaker",
+		description = S("Node Breaker"),
 		texture_base = "pipeworks_nodebreaker",
 		texture_stateful = { top = true, bottom = true, side2 = true, side1 = true, front = true },
 		tube_connect_sides = { top=1, bottom=1, left=1, right=1, back=1 },
@@ -352,7 +349,7 @@ if pipeworks.enable_node_breaker then
 							{pos=pointed_thing.under, gain=sound.gain})
 					end
 					wieldstack = virtplayer:get_wielded_item()
-				else
+				--~ else
 					--pipeworks.logger(dname.."couldn't dig node!")
 				end
 			end
@@ -374,10 +371,11 @@ if pipeworks.enable_node_breaker then
 		eject_drops = true,
 	}
 	register_wielder(data)
+	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:nodebreaker_off"
 	minetest.register_craft({
 		output = "pipeworks:nodebreaker_off",
 		recipe = {
-			{ "pipeworks:gear", "pipeworks:gear",   "pipeworks:gear"    },
+			{ "basic_materials:gear_steel", "basic_materials:gear_steel",   "basic_materials:gear_steel"    },
 			{ "default:stone", "mesecons:piston",   "default:stone" },
 			{ "group:wood",    "mesecons:mesecon",  "group:wood" },
 		}
@@ -408,7 +406,7 @@ end
 if pipeworks.enable_deployer then
 	register_wielder({
 		name_base = "pipeworks:deployer",
-		description = "Deployer",
+		description = S("Deployer"),
 		texture_base = "pipeworks_deployer",
 		texture_stateful = { front = true },
 		tube_connect_sides = { back=1 },
@@ -425,6 +423,7 @@ if pipeworks.enable_deployer then
 		end,
 		eject_drops = false,
 	})
+	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:deployer_off"
 	minetest.register_craft({
 		output = "pipeworks:deployer_off",
 		recipe = {
@@ -441,7 +440,7 @@ end
 if pipeworks.enable_dispenser then
 	register_wielder({
 		name_base = "pipeworks:dispenser",
-		description = "Dispenser",
+		description = S("Dispenser"),
 		texture_base = "pipeworks_dispenser",
 		texture_stateful = { front = true },
 		tube_connect_sides = { back=1 },
@@ -460,6 +459,7 @@ if pipeworks.enable_dispenser then
 		end,
 		eject_drops = false,
 	})
+	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:dispenser_off"
 	minetest.register_craft({
 		output = "pipeworks:dispenser_off",
 		recipe = {