Merge remote-tracking branch 'upstream/master'

add caching layer to teleport tube

See merge request VanessaE/pipeworks!46

.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

@@ -47,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
@@ -76,7 +76,7 @@ local function run_autocrafter(pos, elapsed)
 		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
@@ -109,7 +109,6 @@ local function after_recipe_change(pos, inventory)
 		inventory:set_stack("output", 1, "")
 		return
 	end
-	local recipe_changed = false
 	local recipe = inventory:get_list("recipe")
 
 	local hash = minetest.hash_node_position(pos)
@@ -194,8 +193,9 @@ 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;"..S("Channel")..";${channel}]"
-		fs = fs.."button_exit[5,3.2;2,1;save;"..S("Save").."]"
+		fs = fs.."field[0.3,3.5;4.5,1;channel;"..S("Channel")..";${channel}]"..
+			"button[4.5,3.2;1.5,1;set_channel;"..S("Set").."]"..
+			"button_exit[6,3.2;2,1;close;"..S("Close").."]"
 	end
 	meta:set_string("formspec",fs)
 
@@ -280,7 +280,10 @@ minetest.register_node("pipeworks:autocrafter", {
 		update_meta(meta, false)
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		if not pipeworks.may_configure(pos, sender) then return end
+		if not fields.channel or (fields.quit and not fields.key_enter_field)
+				or not pipeworks.may_configure(pos, sender) then
+			return
+		end
 		local meta = minetest.get_meta(pos)
 		if fields.on then
 			update_meta(meta, false)
@@ -289,8 +292,9 @@ minetest.register_node("pipeworks:autocrafter", {
 			if update_meta(meta, true) then
 				start_crafter(pos)
 			end
-		elseif fields.save then
-			meta:set_string("channel",fields.channel)
+		end
+		if fields.channel then
+			meta:set_string("channel", fields.channel)
 		end
 	end,
 	can_dig = function(pos, player)
@@ -392,6 +396,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()
@@ -406,6 +431,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

@@ -81,7 +81,7 @@ local function tube_autoroute(pos)
 	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
-	for _, elt in ipairs(tbl2) do
-		tbl[index] = elt
-		index = index + 1
+	local oldlength = #tbl
+	for i = 1,#tbl2 do
+		tbl[oldlength + i] = tbl2[i]
 	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
-			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

@@ -7,7 +7,7 @@ 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 =

decorative_tubes.lua

@@ -28,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",
@@ -45,6 +46,10 @@ 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 = S("Airtight panel embedded tube"),
@@ -55,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,
@@ -76,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",

devices.lua

@@ -10,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)
 
@@ -36,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
 
@@ -105,6 +103,7 @@ if minetest.get_modpath("mesecons") then
 	}
 end
 
+--[[
 local pipes_devicelist = {
 	"pump",
 	"valve",
@@ -120,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
@@ -222,6 +222,8 @@ 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, {
@@ -301,6 +303,7 @@ minetest.register_node("pipeworks:grating", {
 	end,
 	on_rotate = false
 })
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:grating"
 
 -- outlet spigot
 
@@ -378,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)
@@ -441,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)
@@ -465,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 = {
@@ -504,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 = {
@@ -525,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
@@ -603,6 +613,7 @@ 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
 
@@ -626,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 = {
@@ -639,6 +650,7 @@ 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, {
@@ -661,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 = {
@@ -734,6 +746,7 @@ minetest.register_node(nodename_sp_loaded, {
 	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,10 +1,6 @@
 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 = S("@1 Filter-Injector", data.wise_desc)
 	if meta:get_int("slotseq_mode") == 2 then
@@ -18,17 +14,20 @@ local function set_filter_formspec(data, meta)
 
 	local formspec
 	if data.digiline then
-		formspec = "size[8,2.7]"..
-			"item_image[0,0;1,1;pipeworks:"..data.name.."]"..
-			"label[1,0;"..minetest.formspec_escape(itemname).."]"..
-			"field[0.3,1.5;8.0,1;channel;"..S("Channel")..";${channel}]"..
-			fs_helpers.cycling_button(meta, "button[0,2;4,1", "slotseq_mode",
+		formspec =
+			"size[8.5,3]"..
+			"item_image[0.2,0;1,1;pipeworks:"..data.name.."]"..
+			"label[1.2,0.2;"..minetest.formspec_escape(itemname).."]"..
+			"field[0.5,1.6;4.6,1;channel;"..S("Channel")..";${channel}]"..
+			"button[4.8,1.3;1.5,1;set_channel;"..S("Set").."]"..
+			fs_helpers.cycling_button(meta, "button[0.2,2.3;4.05,1", "slotseq_mode",
 				{S("Sequence slots by Priority"),
 				 S("Sequence slots Randomly"),
 				 S("Sequence slots by Rotation")})..
-			fs_helpers.cycling_button(meta, "button[4,2;4,1", "exmatch_mode",
+			fs_helpers.cycling_button(meta, "button[4.25,2.3;4.05,1", "exmatch_mode",
 				{S("Exact match - off"),
-				 S("Exact match - on")})
+				 S("Exact match - on")})..
+			"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"
 	else
 		local exmatch_button = ""
 		if data.stackwise then
@@ -326,7 +325,8 @@ local function punch_filter(data, filtpos, filtnode, msg)
 				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())
+				pipeworks.tube_inject_item(pos, start_pos, dir, item,
+					fakePlayer:get_player_name())
 				return true -- only fire one item, please
 			end
 		end
@@ -428,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
 
@@ -475,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,8 +5,7 @@
 --
 
 pipeworks = {}
-
-local DEBUG = false
+pipeworks.ui_cat_tube_list = {}
 
 pipeworks.worldpath = minetest.get_worldpath()
 pipeworks.modpath = minetest.get_modpath("pipeworks")
@@ -71,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
-		return owner == name
+	if owner ~= "" and owner == name then -- wielders and filters
+		return true
 	end
 	return not minetest.is_protected(pos, name)
 end
@@ -150,4 +149,16 @@ end
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
-print("Pipeworks loaded!")
+-- Unified Inventory categories integration
+
+if minetest.global_exists("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

@@ -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..")")
-			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
-			pipeworks.scan_for_tube_objects(pos)
+			pipeworks.break_tube(pos)
 		end
 	end
 end
@@ -194,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
@@ -205,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()}
@@ -391,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)

locale/pipeworks.fr.tr

@@ -3,6 +3,10 @@
 # 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
 
@@ -86,11 +90,12 @@ 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
+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
-unconfigured Teleportation Tube=Tuyau téléporteur non-configuré
+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'
@@ -102,7 +107,9 @@ Trash Can=Poubelle
 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)
 

locale/pipeworks.zh_CN.tr

@@ -1,6 +1,10 @@
 # textdomain: pipeworks
 # License: CC-by-SA 4.0
-# Author: wzy2006 <3450354617@qq.com>
+# Author: pevernow <3450354617@qq.com>
+
+## generic interaction
+Set=
+Cancel=
 
 ## digilines interfacing
 Channel=频道
@@ -12,23 +16,23 @@ Allow splitting incoming stacks from tubes=允许从管道中拆分传入堆栈
 Unknown item=通道
 unconfigured Autocrafter: unknown recipe=未配置的自动工作台: 未知配方
 unconfigured Autocrafter=未配置的自动工作台
-'@1' Autocrafter (@2)=自动建造者 '@1' (@2)
+'@1' Autocrafter (@2)=自动工作台 '@1' (@2)
 Save=保存
-paused '@1' Autocrafter=暂停的自动建造者
-Autocrafter=自动建造者
+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=密封面板嵌入式管
+Airtight steelblock embedded tube=密封嵌入式铁块管道
+Airtight panel embedded tube=密封嵌入式片状管道
 
 ## devices
 Pump/Intake Module=泵/进气模块
 Valve=阀门
 Decorative grating=Decorative grating
-Spigot outlet=出气口
+Spigot outlet=龙头
 Airtight Pipe entry/exit=密闭管进/出
 Flow Sensor=流量传感器
 Flow sensor (on)=流量传感器（上）
@@ -49,7 +53,7 @@ Exact match - on=完全匹配-开启
 Prefer item types:=偏好物品类型 :
 Itemwise=逐项
 Stackwise=堆叠方式
-Digiline=digiline
+Digiline=Digiline
 
 ## legacy
 Auto-Tap=自动轴阀
@@ -60,35 +64,36 @@ Pipe Segment (legacy)=管道（旧版）
 
 
 ## routing tubes
-Pneumatic tube segment=空气管道
+Pneumatic tube segment=普通管道
 Broken Tube=断管
 High Priority Tube Segment=高优先级管段
-Accelerating Pneumatic Tube Segment=加速气动管道
-Crossing Pneumatic 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 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=导通气动管道
+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传导气动管道（运行中）
+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=分选气动管
+Sorting Pneumatic Tube Segment=分类管道
+Sorting pneumatic tube=分类管道
 
 ## teleport tube
 Receive=接收
-channels are public by default=频道默认为公开
-use <player>:<channel> for fully private channels=49/5000将<player>:<channel>用于完全私人的频道
-use <player>;<channel> for private receivers=使用<player>;<channel>进行私人接待
-Teleporting Pneumatic Tube Segment=传送气动管道
-unconfigured Teleportation Tube=未配置的传送管
+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'上
@@ -97,14 +102,16 @@ Teleportation Tube @1 on '@2'=传送管'@1'在'@2'上
 Trash Can=垃圾箱
 
 ## tube registration
-Pneumatic tube segment (legacy)=空气管道（旧式）
+Pneumatic tube segment (legacy)=普通管道（旧式）
 
 ## vacuum tubes
-Vacuuming Pneumatic Tube Segment=吸尘气动管道
-Adjustable Vacuuming Pneumatic Tube Segment=可调式真空气动管道
-Adjustable Vacuuming Pneumatic Tube Segment (@1m)=可调式吸尘气动管道(@1m)
+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=饮水机
+Node Breaker=方块破坏器
+Deployer=放置器
+Dispenser=投掷器

locale/template.txt

@@ -3,6 +3,10 @@
 # License: CC-by-SA 4.0
 # Author:
 
+## generic interaction
+Set=
+Cancel=
+
 ## digilines interfacing
 Channel=
 
@@ -86,11 +90,12 @@ Sorting pneumatic tube=
 
 ## teleport tube
 Receive=
-channels are public by default=
-use <player>:<channel> for fully private channels=
-use <player>;<channel> for private receivers=
+Channels are public by default=
+Use <player>:<channel> for fully private channels=
+Use <player>;<channel> for private receivers=
 Teleporting Pneumatic Tube Segment=
-unconfigured Teleportation Tube=
+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'=
@@ -102,7 +107,9 @@ Trash Can=
 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)=
 

lua_tube.lua

@@ -666,6 +666,7 @@ local function 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]"
+		.."style_type[label,textarea;font=mono]"
 		.."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.."]"
@@ -813,82 +814,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)..
-			tostring(yellow)..tostring(blue)..tostring(red)
+	local cid = white..black..green..yellow..blue..red
 	local node_name = BASENAME..cid
+
 	local tiles = table.copy(tiles_base)
-	if red == 1 then
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-	else
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-	end
-	if blue == 1 then
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR90)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR270)"
-	else
-		tiles[1] = tiles[1].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-		tiles[2] = tiles[2].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_off.png^[transformR90)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_off.png^[transformR270)"
-	end
-	if yellow == 1 then
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-		tiles[5] = tiles[5].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-		tiles[6] = tiles[6].."^(pipeworks_lua_tube_port_on.png^[transformR180)"
-	else
-		tiles[3] = tiles[3].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-		tiles[4] = tiles[4].."^(pipeworks_lua_tube_port_off.png^[transformR180)"
-		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
+	-- Red
+	tiles[1] = tiles[1]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
+	tiles[2] = tiles[2]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
+	tiles[5] = tiles[5]..tiles_on_off.R270:format(red == 1 and "on" or "off");
+	tiles[6] = tiles[6]..tiles_on_off.R_90:format(red == 1 and "on" or "off");
+	-- Blue
+	tiles[1] = tiles[1]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
+	tiles[2] = tiles[2]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
+	tiles[5] = tiles[5]..tiles_on_off.R_90:format(blue == 1 and "on" or "off");
+	tiles[6] = tiles[6]..tiles_on_off.R270:format(blue == 1 and "on" or "off");
+	-- Yellow
+	tiles[1] = tiles[1]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
+	tiles[2] = tiles[2]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
+	tiles[5] = tiles[5]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
+	tiles[6] = tiles[6]..tiles_on_off.R180:format(yellow == 1 and "on" or "off");
+	-- Green
+	tiles[3] = tiles[3]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
+	tiles[4] = tiles[4]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
+	tiles[5] = tiles[5]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
+	tiles[6] = tiles[6]..tiles_on_off.R__0:format(green == 1 and "on" or "off");
+	-- Black
+	tiles[1] = tiles[1]..tiles_on_off.R180:format(black == 1 and "on" or "off");
+	tiles[2] = tiles[2]..tiles_on_off.R__0:format(black == 1 and "on" or "off");
+	tiles[3] = tiles[3]..tiles_on_off.R_90:format(black == 1 and "on" or "off");
+	tiles[4] = tiles[4]..tiles_on_off.R270:format(black == 1 and "on" or "off");
+	-- White
+	tiles[1] = tiles[1]..tiles_on_off.R__0:format(white == 1 and "on" or "off");
+	tiles[2] = tiles[2]..tiles_on_off.R180:format(white == 1 and "on" or "off");
+	tiles[3] = tiles[3]..tiles_on_off.R270:format(white == 1 and "on" or "off");
+	tiles[4] = tiles[4]..tiles_on_off.R_90:format(white == 1 and "on" or "off");
 
 	local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1}
 	if red + blue + yellow + green + black + white ~= 0 then
@@ -933,6 +908,7 @@ for white  = 0, 1 do
 		description = "Lua controlled Tube",
 		drawtype = "nodebox",
 		tiles = tiles,
+		use_texture_alpha = texture_alpha_mode,
 		paramtype = "light",
 		is_ground_content = false,
 		groups = groups,
@@ -969,7 +945,7 @@ 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
@@ -993,7 +969,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)
@@ -1006,6 +982,8 @@ end
 end
 end
 
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = BASENAME.."000000"
+
 ------------------------------------
 -- Overheated Lua controlled Tube --
 ------------------------------------
@@ -1039,6 +1017,7 @@ 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,
@@ -1070,7 +1049,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

@@ -318,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
@@ -340,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,5 +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
+optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory
 min_minetest_version = 5.2.0

pipes.lua

@@ -11,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 = {}
@@ -30,10 +30,12 @@ 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 = S("Pipe Segment").." "..dump(connects)
@@ -131,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

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 = ""
-	if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
+	--~ local tail = ""
+	--~ 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

@@ -10,6 +10,35 @@ 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", {
@@ -36,29 +65,27 @@ pipeworks.register_tube("pipeworks:broken_tube", {
 			local wieldname = itemstack:get_name()
 			local playername = puncher:get_player_name()
 			local log_msg = playername.." struck a broken tube at "..minetest.pos_to_string(pos).."\n"
-			if   wieldname == "anvil:hammer"
-			  or wieldname == "cottages:hammer"
-			  or wieldname == "glooptest:hammer_steel"
-			  or wieldname == "glooptest:hammer_bronze"
-			  or wieldname == "glooptest:hammer_diamond"
-			  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
-					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)
-					itemstack:add_wear(1000)
-					puncher:set_wielded_item(itemstack)
-					return itemstack
-				else
+			if not was_node then
 				pipeworks.logger(log_msg.."            but it can't be repaired.")
+				return
+			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
 	}
 })
@@ -165,6 +192,7 @@ if pipeworks.enable_one_way_tube then
 		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,4 +1,16 @@
 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", {
@@ -8,11 +20,10 @@ if pipeworks.enable_detector_tube then
 			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},
@@ -34,9 +45,7 @@ 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
-					 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, pos)
 				end,
 			},
 	})
@@ -87,13 +96,20 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then
 				on_construct = function(pos)
 					local meta = minetest.get_meta(pos)
 					meta:set_string("formspec",
-						"size[8.6,2.2]"..
-						"field[0.6,0.6;8,1;channel;"..S("Channel")..";${channel}]"..
-						"image[0.3,1.3;1,1;pipeworks_digiline_detector_tube_inv.png]"..
-						"label[1.6,1.2;"..S("Digiline Detecting Tube").."]"
+						"size[8.5,2.2]"..
+						"image[0.2,0;1,1;pipeworks_digiline_detector_tube_inv.png]"..
+						"label[1.2,0.2;"..S("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

sorting_tubes.lua

@@ -110,9 +110,22 @@ if pipeworks.enable_mese_tube then
 					update_formspec(pos)
 					meta:set_string("infotext", S("Sorting pneumatic tube"))
 				end,
+				after_place_node = function(pos, placer, itemstack, pointed_thing)
+					if placer and placer:is_player() and placer:get_player_control().aux1 then
+						local meta = minetest.get_meta(pos)
+						for i = 1, 6 do
+							meta:set_int("l"..tostring(i).."s", 0)
+						end
+						update_formspec(pos)
+					end
+					return pipeworks.after_place(pos, placer, itemstack, pointed_thing)
+				end,
 				on_punch = update_formspec,
 				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)
 					update_formspec(pos)
 				end,

teleport_tube.lua

@@ -4,6 +4,9 @@ local filename=minetest.get_worldpath() .. "/teleport_tubes"
 local tp_tube_db = nil -- nil forces a read
 local tp_tube_db_version = 2.0
 
+-- cached rceiver list: hash(pos) => {receivers}
+local cache = {}
+
 local function hash(pos)
 	return string.format("%.30g", minetest.hash_node_position(pos))
 end
@@ -18,12 +21,14 @@ local function save_tube_db()
 	else
 		error(err)
 	end
+	-- reset tp-tube cache
+	cache = {}
 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
@@ -101,6 +106,12 @@ local function read_node_with_vm(pos)
 end
 
 local function get_receivers(pos, channel)
+	local hash = minetest.hash_node_position(pos)
+	if cache[hash] then
+		-- re-use cached result
+		return cache[hash]
+	end
+
 	local tubes = tp_tube_db or read_tube_db()
 	local receivers = {}
 	local dirty = false
@@ -121,20 +132,28 @@ local function get_receivers(pos, channel)
 	if dirty then
 		save_tube_db()
 	end
+	-- cache the result for next time
+	cache[hash] = receivers
 	return receivers
 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]"..
-			"field[0.6,0.6;7,1;channel;"..S("Channel")..";${channel}]"..
-			"label[7.3,0;"..S("Receive").."]"..
-			"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]"..
-			"label[1.6,1.2;"..S("channels are public by default").."]" ..
-			"label[1.6,1.5;"..S("use <player>:<channel> for fully private channels").."]" ..
-			"label[1.6,1.8;"..S("use <player>\\;<channel> for private receivers").."]" ..
+	local itext = S("Channels are public by default").."\n"..
+		S("Use <player>:<channel> for fully private channels").."\n"..
+		S("Use <player>\\;<channel> for private receivers")
+
+	meta:set_string("formspec",
+		"size[8.5,3.5]"..
+		"image[0.2,o;1,1;pipeworks_teleport_tube_inv.png]"..
+		"label[1.2,0.2;"..S("Teleporting 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").."]"..
+		"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
@@ -170,10 +189,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", S("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
@@ -207,7 +227,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
@@ -233,7 +253,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 				else
 					-- remove empty channel tubes, to not have to search through them
 					remove_tube(pos)
-					meta:set_string("infotext", S("unconfigured Teleportation Tube"))
+					meta:set_string("infotext", S("Unconfigured Teleportation Tube"))
 				end
 			end
 		end,
@@ -261,3 +281,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

@@ -40,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

@@ -26,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)
@@ -82,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,
@@ -107,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,
@@ -182,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}}
@@ -204,6 +223,7 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
 				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

@@ -40,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]"..
-							"image[0,0;1,1;pipeworks_mese_sand_tube_inv.png]"..
-							"field[1.3,0.4;1,1;dist;radius;${dist}]"..
+					meta:set_string("formspec",
+						"size[6.0,2.2]"..
+						"image[0.2,0;1,1;pipeworks_mese_sand_tube_inv.png]"..
+						"label[1.2,0.2;"..S("Adjustable Vacuuming Tube").."]"..
+						"field[0.5,1.6;2.1,1;dist;"..S("Radius")..";${dist}]"..
+						"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", (S("Adjustable Vacuuming Pneumatic Tube Segment (@1m)", dist)))
+						meta:set_string("infotext", S("Adjustable Vacuuming Pneumatic Tube Segment (@1m)", dist))
 					end
 				end,
 			},

wielder.lua

@@ -1,17 +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..";]"..
@@ -353,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
@@ -375,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" },
 		}
@@ -426,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 = {
@@ -461,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 = {