Merge remote-tracking branch 'upstream/master'

.gitlab-ci.yml

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

.luacheckrc

@@ -1,24 +0,0 @@
-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 _ = 1, number do -- We have to do that since remove_item does not work if count > stack_max
+		for i = 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
@@ -67,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
+	if output_item:is_empty() or limitcraft > 0 then
 		meta:set_string("infotext", S("unconfigured Autocrafter: unknown recipe"))
 		return false
 	end
 
-	for _ = 1, math.floor(elapsed/craft_time) do
+	for step = 1, math.floor(elapsed/craft_time) do
 		local continue = autocraft(inventory, craft)
 		if not continue then return false end
 	end
@@ -106,6 +109,7 @@ 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)
@@ -423,7 +427,6 @@ 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 _, n in ipairs(active) do
+		for i, n in ipairs(active) do
 			nsurround = nsurround..n
 		end
 		nctr.name = basename.."_"..nsurround

common.lua

@@ -114,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 in pairs(fields) do
+	for field, value in pairs(fields) do
 		if pipeworks.string_startswith(field, "fs_helpers_cycling:") then
 			local l = field:split(":")
 			local new_value = tonumber(l[2])
@@ -223,7 +223,7 @@ function pipeworks.create_fake_player(def, is_dynamic)
 				return self._inventory:set_stack(def.wield_list,
 					self._wield_index, item)
 			end
-			self._wielded_item = ItemStack(item)
+			_wielded_item = ItemStack(item)
 		end,
 		get_wielded_item = function(self, item)
 			if self._inventory and def.wield_list then
@@ -242,18 +242,17 @@ 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 _, v in pairs(open_chests) do
+				for k, 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
@@ -230,7 +230,7 @@ override.tiles = {
 }
 
 -- Add the extra groups
-for _,v in ipairs({override_protected, override, override_open, override_protected_open}) do
+for i,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
 
-local tube_entry = "^pipeworks_tube_connection_stony.png"
+tube_entry = "^pipeworks_tube_connection_stony.png"
 
 local function active_formspec(fuel_percent, item_percent, pos, meta)
 	local formspec =

decorative_tubes.lua

@@ -28,7 +28,6 @@ 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",
@@ -46,10 +45,6 @@ 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"),
@@ -60,7 +55,6 @@ 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,
@@ -82,7 +76,6 @@ 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
 
-	local newnode = string.gsub(node.name, "_on", "_off")
+	newnode = string.gsub(node.name, "_on", "_off")
 	minetest.swap_node(pos, { name = newnode, param2 = new_param2 })
 	pipeworks.scan_for_pipe_objects(pos)
 
@@ -20,7 +20,7 @@ end
 function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 
 	local playername = placer:get_player_name()
-	if not minetest.is_protected(pointed_thing.under, playername)
+	if not minetest.is_protected(pointed_thing.under, playername) 
 	   and not minetest.is_protected(pointed_thing.above, playername) then
 
 		local node = minetest.get_node(pointed_thing.under)
@@ -36,7 +36,9 @@ 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
 
@@ -103,7 +105,6 @@ if minetest.get_modpath("mesecons") then
 	}
 end
 
---[[
 local pipes_devicelist = {
 	"pump",
 	"valve",
@@ -119,15 +120,14 @@ 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
@@ -187,11 +187,11 @@ 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,
@@ -222,8 +222,6 @@ 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, {
@@ -235,11 +233,11 @@ 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},
@@ -303,7 +301,6 @@ minetest.register_node("pipeworks:grating", {
 	end,
 	on_rotate = false
 })
-pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:grating"
 
 -- outlet spigot
 
@@ -381,8 +378,6 @@ 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)
@@ -446,9 +441,6 @@ 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)
@@ -473,7 +465,7 @@ minetest.register_node(nodename_sensor_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_off(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_off(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -512,7 +504,7 @@ minetest.register_node(nodename_sensor_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -533,8 +525,6 @@ 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
@@ -613,7 +603,6 @@ 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
 
@@ -637,7 +626,7 @@ minetest.register_node(nodename_fountain_empty, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -650,7 +639,6 @@ 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, {
@@ -673,7 +661,7 @@ minetest.register_node(nodename_fountain_loaded, {
 	end,
 	on_construct = function(pos)
 		if mesecon then
-			mesecon.receptor_on(pos, pipeworks.mesecons_rules)
+			mesecon.receptor_on(pos, rules) 
 		end
 	end,
 	selection_box = {
@@ -746,7 +734,6 @@ 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,6 +1,10 @@
 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
@@ -14,20 +18,17 @@ local function set_filter_formspec(data, meta)
 
 	local formspec
 	if data.digiline then
-		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",
+		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",
 				{S("Sequence slots by Priority"),
 				 S("Sequence slots Randomly"),
 				 S("Sequence slots by Rotation")})..
-			fs_helpers.cycling_button(meta, "button[4.25,2.3;4.05,1", "exmatch_mode",
+			fs_helpers.cycling_button(meta, "button[4,2;4,1", "exmatch_mode",
 				{S("Exact match - off"),
-				 S("Exact match - on")})..
-			"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"
+				 S("Exact match - on")})
 	else
 		local exmatch_button = ""
 		if data.stackwise then
@@ -325,8 +326,7 @@ 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)
-				pipeworks.tube_inject_item(pos, start_pos, dir, item,
-					fakePlayer:get_player_name())
+				local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item, fakePlayer:get_player_name())
 				return true -- only fire one item, please
 			end
 		end
@@ -428,14 +428,10 @@ for _, data in ipairs({
 		end
 
 		node.on_receive_fields = function(pos, formname, fields, sender)
-			if (fields.quit and not fields.key_enter_field)
-			or not pipeworks.may_configure(pos, sender) then
-				return
-			end
-
+			if not pipeworks.may_configure(pos, sender) then return end
 			fs_helpers.on_receive_fields(pos, fields)
 
-			if fields.channel and (fields.key_enter_field == "channel" or fields.set_channel) then
+			if fields.channel then
 				minetest.get_meta(pos):set_string("channel", fields.channel)
 			end
 
@@ -479,7 +475,6 @@ 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( {

flowing_logic.lua

@@ -60,8 +60,8 @@ pipeworks.check_for_inflows = function(pos,node)
 			end
 		end
 	end
-	if newnode then
-		minetest.add_node(pos,{name=newnode, param2 = node.param2})
+	if newnode then 
+		minetest.add_node(pos,{name=newnode, param2 = node.param2}) 
 		minetest.get_meta(pos):set_string("source",minetest.pos_to_string(source))
 	end
 end
@@ -75,15 +75,15 @@ pipeworks.check_sources = function(pos,node)
 		newnode = string.gsub(node.name,"loaded","empty")
 	end
 
-	if newnode then
-		minetest.add_node(pos,{name=newnode, param2 = node.param2})
+	if newnode then 
+		minetest.add_node(pos,{name=newnode, param2 = node.param2}) 
 		minetest.get_meta(pos):set_string("source","")
 	end
 end
 
 pipeworks.spigot_check = function(pos, node)
 	local belowname = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name
-	if belowname and (belowname == "air" or belowname == "default:water_flowing" or belowname == "default:water_source") then
+	if belowname and (belowname == "air" or belowname == "default:water_flowing" or belowname == "default:water_source") then 
 		local spigotname = minetest.get_node(pos).name
 		local fdir=node.param2 % 4
 		local check = {
@@ -113,7 +113,7 @@ end
 
 pipeworks.fountainhead_check = function(pos, node)
 	local abovename = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name
-	if abovename and (abovename == "air" or abovename == "default:water_flowing" or abovename == "default:water_source") then
+	if abovename and (abovename == "air" or abovename == "default:water_flowing" or abovename == "default:water_source") then 
 		local fountainhead_name = minetest.get_node(pos).name
 		local near_node = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z})
 		if near_node and string.find(near_node.name, "_loaded") then

init.lua

@@ -5,7 +5,8 @@
 --
 
 pipeworks = {}
-pipeworks.ui_cat_tube_list = {}
+
+local DEBUG = false
 
 pipeworks.worldpath = minetest.get_worldpath()
 pipeworks.modpath = minetest.get_modpath("pipeworks")
@@ -149,16 +150,4 @@ end
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
--- 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

@@ -42,7 +42,7 @@ minetest.register_globalstep(function(dtime)
 		return
 	end
 	tube_item_count = {}
-	for _, entity in pairs(luaentity.entities) do
+	for id, 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,22 +55,15 @@ 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..")")
-			pipeworks.break_tube(pos)
+			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
+			pipeworks.scan_for_tube_objects(pos)
 		end
 	end
 end
@@ -201,7 +194,6 @@ 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
@@ -213,7 +205,6 @@ 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()}
@@ -400,7 +391,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 _, entity in pairs(luaentity.entities) do
+		for id, 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,6 +1,6 @@
 local S = minetest.get_translator("pipeworks")
 
-if not minetest.get_modpath("auto_tree_tap") and
+if not minetest.get_modpath("auto_tree_tap") and 
   minetest.get_modpath("technic") then
 
 	minetest.register_abm({
@@ -38,10 +38,10 @@ if not minetest.get_modpath("auto_tree_tap") and
 		after_place_node = function (pos, placer)
 			pipeworks.scan_for_tube_objects(pos, placer)
 			local placer_pos = placer:get_pos()
-
+		
 			--correct for the player's height
 			if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
-
+		
 			--correct for 6d facedir
 			if placer_pos then
 				local dir = {

locale/pipeworks.fr.tr

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

@@ -2,10 +2,6 @@
 # License: CC-by-SA 4.0
 # Author: pevernow <3450354617@qq.com>
 
-## generic interaction
-Set=
-Cancel=
-
 ## digilines interfacing
 Channel=频道
 
@@ -88,12 +84,11 @@ 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>作为私人接收器
+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=未配置的传送管道
+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'上
@@ -105,9 +100,7 @@ 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)=高级拾取管道(@1m)
 

locale/template.txt

@@ -3,10 +3,6 @@
 # License: CC-by-SA 4.0
 # Author:
 
-## generic interaction
-Set=
-Cancel=
-
 ## digilines interfacing
 Channel=
 
@@ -90,12 +86,11 @@ 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=
-Teleporting Tube=
-Unconfigured Teleportation 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'=
@@ -107,9 +102,7 @@ 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

@@ -813,56 +813,82 @@ 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 = white..black..green..yellow..blue..red
+	local cid = tostring(white)..tostring(black)..tostring(green)..
+			tostring(yellow)..tostring(blue)..tostring(red)
 	local node_name = BASENAME..cid
-
 	local tiles = table.copy(tiles_base)
-	-- 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");
+	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
 
 	local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1}
 	if red + blue + yellow + green + black + white ~= 0 then
@@ -907,7 +933,6 @@ 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,
@@ -944,7 +969,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 _, rule in pairs(rules) do
+				for color, 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
@@ -968,7 +993,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
+				return {string.format("%s_%s", name, dropname)}
 			end
 			minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
 			pipeworks.scan_for_tube_objects(pos)
@@ -981,8 +1006,6 @@ end
 end
 end
 
-pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = BASENAME.."000000"
-
 ------------------------------------
 -- Overheated Lua controlled Tube --
 ------------------------------------
@@ -1016,7 +1039,6 @@ 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,
@@ -1048,7 +1070,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
+			return {string.format("%s_%s", name, dropname)}
 		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")
-	f:close()
+    	local t = f:read("*all")
+    	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:close()
+    	f:write(minetest.serialize(tbl))
+    	f:close()
 end
 
 local function read_entities()
@@ -36,7 +36,7 @@ local function read_entities()
 		y=math.min(30927,y)
 		z=math.min(30927,z)
 
-		entity.start_pos.x = x
+		entity.start_pos.x = x                 
 		entity.start_pos.y = y
 		entity.start_pos.z = z
 
@@ -211,7 +211,7 @@ local entitydef_default = {
 		end
 	end,
 	get_velocity = function(self)
-		return vector.new(self._velocity)
+		return vector.new(self._velocity)	
 	end,
 	set_velocity = function(self, velocity)
 		self._velocity = vector.new(velocity)
@@ -289,7 +289,7 @@ function luaentity.add_entity(pos, name)
 		_acceleration = {x = 0, y = 0, z = 0},
 		_attached_entities = {},
 	}
-
+	
 	local prototype = luaentity.registered_entities[name]
 	setmetatable(entity, prototype) -- Default to prototype for other methods
 	luaentity.entities[index] = entity
@@ -318,20 +318,19 @@ end
 function luaentity.get_objects_inside_radius(pos, radius)
 	local objects = {}
 	local index = 1
-	for _, entity in pairs(luaentity.entities) do
+	for id, 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 _, entity in pairs(luaentity.entities) do
+	for id, 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

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

pipes.lua

@@ -11,11 +11,11 @@ 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 = {}
-
+	
 	local jx = 0
 	local jy = 0
 	local jz = 0
@@ -30,13 +30,11 @@ 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)
 
@@ -44,11 +42,11 @@ for index, connects in ipairs(cconnects) do
 		pgroups = {snappy = 3, tube = 1}
 		pipedesc = S("Pipe Segment")
 	end
-
+	
 	local outimg_e = { "pipeworks_pipe_plain.png" }
 	local outimg_l = { "pipeworks_pipe_plain.png" }
 
-	if index == 3 then
+	if index == 3 then 
 		outimg_e = { "pipeworks_pipe_3_empty.png" }
 		outimg_l = { "pipeworks_pipe_3_loaded.png" }
 	end
@@ -90,7 +88,7 @@ for index, connects in ipairs(cconnects) do
 		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
 		pipenumber = index
 	})
-
+	
 	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
 
 	minetest.register_node("pipeworks:pipe_"..index.."_loaded", {
@@ -125,7 +123,7 @@ for index, connects in ipairs(cconnects) do
 		check_for_horiz_pole = pipeworks.check_for_horiz_pipe,
 		pipenumber = index
 	})
-
+	
 	local emptypipe = "pipeworks:pipe_"..index.."_empty"
 	local fullpipe = "pipeworks:pipe_"..index.."_loaded"
 	table.insert(pipes_empty_nodenames, emptypipe)
@@ -133,7 +131,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
@@ -241,7 +239,7 @@ minetest.register_abm({
 	nodenames = {"pipeworks:spigot","pipeworks:spigot_pouring"},
 	interval = 1,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node, active_object_count, active_object_count_wider) 
 		pipeworks.spigot_check(pos,node)
 	end
 })
@@ -250,7 +248,7 @@ minetest.register_abm({
 	nodenames = {"pipeworks:fountainhead","pipeworks:fountainhead_pouring"},
 	interval = 1,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node, active_object_count, active_object_count_wider) 
 		pipeworks.fountainhead_check(pos,node)
 	end
 })

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 @@ end
 local check_for_liquids_v2 = function(pos, limit)
 	local coords = make_coords_offsets(pos, false)
 	local total = 0
-	for _, tpos in ipairs(coords) do
+	for index, 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,13 +69,11 @@ 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
---]]
 
 
 
@@ -153,7 +151,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 _, offset in ipairs(candidates) do
+	for index, offset in ipairs(candidates) do
 		local npos = vector.add(pos, offset)
 		local neighbour = minetest.get_node(npos)
 		local nodename = neighbour.name
@@ -187,12 +185,13 @@ 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
@@ -288,7 +287,7 @@ flowlogic.run_output = function(pos, node, currentpressure, oldpressure, outputd
 	local upper = outputdef.upper
 	local lower = outputdef.lower
 	local result = currentpressure
-	local threshold
+	local threshold = nil
 	if finitemode then threshold = lower else threshold = upper end
 	if currentpressure > threshold then
 		local takenpressure = outputdef.outputfn(pos, node, currentpressure, finitemode)
@@ -317,7 +316,7 @@ flowlogic.run_transition = function(node, currentpressure)
 		local nodename_prev = simplesetdef[1].nodename
 		local result_nodename = node.name
 
-		for _, element in ipairs(simplesetdef) do
+		for index, element in ipairs(simplesetdef) do
 			-- find the highest element that is below the current pressure.
 			local threshold = element.threshold
 			if threshold > currentpressure then
@@ -339,9 +338,7 @@ flowlogic.run_transition = function(node, currentpressure)
 	end
 
 	if not found then
-		pipeworks.logger("flowlogic.run_transition() BUG no transition " ..
-			"definitions found! node.name=" .. node.name ..
-			" currentpressure=" .. tostring(currentpressure))
+		pipeworks.logger("flowlogic.run_transition() BUG no transition definitions found! nodename="..nodename.." 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 _, endvec in ipairs(getends(node)) do
+		for index, endvec in ipairs(getends(node)) do
 			if vector.equals(direction, endvec) then result = true end
 		end
 		return result

routing_tubes.lua

@@ -10,35 +10,6 @@ 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", {
@@ -65,27 +36,29 @@ 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"
-			local meta = minetest.get_meta(pos)
-			local was_node = minetest.deserialize(meta:get_string("the_tube_was"))
-			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
+			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
-					pipeworks.logger(log_msg.."            with "..wieldname.." but that tool is too weak.")
+					pipeworks.logger(log_msg.."            but it can't be repaired.")
 				end
-				return
+			else
+				pipeworks.logger(log_msg.."            with "..wieldname.." but that tool is too weak.")
 			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
 	}
 })
@@ -192,7 +165,6 @@ 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,16 +1,4 @@
 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", {
@@ -20,10 +8,11 @@ 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, after_break, saved_pos)
+						 minetest.after(detector_tube_step, minetest.registered_nodes[name].item_exit, saved_pos)
 						 return pipeworks.notvel(pipeworks.meseadjlist,velocity)
 					end},
 				groups = {mesecon = 2, not_in_creative_inventory = 1},
@@ -45,7 +34,9 @@ if pipeworks.enable_detector_tube then
 				on_construct = function(pos)
 					 local meta = minetest.get_meta(pos)
 					 meta:set_int("nitems", 1)
-					 minetest.after(detector_tube_step, after_break, pos)
+					 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)
 				end,
 			},
 	})
@@ -96,20 +87,13 @@ 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.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").."]"
+						"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").."]"
 					)
 				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

teleport_tube.lua

@@ -23,7 +23,7 @@ end
 local function migrate_tube_db()
 		local tmp_db = {}
 		tp_tube_db.version = nil
-		for _, val in pairs(tp_tube_db) do
+		for key, val in pairs(tp_tube_db) do
 			if(val.channel ~= "") then -- skip unconfigured tubes
 				tmp_db[hash(val)] = val
 			end
@@ -127,22 +127,16 @@ 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"
-	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)
+	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").."]" ..
+			default.gui_bg..
+			default.gui_bg_img)
 end
 
 pipeworks.register_tube("pipeworks:teleport_tube", {
@@ -176,11 +170,10 @@ 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
@@ -200,7 +193,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 						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, S("Sorry, receiving from channel '@1' is reserved for @2",
@@ -214,7 +207,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 
 			-- was the channel changed?
 			local channel = meta:get_string("channel")
-			if new_channel ~= channel and (fields.key_enter_field == "channel" or fields.set_channel) then
+			if new_channel ~= channel then
 				channel = new_channel
 				meta:set_string("channel", channel)
 				dirty = true
@@ -240,7 +233,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,

trashcan.lua

@@ -1,7 +1,7 @@
 local S = minetest.get_translator("pipeworks")
 minetest.register_node("pipeworks:trashcan", {
-	description = S("Trash Can"),
-	drawtype = "normal",
+	description = S("Trash Can"), 
+	drawtype = "normal", 
 	tiles = {
 		"pipeworks_trashcan_bottom.png",
 		"pipeworks_trashcan_bottom.png",
@@ -9,15 +9,15 @@ minetest.register_node("pipeworks:trashcan", {
 		"pipeworks_trashcan_side.png",
 		"pipeworks_trashcan_side.png",
 		"pipeworks_trashcan_side.png",
-	},
-	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1},
+	}, 
+	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1}, 
 	tube = {
 		insert_object = function(pos, node, stack, direction)
 			return ItemStack("")
 		end,
 		connect_sides = {left = 1, right = 1, front = 1, back = 1, top = 1, bottom = 1},
 		priority = 1, -- Lower than anything else
-	},
+	}, 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
@@ -33,14 +33,13 @@ minetest.register_node("pipeworks:trashcan", {
 				"listring[]")
 		meta:set_string("infotext", S("Trash Can"))
 		meta:get_inventory():set_size("trash", 1)
-	end,
+	end, 
 	after_place_node = pipeworks.after_place,
 	after_dig_node = pipeworks.after_dig,
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		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,11 +26,6 @@ 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)
@@ -87,7 +82,6 @@ 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,
@@ -113,18 +107,6 @@ 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,
@@ -200,7 +182,6 @@ 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}}
@@ -223,7 +204,6 @@ 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,31 +40,22 @@ 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[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("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}]"..
+							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 (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
-
+					if 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,13 +1,17 @@
 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",
-			"size[8,"..(6+data.wield_inv_height)..";]"..
+			"invsize[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..";]"..
@@ -349,7 +353,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
@@ -371,7 +375,6 @@ 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 = {
@@ -423,7 +426,6 @@ 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 = {
@@ -459,7 +461,6 @@ 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 = {