Merge remote-tracking branch 'upstream/master'

.github/workflows/luacheck.yml

@@ -1,10 +0,0 @@
-name: luacheck
-on: [push, pull_request]
-jobs:
-  luacheck:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Luacheck
-        uses: lunarmodules/luacheck@master

.gitlab-ci.yml

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

.luacheckrc

@@ -19,8 +19,6 @@ read_globals = {
 
 	-- mods
 	"default", "mesecon", "digiline",
-	"screwdriver", "unified_inventory",
-	"i3", "mcl_experience", "awards",
-	"xcompat",
+	"screwdriver", "unified_inventory"
 
 }

README

@@ -1,7 +1,7 @@
 This mod uses nodeboxes to supply a complete set of 3D pipes and tubes, 
 along devices that work with them.
 
-See https://github.com/mt-mods/pipeworks/wiki/ for detailed information about usage of this mod.
+See https://gitlab.com/VanessaE/pipeworks/wikis/ for detailed information about usage of this mod.
 
 Unlike the previous version of this mod, these pipes are rounded, and when 
 placed, they'll automatically join together as needed.  Pipes can go vertically 
@@ -20,7 +20,3 @@ This mod is a work in progress.
 
 Please note that owing to the nature of this mod, I have opted to use 64px 
 textures.  Anything less just looks terrible.
-
-The teleport tube database used to be kept in a file named 'teleport_tubes'.
-The database is now kept in mod storage. The migration from 'teleport_tubes' is
-automatic. The old file is then kept around but is not used at all.

autocrafter.lua

@@ -1,15 +1,11 @@
 local S = minetest.get_translator("pipeworks")
--- cache some recipe data to avoid calling the slow function
--- minetest.get_craft_result() every second
-local autocrafterCache = {}
+local autocrafterCache = {}  -- caches some recipe data to avoid to call the slow function minetest.get_craft_result() every second
 
 local craft_time = 1
-local next = next
 
 local function count_index(invlist)
 	local index = {}
 	for _, stack in pairs(invlist) do
-		stack = ItemStack(stack)
 		if not stack:is_empty() then
 			local stack_name = stack:get_name()
 			index[stack_name] = (index[stack_name] or 0) + stack:get_count()
@@ -25,244 +21,62 @@ local function get_item_info(stack)
 	return description, name
 end
 
--- Get best matching recipe for what user has put in crafting grid.
--- This function does not consider crafting method (mix vs craft)
-local function get_matching_craft(output_name, example_recipe)
-	local recipes = minetest.get_all_craft_recipes(output_name)
-	if not recipes then
-		return example_recipe
-	end
-
-	if 1 == #recipes then
-		return recipes[1].items
-	end
-
-	local index_example = count_index(example_recipe)
-	local best_score = 0
-	local index_recipe, best_index, score, group
-	for i = 1, #recipes do
-		score = 0
-		index_recipe = count_index(recipes[i].items)
-		for recipe_item_name, _ in pairs(index_recipe) do
-			if index_example[recipe_item_name] then
-				score = score + 1
-			elseif recipe_item_name:sub(1, 6) == "group:" then
-				group = recipe_item_name:sub(7)
-				for example_item_name, _ in pairs(index_example) do
-					if minetest.get_item_group(
-						example_item_name, group) ~= 0
-					then
-						score = score + 1
-						break
-					end
-				end
-			end
-		end
-		if best_score < score then
-			best_index = i
-			best_score = score
-		end
-	end
-
-	return best_index and recipes[best_index].items or example_recipe
-end
-
 local function get_craft(pos, inventory, hash)
 	local hash = hash or minetest.hash_node_position(pos)
 	local craft = autocrafterCache[hash]
-	if craft then return craft end
-
-	local example_recipe = inventory:get_list("recipe")
-	local output, decremented_input = minetest.get_craft_result({
-		method = "normal", width = 3, items = example_recipe
-	})
-
-	local recipe = example_recipe
-	if output and not output.item:is_empty() then
-		recipe = get_matching_craft(output.item:get_name(), example_recipe)
+	if not craft then
+		local recipe = inventory:get_list("recipe")
+		local output, decremented_input = minetest.get_craft_result({method = "normal", width = 3, items = recipe})
+		craft = {recipe = recipe, consumption=count_index(recipe), output = output, decremented_input = decremented_input}
+		autocrafterCache[hash] = craft
 	end
-
-	craft = {
-		recipe = recipe,
-		consumption = count_index(recipe),
-		output = output,
-		decremented_input = decremented_input.items
-	}
-	autocrafterCache[hash] = craft
 	return craft
 end
 
--- From a consumption table with groups and an inventory index,
--- build a consumption table without groups
-local function calculate_consumption(inv_index, consumption_with_groups)
-	inv_index = table.copy(inv_index)
-	consumption_with_groups = table.copy(consumption_with_groups)
-
-	-- table of items to actually consume
-	local consumption = {}
-	-- table of ingredients defined as one or more groups each
-	local grouped_ingredients = {}
-
-	-- First consume all non-group requirements
-	-- This is done to avoid consuming a non-group item which
-	-- is also in a group
-	for key, count in pairs(consumption_with_groups) do
-		if key:sub(1, 6) == "group:" then
-			-- build table with group recipe items while looping
-			grouped_ingredients[key] = key:sub(7):split(',')
-		else
-			-- if the item to consume doesn't exist in inventory
-			-- or not enough of them, abort crafting
-			if not inv_index[key] or inv_index[key] < count then
-				return nil
-			end
-
-			consumption[key] = (consumption[key] or 0) + count
-			consumption_with_groups[key] = consumption_with_groups[key] - count
-			assert(consumption_with_groups[key] == 0)
-			consumption_with_groups[key] = nil
-			inv_index[key] = inv_index[key] - count
-			assert(inv_index[key] >= 0)
-		end
-	end
-
-	-- helper function to resolve matching ingredients with multiple group
-	-- requirements
-	local function ingredient_groups_match_item(ingredient_groups, name)
-		local found = 0
-		local count_ingredient_groups = #ingredient_groups
-		for i = 1, count_ingredient_groups do
-			if minetest.get_item_group(name,
-				ingredient_groups[i]) ~= 0
-			then
-				found = found + 1
-			end
-		end
-		return found == count_ingredient_groups
-	end
-
-	-- Next, resolve groups using the remaining items in the inventory
-	if next(grouped_ingredients) ~= nil then
-		local take
-		for itemname, count in pairs(inv_index) do
-			if count > 0 then
-				-- groupname is the string as defined by recipe.
-				--  e.g. group:dye,color_blue
-				-- groups holds the group names split into a list
-				--  ready to be passed to core.get_item_group()
-				for groupname, groups in pairs(grouped_ingredients) do
-					if consumption_with_groups[groupname] > 0
-						and ingredient_groups_match_item(groups, itemname)
-					then
-						take = math.min(count,
-							consumption_with_groups[groupname])
-						consumption_with_groups[groupname] =
-							consumption_with_groups[groupname] - take
-
-						assert(consumption_with_groups[groupname] >= 0)
-						consumption[itemname] =
-							(consumption[itemname] or 0) + take
-
-						inv_index[itemname] =
-							inv_index[itemname] - take
-						assert(inv_index[itemname] >= 0)
-					end
-				end
-			end
-		end
-	end
-
-	-- Finally, check everything has been consumed
-	for key, count in pairs(consumption_with_groups) do
-		if count > 0 then
-			return nil
-		end
-	end
-
-	return consumption
-end
-
-local function has_room_for_output(list_output, index_output)
-	local name
-	local empty_count = 0
-	for _, item in pairs(list_output) do
-		if item:is_empty() then
-			empty_count = empty_count + 1
-		else
-			name = item:get_name()
-			if index_output[name] then
-				index_output[name] = index_output[name] - item:get_free_space()
-			end
-		end
-	end
-	for _, count in pairs(index_output) do
-		if count > 0 then
-			empty_count = empty_count - 1
-		end
-	end
-	if empty_count < 0 then
-		return false
-	end
-
-	return true
-end
-
 local function autocraft(inventory, craft)
 	if not craft then return false end
+	local output_item = craft.output.item
 
-	-- check if output and all replacements fit in dst
-	local output = craft.output.item
-	local out_items = count_index(craft.decremented_input)
-	out_items[output:get_name()] =
-			(out_items[output:get_name()] or 0) + output:get_count()
-
-	if not has_room_for_output(inventory:get_list("dst"), out_items) then
-		return false
-	end
-
-	-- check if we have enough material available
+	-- check if we have enough room in dst
+	if not inventory:room_for_item("dst", output_item) then	return false end
+	local consumption = craft.consumption
 	local inv_index = count_index(inventory:get_list("src"))
-	local consumption = calculate_consumption(inv_index, craft.consumption)
-	if not consumption then
-		return false
+	-- check if we have enough material available
+	for itemname, number in pairs(consumption) do
+		if (not inv_index[itemname]) or inv_index[itemname] < number then return false end
 	end
-
 	-- consume material
 	for itemname, number in pairs(consumption) do
-		-- We have to do that since remove_item does not work if count > stack_max
-		for _ = 1, number do
+		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
 
 	-- craft the result into the dst inventory and add any "replacements" as well
-	inventory:add_item("dst", output)
-	local leftover
+	inventory:add_item("dst", output_item)
 	for i = 1, 9 do
-		leftover = inventory:add_item("dst", craft.decremented_input[i])
-		if leftover and not leftover:is_empty() then
-			minetest.log("warning", "[pipeworks] autocrafter didn't " ..
-				"calculate output space correctly.")
-		end
+		inventory:add_item("dst", craft.decremented_input.items[i])
 	end
 	return true
 end
 
 -- returns false to stop the timer, true to continue running
--- is started only from start_autocrafter(pos) after sanity checks and
--- recipe is cached
+-- is started only from start_autocrafter(pos) after sanity checks and cached recipe
 local function run_autocrafter(pos, elapsed)
 	local meta = minetest.get_meta(pos)
 	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 _ = 1, math.floor(elapsed/craft_time) do
 		local continue = autocraft(inventory, craft)
 		if not continue then return false end
 	end
@@ -286,17 +100,33 @@ end
 -- note, that this function assumes allready being updated to virtual items
 -- and doesn't handle recipes with stacksizes > 1
 local function after_recipe_change(pos, inventory)
-	local hash = minetest.hash_node_position(pos)
 	local meta = minetest.get_meta(pos)
-	autocrafterCache[hash] = nil
 	-- if we emptied the grid, there's no point in keeping it running or cached
 	if inventory:is_empty("recipe") then
 		minetest.get_node_timer(pos):stop()
+		autocrafterCache[minetest.hash_node_position(pos)] = nil
 		meta:set_string("infotext", S("unconfigured Autocrafter"))
 		inventory:set_stack("output", 1, "")
 		return
 	end
-	local craft = get_craft(pos, inventory, hash)
+	local recipe = inventory:get_list("recipe")
+
+	local hash = minetest.hash_node_position(pos)
+	local craft = autocrafterCache[hash]
+
+	if craft then
+		-- check if it changed
+		local cached_recipe = craft.recipe
+		for i = 1, 9 do
+			if recipe[i]:get_name() ~= cached_recipe[i]:get_name() then
+				autocrafterCache[hash] = nil -- invalidate recipe
+				craft = nil
+				break
+			end
+		end
+	end
+
+	craft = craft or get_craft(pos, inventory, hash)
 	local output_item = craft.output.item
 	local description, name = get_item_info(output_item)
 	meta:set_string("infotext", S("'@1' Autocrafter (@2)", description, name))
@@ -305,8 +135,7 @@ local function after_recipe_change(pos, inventory)
 	after_inventory_change(pos)
 end
 
--- clean out unknown items and groups, which would be handled like unknown
--- items in the crafting grid
+-- clean out unknown items and groups, which would be handled like unknown items in the crafting grid
 -- if minetest supports query by group one day, this might replace them
 -- with a canonical version instead
 local function normalize(item_list)
@@ -337,65 +166,38 @@ local function on_output_change(pos, inventory, stack)
 			end
 			width_idx = (width_idx < 3) and (width_idx + 1) or 1
 		end
-		-- we'll set the output slot in after_recipe_change to the actual
-		-- result of the new recipe
+		-- we'll set the output slot in after_recipe_change to the actual result of the new recipe
 	end
 	after_recipe_change(pos, inventory)
 end
 
--- returns false if we shouldn't bother attempting to start the timer again
--- after this
+-- returns false if we shouldn't bother attempting to start the timer again after this
 local function update_meta(meta, enabled)
 	local state = enabled and "on" or "off"
 	meta:set_int("enabled", enabled and 1 or 0)
-	local list_backgrounds = ""
-	if minetest.get_modpath("i3") or minetest.get_modpath("mcl_formspec") then
-		list_backgrounds = "style_type[box;colors=#666]"
-		for i = 0, 2 do
-			for j = 0, 2 do
-				list_backgrounds = list_backgrounds .. "box[" ..
-					0.22 + (i * 1.25) .. "," .. 0.22 + (j * 1.25) .. ";1,1;]"
-			end
-		end
-		for i = 0, 3 do
-			for j = 0, 2 do
-				list_backgrounds = list_backgrounds .. "box[" ..
-					5.28 + (i * 1.25) .. "," .. 0.22 + (j * 1.25) .. ";1,1;]"
-			end
-		end
-		for i = 0, 7 do
-			for j = 0, 2 do
-				list_backgrounds = list_backgrounds .. "box[" ..
-					0.22 + (i * 1.25) .. "," .. 5 + (j * 1.25) .. ";1,1;]"
-			end
-		end
-	end
-	local size = "10.2,14"
-	local fs =
-		"formspec_version[2]" ..
-		"size[" .. size .. "]" ..
-		pipeworks.fs_helpers.get_prepends(size) ..
-		list_backgrounds ..
-		"list[context;recipe;0.22,0.22;3,3;]" ..
-		"image[4,1.45;1,1;[combine:16x16^[noalpha^[colorize:#141318:255]" ..
-		"list[context;output;4,1.45;1,1;]" ..
-		"image_button[4,2.6;1,0.6;pipeworks_button_" .. state .. ".png;" ..
-		state .. ";;;false;pipeworks_button_interm.png]" ..
-		"list[context;dst;5.28,0.22;4,3;]" ..
-		"list[context;src;0.22,5;8,3;]" ..
-		pipeworks.fs_helpers.get_inv(9) ..
-		"listring[current_player;main]" ..
-		"listring[context;src]" ..
-		"listring[current_player;main]" ..
-		"listring[context;dst]" ..
-		"listring[current_player;main]"
+	local fs = 	"size[8,12]"..
+			"list[context;recipe;0,0;3,3;]"..
+			"image[3,1;1,1;gui_hb_bg.png^[colorize:#141318:255]"..
+			"list[context;output;3,1;1,1;]"..
+			"image_button[3,2;1,0.6;pipeworks_button_" .. state .. ".png;" .. state .. ";;;false;pipeworks_button_interm.png]" ..
+			"list[context;src;0,4.5;8,3;]"..
+			"list[context;dst;4,0;4,3;]"..
+			default.gui_bg..
+			default.gui_bg_img..
+			default.gui_slots..
+			default.get_hotbar_bg(0,8) ..
+			"list[current_player;main;0,8;8,4;]" ..
+			"listring[current_player;main]"..
+			"listring[context;src]" ..
+			"listring[current_player;main]"..
+			"listring[context;dst]" ..
+			"listring[current_player;main]"
 	if minetest.get_modpath("digilines") then
-		fs = fs .. "field[0.22,4.1;4.5,0.75;channel;" .. S("Channel") ..
-			";${channel}]" ..
-			"button[5,4.1;1.5,0.75;set_channel;" .. S("Set") .. "]" ..
-			"button_exit[6.8,4.1;2,0.75;close;" .. S("Close") .. "]"
+		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)
+	meta:set_string("formspec",fs)
 
 	-- toggling the button doesn't quite call for running a recipe change check
 	-- so instead we run a minimal version for infotext setting only
@@ -415,12 +217,9 @@ local function update_meta(meta, enabled)
 end
 
 -- 1st version of the autocrafter had actual items in the crafting grid
--- the 2nd replaced these with virtual items, dropped the content on update and
---   set "virtual_items" to string "1"
--- the third added an output inventory, changed the formspec and added a button
---   for enabling/disabling
--- so we work out way backwards on this history and update each single case
---   to the newest version
+-- the 2nd replaced these with virtual items, dropped the content on update and set "virtual_items" to string "1"
+-- the third added an output inventory, changed the formspec and added a button for enabling/disabling
+-- so we work out way backwards on this history and update each single case to the newest version
 local function upgrade_autocrafter(pos, meta)
 	local meta = meta or minetest.get_meta(pos)
 	local inv = meta:get_inventory()
@@ -431,8 +230,7 @@ local function upgrade_autocrafter(pos, meta)
 		update_meta(meta, true)
 
 		if meta:get_string("virtual_items") == "1" then -- we are version 2
-			-- we already dropped stuff, so lets remove the metadatasetting
-			-- (we are not being called again for this node)
+			-- we already dropped stuff, so lets remove the metadatasetting (we are not being called again for this node)
 			meta:set_string("virtual_items", "")
 		else -- we are version 1
 			local recipe = inv:get_list("recipe")
@@ -457,9 +255,7 @@ minetest.register_node("pipeworks:autocrafter", {
 	description = S("Autocrafter"),
 	drawtype = "normal",
 	tiles = {"pipeworks_autocrafter.png"},
-	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 1, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
+	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1},
 	tube = {insert_object = function(pos, node, stack, direction)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
@@ -473,23 +269,19 @@ minetest.register_node("pipeworks:autocrafter", {
 			return inv:room_for_item("src", stack)
 		end,
 		input_inventory = "dst",
-		connect_sides = {
-			left = 1, right = 1, front = 1, back = 1, top = 1, bottom = 1
-			}
-	},
+		connect_sides = {left = 1, right = 1, front = 1, back = 1, top = 1, bottom = 1}},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
-		inv:set_size("src", 3 * 8)
-		inv:set_size("recipe", 3 * 3)
-		inv:set_size("dst", 4 * 3)
+		inv:set_size("src", 3*8)
+		inv:set_size("recipe", 3*3)
+		inv:set_size("dst", 4*3)
 		inv:set_size("output", 1)
 		update_meta(meta, false)
 	end,
 	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
+		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)
@@ -536,9 +328,7 @@ minetest.register_node("pipeworks:autocrafter", {
 	end,
 	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 		if not pipeworks.may_configure(pos, player) then
-			minetest.log("action", string.format("%s attempted to take from " ..
-				"autocrafter at %s",
-				player:get_player_name(), minetest.pos_to_string(pos)))
+			minetest.log("action", string.format("%s attempted to take from autocrafter at %s", player:get_player_name(), minetest.pos_to_string(pos)))
 			return 0
 		end
 		upgrade_autocrafter(pos)
@@ -554,9 +344,7 @@ minetest.register_node("pipeworks:autocrafter", {
 		after_inventory_change(pos)
 		return stack:get_count()
 	end,
-	allow_metadata_inventory_move = function(
-			pos, from_list, from_index, to_list, to_index, count, player)
-
+	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		if not pipeworks.may_configure(pos, player) then return 0 end
 		upgrade_autocrafter(pos)
 		local inv = minetest.get_meta(pos):get_inventory()
@@ -597,14 +385,13 @@ minetest.register_node("pipeworks:autocrafter", {
 				if type(msg) == "table" then
 					if #msg < 3 then return end
 					local inv = meta:get_inventory()
-					for y = 0, 2, 1 do
-						for x = 1, 3, 1 do
-							local slot = y * 3 + x
-							if minetest.registered_items[msg[y + 1][x]] then
-								inv:set_stack("recipe", slot, ItemStack(
-									msg[y + 1][x]))
+					for y=0,2,1 do
+						for x=1,3,1 do
+							local slot = y*3+x
+							if minetest.registered_items[msg[y+1][x]] then
+								inv:set_stack("recipe",slot,ItemStack(msg[y+1][x]))
 							else
-								inv:set_stack("recipe", slot, ItemStack(""))
+								inv:set_stack("recipe",slot,ItemStack(""))
 							end
 						end
 					end
@@ -613,12 +400,11 @@ minetest.register_node("pipeworks:autocrafter", {
 					local meta = minetest.get_meta(pos)
 					local inv = meta:get_inventory()
 					local recipe = {}
-					for y = 0, 2, 1 do
+					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())
+						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
@@ -645,4 +431,13 @@ minetest.register_node("pipeworks:autocrafter", {
 		},
 	},
 })
-pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list + 1] = "pipeworks:autocrafter"
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:autocrafter"
+
+minetest.register_craft( {
+	output = "pipeworks:autocrafter 2",
+	recipe = {
+	        { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" },
+	        { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" },
+	        { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" }
+	},
+})

changelog.txt

@@ -3,65 +3,6 @@ Changelog
 
 
 
-2024-02-26 (SwissalpS)
-set is_ground_content to false for various nodes.
-
-
-
-2023-06-22 (SwissalpS, rubenwardy)
-groups support in recipe. Set recipe as usual via recipe formspec or digilines.
-Autocrafter now resolves matching recipe using groups so that items in input
-inventory are used, that match group and no longer only strictly what user
-has in recipe-inventory
-
-
-
-2023-06-21 (OgelGames, BuckarooBanzay)
-fix autocrafter destroying replacement items (OG)
-remove facedir debugging logs (BB)
-
-
-
-2023-05-28 (SwissalpS)
-support setting 'can_receive' for teleport tubes via digiline
-
-
-
-2023-05-19 (fluxionary, OgelGames)
-log items going through teleport tubes
-
-
-
-2022-12-02 (wsor4035)
-bring back compatibility with mineclone2
-
-
-
-2022-11-11 (OgelGames)
-prevent tp- and sand-tubes from breaking themselves and refactor part of code
-
-2022-09-18 (fluxionary)
-protection checks before break-/placeing a node -> less violation logs
-
-
-2022-08-14 (wsor4035)
-prevent tubes from connecting to furnace front
-
-
-
-2022-08-13 (TurkeyMcMac)
-moved teleport-tube database to mod-storage
-
-
-
-2022-06-23 (S-S-X)
-on_repair tweak, improved repairing tubes
-
-
-* many updates not mentioned here *
-
-
-
 2017-10-19 (thetaepsilon)
 Directional flowables are now implemented.
 All devices for which it is relevant (valve, flow sensor etc.) have been converted so that they only flow on their connecting sides, so pressure propogation now works as expected for these devices when pressure logic is enabled.

common.lua

@@ -1,96 +1,3 @@
-local S = minetest.get_translator("pipeworks")
-
--- Random variables
-
-pipeworks.expect_infinite_stacks = true
-if minetest.get_modpath("unified_inventory") or not minetest.settings:get_bool("creative_mode") then
-	pipeworks.expect_infinite_stacks = false
-end
-
-pipeworks.meseadjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
-
-pipeworks.rules_all = {{x=0, y=0, z=1},{x=0, y=0, z=-1},{x=1, y=0, z=0},{x=-1, y=0, z=0},
-		{x=0, y=1, z=1},{x=0, y=1, z=-1},{x=1, y=1, z=0},{x=-1, y=1, z=0},
-		{x=0, y=-1, z=1},{x=0, y=-1, z=-1},{x=1, y=-1, z=0},{x=-1, y=-1, z=0},
-		{x=0, y=1, z=0}, {x=0, y=-1, z=0}}
-
-pipeworks.mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
-pipeworks.digilines_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
-
-pipeworks.liquid_texture = minetest.registered_nodes[pipeworks.liquids.water.flowing].tiles[1]
-if type(pipeworks.liquid_texture) == "table" then pipeworks.liquid_texture = pipeworks.liquid_texture.name end
-
-pipeworks.button_off   = {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}
-pipeworks.button_on    = {text="", texture="pipeworks_button_on.png",  addopts="false;false;pipeworks_button_interm.png"}
-pipeworks.button_base  = "image_button[0,4.3;1,0.6"
-pipeworks.button_label = "label[0.9,4.31;"..S("Allow splitting incoming stacks from tubes").."]"
-
--- Helper functions
-
-function pipeworks.fix_image_names(table, replacement)
-	local outtable={}
-	for i in ipairs(table) do
-		outtable[i]=string.gsub(table[i], "_XXXXX", replacement)
-	end
-
-	return outtable
-end
-
-local function overlay_tube_texture(texture)
-	-- The texture appears the first time to be colorized as the opaque background.
-	return ("(%s)^[noalpha^[colorize:#dadada^(%s)"):format(texture, texture)
-end
-
-function pipeworks.make_tube_tile(tile)
-	if pipeworks.use_real_entities then
-		return tile
-	elseif type(tile) == "string" then
-		return overlay_tube_texture(tile)
-	else
-		tile = table.copy(tile)
-		if tile.color then
-			-- Won't work 100% of the time, but good enough.
-			tile.name = tile.name .. "^[multiply:" .. minetest.colorspec_to_colorstring(tile.color)
-			tile.color = nil
-		end
-		tile.name = overlay_tube_texture(tile.name)
-		tile.backface_culling = nil -- The texture is opaque
-		return tile
-	end
-end
-
-function pipeworks.add_node_box(t, b)
-	if not t or not b then return end
-	for i in ipairs(b)
-		do table.insert(t, b[i])
-	end
-end
-
-function pipeworks.may_configure(pos, player)
-	local name = player:get_player_name()
-	local meta = minetest.get_meta(pos)
-	local owner = meta:get_string("owner")
-
-	if owner ~= "" and owner == name then -- wielders and filters
-		return true
-	end
-	return not minetest.is_protected(pos, name)
-end
-
-function pipeworks.replace_name(tbl,tr,name)
-	local ntbl={}
-	for key,i in pairs(tbl) do
-		if type(i)=="string" then
-			ntbl[key]=string.gsub(i,tr,name)
-		elseif type(i)=="table" then
-			ntbl[key]=pipeworks.replace_name(i,tr,name)
-		else
-			ntbl[key]=i
-		end
-	end
-	return ntbl
-end
-
 ----------------------
 -- Vector functions --
 ----------------------
@@ -236,81 +143,6 @@ function fs_helpers.cycling_button(meta, base, meta_name, values)
 	return base..";"..(texture_name and texture_name..";" or "")..field..";"..minetest.formspec_escape(text)..(addopts and ";"..addopts or "").."]"
 end
 
-function fs_helpers.get_inv(y)
-	local fs = {}
-	if minetest.get_modpath("i3") then
-		local inv_x = i3.settings.legacy_inventory and 0.75 or 0.22
-		local inv_y = (y + 0.4) or 6.9
-		local size, spacing = 1, 0.1
-		local hotbar_len = i3.settings.hotbar_len or (i3.settings.legacy_inventory and 8 or 9)
-		local inv_size = i3.settings.inv_size or (hotbar_len * 4)
-
-		table.insert(fs, "style_type[box;colors=#77777710,#77777710,#777,#777]")
-
-		for i = 0, hotbar_len - 1 do
-			table.insert(fs, "box["..(i * size + inv_x + (i * spacing))..","..inv_y..";"..size..","..size..";]")
-		end
-
-		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
-		table.insert(fs, "list[current_player;main;"..inv_x..","..inv_y..";"..hotbar_len..",1;]")
-
-		table.insert(fs, "style_type[box;colors=#666]")
-		for i=0, 2 do
-			for j=0, hotbar_len - 1 do
-				table.insert(fs, "box["..0.2+(j*0.1)+(j*size)..","..(inv_y+size+spacing+0.05)+(i*0.1)+(i*size)..";"..size..","..size..";]")
-			end
-		end
-
-		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
-		table.insert(fs, "list[current_player;main;"..inv_x..","..(inv_y + 1.15)..";"..hotbar_len..","..(inv_size / hotbar_len)..";"..hotbar_len.."]")
-	elseif minetest.get_modpath("mcl_formspec") then
-		local inv_x = 0.22
-		local inv_y = (y + 0.4) or 6.9
-		local size, spacing = 1, 0.1
-		local hotbar_len = 9
-		local inv_size = hotbar_len * 4
-
-		table.insert(fs, "style_type[box;colors=#77777710,#77777710,#777,#777]")
-
-		for i = 0, hotbar_len - 1 do
-			table.insert(fs, "box["..(i * size + inv_x + (i * spacing))..","..inv_y..";"..size..","..size..";]")
-		end
-
-		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
-		table.insert(fs, "list[current_player;main;"..inv_x..","..inv_y..";"..hotbar_len..",1;]")
-
-		table.insert(fs, "style_type[box;colors=#666]")
-		for i=0, 2 do
-			for j=0, hotbar_len - 1 do
-				table.insert(fs, "box["..0.2+(j*0.1)+(j*size)..","..(inv_y+size+spacing+0.05)+(i*0.1)+(i*size)..";"..size..","..size..";]")
-			end
-		end
-
-		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
-		table.insert(fs, "list[current_player;main;"..inv_x..","..(inv_y + 1.15)..";"..hotbar_len..","..(inv_size / hotbar_len)..";"..hotbar_len.."]")
-	else
-		table.insert(fs, "list[current_player;main;0.22,"..y..";8,4;]")
-	end
-
-	return table.concat(fs, "")
-end
-
-function fs_helpers.get_prepends(size)
-	local prepend = {}
-
-	if minetest.get_modpath("i3") then
-		prepend = {
-			"no_prepend[]",
-			"bgcolor[black;neither]",
-			"background9[0,0;"..size..";i3_bg_full.png;false;10]",
-			"style_type[button;border=false;bgimg=[combine:16x16^[noalpha^[colorize:#6b6b6b]",
-			"listcolors[#0000;#ffffff20]"
-		}
-	end
-
-	return table.concat(prepend, "")
-end
-
 ---------
 -- Env --
 ---------
@@ -341,183 +173,6 @@ local function get_set_wrap(name, is_dynamic)
 	end)
 end
 
-local fake_player_metatable = {
-	is_player = delay(true),
-	is_fake_player = true,
-
-	-- dummy implementation of the rest of the player API:
-	add_player_velocity = delay(),  -- deprecated
-	add_velocity = delay(),
-	get_acceleration = delay(), -- no-op for players
-	get_animation = delay({x = 0, y = 0}, 0, 0, false),
-	get_armor_groups = delay({}),
-	get_attach = delay(),
-	get_attribute = delay(),  -- deprecated
-	get_bone_position = delay(vector.zero(), vector.zero()),
-	get_children = delay({}),
-	get_clouds = delay({
-		ambient = { r = 0, b = 0, g = 0, a = 0 },
-		color = { r = 0, b = 0, g = 0, a = 0 },
-		density = 0,
-		height = 120,
-		thickness = 10,
-		speed = vector.zero(),
-	}),
-	get_day_night_ratio = delay(),
-	get_entity_name = delay(),
-	get_formspec_prepend = delay(""),
-	get_fov = delay(0, false, 0),
-	get_lighting = delay({
-		exposure = {
-			center_weight_power = 1,
-			exposure_correction = 0,
-			luminance_max = -3,
-			luminance_min = -3,
-			speed_bright_dark = 1000,
-			speed_dark_bright = 1000,
-		},
-		saturation = 1,
-		shadows = {
-			intensity = .6212,
-		},
-	}),
-	get_local_animation = delay({x = 0, y = 0}, {x = 0, y = 0}, {x = 0, y = 0}, {x = 0, y = 0}, 30),
-	get_luaentity = delay(),
-	get_meta = delay({
-		contains = delay(false),
-		get = delay(),
-		set_string = delay(),
-		get_string = delay(""),
-		set_int = delay(),
-		get_int = delay(0),
-		set_float = delay(),
-		get_float = delay(0),
-		get_keys = delay({}),
-		to_table = delay({fields = {}}),
-		from_table = delay(false),
-		equals = delay(false),
-	}),
-	get_moon = delay({
-		scale = 1,
-		texture = "",
-		tonemap = "",
-		visible = false,
-	}),
-	get_physics_override = delay({
-		acceleration_air = 1,
-		acceleration_default = 1,
-		gravity = 1,
-		jump = 1,
-		liquid_fluidity = 1,
-		liquid_fluidity_smooth = 1,
-		liquid_sink = 1,
-		new_move = true,
-		sneak = true,
-		sneak_glitch = false,
-		speed = 1,
-		speed_climb = 1,
-		speed_crouch = 1,
-	}),
-	get_player_velocity = vector.zero,  -- deprecated
-	get_rotation = delay(), -- no-op for players
-	get_sky = delay({ r = 0, g = 0, b = 0, a = 0 }, "regular", {}, true),
-	get_sky_color = delay({
-		dawn_horizon = { r = 0, g = 0, b = 0, a = 0 },
-		dawn_sky = { r = 0, g = 0, b = 0, a = 0 },
-		day_horizon = { r = 0, g = 0, b = 0, a = 0 },
-		day_sky = { r = 0, g = 0, b = 0, a = 0 },
-		fog_moon_tint = { r = 0, g = 0, b = 0, a = 0 },
-		fog_sun_tint = { r = 0, g = 0, b = 0, a = 0 },
-		fog_tint_type = "default",
-		indoors = { r = 0, g = 0, b = 0, a = 0 },
-		night_horizon = { r = 0, g = 0, b = 0, a = 0 },
-		night_sky = { r = 0, g = 0, b = 0, a = 0 },
-	}),
-	get_stars = delay({
-		count = 1000,
-		day_opacity = 0,
-		scale = 1,
-		star_color = { r = 0, g = 0, b = 0, a = 0 },
-		visible = true,
-	}),
-	get_sun = delay({
-		scale = 1,
-		sunrise = "",
-		sunrise_visible = true,
-		texture = "",
-		tonemap = "",
-		visible = true,
-	}),
-	get_texture_mod = delay(), -- no-op for players
-	get_velocity = vector.zero,
-	get_yaw = delay(), -- no-op for players
-	getacceleration = delay(), -- backward compatibility
-	getvelocity = vector.zero, -- backward compatibility
-	getyaw = delay(), -- backward compatibility
-	hud_add = delay(),
-	hud_change = delay(),
-	hud_get = delay(),
-	hud_get_flags = delay({
-		basic_debug = false,
-		breathbar = false,
-		chat = false,
-		crosshair = false,
-		healthbar = false,
-		hotbar = false,
-		minimap = false,
-		minimap_radar = false,
-		wielditem = false,
-	}),
-	hud_get_hotbar_image = delay(""),
-	hud_get_hotbar_itemcount = delay(1),
-	hud_get_hotbar_selected_image = delay(""),
-	hud_remove = delay(),
-	hud_set_flags = delay(),
-	hud_set_hotbar_image = delay(),
-	hud_set_hotbar_itemcount = delay(),
-	hud_set_hotbar_selected_image = delay(),
-	override_day_night_ratio = delay(),
-	punch = delay(),
-	remove = delay(),
-	respawn = delay(),
-	right_click = delay(),
-	send_mapblock = delay(),
-	set_acceleration = delay(),
-	set_animation = delay(),
-	set_animation_frame_speed = delay(),
-	set_armor_groups = delay(),
-	set_attach = delay(),
-	set_attribute = delay(), -- deprecated
-	set_bone_position = delay(),
-	set_clouds = delay(),
-	set_detach = delay(),
-	set_formspec_prepend = delay(),
-	set_fov = delay(),
-	set_lighting = delay(),
-	set_local_animation = delay(),
-	set_look_horizontal = delay(),
-	set_look_pitch = delay(),
-	set_look_vertical = delay(),
-	set_look_yaw = delay(),
-	set_minimap_modes = delay(),
-	set_moon = delay(),
-	set_nametag_attributes = delay(),
-	set_physics_override = delay(),
-	set_rotation = delay(), -- no-op for players
-	set_sky = delay(),
-	set_sprite = delay(), -- no-op for players
-	set_stars = delay(),
-	set_sun = delay(),
-	set_texture_mod = delay(), -- no-op for players
-	set_velocity = delay(), -- no-op for players
-	set_yaw = delay(), -- no-op for players
-	setacceleration = delay(), -- backward compatibility
-	setsprite = delay(), -- backward compatibility
-	settexturemod = delay(), -- backward compatibility
-	setvelocity = delay(), -- backward compatibility
-	setyaw = delay(), -- backward compatibility
-}
-
 function pipeworks.create_fake_player(def, is_dynamic)
 	local wielded_item = ItemStack("")
 	if def.inventory and def.wield_list then
@@ -525,8 +180,10 @@ function pipeworks.create_fake_player(def, is_dynamic)
 	end
 	local p = {
 		get_player_name = delay(def.name),
+		is_player = delay(true),
+		is_fake_player = true,
 
-		_formspec = def.formspec or "",
+		_formspec = def.formspec or default.gui_survival_form,
 		_hp = def.hp or 20,
 		_breath = 11,
 		_pos = def.position and table.copy(def.position) or vector.new(),
@@ -545,11 +202,12 @@ function pipeworks.create_fake_player(def, is_dynamic)
 		get_eye_offset = function(self)
 			return self._eye_offset1, self._eye_offset3
 		end,
-		get_look_dir = delay(def.look_dir or vector.new()),
+		get_look_dir = delay(def.look_dir or {x=0, y=0, z=1}),
 		get_look_pitch = delay(def.look_pitch or 0),
 		get_look_yaw = delay(def.look_yaw or 0),
 		get_look_horizontal = delay(def.look_yaw or 0),
 		get_look_vertical = delay(-(def.look_pitch or 0)),
+		set_animation = delay(),
 
 		-- Controls
 		get_player_control = delay({
@@ -575,11 +233,14 @@ function pipeworks.create_fake_player(def, is_dynamic)
 			return ItemStack(self._wielded_item)
 		end,
 		get_wield_list = delay(def.wield_list),
-		get_nametag_attributes = delay({
-			bgcolor = false,
-			color = { r = 0, g = 0, b = 0, a = 0 },
-			text = def.name,
-		}),
+
+		punch = delay(),
+		remove = delay(),
+		right_click = delay(),
+		set_attach = delay(),
+		set_detach = delay(),
+		set_bone_position = delay(),
+		hud_change = delay(),
 	}
 	-- Getter & setter functions
 	p.get_inventory_formspec, p.set_inventory_formspec
@@ -593,10 +254,37 @@ function pipeworks.create_fake_player(def, is_dynamic)
 	-- For players, move_to and get_pos do the same
 	p.move_to = p.get_pos
 
-	-- Backwards compatibility
+	-- Backwards compatibilty
 	p.getpos = p.get_pos
 	p.setpos = p.set_pos
 	p.moveto = p.move_to
-	setmetatable(p, { __index = fake_player_metatable })
+
+	-- TODO "implement" all these
+	-- set_armor_groups
+	-- get_armor_groups
+	-- get_animation
+	-- get_bone_position
+	-- get_player_velocity
+	-- set_look_pitch
+	-- set_look_yaw
+	-- set_physics_override
+	-- get_physics_override
+	-- hud_add
+	-- hud_remove
+	-- hud_get
+	-- hud_set_flags
+	-- hud_get_flags
+	-- hud_set_hotbar_itemcount
+	-- hud_get_hotbar_itemcount
+	-- hud_set_hotbar_image
+	-- hud_get_hotbar_image
+	-- hud_set_hotbar_selected_image
+	-- hud_get_hotbar_selected_image
+	-- hud_replace_builtin
+	-- set_sky
+	-- get_sky
+	-- override_day_night_ratio
+	-- get_day_night_ratio
+	-- set_local_animation
 	return p
 end

compat-chests.lua

@@ -11,72 +11,33 @@ local tube_entry = "^pipeworks_tube_connection_wooden.png"
 -- Chest Locals
 local open_chests = {}
 
-local get_chest_formspec
+local function get_chest_formspec(pos)
+	local spos = pos.x .. "," .. pos.y .. "," .. pos.z
+	local formspec =
+		"size[8,9]" ..
+		default.gui_bg ..
+		default.gui_bg_img ..
+		default.gui_slots ..
+		"list[nodemeta:" .. spos .. ";main;0,0.3;8,4;]" ..
+		"list[current_player;main;0,4.85;8,1;]" ..
+		"list[current_player;main;0,6.08;8,3;8]" ..
+		"listring[nodemeta:" .. spos .. ";main]" ..
+		"listring[current_player;main]" ..
+		default.get_hotbar_bg(0,4.85)
 
-if minetest.get_modpath("default") then
-	function get_chest_formspec(pos)
-		local spos = pos.x .. "," .. pos.y .. "," .. pos.z
-		local formspec =
-			"size[8,9]" ..
-			default.gui_bg ..
-			default.gui_bg_img ..
-			default.gui_slots ..
-			"list[nodemeta:" .. spos .. ";main;0,0.3;8,4;]" ..
-			"list[current_player;main;0,4.85;8,1;]" ..
-			"list[current_player;main;0,6.08;8,3;8]" ..
-			"listring[nodemeta:" .. spos .. ";main]" ..
-			"listring[current_player;main]" ..
-			default.get_hotbar_bg(0,4.85)
+	-- Pipeworks Switch
+	formspec = formspec ..
+		fs_helpers.cycling_button(
+			minetest.get_meta(pos),
+			pipeworks.button_base,
+			"splitstacks",
+			{
+				pipeworks.button_off,
+				pipeworks.button_on
+			}
+		)..pipeworks.button_label
 
-		-- Pipeworks Switch
-		formspec = formspec ..
-			fs_helpers.cycling_button(
-				minetest.get_meta(pos),
-				pipeworks.button_base,
-				"splitstacks",
-				{
-					pipeworks.button_off,
-					pipeworks.button_on
-				}
-			)..pipeworks.button_label
-
-		return formspec
-	end
-else
-	local function get_hotbar_bg(x,y)
-		local out = ""
-		for i=0,7,1 do
-			out = out .."image["..x+i..","..y..";1,1;gui_hb_bg.png]"
-		end
-		return out
-	end
-
-	function get_chest_formspec(pos)
-		local spos = pos.x .. "," .. pos.y .. "," .. pos.z
-		local formspec =
-			"size[10,9]" ..
-			"background9[8,8;8,9;hades_chests_chestui.png;true;8]"..
-			"list[nodemeta:" .. spos .. ";main;0,0.3;10,4;]" ..
-			"list[current_player;main;0,4.85;10,1;]" ..
-			"list[current_player;main;0,6.08;10,3;10]" ..
-			"listring[nodemeta:" .. spos .. ";main]" ..
-			"listring[current_player;main]" ..
-			get_hotbar_bg(0,4.85)
-
-		-- Pipeworks Switch
-		formspec = formspec ..
-			fs_helpers.cycling_button(
-				minetest.get_meta(pos),
-				pipeworks.button_base,
-				"splitstacks",
-				{
-					pipeworks.button_off,
-					pipeworks.button_on
-				}
-			)..pipeworks.button_label
-
-		return formspec
-	end
+	return formspec
 end
 
 local function chest_lid_obstructed(pos)
@@ -110,15 +71,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 					end
 				end
 				minetest.after(0.2, function()
-					if minetest.get_modpath("default") then
-						local current_node = minetest.get_node(pos)
-						if current_node.name ~= "default:" .. swap .. "_open" then
-							-- the chest has already been replaced, don't try to replace what's there.
-							-- see: https://github.com/minetest/minetest_game/pull/3046
-							return
-						end
-						minetest.swap_node(pos, { name = "default:" .. swap, param2 = node.param2 })
-					end
+					minetest.swap_node(pos, { name = "default:" .. swap, param2 = node.param2 })
 
 					-- Pipeworks notification
 					pipeworks.after_place(pos)
@@ -135,18 +88,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 end)
 
 -- Original Definitions
-local old_chest_def, old_chest_open_def, old_chest_locked_def, old_chest_locked_open_def
-if minetest.get_modpath("default") then
-	old_chest_def = table.copy(minetest.registered_items["default:chest"])
-	old_chest_open_def = table.copy(minetest.registered_items["default:chest_open"])
-	old_chest_locked_def = table.copy(minetest.registered_items["default:chest_locked"])
-	old_chest_locked_open_def = table.copy(minetest.registered_items["default:chest_locked_open"])
-elseif minetest.get_modpath("hades_chests") then
-	old_chest_def = table.copy(minetest.registered_items["hades_chests:chest"])
-	old_chest_open_def = table.copy(minetest.registered_items["hades_chests:chest"])
-	old_chest_locked_def = table.copy(minetest.registered_items["hades_chests:chest_locked"])
-	old_chest_locked_open_def = table.copy(minetest.registered_items["hades_chests:chest_locked"])
-end
+local old_chest_def = table.copy(minetest.registered_items["default:chest"])
+local old_chest_open_def = table.copy(minetest.registered_items["default:chest_open"])
+local old_chest_locked_def = table.copy(minetest.registered_items["default:chest_locked"])
+local old_chest_locked_open_def = table.copy(minetest.registered_items["default:chest_locked_open"])
 
 -- Override Construction
 local override_protected, override, override_open, override_protected_open
@@ -171,11 +116,9 @@ override_protected = {
 		minetest.sound_play(old_chest_locked_def.sound_open, {gain = 0.3,
 				pos = pos, max_hear_distance = 10})
 		if not chest_lid_obstructed(pos) then
-			if minetest.get_modpath("default") then
-				minetest.swap_node(pos,
-						{ name = "default:" .. "chest_locked" .. "_open",
-						param2 = node.param2 })
-			end
+			minetest.swap_node(pos,
+					{ name = "default:" .. "chest_locked" .. "_open",
+					param2 = node.param2 })
 		end
 		minetest.after(0.2, minetest.show_formspec,
 				clicker:get_player_name(),
@@ -217,11 +160,9 @@ override = {
 		minetest.sound_play(old_chest_def.sound_open, {gain = 0.3, pos = pos,
 				max_hear_distance = 10})
 		if not chest_lid_obstructed(pos) then
-			if minetest.get_modpath("default") then
-				minetest.swap_node(pos, {
-						name = "default:" .. "chest" .. "_open",
-						param2 = node.param2 })
-			end
+			minetest.swap_node(pos, {
+					name = "default:" .. "chest" .. "_open",
+					param2 = node.param2 })
 		end
 		minetest.after(0.2, minetest.show_formspec,
 				clicker:get_player_name(),
@@ -295,15 +236,8 @@ for _,v in ipairs({override_protected, override, override_open, override_protect
 end
 
 -- Override with the new modifications.
-if minetest.get_modpath("default") then
-	minetest.override_item("default:chest", override)
-	minetest.override_item("default:chest_open", override_open)
-	minetest.override_item("default:chest_locked", override_protected)
-  minetest.override_item("default:chest_locked_open", override_protected_open)
-elseif minetest.get_modpath("hades_chests") then
-	minetest.override_item("hades_chests:chest", override)
-	--minetest.override_item("hades_chests:chest_open", override_open)
-	minetest.override_item("hades_chests:chest_locked", override_protected)
-  --minetest.override_item("hades_chests:chest_locked_open", override_protected_open)
-end
+minetest.override_item("default:chest", override)
+minetest.override_item("default:chest_open", override_open)
+minetest.override_item("default:chest_locked", override_protected)
+minetest.override_item("default:chest_locked_open", override_protected_open)
 

compat-furnaces.lua

@@ -1,28 +1,280 @@
 -- this file is basically a modified copy of
 -- minetest_game/mods/default/furnaces.lua
 
-local def--, def_active
-if minetest.get_modpath("default") then
-	def = table.copy(minetest.registered_nodes["default:furnace"])
-	--def_active = table.copy(minetest.registered_nodes["default:furnace_active"])
-elseif minetest.get_modpath("hades_furnaces") then
-	def = table.copy(minetest.registered_nodes["hades_furnaces:furnace"])
-	--def_active = table.copy(minetest.registered_nodes["hades_furnaces:furnace_active"])
-end
+-- translation support
+local S = minetest.get_translator("pipeworks")
+local DS = minetest.get_translator("default")
+
+local fs_helpers = pipeworks.fs_helpers
 
 local tube_entry = "^pipeworks_tube_connection_stony.png"
 
-local groups = def.groups
-groups["tubedevice"] = 1
-groups["tubedevice_receiver"] = 1
-local groups_active = table.copy(groups)
-groups_active["not_in_creative_inventory"] = 1
+local function active_formspec(fuel_percent, item_percent, pos, meta)
+	local formspec =
+		"size[8,8.5]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"list[current_name;src;2.75,0.5;1,1;]"..
+		"list[current_name;fuel;2.75,2.5;1,1;]"..
+		"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
+		(100-fuel_percent)..":default_furnace_fire_fg.png]"..
+		"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:"..
+		(item_percent)..":gui_furnace_arrow_fg.png^[transformR270]"..
+		"list[current_name;dst;4.75,0.96;2,2;]"..
+		"list[current_player;main;0,4.25;8,1;]"..
+		"list[current_player;main;0,5.5;8,3;8]"..
+		"listring[current_name;dst]"..
+		"listring[current_player;main]"..
+		"listring[current_name;src]"..
+		"listring[current_player;main]"..
+		"listring[current_name;fuel]"..
+		"listring[current_player;main]"..
+		default.get_hotbar_bg(0, 4.25) ..
+			fs_helpers.cycling_button(
+				meta,
+				"image_button[0,3.5;1,0.6",
+				"split_material_stacks",
+				{
+					pipeworks.button_off,
+					pipeworks.button_on
+				}
+			).."label[0.9,3.51;"..S("Allow splitting incoming material (not fuel) stacks from tubes").."]"
+	return formspec
+end
+
+local function inactive_formspec(pos, meta)
+	local formspec = "size[8,8.5]"..
+	default.gui_bg..
+	default.gui_bg_img..
+	default.gui_slots..
+	"list[current_name;src;2.75,0.5;1,1;]"..
+	"list[current_name;fuel;2.75,2.5;1,1;]"..
+	"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
+	"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+	"list[current_name;dst;4.75,0.96;2,2;]"..
+	"list[current_player;main;0,4.25;8,1;]"..
+	"list[current_player;main;0,5.5;8,3;8]"..
+	"listring[current_name;dst]"..
+	"listring[current_player;main]"..
+	"listring[current_name;src]"..
+	"listring[current_player;main]"..
+	"listring[current_name;fuel]"..
+	"listring[current_player;main]"..
+	default.get_hotbar_bg(0, 4.25) ..
+		fs_helpers.cycling_button(
+			meta,
+			"image_button[0,3.5;1,0.6",
+			"split_material_stacks",
+			{
+				pipeworks.button_off,
+				pipeworks.button_on
+			}
+		).."label[0.9,3.51;"..S("Allow splitting incoming material (not fuel) stacks from tubes").."]"
+	return formspec
+end
+
+--
+-- Node callback functions that are the same for active and inactive furnace
+--
+
+local function can_dig(pos, player)
+	local meta = minetest.get_meta(pos);
+	local inv = meta:get_inventory()
+	return inv:is_empty("fuel") and inv:is_empty("dst") and inv:is_empty("src")
+end
+
+local function allow_metadata_inventory_put(pos, listname, index, stack, player)
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return 0
+	end
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	if listname == "fuel" then
+		if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then
+			if inv:is_empty("src") then
+				meta:set_string("infotext", DS("Furnace is empty"))
+			end
+			return stack:get_count()
+		else
+			return 0
+		end
+	elseif listname == "src" then
+		return stack:get_count()
+	elseif listname == "dst" then
+		return 0
+	end
+end
+
+local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	local stack = inv:get_stack(from_list, from_index)
+	return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
+end
+
+local function allow_metadata_inventory_take(pos, listname, index, stack, player)
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return 0
+	end
+	return stack:get_count()
+end
+
+local function swap_node(pos, name)
+	local node = minetest.get_node(pos)
+	if node.name == name then
+		return
+	end
+	node.name = name
+	minetest.swap_node(pos, node)
+end
+
+local function furnace_node_timer(pos, elapsed)
+	--
+	-- Inizialize metadata
+	--
+	local meta = minetest.get_meta(pos)
+	local fuel_time = meta:get_float("fuel_time") or 0
+	local src_time = meta:get_float("src_time") or 0
+	local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
+
+	local inv = meta:get_inventory()
+	local srclist, fuellist
+
+	local cookable, cooked
+	local fuel
+
+	local update = true
+	while update do
+		update = false
+
+		srclist = inv:get_list("src")
+		fuellist = inv:get_list("fuel")
+
+		--
+		-- Cooking
+		--
+
+		-- Check if we have cookable content
+		local aftercooked
+		cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
+		cookable = cooked.time ~= 0
+
+		-- Check if we have enough fuel to burn
+		if fuel_time < fuel_totaltime then
+			-- The furnace is currently active and has enough fuel
+			fuel_time = fuel_time + elapsed
+			-- If there is a cookable item then check if it is ready yet
+			if cookable then
+				src_time = src_time + elapsed
+				if src_time >= cooked.time then
+					-- Place result in dst list if possible
+					if inv:room_for_item("dst", cooked.item) then
+						inv:add_item("dst", cooked.item)
+						inv:set_stack("src", 1, aftercooked.items[1])
+						src_time = src_time - cooked.time
+						update = true
+					end
+				end
+			end
+		else
+			-- Furnace ran out of fuel
+			if cookable then
+				-- We need to get new fuel
+				local afterfuel
+				fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
+
+				if fuel.time == 0 then
+					-- No valid fuel in fuel list
+					fuel_totaltime = 0
+					src_time = 0
+				else
+					-- Take fuel from fuel list
+					inv:set_stack("fuel", 1, afterfuel.items[1])
+					update = true
+					fuel_totaltime = fuel.time + (fuel_time - fuel_totaltime)
+					src_time = src_time + elapsed
+				end
+			else
+				-- We don't need to get new fuel since there is no cookable item
+				fuel_totaltime = 0
+				src_time = 0
+			end
+			fuel_time = 0
+		end
+
+		elapsed = 0
+	end
+
+	if fuel and fuel_totaltime > fuel.time then
+		fuel_totaltime = fuel.time
+	end
+	if srclist[1]:is_empty() then
+		src_time = 0
+	end
+
+	--
+	-- Update formspec, infotext and node
+	--
+	local formspec = inactive_formspec(pos, meta)
+	local item_state
+	local item_percent = 0
+	if cookable then
+		item_percent = math.floor(src_time / cooked.time * 100)
+		if item_percent > 100 then
+			item_state = DS("100% (output full)")
+		else
+			item_state = DS("@1%", item_percent)
+		end
+	else
+		if srclist[1]:is_empty() then
+			item_state = DS("Empty")
+		else
+			item_state = DS("Not cookable")
+		end
+	end
+
+	local fuel_state = DS("Empty")
+	local active = DS("Furnace inactive")
+	local result = false
+
+	if fuel_totaltime ~= 0 then
+		active = DS("Furnace active")
+		local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
+		fuel_state = DS("@1%", fuel_percent)
+		formspec = active_formspec(fuel_percent, item_percent, pos, meta)
+		swap_node(pos, "default:furnace_active")
+		-- make sure timer restarts automatically
+		result = true
+	else
+		if not fuellist[1]:is_empty() then
+			fuel_state = DS("@1%", "0")
+		end
+		swap_node(pos, "default:furnace")
+		-- stop timer on the inactive furnace
+		minetest.get_node_timer(pos):stop()
+	end
+
+	local infotext = active.." "..DS("(Item: @1; Fuel: @2)", item_state, fuel_state)
+
+	--
+	-- Set meta values
+	--
+	meta:set_float("fuel_totaltime", fuel_totaltime)
+	meta:set_float("fuel_time", fuel_time)
+	meta:set_float("src_time", src_time)
+	meta:set_string("formspec", formspec)
+	meta:set_string("infotext", infotext)
+
+	return result
+end
 
 --
 -- Node definitions
 --
 
-local override = {
+minetest.register_node(":default:furnace", {
+	description = DS("Furnace"),
 	tiles = {
 		"default_furnace_top.png"..tube_entry,
 		"default_furnace_bottom.png"..tube_entry,
@@ -31,7 +283,7 @@ local override = {
 		"default_furnace_side.png"..tube_entry,
 		"default_furnace_front.png"
 	},
-	groups = groups,
+	groups = {cracky = 2, tubedevice = 1, tubedevice_receiver = 1},
 	tube = {
 		insert_object = function(pos, node, stack, direction)
 			local meta = minetest.get_meta(pos)
@@ -59,15 +311,59 @@ local override = {
 			end
 		end,
 		input_inventory = "dst",
-		connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
 	},
+	paramtype2 = "facedir",
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
 
+	can_dig = can_dig,
+
+	on_timer = furnace_node_timer,
+
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", inactive_formspec(pos, meta))
+		local inv = meta:get_inventory()
+		inv:set_size('src', 1)
+		inv:set_size('fuel', 1)
+		inv:set_size('dst', 4)
+	end,
+
+	on_metadata_inventory_move = function(pos)
+		minetest.get_node_timer(pos):start(1.0)
+	end,
+	on_metadata_inventory_put = function(pos)
+		-- start timer function, it will sort out whether furnace can burn or not.
+		minetest.get_node_timer(pos):start(1.0)
+	end,
+	on_blast = function(pos)
+		local drops = {}
+		default.get_inventory_drops(pos, "src", drops)
+		default.get_inventory_drops(pos, "fuel", drops)
+		default.get_inventory_drops(pos, "dst", drops)
+		drops[#drops+1] = "default:furnace"
+		minetest.remove_node(pos)
+		return drops
+	end,
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+	on_receive_fields = function(pos, formname, fields, sender)
+		if not pipeworks.may_configure(pos, sender) then return end
+		fs_helpers.on_receive_fields(pos, fields)
+		local meta = minetest.get_meta(pos)
+		local formspec = inactive_formspec(pos, meta)
+		meta:set_string("formspec", formspec)
+	end,
 	after_place_node = pipeworks.after_place,
 	after_dig_node = pipeworks.after_dig,
 	on_rotate = pipeworks.on_rotate
-}
+})
 
-local override_active = {
+minetest.register_node(":default:furnace_active", {
+	description = DS("Furnace"),
 	tiles = {
 		"default_furnace_top.png"..tube_entry,
 		"default_furnace_bottom.png"..tube_entry,
@@ -85,7 +381,7 @@ local override_active = {
 			},
 		}
 	},
-	groups = groups_active,
+	groups = {cracky = 2, tubedevice = 1, tubedevice_receiver = 1, not_in_creative_inventory = 1},
 	tube = {
 		insert_object = function(pos,node,stack,direction)
 			local meta = minetest.get_meta(pos)
@@ -106,23 +402,37 @@ local override_active = {
 			if direction.y == 1 then
 				return inv:room_for_item("fuel", stack)
 			else
+				if meta:get_int("split_material_stacks") == 1 then
+					stack = stack:peek_item(1)
+				end
 				return inv:room_for_item("src", stack)
 			end
 		end,
 		input_inventory = "dst",
-		connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
+		connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
 	},
+	paramtype2 = "facedir",
+	light_source = 8,
+	drop = "default:furnace",
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+	on_timer = furnace_node_timer,
 
+	can_dig = can_dig,
+
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+	on_receive_fields = function(pos, formname, fields, sender)
+		if not pipeworks.may_configure(pos, sender) then return end
+		fs_helpers.on_receive_fields(pos, fields)
+		local meta = minetest.get_meta(pos)
+		local formspec = active_formspec(0, 0, pos, meta)
+		meta:set_string("formspec", formspec)
+	end,
 	after_place_node = pipeworks.after_place,
 	after_dig_node = pipeworks.after_dig,
 	on_rotate = pipeworks.on_rotate
-}
-
-if minetest.get_modpath("default") then
-	minetest.override_item("default:furnace", override)
-	minetest.override_item("default:furnace_active", override_active)
-elseif minetest.get_modpath("hades_furnaces") then
-	minetest.override_item("hades_furnaces:furnace", override)
-	minetest.override_item("hades_furnaces:furnace_active", override_active)
-end
+})
 

crafts.lua

@@ -1,318 +1,87 @@
 -- Crafting recipes for pipes
-local materials = xcompat.materials
 
 minetest.register_craft( {
-	output = "pipeworks:pipe_1_empty 12",
-	recipe = {
-			{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot },
-			{ "", "", "" },
-			{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot }
-	},
+        output = "pipeworks:pipe_1_empty 12",
+        recipe = {
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+                { "", "", "" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:straight_pipe_empty 3",
-	recipe = {
-			{ "pipeworks:pipe_1_empty", "pipeworks:pipe_1_empty", "pipeworks:pipe_1_empty" },
-	},
+        output = "pipeworks:straight_pipe_empty 3",
+        recipe = {
+                { "pipeworks:pipe_1_empty", "pipeworks:pipe_1_empty", "pipeworks:pipe_1_empty" },
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:spigot 3",
-	recipe = {
-			{ "pipeworks:pipe_1_empty", "" },
-			{ "", "pipeworks:pipe_1_empty" },
-	},
+        output = "pipeworks:spigot 3",
+        recipe = {
+                { "pipeworks:pipe_1_empty", "" },
+                { "", "pipeworks:pipe_1_empty" },
+        },
 })
 
 minetest.register_craft( {
-output = "pipeworks:entry_panel_empty 2",
-recipe = {
-	{ "", materials.steel_ingot, "" },
-	{ "", "pipeworks:pipe_1_empty", "" },
-	{ "", materials.steel_ingot, "" },
-},
+	output = "pipeworks:entry_panel_empty 2",
+	recipe = {
+		{ "", "default:steel_ingot", "" },
+		{ "", "pipeworks:pipe_1_empty", "" },
+		{ "", "default:steel_ingot", "" },
+	},
 })
 
 -- Various ancillary pipe devices
 
 minetest.register_craft( {
-	output = "pipeworks:pump_off 2",
-	recipe = {
-			{ materials.stone, materials.steel_ingot, materials.stone },
-			{ materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot },
-			{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot }
-	},
+        output = "pipeworks:pump_off 2",
+        recipe = {
+                { "default:stone", "default:steel_ingot", "default:stone" },
+                { "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:valve_off_empty 2",
-	recipe = {
-			{ "", "group:stick", "" },
-			{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot },
-			{ "", materials.steel_ingot, "" }
-	},
+        output = "pipeworks:valve_off_empty 2",
+        recipe = {
+                { "", "group:stick", "" },
+                { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+                { "", "default:steel_ingot", "" }
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:storage_tank_0 2",
-	recipe = {
-			{ "", materials.steel_ingot, materials.steel_ingot },
-			{ materials.steel_ingot, materials.glass, materials.steel_ingot },
-			{ materials.steel_ingot, materials.steel_ingot, "" }
-	},
+        output = "pipeworks:storage_tank_0 2",
+        recipe = {
+                { "", "default:steel_ingot", "default:steel_ingot" },
+                { "default:steel_ingot", "default:glass", "default:steel_ingot" },
+                { "default:steel_ingot", "default:steel_ingot", "" }
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:grating 2",
-	recipe = {
-			{ materials.steel_ingot, "", materials.steel_ingot },
-			{ "", "pipeworks:pipe_1_empty", "" },
-			{ materials.steel_ingot, "", materials.steel_ingot }
-	},
+        output = "pipeworks:grating 2",
+        recipe = {
+                { "default:steel_ingot", "", "default:steel_ingot" },
+                { "", "pipeworks:pipe_1_empty", "" },
+                { "default:steel_ingot", "", "default:steel_ingot" }
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:flow_sensor_empty 2",
-	recipe = {
-			{ "pipeworks:pipe_1_empty", "mesecons:mesecon", "pipeworks:pipe_1_empty" },
-	},
+        output = "pipeworks:flow_sensor_empty 2",
+        recipe = {
+                { "pipeworks:pipe_1_empty", "mesecons:mesecon", "pipeworks:pipe_1_empty" },
+        },
 })
 
 minetest.register_craft( {
-	output = "pipeworks:fountainhead 2",
-	recipe = {
-			{ "pipeworks:pipe_1_empty" },
-			{ "pipeworks:pipe_1_empty" }
-	},
+        output = "pipeworks:fountainhead 2",
+        recipe = {
+                { "pipeworks:pipe_1_empty" },
+				{ "pipeworks:pipe_1_empty" }
+        },
 })
-
--- injectors
-
-minetest.register_craft( {
-	output = "pipeworks:filter 2",
-	recipe = {
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" },
-			{ "group:stick", materials.mese_crystal, "basic_materials:plastic_sheet" },
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" }
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:mese_filter 2",
-	recipe = {
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" },
-			{ "group:stick", materials.mese, "basic_materials:plastic_sheet" },
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" }
-	},
-})
-
-if minetest.get_modpath("digilines") then
-	minetest.register_craft( {
-		output = "pipeworks:digiline_filter 2",
-		recipe = {
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" },
-			{ "group:stick", "digilines:wire_std_00000000", "basic_materials:plastic_sheet" },
-			{ materials.steel_ingot, materials.steel_ingot, "basic_materials:plastic_sheet" }
-		},
-	})
-end
-
--- other
-
-minetest.register_craft( {
-	output = "pipeworks:autocrafter 2",
-	recipe = {
-			{ materials.steel_ingot, materials.mese_crystal, materials.steel_ingot },
-			{ "basic_materials:plastic_sheet", materials.steel_ingot, "basic_materials:plastic_sheet" },
-			{ materials.steel_ingot, materials.mese_crystal, materials.steel_ingot }
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:steel_pane_embedded_tube 1",
-	recipe = {
-		{ "", materials.steel_ingot, "" },
-		{ "", "pipeworks:tube_1", "" },
-		{ "", materials.steel_ingot, "" }
-	},
-})
-
-minetest.register_craft({
-	output = "pipeworks:trashcan",
-	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ materials.steel_ingot, "", materials.steel_ingot },
-		{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot },
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:teleport_tube_1 2",
-	recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ materials.desert_stone, materials.mese, materials.desert_stone },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-	},
-})
-
-if pipeworks.enable_priority_tube then
-	minetest.register_craft( {
-		output = "pipeworks:priority_tube_1 6",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ materials.gold_ingot, "", materials.gold_ingot },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-end
-
-if pipeworks.enable_accelerator_tube then
-	minetest.register_craft( {
-		output = "pipeworks:accelerator_tube_1 2",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ materials.mese_crystal_fragment, materials.steel_ingot, materials.mese_crystal_fragment },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-end
-
-if pipeworks.enable_crossing_tube then
-	minetest.register_craft( {
-		output = "pipeworks:crossing_tube_1 5",
-		recipe = {
-			{ "", "pipeworks:tube_1", "" },
-			{ "pipeworks:tube_1", "pipeworks:tube_1", "pipeworks:tube_1" },
-			{ "", "pipeworks:tube_1", "" }
-		},
-	})
-end
-
-if pipeworks.enable_one_way_tube then
-	minetest.register_craft({
-		output = "pipeworks:one_way_tube 2",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ "group:stick", materials.mese_crystal, "basic_materials:plastic_sheet" },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-end
-
-if pipeworks.enable_mese_tube then
-	minetest.register_craft( {
-		output = "pipeworks:mese_tube_000000 2",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ "", materials.mese_crystal, "" },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-
-	minetest.register_craft( {
-		type = "shapeless",
-		output = "pipeworks:mese_tube_000000",
-		recipe = {
-			"pipeworks:tube_1",
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-		},
-	})
-end
-
-if pipeworks.enable_item_tags and pipeworks.enable_tag_tube then
-	minetest.register_craft( {
-		output = "pipeworks:tag_tube_000000 2",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ materials.book, materials.mese_crystal, materials.book },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-
-	minetest.register_craft( {
-		type = "shapeless",
-		output = "pipeworks:tag_tube_000000",
-		recipe = {
-			"pipeworks:mese_tube_000000",
-			materials.book,
-		},
-	})
-end
-
-if pipeworks.enable_sand_tube then
-	minetest.register_craft( {
-		output = "pipeworks:sand_tube_1 2",
-		recipe = {
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
-			{"group:sand",                 "group:sand",                 "group:sand"},
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}
-		},
-	})
-
-	minetest.register_craft( {
-		output = "pipeworks:sand_tube_1",
-		recipe = {
-			{"group:sand", "pipeworks:tube_1", "group:sand"},
-		},
-	})
-end
-
-if pipeworks.enable_mese_sand_tube then
-	minetest.register_craft( {
-		output = "pipeworks:mese_sand_tube_1 2",
-		recipe = {
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{"group:sand",				 materials.mese_crystal,	   "group:sand" },
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-
-	minetest.register_craft( {
-		type = "shapeless",
-		output = "pipeworks:mese_sand_tube_1",
-		recipe = {
-			"pipeworks:sand_tube_1",
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-			materials.mese_crystal_fragment,
-		},
-	})
-end
-
-if pipeworks.enable_deployer then
-	minetest.register_craft({
-		output = "pipeworks:deployer_off",
-		recipe = {
-			{ "group:wood",	materials.chest,	"group:wood"	},
-			{ materials.stone, "mesecons:piston",  materials.stone },
-			{ materials.stone, "mesecons:mesecon", materials.stone },
-		}
-	})
-end
-
-if pipeworks.enable_dispenser then
-	minetest.register_craft({
-		output = "pipeworks:dispenser_off",
-		recipe = {
-			{ materials.desert_sand, materials.chest,	materials.desert_sand },
-			{ materials.stone,	   "mesecons:piston",  materials.stone	   },
-			{ materials.stone,	   "mesecons:mesecon", materials.stone	  },
-		}
-	})
-end
-
-if pipeworks.enable_node_breaker then
-	minetest.register_craft({
-		output = "pipeworks:nodebreaker_off",
-		recipe = {
-			{ "basic_materials:gear_steel", "basic_materials:gear_steel",   "basic_materials:gear_steel"	},
-			{ materials.stone, "mesecons:piston",   materials.stone },
-			{ "group:wood",	"mesecons:mesecon",  "group:wood" },
-		}
-	})
-end

decorative_tubes.lua

@@ -0,0 +1,94 @@
+local S = minetest.get_translator("pipeworks")
+
+local straight = function(pos, node, velocity, stack) return {velocity} end
+
+minetest.register_node("pipeworks:steel_block_embedded_tube", {
+	description = S("Airtight steelblock embedded tube"),
+	tiles = {
+		"default_steel_block.png", "default_steel_block.png",
+		"default_steel_block.png", "default_steel_block.png",
+		"default_steel_block.png^pipeworks_tube_connection_metallic.png",
+		"default_steel_block.png^pipeworks_tube_connection_metallic.png",
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1},
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_stone_defaults(),
+	tube = {
+		connect_sides = {front = 1, back = 1,},
+		priority = 50,
+		can_go = straight,
+		can_insert = function(pos, node, stack, direction)
+			local dir = minetest.facedir_to_dir(node.param2)
+			return vector.equals(dir, direction) or vector.equals(vector.multiply(dir, -1), direction)
+		end,
+	},
+	after_place_node = pipeworks.after_place,
+	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",
+	recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+		{ "default:steel_ingot", "pipeworks:tube_1", "default:steel_ingot" },
+		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+	},
+})
+
+local pane_box = {
+	type = "fixed",
+	fixed = {
+		{ -9/64, -9/64, -8/16, 9/64, 9/64, 8/16 }, -- tube
+		{ -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"),
+	tiles = {
+		"pipeworks_pane_embedded_tube_sides.png^[transformR90",
+		"pipeworks_pane_embedded_tube_sides.png^[transformR90",
+		"pipeworks_pane_embedded_tube_sides.png",
+		"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,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1},
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_stone_defaults(),
+	tube = {
+		connect_sides = {front = 1, back = 1,},
+		priority = 50,
+		can_go = straight,
+		can_insert = function(pos, node, stack, direction)
+			local dir = minetest.facedir_to_dir(node.param2)
+			return vector.equals(dir, direction) or vector.equals(vector.multiply(dir, -1), direction)
+		end,
+	},
+	after_place_node = pipeworks.after_place,
+	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",
+	recipe = {
+		{ "", "default:steel_ingot", "" },
+		{ "", "pipeworks:tube_1", "" },
+		{ "", "default:steel_ingot", "" }
+	},
+})

default_settings.lua

@@ -4,8 +4,6 @@ local prefix = "pipeworks_"
 
 local settings = {
 	enable_pipes = true,
-	enable_item_tags = true,
-	enable_tag_tube = true,
 	enable_lowpoly = false,
 	enable_autocrafter = true,
 	enable_deployer = true,
@@ -29,8 +27,6 @@ local settings = {
 	enable_cyclic_mode = true,
 	drop_on_routing_fail = false,
 	delete_item_on_clearobject = true,
-	use_real_entities = true,
-	entity_update_interval = 0,
 }
 
 pipeworks.toggles = {}
@@ -66,9 +62,10 @@ pipeworks.toggles.finite_water = nil
 for name, value in pairs(settings) do
 	local setting_type = type(value)
 	if setting_type == "boolean" then
-		pipeworks[name] = minetest.settings:get_bool(prefix..name, value)
-	elseif setting_type == "number" then
-		pipeworks[name] = tonumber(minetest.settings:get(prefix..name) or value)
+		pipeworks[name] = minetest.settings:get_bool(prefix..name)
+		if pipeworks[name] == nil then
+			pipeworks[name] = value
+		end
 	else
 		pipeworks[name] = value
 	end

devices.lua

@@ -1,8 +1,6 @@
 local S = minetest.get_translator("pipeworks")
 local new_flow_logic_register = pipeworks.flowables.register
 
-local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
-
 local polys = ""
 if pipeworks.enable_lowpoly then polys = "_lowpoly" end
 
@@ -30,12 +28,10 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
 		if (not placer:get_player_control().sneak)
 		  and minetest.registered_nodes[node.name]
 		  and minetest.registered_nodes[node.name].on_rightclick then
-			minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under,
-				node, placer, itemstack, pointed_thing)
-
+			minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack)
 		else
 
-			local pitch = -placer:get_look_vertical()
+			local pitch = placer:get_look_pitch()
 			local above = pointed_thing.above
 			local under = pointed_thing.under
 			local fdir = minetest.dir_to_facedir(placer:get_look_dir())
@@ -133,9 +129,9 @@ for s in ipairs(states) do
 
 	local dgroups
 	if states[s] == "off" then
-		dgroups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+		dgroups = {snappy=3, pipe=1}
 	else
-		dgroups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+		dgroups = {snappy=3, pipe=1, not_in_creative_inventory=1}
 	end
 
 	local pumpname = "pipeworks:pump_"..states[s]
@@ -144,15 +140,10 @@ for s in ipairs(states) do
 		drawtype = "mesh",
 		mesh = "pipeworks_pump"..polys..".obj",
 		tiles = { "pipeworks_pump_"..states[s]..".png" },
-		use_texture_alpha = texture_alpha_mode and "clip" or true,
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = dgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		pipe_connections = { top = 1 },
 		after_place_node = function(pos)
@@ -174,7 +165,7 @@ for s in ipairs(states) do
 			local fdir = node.param2
 			minetest.swap_node(pos, { name = "pipeworks:pump_"..states[3-s], param2 = fdir })
 		end,
-		on_rotate = screwdriver and screwdriver.rotate_simple or nil
+		on_rotate = screwdriver.rotate_simple
 	})
 
 	-- FIXME: this currently assumes that pumps can only rotate around the fixed axis pointing Y+.
@@ -204,11 +195,7 @@ for s in ipairs(states) do
 			fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
 		},
 		groups = dgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		on_place = pipeworks.rotate_on_place,
 		after_dig_node = function(pos)
@@ -255,12 +242,8 @@ minetest.register_node(nodename_valve_loaded, {
 		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, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -301,7 +284,6 @@ minetest.register_node("pipeworks:grating", {
 		"pipeworks_grating_sides.png",
 		"pipeworks_grating_sides.png"
 	},
-	use_texture_alpha = texture_alpha_mode and "clip" or true,
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -309,12 +291,8 @@ minetest.register_node("pipeworks:grating", {
 	},
 	sunlight_propagates = true,
 	paramtype = "light",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { top = 1 },
 	after_place_node = function(pos)
@@ -338,12 +316,8 @@ minetest.register_node(nodename_spigot_empty, {
 	sunlight_propagates = true,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { left=1, right=1, front=1, back=1,
 						 left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@@ -370,19 +344,22 @@ minetest.register_node(nodename_spigot_loaded, {
 	drawtype = "mesh",
 	mesh = "pipeworks_spigot_pouring"..polys..".obj",
 	tiles = {
-		minetest.registered_nodes[pipeworks.liquids.water.source].tiles[1],
+		{
+			name = "default_water_flowing_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 0.8,
+			},
+		},
 		{ name = "pipeworks_spigot.png" }
 	},
-	use_texture_alpha = texture_alpha_mode and "blend" or true,
 	sunlight_propagates = true,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { left=1, right=1, front=1, back=1,
 						 left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@@ -437,12 +414,8 @@ minetest.register_node(nodename_panel_empty, {
 	tiles = { "pipeworks_entry_panel.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -461,12 +434,8 @@ minetest.register_node(nodename_panel_loaded, {
 	tiles = { "pipeworks_entry_panel.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -495,12 +464,8 @@ minetest.register_node(nodename_sensor_empty, {
 	sunlight_propagates = true,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -538,12 +503,8 @@ minetest.register_node(nodename_sensor_loaded, {
 	sunlight_propagates = true,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -587,12 +548,12 @@ new_flow_logic_register.transition_simple_set(sensor_pressure_set, { mesecons=pi
 -- TODO flow-logic-stub: these don't currently do anything under the new flow logic.
 for fill = 0, 10 do
 	local filldesc=S("empty")
-	local sgroups = {snappy=3, pipe=1, tankfill=fill+1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+	local sgroups = {snappy=3, pipe=1, tankfill=fill+1}
 	local image = nil
 
 	if fill ~= 0 then
 		filldesc=S("@1% full", 10*fill)
-		sgroups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+		sgroups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1}
 		image = "pipeworks_storage_tank_fittings.png"
 	end
 
@@ -609,12 +570,8 @@ for fill = 0, 10 do
 		inventory_image = image,
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:storage_tank_0",
 		pipe_connections = { top = 1, bottom = 1},
@@ -642,11 +599,7 @@ for fill = 0, 10 do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = sgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:storage_tank_0",
 		pipe_connections = { top = 1, bottom = 1},
@@ -672,12 +625,8 @@ minetest.register_node(nodename_fountain_empty, {
 	tiles = { "pipeworks_fountainhead.png" },
 	sunlight_propagates = true,
 	paramtype = "light",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { bottom = 1 },
 	after_place_node = function(pos)
@@ -711,12 +660,8 @@ minetest.register_node(nodename_fountain_loaded, {
 	tiles = { "pipeworks_fountainhead.png" },
 	sunlight_propagates = true,
 	paramtype = "light",
-	groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	pipe_connections = { bottom = 1 },
 	after_place_node = function(pos)
@@ -765,12 +710,8 @@ minetest.register_node(nodename_sp_empty, {
 	tiles = { "pipeworks_straight_pipe_empty.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)
@@ -791,12 +732,8 @@ minetest.register_node(nodename_sp_loaded, {
 	tiles = { "pipeworks_straight_pipe_loaded.png" },
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	_sound_def = {
-		key = "node_sound_metal_defaults",
-	},
+	groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_metal_defaults(),
 	walkable = true,
 	on_place = pipeworks.rotate_on_place,
 	after_dig_node = function(pos)

filter-injector.lua

@@ -14,68 +14,41 @@ local function set_filter_formspec(data, meta)
 
 	local formspec
 	if data.digiline then
-		local form_height = 3
-		if pipeworks.enable_item_tags then
-			form_height = 4
-		end
 		formspec =
-			("size[8.5,%f]"):format(form_height) ..
+			"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,%f;4.05,1"):format(form_height - 0.7), "slotseq_mode",
+			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.25,%f;4.05,1"):format(form_height - 0.7), "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")})..
-			("button_exit[6.3,%f;2,1;close;" .. S("Close") .. "]"):format(form_height - 1.7)
-		if pipeworks.enable_item_tags then
-			formspec = formspec ..
-				("field[0.5,%f;4.6,1;item_tags;"):format(form_height - 1.4) .. S("Item Tags") .. ";${item_tags}]" ..
-				("button[4.8,%f;1.5,1;set_item_tags;"):format(form_height - 1.7) .. S("Set") .. "]"
-		end
+			"button_exit[6.3,1.3;2,1;close;"..S("Close").."]"
 	else
 		local exmatch_button = ""
 		if data.stackwise then
 			exmatch_button =
-				fs_helpers.cycling_button(meta, "button["..(10.2-(0.22)-4)..",4.5;4,1", "exmatch_mode",
+				fs_helpers.cycling_button(meta, "button[4,3.5;4,1", "exmatch_mode",
 					{S("Exact match - off"),
 					 S("Exact match - on")})
 		end
-		local size = "10.2,11"
-		local list_backgrounds = ""
-		if minetest.get_modpath("i3") or minetest.get_modpath("mcl_formspec") then
-			list_backgrounds = "style_type[box;colors=#666]"
-			for i=0, 7 do
-				for j=0, 1 do
-					list_backgrounds = list_backgrounds .. "box[".. 0.22+(i*1.25) ..",".. 1.75+(j*1.25) ..";1,1;]"
-				end
-			end
-		end
-		formspec =
-			"formspec_version[2]"..
-			"size["..size.."]"..
-			pipeworks.fs_helpers.get_prepends(size)..
-			"item_image[0.22,0.22;1,1;pipeworks:"..data.name.."]"..
-			"label[1.22,0.72;"..minetest.formspec_escape(itemname).."]"..
-			"label[0.22,1.5;"..S("Prefer item types:").."]"..
-			list_backgrounds..
-			"list[context;main;0.22,1.75;8,2;]"..
-			fs_helpers.cycling_button(meta, "button[0.22,4.5;4,1", "slotseq_mode",
+
+		formspec = "size[8,8.5]"..
+			"item_image[0,0;1,1;pipeworks:"..data.name.."]"..
+			"label[1,0;"..minetest.formspec_escape(itemname).."]"..
+			"label[0,1;"..S("Prefer item types:").."]"..
+			"list[context;main;0,1.5;8,2;]"..
+			fs_helpers.cycling_button(meta, "button[0,3.5;4,1", "slotseq_mode",
 				{S("Sequence slots by Priority"),
 				 S("Sequence slots Randomly"),
 				 S("Sequence slots by Rotation")})..
 			exmatch_button..
-			pipeworks.fs_helpers.get_inv(6)..
+			"list[current_player;main;0,4.5;8,4;]" ..
 			"listring[]"
-		if pipeworks.enable_item_tags then
-			formspec = formspec ..
-				"field[5.8,0.5;3,0.8;item_tags;" .. S("Item Tags") .. ";${item_tags}]" ..
-				"button[9,0.3;1,1.1;set_item_tags;" .. S("Set") .. "]"
-		end
 	end
 	meta:set_string("formspec", formspec)
 end
@@ -92,8 +65,8 @@ local function punch_filter(data, filtpos, filtnode, msg)
 	local fromnode = minetest.get_node(frompos)
 	if not fromnode then return end
 	local fromdef = minetest.registered_nodes[fromnode.name]
-	if not fromdef or not fromdef.tube then return end
-	local fromtube = table.copy(fromdef.tube)
+	if not fromdef then return end
+	local fromtube = fromdef.tube
 	local input_special_cases = {
 		["technic:mv_electric_furnace"] = "dst",
 		["technic:mv_electric_furnace_active"] = "dst",
@@ -137,7 +110,6 @@ local function punch_filter(data, filtpos, filtnode, msg)
 	local slotseq_mode
 	local exmatch_mode
 
-	local item_tags = pipeworks.sanitize_tags(filtmeta:get_string("item_tags"))
 	local filters = {}
 	if data.digiline then
 		local function add_filter(name, group, count, wear, metadata)
@@ -201,12 +173,6 @@ local function punch_filter(data, filtpos, filtnode, msg)
 				set_filter_formspec(data, filtmeta)
 			end
 
-			if type(msg.tags) == "table" or type(msg.tags) == "string" then
-				item_tags = pipeworks.sanitize_tags(msg.tags)
-			elseif type(msg.tag) == "string" then
-				item_tags = pipeworks.sanitize_tags({msg.tag})
-			end
-
 			if msg.nofire then
 				return
 			end
@@ -360,7 +326,7 @@ local function punch_filter(data, filtpos, filtnode, msg)
 				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(), item_tags)
+					fakePlayer:get_player_name())
 				return true -- only fire one item, please
 			end
 		end
@@ -409,13 +375,9 @@ for _, data in ipairs({
 			"pipeworks_"..data.name.."_top.png",
 		},
 		paramtype2 = "facedir",
-		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2, axey=1, handy=1, pickaxey=1},
-		is_ground_content = false,
-		_mcl_hardness=0.8,
+		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2},
 		legacy_facedir_simple = true,
-		_sound_def = {
-			key = "node_sound_wood_defaults",
-		},
+		sounds = default.node_sound_wood_defaults(),
 		on_construct = function(pos)
 			local meta = minetest.get_meta(pos)
 			set_filter_formspec(data, meta)
@@ -478,10 +440,6 @@ for _, data in ipairs({
 			end
 
 			local meta = minetest.get_meta(pos)
-			if pipeworks.enable_item_tags and fields.item_tags and (fields.key_enter_field == "item_tags" or fields.set_item_tags) then
-				local tags = pipeworks.sanitize_tags(fields.item_tags)
-				meta:set_string("item_tags", table.concat(tags, ","))
-			end
 			--meta:set_int("slotseq_index", 1)
 			set_filter_formspec(data, meta)
 			set_filter_infotext(data, meta)
@@ -503,10 +461,6 @@ for _, data in ipairs({
 			fs_helpers.on_receive_fields(pos, fields)
 			local meta = minetest.get_meta(pos)
 			meta:set_int("slotseq_index", 1)
-			if pipeworks.enable_item_tags and fields.item_tags and (fields.key_enter_field == "item_tags" or fields.set_item_tags) then
-				local tags = pipeworks.sanitize_tags(fields.item_tags)
-				meta:set_string("item_tags", table.concat(tags, ","))
-			end
 			set_filter_formspec(data, meta)
 			set_filter_infotext(data, meta)
 		end
@@ -528,6 +482,35 @@ for _, data in ipairs({
 	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:"..data.name
 end
 
+minetest.register_craft( {
+	output = "pipeworks:filter 2",
+	recipe = {
+	        { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" },
+	        { "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" },
+	        { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }
+	},
+})
+
+minetest.register_craft( {
+	output = "pipeworks:mese_filter 2",
+	recipe = {
+	        { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" },
+	        { "group:stick", "default:mese", "basic_materials:plastic_sheet" },
+	        { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }
+	},
+})
+
+if minetest.get_modpath("digilines") then
+	minetest.register_craft( {
+		output = "pipeworks:digiline_filter 2",
+		recipe = {
+			{ "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" },
+			{ "group:stick", "digilines:wire_std_00000000", "basic_materials:plastic_sheet" },
+			{ "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }
+		},
+	})
+end
+
 --[[
 In the past the filter-injectors had real items in their inventories. This code
 puts them to the input to the filter-injector if possible. Else the items are

flowing_logic.lua

@@ -83,7 +83,7 @@ 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 == pipeworks.liquids.water.flowing or belowname == pipeworks.liquids.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 = {
@@ -96,14 +96,14 @@ pipeworks.spigot_check = function(pos, node)
 		if near_node and string.find(near_node.name, "_loaded") then
 			if spigotname and spigotname == "pipeworks:spigot" then
 				minetest.add_node(pos,{name = "pipeworks:spigot_pouring", param2 = fdir})
-				if finitewater or belowname ~= pipeworks.liquids.water.source then
-					minetest.add_node({x=pos.x,y=pos.y-1,z=pos.z},{name = pipeworks.liquids.water.source})
+				if finitewater or belowname ~= "default:water_source" then
+					minetest.add_node({x=pos.x,y=pos.y-1,z=pos.z},{name = "default:water_source"})
 				end
 			end
 		else
 			if spigotname == "pipeworks:spigot_pouring" then
 				minetest.add_node({x=pos.x,y=pos.y,z=pos.z},{name = "pipeworks:spigot", param2 = fdir})
-				if belowname == pipeworks.liquids.water.source and not finitewater then
+				if belowname == "default:water_source" and not finitewater then
 					minetest.remove_node({x=pos.x,y=pos.y-1,z=pos.z})
 				end
 			end
@@ -113,20 +113,20 @@ 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 == pipeworks.liquids.water.flowing or abovename == pipeworks.liquids.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
 			if fountainhead_name and fountainhead_name == "pipeworks:fountainhead" then
 				minetest.add_node(pos,{name = "pipeworks:fountainhead_pouring"})
-				if finitewater or abovename ~= pipeworks.liquids.water.source then
-					minetest.add_node({x=pos.x,y=pos.y+1,z=pos.z},{name = pipeworks.liquids.water.source})
+				if finitewater or abovename ~= "default:water_source" then
+					minetest.add_node({x=pos.x,y=pos.y+1,z=pos.z},{name = "default:water_source"})
 				end
 			end
 		else
 			if fountainhead_name == "pipeworks:fountainhead_pouring" then
 				minetest.add_node({x=pos.x,y=pos.y,z=pos.z},{name = "pipeworks:fountainhead"})
-				if abovename == pipeworks.liquids.water.source and not finitewater then
+				if abovename == "default:water_source" and not finitewater then
 					minetest.remove_node({x=pos.x,y=pos.y+1,z=pos.z})
 				end
 			end

init.lua

@@ -4,21 +4,12 @@
 -- and devices that they can connect to.
 --
 
-pipeworks = {
-	ui_cat_tube_list = {},
-	worldpath = minetest.get_worldpath(),
-	modpath = minetest.get_modpath("pipeworks"),
-	liquids = {
-		water = {
-			source = minetest.registered_nodes["mapgen_water_source"].name,
-			flowing = minetest.registered_nodes["mapgen_water_source"].liquid_alternative_flowing
-		},
-		river_water = {
-			source = minetest.registered_nodes["mapgen_river_water_source"].name,
-			flowing = minetest.registered_nodes["mapgen_river_water_source"].liquid_alternative_flowing
-		}
-	}
-}
+pipeworks = {}
+pipeworks.ui_cat_tube_list = {}
+
+pipeworks.worldpath = minetest.get_worldpath()
+pipeworks.modpath = minetest.get_modpath("pipeworks")
+local S = minetest.get_translator("pipeworks")
 
 dofile(pipeworks.modpath.."/default_settings.lua")
 -- Read the external config file if it exists.
@@ -31,12 +22,76 @@ end
 if pipeworks.toggles.pipe_mode == "pressure" then
 	minetest.log("warning", "pipeworks pressure logic mode comes with caveats and differences in behaviour, you have been warned!")
 end
-if pipeworks.entity_update_interval >= 0.2 and pipeworks.enable_accelerator_tube then
-	minetest.log("warning", "pipeworks accelerator tubes will not entirely work with an entity update interval 0.2 or above.")
+
+-- Random variables
+
+pipeworks.expect_infinite_stacks = true
+if minetest.get_modpath("unified_inventory") or not minetest.settings:get_bool("creative_mode") then
+	pipeworks.expect_infinite_stacks = false
+end
+
+pipeworks.meseadjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
+
+pipeworks.rules_all = {{x=0, y=0, z=1},{x=0, y=0, z=-1},{x=1, y=0, z=0},{x=-1, y=0, z=0},
+		{x=0, y=1, z=1},{x=0, y=1, z=-1},{x=1, y=1, z=0},{x=-1, y=1, z=0},
+		{x=0, y=-1, z=1},{x=0, y=-1, z=-1},{x=1, y=-1, z=0},{x=-1, y=-1, z=0},
+		{x=0, y=1, z=0}, {x=0, y=-1, z=0}}
+
+pipeworks.mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
+pipeworks.digilines_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
+
+pipeworks.liquid_texture = "default_water.png"
+
+pipeworks.button_off   = {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}
+pipeworks.button_on    = {text="", texture="pipeworks_button_on.png",  addopts="false;false;pipeworks_button_interm.png"}
+pipeworks.button_base  = "image_button[0,4.3;1,0.6"
+pipeworks.button_label = "label[0.9,4.31;"..S("Allow splitting incoming stacks from tubes").."]"
+
+-- Helper functions
+
+function pipeworks.fix_image_names(table, replacement)
+	local outtable={}
+	for i in ipairs(table) do
+		outtable[i]=string.gsub(table[i], "_XXXXX", replacement)
+	end
+
+	return outtable
+end
+
+function pipeworks.add_node_box(t, b)
+	if not t or not b then return end
+	for i in ipairs(b)
+		do table.insert(t, b[i])
+	end
+end
+
+function pipeworks.may_configure(pos, player)
+	local name = player:get_player_name()
+	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+
+	if owner ~= "" and owner == name then -- wielders and filters
+		return true
+	end
+	return not minetest.is_protected(pos, name)
+end
+
+function pipeworks.replace_name(tbl,tr,name)
+	local ntbl={}
+	for key,i in pairs(tbl) do
+		if type(i)=="string" then
+			ntbl[key]=string.gsub(i,tr,name)
+		elseif type(i)=="table" then
+			ntbl[key]=pipeworks.replace_name(i,tr,name)
+		else
+			ntbl[key]=i
+		end
+	end
+	return ntbl
 end
 
 pipeworks.logger = function(msg)
-	minetest.log("action", "[pipeworks] "..msg)
+	print("[pipeworks] "..msg)
 end
 
 -------------------------------------------
@@ -58,26 +113,16 @@ dofile(pipeworks.modpath.."/autoplace_tubes.lua")
 dofile(pipeworks.modpath.."/luaentity.lua")
 dofile(pipeworks.modpath.."/item_transport.lua")
 dofile(pipeworks.modpath.."/flowing_logic.lua")
+dofile(pipeworks.modpath.."/crafts.lua")
+dofile(pipeworks.modpath.."/tube_registration.lua")
+dofile(pipeworks.modpath.."/routing_tubes.lua")
+dofile(pipeworks.modpath.."/sorting_tubes.lua")
+dofile(pipeworks.modpath.."/vacuum_tubes.lua")
+dofile(pipeworks.modpath.."/signal_tubes.lua")
+dofile(pipeworks.modpath.."/decorative_tubes.lua")
 dofile(pipeworks.modpath.."/filter-injector.lua")
 dofile(pipeworks.modpath.."/trashcan.lua")
 dofile(pipeworks.modpath.."/wielder.lua")
-dofile(pipeworks.modpath.."/tubes/registration.lua")
-dofile(pipeworks.modpath.."/tubes/routing.lua")
-dofile(pipeworks.modpath.."/tubes/sorting.lua")
-dofile(pipeworks.modpath.."/tubes/signal.lua")
-dofile(pipeworks.modpath.."/tubes/embedded_tube.lua")
-dofile(pipeworks.modpath.."/tubes/pane_embedded_tube.lua")
-dofile(pipeworks.modpath.."/tubes/tags.lua")
-
-if pipeworks.enable_teleport_tube then
-	dofile(pipeworks.modpath.."/tubes/teleport.lua")
-end
-if pipeworks.enable_lua_tube and minetest.get_modpath("mesecons") then
-	dofile(pipeworks.modpath.."/tubes/lua.lua")
-end
-if pipeworks.enable_sand_tube or pipeworks.enable_mese_sand_tube then
-	dofile(pipeworks.modpath.."/tubes/vacuum.lua")
-end
 
 local logicdir = "/pressure_logic/"
 
@@ -89,33 +134,24 @@ dofile(pipeworks.modpath..logicdir.."abms.lua")
 dofile(pipeworks.modpath..logicdir.."abm_register.lua")
 dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua")
 
-if pipeworks.enable_pipes then
-	dofile(pipeworks.modpath.."/pipes.lua")
-end
-if pipeworks.enable_pipe_devices then
-	dofile(pipeworks.modpath.."/devices.lua")
-end
-if pipeworks.enable_redefines and (minetest.get_modpath("default") or minetest.get_modpath("hades_core")) then
+if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
+if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
+if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
+if pipeworks.enable_redefines then
 	dofile(pipeworks.modpath.."/compat-chests.lua")
 	dofile(pipeworks.modpath.."/compat-furnaces.lua")
 end
-if pipeworks.enable_redefines and minetest.get_modpath("mcl_barrels") then
-	dofile(pipeworks.modpath.."/mcl_barrels.lua")
+if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua") end
+if pipeworks.enable_lua_tube and
+		(minetest.get_modpath("mesecons") or minetest.get_modpath("digilines")) then
+	dofile(pipeworks.modpath.."/lua_tube.lua")
 end
-if pipeworks.enable_redefines and minetest.get_modpath("mcl_furnaces") then
-	dofile(pipeworks.modpath.."/mcl_furnaces.lua")
-end
-if pipeworks.enable_autocrafter then
-	dofile(pipeworks.modpath.."/autocrafter.lua")
-end
-
-dofile(pipeworks.modpath.."/crafts.lua")
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 
 -- Unified Inventory categories integration
 
-if minetest.get_modpath("unified_inventory") and unified_inventory.registered_categories then
+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",

item_transport.lua

@@ -1,38 +1,13 @@
 local luaentity = pipeworks.luaentity
-local enable_max_limit = minetest.settings:get_bool("pipeworks_enable_items_per_tube_limit")
+local enable_max_limit = minetest.settings:get("pipeworks_enable_items_per_tube_limit")
 local max_tube_limit = tonumber(minetest.settings:get("pipeworks_max_items_per_tube")) or 30
 if enable_max_limit == nil then enable_max_limit = true end
 
-if pipeworks.enable_item_tags then
-	local max_tag_length = tonumber(minetest.settings:get("pipeworks_max_item_tag_length")) or 32
-	local max_tags = tonumber(minetest.settings:get("pipeworks_max_item_tags")) or 16
-
-	function pipeworks.sanitize_tags(tags)
-		if type(tags) == "string" then
-			tags = tags:split(",")
-		end
-		local sanitized = {}
-		for i, tag in ipairs(tags) do
-			if type(tag) == "string" then
-				tag = tag:gsub("[%s,]", "")  -- Remove whitespace and commas
-				tag = tag:gsub("%$%b%{%}", "")  -- Remove special ${key} values
-				if tag ~= "" then
-					table.insert(sanitized, tag:sub(1, max_tag_length))
-				end
-			end
-			if #sanitized >= max_tags then
-				break
-			end
-		end
-		return sanitized
-	end
-end
-
 function pipeworks.tube_item(pos, item)
 	error("obsolete pipeworks.tube_item() called; change caller to use pipeworks.tube_inject_item() instead")
 end
 
-function pipeworks.tube_inject_item(pos, start_pos, velocity, item, owner, tags)
+function pipeworks.tube_inject_item(pos, start_pos, velocity, item, owner)
 	-- Take item in any format
 	local stack = ItemStack(item)
 	local obj = luaentity.add_entity(pos, "pipeworks:tubed_item")
@@ -40,7 +15,6 @@ function pipeworks.tube_inject_item(pos, start_pos, velocity, item, owner, tags)
 	obj.start_pos = vector.new(start_pos)
 	obj:set_velocity(velocity)
 	obj.owner = owner
-	obj.tags = tags
 	--obj:set_color("red") -- todo: this is test-only code
 	return obj
 end
@@ -105,14 +79,13 @@ end
 
 -- compatibility behaviour for the existing can_go() callbacks,
 -- which can only specify a list of possible positions.
-local function go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner, tags)
+local function go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner)
 	local next_positions = {}
 	local max_priority = 0
 	local can_go
 
-	local def = minetest.registered_nodes[cnode.name]
-	if def and def.tube and def.tube.can_go then
-		can_go = def.tube.can_go(pos, cnode, vel, stack, tags)
+	if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then
+		can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos, cnode, vel, stack)
 	else
 		local adjlist_string = minetest.get_meta(pos):get_string("adjlist")
 		local adjlist = minetest.deserialize(adjlist_string) or default_adjlist -- backward compat: if not found, use old behavior: all directions
@@ -171,7 +144,7 @@ end
 -- * a "multi-mode" data table (or nil if N/A) where a stack was split apart.
 --	if this is not nil, the luaentity spawns new tubed items for each new fragment stack,
 --	then deletes itself (i.e. the original item stack).
-local function go_next(pos, velocity, stack, owner, tags)
+local function go_next(pos, velocity, stack, owner)
 	local cnode = minetest.get_node(pos)
 	local cmeta = minetest.get_meta(pos)
 	local speed = math.abs(velocity.x + velocity.y + velocity.z)
@@ -199,7 +172,7 @@ local function go_next(pos, velocity, stack, owner, tags)
 	-- n is the new value of the cycle counter.
 	-- XXX: this probably needs cleaning up after being split out,
 	-- seven args is a bit too many
-	local n, found, new_velocity, multimode = go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner, tags)
+	local n, found, new_velocity, multimode = go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner)
 
 	-- if not using output cycling,
 	-- don't update the field so it stays the same for the next item.
@@ -303,7 +276,6 @@ luaentity.register_entity("pipeworks:tubed_item", {
 	color_entity = nil,
 	color = nil,
 	start_pos = nil,
-	tags = nil,
 
 	set_item = function(self, item)
 		local itemstring = ItemStack(item):to_string() -- Accept any input format
@@ -339,6 +311,8 @@ luaentity.register_entity("pipeworks:tubed_item", {
 			self:set_pos(pos)
 		end
 
+		local stack = ItemStack(self.itemstring)
+
 		local velocity = self:get_velocity()
 
 		local moved = false
@@ -355,19 +329,12 @@ luaentity.register_entity("pipeworks:tubed_item", {
 			moved = true
 		end
 
-		if not moved then
-			return
-		end
-
-		local stack = ItemStack(self.itemstring)
-
 		pipeworks.load_position(self.start_pos)
 		local node = minetest.get_node(self.start_pos)
-		if minetest.get_item_group(node.name, "tubedevice_receiver") == 1 then
+		if moved and minetest.get_item_group(node.name, "tubedevice_receiver") == 1 then
 			local leftover
-			local def = minetest.registered_nodes[node.name]
-			if def.tube and def.tube.insert_object then
-				leftover = def.tube.insert_object(self.start_pos, node, stack, vel, self.owner)
+			if minetest.registered_nodes[node.name].tube and minetest.registered_nodes[node.name].tube.insert_object then
+				leftover = minetest.registered_nodes[node.name].tube.insert_object(self.start_pos, node, stack, vel, self.owner)
 			else
 				leftover = stack
 			end
@@ -382,50 +349,45 @@ luaentity.register_entity("pipeworks:tubed_item", {
 			return
 		end
 
-		local tags
-		if pipeworks.enable_item_tags then
-			tags = self.tags or {}
-		end
-		local found_next, new_velocity, multimode = go_next(self.start_pos, velocity, stack, self.owner, tags) -- todo: color
-		if pipeworks.enable_item_tags then
-			self.tags = #tags > 0 and tags or nil
-		end
-		local rev_vel = vector.multiply(velocity, -1)
-		local rev_dir = vector.direction(self.start_pos,vector.add(self.start_pos,rev_vel))
-		local rev_node = minetest.get_node(vector.round(vector.add(self.start_pos,rev_dir)))
-		local tube_present = minetest.get_item_group(rev_node.name,"tubedevice") == 1
-		if not found_next then
-			if pipeworks.drop_on_routing_fail or not tube_present or
-					minetest.get_item_group(rev_node.name,"tube") ~= 1 then
-				-- Using add_item instead of item_drop since this makes pipeworks backward
-				-- compatible with Minetest 0.4.13.
-				-- Using item_drop here makes Minetest 0.4.13 crash.
-				local dropped_item = minetest.add_item(self.start_pos, stack)
-				if dropped_item then
-					dropped_item:set_velocity(vector.multiply(velocity, 5))
-					self:remove()
+		if moved then
+			local found_next, new_velocity, multimode = go_next(self.start_pos, velocity, stack, self.owner) -- todo: color
+			local rev_vel = vector.multiply(velocity, -1)
+			local rev_dir = vector.direction(self.start_pos,vector.add(self.start_pos,rev_vel))
+			local rev_node = minetest.get_node(vector.round(vector.add(self.start_pos,rev_dir)))
+			local tube_present = minetest.get_item_group(rev_node.name,"tubedevice") == 1
+			if not found_next then
+				if pipeworks.drop_on_routing_fail or not tube_present or
+						minetest.get_item_group(rev_node.name,"tube") ~= 1 then
+					-- Using add_item instead of item_drop since this makes pipeworks backward
+					-- compatible with Minetest 0.4.13.
+					-- Using item_drop here makes Minetest 0.4.13 crash.
+					local dropped_item = minetest.add_item(self.start_pos, stack)
+					if dropped_item then
+						dropped_item:set_velocity(vector.multiply(velocity, 5))
+						self:remove()
+					end
+					return
+				else
+					velocity = vector.multiply(velocity, -1)
+					self:set_pos(vector.subtract(self.start_pos, vector.multiply(vel, moved_by - 1)))
+					self:set_velocity(velocity)
 				end
+			elseif is_multimode(multimode) then
+				-- create new stacks according to returned data.
+				local s = self.start_pos
+				for _, split in ipairs(multimode) do
+					pipeworks.tube_inject_item(s, s, split.velocity, split.itemstack, self.owner)
+				end
+				-- remove ourself now the splits are sent
+				self:remove()
 				return
-			else
-				velocity = vector.multiply(velocity, -1)
-				self:set_pos(vector.subtract(self.start_pos, vector.multiply(vel, moved_by - 1)))
-				self:set_velocity(velocity)
 			end
-		elseif is_multimode(multimode) then
-			-- create new stacks according to returned data.
-			local s = self.start_pos
-			for _, split in ipairs(multimode) do
-				pipeworks.tube_inject_item(s, s, split.velocity, split.itemstack, self.owner)
-			end
-			-- remove ourself now the splits are sent
-			self:remove()
-			return
-		end
 
-		if new_velocity and not vector.equals(velocity, new_velocity) then
-			local nvelr = math.abs(new_velocity.x + new_velocity.y + new_velocity.z)
-			self:set_pos(vector.add(self.start_pos, vector.multiply(new_velocity, (moved_by - 1) / nvelr)))
-			self:set_velocity(new_velocity)
+			if new_velocity and not vector.equals(velocity, new_velocity) then
+				local nvelr = math.abs(new_velocity.x + new_velocity.y + new_velocity.z)
+				self:set_pos(vector.add(self.start_pos, vector.multiply(new_velocity, (moved_by - 1) / nvelr)))
+				self:set_velocity(new_velocity)
+			end
 		end
 	end
 })

legacy.lua

@@ -24,13 +24,10 @@ if not minetest.get_modpath("auto_tree_tap") and
 		description = S("Auto-Tap"),
 		tiles = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png",
 			"pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"},
-		is_ground_content = false,
+		is_ground_content = true,
 		paramtype2 = "facedir",
-		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1, axey=1, handy=1, pickaxey=1},
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_stone_defaults",
-		},
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1 },
+		sounds = default.node_sound_stone_defaults(),
 		tube = {connect_sides={back=1}},
 		on_construct = function(pos)
 			local meta = minetest.get_meta(pos)
@@ -55,6 +52,7 @@ if not minetest.get_modpath("auto_tree_tap") and
 				local node = minetest.get_node(pos)
 				node.param2 = minetest.dir_to_facedir(dir, true)
 				minetest.set_node(pos, node)
+				minetest.log("action", "real (6d) facedir: " .. node.param2)
 			end
 		end,
 		after_dig_node = pipeworks.scan_for_tube_objects,

lua_tube.lua

@@ -370,10 +370,7 @@ local function clean_and_weigh_digiline_message(msg, back_references)
 		return msg, #msg + 25
 	elseif t == "number" then
 		-- Numbers are passed by value so need not be touched, and cost 8 bytes
-		-- as all numbers in Lua are doubles. NaN values are removed.
-		if msg ~= msg then
-			return nil, 0
-		end
+		-- as all numbers in Lua are doubles.
 		return msg, 8
 	elseif t == "boolean" then
 		-- Booleans are passed by value so need not be touched, and cost 1
@@ -428,7 +425,7 @@ end
 
 -- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
 local function get_digiline_send(pos, itbl, send_warning)
-	if not minetest.get_modpath("digilines") then return end
+	if not minetest.global_exists("digilines") then return end
 	local chan_maxlen = mesecon.setting("luacontroller_digiline_channel_maxlen", 256)
 	local maxlen = mesecon.setting("luacontroller_digiline_maxlen", 50000)
 	return function(channel, msg)
@@ -868,7 +865,7 @@ for white  = 0, 1 do
 	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, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+	local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1}
 	if red + blue + yellow + green + black + white ~= 0 then
 		groups.not_in_creative_inventory = 1
 	end
@@ -915,16 +912,13 @@ for white  = 0, 1 do
 		paramtype = "light",
 		is_ground_content = false,
 		groups = groups,
-		_mcl_hardness=0.8,
 		drop = BASENAME.."000000",
 		sunlight_propagates = true,
 		selection_box = selection_box,
 		node_box = node_box,
 		on_construct = reset_meta,
 		on_receive_fields = on_receive_fields,
-		_sound_def = {
-			key = "node_sound_wood_defaults",
-		},
+		sounds = default.node_sound_wood_defaults(),
 		mesecons = mesecons,
 		digiline = digiline,
 		-- Virtual portstates are the ports that
@@ -948,7 +942,7 @@ for white  = 0, 1 do
 		tube = {
 			connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1},
 			priority = 50,
-			can_go = function(pos, node, velocity, stack, tags)
+			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
@@ -963,33 +957,12 @@ for white  = 0, 1 do
 					itemstring = stack:to_string(),
 					item = stack:to_table(),
 					velocity = velocity,
-					tags = table.copy(tags),
-					side = src.name,
 				})
-				if not succ then
+				if not succ or type(msg) ~= "string" then
 					return go_back(velocity)
 				end
-				if type(msg) == "string" then
-					local side = rules[msg]
-					return side and {side} or go_back(velocity)
-				elseif type(msg) == "table" then
-					if pipeworks.enable_item_tags then
-						local new_tags
-						if type(msg.tags) == "table" or type(msg.tags) == "string" then
-							new_tags = pipeworks.sanitize_tags(msg.tags)
-						elseif type(msg.tag) == "string" then
-							new_tags = pipeworks.sanitize_tags({msg.tag})
-						end
-						if new_tags then
-							for i=1, math.max(#tags, #new_tags) do
-								tags[i] = new_tags[i]
-							end
-						end
-					end
-					local side = rules[msg.side]
-					return side and {side} or go_back(velocity)
-				end
-				return go_back(velocity)
+				local r = rules[msg]
+				return r and {r} or go_back(velocity)
 			end,
 		},
 		after_place_node = pipeworks.after_place,
@@ -1048,17 +1021,14 @@ minetest.register_node(BASENAME .. "_burnt", {
 	is_burnt = true,
 	paramtype = "light",
 	is_ground_content = false,
-	groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	_mcl_hardness=0.8,
+	groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1},
 	drop = BASENAME.."000000",
 	sunlight_propagates = true,
 	selection_box = selection_box,
 	node_box = node_box,
 	on_construct = reset_meta,
 	on_receive_fields = on_receive_fields,
-	_sound_def = {
-        key = "node_sound_wood_defaults",
-    },
+	sounds = default.node_sound_wood_defaults(),
 	virtual_portstates = {red = false, blue = false, yellow = false,
 		green = false, black = false, white = false},
 	mesecons = {

luaentity.lua

@@ -73,43 +73,31 @@ local function get_blockpos(pos)
 	        z = math.floor(pos.z / 16)}
 end
 
-local move_entities_globalstep_part1
-local is_active
+local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones)
 
-if pipeworks.use_real_entities then
-	local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones)
+local move_entities_globalstep_part1 = function(dtime)
+	local active_block_range = tonumber(minetest.settings:get("active_block_range")) or 2
+	local new_active_blocks = {}
+	for _, player in ipairs(minetest.get_connected_players()) do
+		local blockpos = get_blockpos(player:get_pos())
+		local minp = vector.subtract(blockpos, active_block_range)
+		local maxp = vector.add(blockpos, active_block_range)
 
-	move_entities_globalstep_part1 = function(dtime)
-		local active_block_range = tonumber(minetest.settings:get("active_block_range")) or 2
-		local new_active_blocks = {}
-		for _, player in ipairs(minetest.get_connected_players()) do
-			local blockpos = get_blockpos(player:get_pos())
-			local minp = vector.subtract(blockpos, active_block_range)
-			local maxp = vector.add(blockpos, active_block_range)
-
-			for x = minp.x, maxp.x do
-			for y = minp.y, maxp.y do
-			for z = minp.z, maxp.z do
-				local pos = {x = x, y = y, z = z}
-				new_active_blocks[minetest.hash_node_position(pos)] = pos
-			end
-			end
-			end
+		for x = minp.x, maxp.x do
+		for y = minp.y, maxp.y do
+		for z = minp.z, maxp.z do
+			local pos = {x = x, y = y, z = z}
+			new_active_blocks[minetest.hash_node_position(pos)] = pos
+		end
+		end
 		end
-		active_blocks = new_active_blocks
-		-- todo: callbacks on block load/unload
 	end
+	active_blocks = new_active_blocks
+	-- todo: callbacks on block load/unload
+end
 
-	is_active = function(pos)
-		return active_blocks[minetest.hash_node_position(get_blockpos(pos))] ~= nil
-	end
-else
-	move_entities_globalstep_part1 = function()
-	end
-
-	is_active = function()
-		return false
-	end
+local function is_active(pos)
+	return active_blocks[minetest.hash_node_position(get_blockpos(pos))] ~= nil
 end
 
 local entitydef_default = {
@@ -163,15 +151,11 @@ local entitydef_default = {
 		if not is_active(entity_pos) then
 			return
 		end
-		local object = minetest.add_entity(entity_pos, entity.name)
-		if not object then
-			return
-		end
-		local ent = object:get_luaentity()
+		local ent = minetest.add_entity(entity_pos, entity.name):get_luaentity()
 		ent:from_data(entity.data)
 		ent.parent_id = self._id
 		ent.attached_id = index
-		entity.entity = object
+		entity.entity = ent.object
 		local master = self._attached_entities_master
 		if master then
 			self:_attach(index, master)
@@ -386,36 +370,13 @@ local move_entities_globalstep_part2 = function(dtime)
 	end
 end
 
--- dtime after which there is an update (or skip).
-local dtime_threshold = pipeworks.entity_update_interval
--- Accumulated dtime since last update (or skip).
-local dtime_accum = 0
--- Delayed dtime accumulated due to skipped updates.
-local dtime_delayed = 0
-local skip_update = false
+local handle_active_blocks_timer = 0.1
 
 minetest.register_globalstep(function(dtime)
-	if dtime >= 0.2 and dtime_delayed < 1 then
-		-- Reduce activity when the server is lagging.
-		skip_update = true
+	handle_active_blocks_timer = handle_active_blocks_timer + dtime
+	if dtime < 0.2 or handle_active_blocks_timer >= (dtime * 3) then
+		handle_active_blocks_timer = 0.1
+		move_entities_globalstep_part1(dtime)
+		move_entities_globalstep_part2(dtime)
 	end
-
-	dtime_accum = dtime_accum + dtime
-	if dtime_accum < dtime_threshold then
-		return
-	end
-
-	if skip_update then
-		dtime_delayed = dtime_delayed + dtime_accum
-		skip_update = false
-	else
-		move_entities_globalstep_part1(dtime_accum + dtime_delayed)
-		move_entities_globalstep_part2(dtime_accum + dtime_delayed)
-		dtime_delayed = 0
-	end
-
-	-- Tune the threshold so that the average interval is pipeworks.entity_update_interval.
-	dtime_threshold = math.max(dtime_threshold + (pipeworks.entity_update_interval - dtime_accum) / 10, 0)
-
-	dtime_accum = 0
 end)

mcl_barrels.lua

@@ -1,72 +0,0 @@
--- this bit of code modifies the mcl barrels to be compatible with
--- pipeworks.
-
--- Pipeworks Specific
-local tube_entry = "^pipeworks_tube_connection_wooden.png"
-
--- Original Definitions
-local old_barrel = table.copy(minetest.registered_items["mcl_barrels:barrel_closed"])
-
-local groups = old_barrel.groups
-groups["tubedevice"] = 1
-groups["tubedevice_receiver"] = 1
-local groups_open = table.copy(groups)
-groups_open["not_in_creative_inventory"] = 1
-
-
--- Override Construction
-local override_barrel = {}
-
-override_barrel.tiles = {
-   "mcl_barrels_barrel_top.png^[transformR270",
-   "mcl_barrels_barrel_bottom.png"..tube_entry,
-   "mcl_barrels_barrel_side.png"..tube_entry
-}
-
-override_barrel.after_place_node = function(pos, placer, itemstack, pointed_thing)
-   old_barrel.after_place_node(pos, placer, itemstack, pointed_thing)
-   pipeworks.after_place(pos, placer, itemstack, pointed_thing)
-end
-
-override_barrel.tube = {
-   insert_object = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      return inv:add_item("main", stack)
-   end,
-   can_insert = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if meta:get_int("splitstacks") == 1 then
-	 stack = stack:peek_item(1)
-      end
-      return inv:room_for_item("main", stack)
-   end,
-   input_inventory = "main",
-   connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1}
-}
-
-override_barrel.after_dig_node = function(pos, oldnode, oldmetadata, digger)
-   old_barrel.after_dig_node(pos, oldnode, oldmetadata, digger)
-   pipeworks.after_dig(pos)
-end
-
-override_barrel.groups = table.copy(old_barrel.groups)
-
-override_barrel.on_rotate = pipeworks.on_rotate
-
-
-local override_barrel_open = table.copy(override_barrel)
-
-override_barrel_open.tiles = {
-   "mcl_barrels_barrel_top_open.png",
-   "mcl_barrels_barrel_bottom.png"..tube_entry,
-   "mcl_barrels_barrel_side.png"..tube_entry
-}
-
-override_barrel_open.groups = groups_open
-
-
--- Override with the new modifications.
-minetest.override_item("mcl_barrels:barrel_closed", override_barrel)
-minetest.override_item("mcl_barrels:barrel_open", override_barrel_open)

mcl_furnaces.lua

@@ -1,376 +0,0 @@
-
-local old_furnace = table.copy(minetest.registered_nodes["mcl_furnaces:furnace"])
-local old_blast_furnace = table.copy(minetest.registered_nodes["mcl_blast_furnace:blast_furnace"])
-local old_smoker = table.copy(minetest.registered_nodes["mcl_smoker:smoker"])
-
-local tube_entry = "^pipeworks_tube_connection_stony.png"
-
--- groups
-local furnace_groups = old_furnace.groups
-furnace_groups["tubedevice"] = 1
-furnace_groups["tubedevice_receiver"] = 1
-local furnace_groups_active = table.copy(furnace_groups)
-furnace_groups_active["not_in_creative_inventory"] = 1
-
-local blast_furnace_groups = old_blast_furnace.groups
-blast_furnace_groups["tubedevice"] = 1
-blast_furnace_groups["tubedevice_receiver"] = 1
-local blast_furnace_groups_active = table.copy(blast_furnace_groups)
-blast_furnace_groups_active["not_in_creative_inventory"] = 1
-
-local smoker_groups = old_smoker.groups
-smoker_groups["tubedevice"] = 1
-smoker_groups["tubedevice_receiver"] = 1
-local smoker_groups_active = table.copy(smoker_groups)
-smoker_groups_active["not_in_creative_inventory"] = 1
-
-
--- a hack to give the exp to fake players it's be dropped instead added to (fake) player inv
-local function give_xp(pos, player)
-   local meta = minetest.get_meta(pos)
-   local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2), -1.95)
-   local xp = meta:get_int("xp")
-   if xp > 0 then
-      mcl_experience.throw_xp(vector.add(pos, dir), xp)
-      meta:set_int("xp", 0)
-   end
-end
-
-local override = {}
-
-override.tiles = {
-   "default_furnace_top.png"..tube_entry,
-   "default_furnace_bottom.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_front.png"
-}
-
-override.groups = furnace_groups
-
-override.tube = {
-   insert_object = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 if meta:get_int("split_material_stacks") == 1 then
-	    stack = stack:peek_item(1)
-	 end
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-override.after_place_node = function(pos, placer, itemstack, pointed_thing)
-   pipeworks.after_place(pos, placer, itemstack, pointed_thing)
-end
-
-override.after_dig_node = function(pos, oldnode, oldmetadata, digger)
-   old_furnace.after_dig_node(pos, oldnode, oldmetadata, digger)
-   pipeworks.after_dig(pos)
-end
-
-override.on_metadata_inventory_take = function(pos, listname, index, stack, player)
-   if listname == "dst" then
-      if stack:get_name() == "mcl_core:iron_ingot" then
-	 awards.unlock(player:get_player_name(), "mcl:acquireIron")
-      elseif stack:get_name() == "mcl_fishing:fish_cooked" then
-	 awards.unlock(player:get_player_name(), "mcl:cookFish")
-      end
-      give_xp(pos, player)
-   end
-end
-
-override.on_rotate = pipeworks.on_rotate
-
-
-local override_active = table.copy(override)
-
-override_active.tiles = {
-   "default_furnace_top.png"..tube_entry,
-   "default_furnace_bottom.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_side.png"..tube_entry,
-   "default_furnace_front_active.png",
-}
-
-override_active.groups = furnace_groups_active
-
-override_active.tube = {
-   insert_object = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-
---blast furnace
-
-local override_blast_furnace = {}
-
-override_blast_furnace.tiles = {
-   "blast_furnace_top.png"..tube_entry,
-   "blast_furnace_top.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   "blast_furnace_front.png"
-}
-
-override_blast_furnace.groups = blast_furnace_groups
-
-override_blast_furnace.tube = {
-   insert_object = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 if meta:get_int("split_material_stacks") == 1 then
-	    stack = stack:peek_item(1)
-	 end
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-override_blast_furnace.after_place_node = function(pos, placer, itemstack, pointed_thing)
-   pipeworks.after_place(pos, placer, itemstack, pointed_thing)
-end
-
-override_blast_furnace.after_dig_node = function(pos, oldnode, oldmetadata, digger)
-   old_blast_furnace.after_dig_node(pos, oldnode, oldmetadata, digger)
-   pipeworks.after_dig(pos)
-end
-
-override_blast_furnace.on_metadata_inventory_take = function(pos, listname, index, stack, player)
-   -- Award smelting achievements
-   if listname == "dst" then
-      if stack:get_name() == "mcl_core:iron_ingot" then
-	 awards.unlock(player:get_player_name(), "mcl:acquireIron")
-      end
-      give_xp(pos, player)
-   end
-end
-
-override_blast_furnace.on_rotate = pipeworks.on_rotate
-
-
-local override_blast_active = table.copy(override)
-
-override_blast_active.tiles = {
-   "blast_furnace_top.png"..tube_entry,
-   "blast_furnace_top.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   "blast_furnace_side.png"..tube_entry,
-   {
-      name = "blast_furnace_front_on.png",
-      animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48 }
-   },
-}
-
-override_blast_active.groups = blast_furnace_groups_active
-
-override_blast_active.tube = {
-   insert_object = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-
--- smoker
-
-local override_smoker = {}
-
-override_smoker.tiles = {
-   "smoker_top.png"..tube_entry,
-   "smoker_bottom.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   "smoker_front.png"
-}
-
-override_smoker.groups = smoker_groups
-
-override_smoker.tube = {
-   insert_object = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 if meta:get_int("split_material_stacks") == 1 then
-	    stack = stack:peek_item(1)
-	 end
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-override_smoker.after_place_node = function(pos, placer, itemstack, pointed_thing)
-   pipeworks.after_place(pos, placer, itemstack, pointed_thing)
-end
-
-override_smoker.after_dig_node = function(pos, oldnode, oldmetadata, digger)
-   old_smoker.after_dig_node(pos, oldnode, oldmetadata, digger)
-   pipeworks.after_dig(pos)
-end
-
-override_smoker.on_metadata_inventory_take = function(pos, listname, index, stack, player)
-   -- Award fish achievements
-   if listname == "dst" then
-      if stack:get_name() == "mcl_fishing:fish_cooked" then
-	 awards.unlock(player:get_player_name(), "mcl:cookFish")
-      end
-      give_xp(pos, player)
-   end
-end
-
-override_smoker.on_rotate = pipeworks.on_rotate
-
-
-local override_smoker_active = table.copy(override)
-
-override_smoker_active.tiles = {
-   "smoker_top.png"..tube_entry,
-   "smoker_bottom.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   "smoker_side.png"..tube_entry,
-   {
-      name = "smoker_front_on.png",
-      animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48 }
-   },
-}
-
-override_smoker_active.groups = smoker_groups_active
-
-override_smoker_active.tube = {
-   insert_object = function(pos,node,stack,direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      local timer = minetest.get_node_timer(pos)
-      if not timer:is_started() then
-	 timer:start(1.0)
-      end
-      if direction.y == 1 then
-	 return inv:add_item("fuel", stack)
-      else
-	 return inv:add_item("src", stack)
-      end
-   end,
-   can_insert = function(pos, node, stack, direction)
-      local meta = minetest.get_meta(pos)
-      local inv = meta:get_inventory()
-      if direction.y == 1 then
-	 return inv:room_for_item("fuel", stack)
-      else
-	 return inv:room_for_item("src", stack)
-      end
-   end,
-   input_inventory = "dst",
-   connect_sides = {left = 1, right = 1, back = 1, bottom = 1, top = 1}
-}
-
-
--- override
-minetest.override_item("mcl_furnaces:furnace", override)
-minetest.override_item("mcl_furnaces:furnace_active", override_active)
-
-minetest.override_item("mcl_blast_furnace:blast_furnace", override_blast_furnace)
-minetest.override_item("mcl_blast_furnace:blast_furnace_active", override_blast_active)
-
-minetest.override_item("mcl_smoker:smoker", override_smoker)
-minetest.override_item("mcl_smoker:smoker_active", override_smoker_active)

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 = basic_materials, xcompat
-optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen, sound_api, i3, hades_core, hades_furnaces, hades_chests, mcl_mapgen_core, mcl_barrels, mcl_furnaces, mcl_experience
-min_minetest_version = 5.5.0
+depends = default, basic_materials, screwdriver
+optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory
+min_minetest_version = 5.2.0

pipes.lua

@@ -37,11 +37,11 @@ for index, connects in ipairs(cconnects) do
 	end
 	--]]
 
-	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
 	local pipedesc = S("Pipe Segment").." "..dump(connects)
 
 	if #connects == 0 then
-		pgroups = {snappy = 3, tube = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+		pgroups = {snappy = 3, tube = 1}
 		pipedesc = S("Pipe Segment")
 	end
 
@@ -76,11 +76,7 @@ for index, connects in ipairs(cconnects) do
 			fixed = outsel
 		},
 		groups = pgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
@@ -95,7 +91,7 @@ for index, connects in ipairs(cconnects) do
 		pipenumber = index
 	})
 
-	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+	local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
 
 	minetest.register_node("pipeworks:pipe_"..index.."_loaded", {
 		description = pipedesc,
@@ -114,11 +110,7 @@ for index, connects in ipairs(cconnects) do
 			fixed = outsel
 		},
 		groups = pgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_metal_defaults",
-		},
+		sounds = default.node_sound_metal_defaults(),
 		walkable = true,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
@@ -153,7 +145,6 @@ if REGISTER_COMPATIBILITY then
 		paramtype = "light",
 		description = S("Pipe Segment (legacy)"),
 		groups = {not_in_creative_inventory = 1, pipe_to_update = 1},
-		is_ground_content = false,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
 			pipeworks.scan_for_pipe_objects(pos)
@@ -166,7 +157,6 @@ if REGISTER_COMPATIBILITY then
 		sunlight_propagates = true,
 		paramtype = "light",
 		groups = {not_in_creative_inventory = 1, pipe_to_update = 1},
-		is_ground_content = false,
 		drop = "pipeworks:pipe_1_empty",
 		after_place_node = function(pos)
 			pipeworks.scan_for_pipe_objects(pos)

pressure_logic/abms.lua

@@ -42,7 +42,7 @@ local check_for_liquids_v2 = function(pos, limit)
 	for _, tpos in ipairs(coords) do
 		if total >= limit then break end
 		local name = minetest.get_node(tpos).name
-		if name == pipeworks.liquids.water.source then
+		if name == "default:water_source" then
 			minetest.remove_node(tpos)
 			total = total + 1
 		end
@@ -247,9 +247,9 @@ flowlogic.helpers.make_neighbour_output_fixed = function(neighbours)
 			-- in non-finite mode, pressure has to be sustained to keep the sources there.
 			-- so in non-finite mode, placing water is dependent on the target node;
 			-- draining pressure is not.
-			local canplace = (name == "air") or (name == pipeworks.liquids.water.flowing)
+			local canplace = (name == "air") or (name == "default:water_flowing")
 			if canplace then
-				minetest.swap_node(npos, {name=pipeworks.liquids.water.source})
+				minetest.swap_node(npos, {name="default:water_source"})
 			end
 			if (not finitemode) or canplace then
 				taken = taken + 1
@@ -268,7 +268,7 @@ flowlogic.helpers.make_neighbour_cleanup_fixed = function(neighbours)
 		for _, offset in pairs(neighbours) do
 			local npos = vector.add(pos, offset)
 			local name = minetest.get_node(npos).name
-			if (name == pipeworks.liquids.water.source) then
+			if (name == "default:water_source") then
 				--pipeworks.logger("neighbour_cleanup_fixed removing "..formatvec(npos))
 				minetest.remove_node(npos)
 			end
@@ -353,7 +353,7 @@ end
 flowlogic.run_transition_post = function(pos, node)
 	local mesecons_def = minetest.registered_nodes[node.name].mesecons
 	local mesecons_rules = pipeworks.flowables.transitions.mesecons[node.name]
-	if minetest.get_modpath("mesecons") and (mesecons_def ~= nil) and mesecons_rules then
+	if minetest.global_exists("mesecon") and (mesecons_def ~= nil) and mesecons_rules then
 		if type(mesecons_def) ~= "table" then
 			pipeworks.logger("flowlogic.run_transition_post() BUG mesecons def for "..node.name.."not a table: got "..tostring(mesecons_def))
 		else

routing_tubes.lua

@@ -50,7 +50,6 @@ pipeworks.register_tube("pipeworks:broken_tube", {
 	node_def = {
 		drop = "pipeworks:tube_1",
 		groups = {not_in_creative_inventory = 1, tubedevice_receiver = 1},
-		is_ground_content = false,
 		tube = {
 			insert_object = function(pos, node, stack, direction)
 				minetest.item_drop(stack, nil, pos)
@@ -65,50 +64,29 @@ pipeworks.register_tube("pipeworks:broken_tube", {
 			local itemstack = puncher:get_wielded_item()
 			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 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.")
+				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.")
+					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.")
+					pipeworks.logger(log_msg.."            with "..wieldname.." but that tool is too weak.")
 				end
 				return
 			end
-			log_msg = log_msg.."with "..wieldname.." to repair it"
-			local nodedef = minetest.registered_nodes[was_node.name]
-			if nodedef then
-				pipeworks.logger(log_msg..".")
-				if nodedef.tube and nodedef.tube.on_repair then
-					nodedef.tube.on_repair(pos, was_node)
-				else
-					minetest.swap_node(pos, { name = was_node.name, param2 = was_node.param2 })
-					pipeworks.scan_for_tube_objects(pos)
-				end
-				meta:set_string("the_tube_was", "")
-			else
-				pipeworks.logger(log_msg.." but original node "..was_node.name.." is not registered anymore.")
-				minetest.chat_send_player(playername, S("This tube cannot be repaired."))
-			end
-		end,
-		allow_metadata_inventory_put = function()
-			return 0
-		end,
-		allow_metadata_inventory_move = function()
-			return 0
-		end,
-		allow_metadata_inventory_take = function()
-			return 0
-		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
 	}
 })
 
@@ -128,6 +106,14 @@ if pipeworks.enable_priority_tube then
 				tube = { priority = 150 } -- higher than tubedevices (100)
 			},
 	})
+	minetest.register_craft( {
+		output = "pipeworks:priority_tube_1 6",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ "default:gold_ingot", "", "default:gold_ingot" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
 end
 
 if pipeworks.enable_accelerator_tube then
@@ -145,6 +131,14 @@ if pipeworks.enable_accelerator_tube then
 					end}
 			},
 	})
+	minetest.register_craft( {
+		output = "pipeworks:accelerator_tube_1 2",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
 end
 
 if pipeworks.enable_crossing_tube then
@@ -159,32 +153,28 @@ if pipeworks.enable_crossing_tube then
 				tube = {can_go = function(pos, node, velocity, stack) return {velocity} end }
 			},
 	})
+	minetest.register_craft( {
+		output = "pipeworks:crossing_tube_1 5",
+		recipe = {
+			{ "", "pipeworks:tube_1", "" },
+			{ "pipeworks:tube_1", "pipeworks:tube_1", "pipeworks:tube_1" },
+			{ "", "pipeworks:tube_1", "" }
+		},
+	})
 end
 
-local texture_alpha_mode = minetest.features.use_texture_alpha_string_modes
-	and "clip" or true
-
 if pipeworks.enable_one_way_tube then
-	local tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png",
-		"pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"}
-	for i, tile in ipairs(tiles) do
-		tiles[i] = pipeworks.make_tube_tile(tile)
-	end
 	minetest.register_node("pipeworks:one_way_tube", {
 		description = S("One way tube"),
-		tiles = tiles,
-		use_texture_alpha = texture_alpha_mode,
+		tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png",
+			"pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"},
 		paramtype2 = "facedir",
 		drawtype = "nodebox",
 		paramtype = "light",
 		node_box = {type = "fixed",
 			fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}},
-		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1, axey=1, handy=1, pickaxey=1},
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_wood_defaults",
-		},
+		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1},
+		sounds = default.node_sound_wood_defaults(),
 		tube = {
 			connect_sides = {left = 1, right = 1},
 			can_go = function(pos, node, velocity, stack)
@@ -203,4 +193,12 @@ if pipeworks.enable_one_way_tube then
 		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 = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
 end

settingtypes.txt

@@ -75,15 +75,3 @@ pipeworks_drop_on_routing_fail (Drop On Routing Fail) bool false
 
 #Delete item on clearobject.
 pipeworks_delete_item_on_clearobject (Delete Item On Clearobject) bool true
-
-#Use real visible entities in tubes within active areas.
-#When disabled, tubes are made opaque.
-pipeworks_use_real_entities (Use Real Entities) bool true
-
-#Target interval between tube entity steps.
-#A high value may cause issues with tube entity visuals.
-#A value 0.2 or above may cause issues with accelerator tubes.
-pipeworks_entity_update_interval (Entity Update Interval) float 0 0 0.8
-
-# if set to true, items passing through teleport tubes will log log where they came from and where they went.
-pipeworks_log_teleport_tubes (Log Teleport Tubes) bool false

signal_tubes.lua

@@ -11,8 +11,8 @@ local function after_break(pos)
 	end
 end
 
-if minetest.get_modpath("mesecons") and pipeworks.enable_detector_tube then
-	local detector_tube_step = 5 * (tonumber(minetest.settings:get("dedicated_server_step")) or 0.09)
+if pipeworks.enable_detector_tube then
+	local detector_tube_step = 5 * tonumber(minetest.settings:get("dedicated_server_step"))
 	pipeworks.register_tube("pipeworks:detector_tube_on", {
 			description = S("Detecting Pneumatic Tube Segment on"),
 			inventory_image = "pipeworks_detector_tube_inv.png",
@@ -137,7 +137,7 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then
 	})
 end
 
-if minetest.get_modpath("mesecons") and pipeworks.enable_conductor_tube then
+if pipeworks.enable_conductor_tube then
 	pipeworks.register_tube("pipeworks:conductor_tube_off", {
 			description = S("Conducting Pneumatic Tube Segment"),
 			inventory_image = "pipeworks_conductor_tube_inv.png",

sorting_tubes.lua

@@ -16,43 +16,29 @@ if pipeworks.enable_mese_tube then
 		local buttons_formspec = ""
 		for i = 0, 5 do
 			buttons_formspec = buttons_formspec .. fs_helpers.cycling_button(meta,
-				"image_button[9,"..(i+(i*0.25)+0.5)..";1,0.6", "l"..(i+1).."s",
+				"image_button[7,"..(i+0.2)..";1,0.6", "l"..(i+1).."s",
 				{
 					pipeworks.button_off,
 					pipeworks.button_on
 				}
 			)
 		end
-		local list_backgrounds = ""
-		if minetest.get_modpath("i3") or minetest.get_modpath("mcl_formspec") then
-			list_backgrounds = "style_type[box;colors=#666]"
-			for i=0, 5 do
-				for j=0, 5 do
-					list_backgrounds = list_backgrounds .. "box[".. 1.5+(i*1.25) ..",".. 0.25+(j*1.25) ..";1,1;]"
-				end
-			end
-		end
-		local size = "10.2,13"
 		meta:set_string("formspec",
-			"formspec_version[2]"..
-			"size["..size.."]"..
-			pipeworks.fs_helpers.get_prepends(size)..
-			"list[context;line1;1.5,0.25;6,1;]"..
-			"list[context;line2;1.5,1.50;6,1;]"..
-			"list[context;line3;1.5,2.75;6,1;]"..
-			"list[context;line4;1.5,4.00;6,1;]"..
-			"list[context;line5;1.5,5.25;6,1;]"..
-			"list[context;line6;1.5,6.50;6,1;]"..
-			list_backgrounds..
-			"image[0.22,0.25;1,1;pipeworks_white.png]"..
-			"image[0.22,1.50;1,1;pipeworks_black.png]"..
-			"image[0.22,2.75;1,1;pipeworks_green.png]"..
-			"image[0.22,4.00;1,1;pipeworks_yellow.png]"..
-			"image[0.22,5.25;1,1;pipeworks_blue.png]"..
-			"image[0.22,6.50;1,1;pipeworks_red.png]"..
+			"size[8,11]"..
+			"list[context;line1;1,0;6,1;]"..
+			"list[context;line2;1,1;6,1;]"..
+			"list[context;line3;1,2;6,1;]"..
+			"list[context;line4;1,3;6,1;]"..
+			"list[context;line5;1,4;6,1;]"..
+			"list[context;line6;1,5;6,1;]"..
+			"image[0,0;1,1;pipeworks_white.png]"..
+			"image[0,1;1,1;pipeworks_black.png]"..
+			"image[0,2;1,1;pipeworks_green.png]"..
+			"image[0,3;1,1;pipeworks_yellow.png]"..
+			"image[0,4;1,1;pipeworks_blue.png]"..
+			"image[0,5;1,1;pipeworks_red.png]"..
 			buttons_formspec..
-			--"list[current_player;main;0,8;8,4;]" ..
-			pipeworks.fs_helpers.get_inv(8)..
+			"list[current_player;main;0,7;8,4;]" ..
 			"listring[current_player;main]" ..
 			"listring[current_player;main]" ..
 			"listring[context;line1]" ..
@@ -177,4 +163,25 @@ if pipeworks.enable_mese_tube then
 				end,
 			},
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:mese_tube_000000 2",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ "", "default:mese_crystal", "" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_tube_000000",
+		recipe = {
+			"pipeworks:tube_1",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment"
+		},
+	})
 end

teleport_tube.lua

@@ -0,0 +1,291 @@
+local S = minetest.get_translator("pipeworks")
+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
+
+local function save_tube_db()
+	local file, err = io.open(filename, "w")
+	if file then
+		tp_tube_db.version = tp_tube_db_version
+		file:write(minetest.serialize(tp_tube_db))
+		tp_tube_db.version = nil
+		io.close(file)
+	else
+		error(err)
+	end
+	-- reset tp-tube cache
+	cache = {}
+end
+
+local function migrate_tube_db()
+		local tmp_db = {}
+		tp_tube_db.version = nil
+		for _, val in pairs(tp_tube_db) do
+			if(val.channel ~= "") then -- skip unconfigured tubes
+				tmp_db[hash(val)] = val
+			end
+		end
+		tp_tube_db = tmp_db
+		save_tube_db()
+end
+
+local function read_tube_db()
+	local file = io.open(filename, "r")
+	if file ~= nil then
+		local file_content = file:read("*all")
+		io.close(file)
+
+		if file_content and file_content ~= "" then
+			tp_tube_db = minetest.deserialize(file_content)
+			if(not tp_tube_db.version or tonumber(tp_tube_db.version) < tp_tube_db_version) then
+				migrate_tube_db()
+			end
+			tp_tube_db.version = nil -- we add it back when saving
+			return tp_tube_db -- we read sucessfully
+		end
+	end
+	tp_tube_db = {}
+	return tp_tube_db
+end
+
+-- debug formatter for coordinates used below
+local fmt = function(pos)
+	return pos.x..", "..pos.y..", "..pos.z
+end
+
+-- updates or adds a tube
+local function set_tube(pos, channel, can_receive)
+	local tubes = tp_tube_db or read_tube_db()
+	local hash = hash(pos)
+	local tube = tubes[hash]
+	if tube then
+		tube.channel = channel
+		tube.cr = can_receive
+		save_tube_db()
+		return
+	end
+
+	-- we haven't found any tp tube to update, so lets add it
+	-- but sanity check that the hash has not already been inserted.
+	-- if so, complain very loudly and refuse the update so the player knows something is amiss.
+	-- to catch regressions of https://github.com/minetest-mods/pipeworks/issues/166
+	local existing = tp_tube_db[hash]
+	if  existing ~= nil then
+		local e = "error"
+		minetest.log(e, "pipeworks teleport tube update refused due to position hash collision")
+		minetest.log(e, "collided hash: "..hash)
+		minetest.log(e, "tried-to-place tube: "..fmt(pos))
+		minetest.log(e, "existing tube: "..fmt(existing))
+		return
+	end
+
+	tp_tube_db[hash] = {x=pos.x,y=pos.y,z=pos.z,channel=channel,cr=can_receive}
+	save_tube_db()
+end
+
+local function remove_tube(pos)
+	local tubes = tp_tube_db or read_tube_db()
+	tubes[hash(pos)] = nil
+	save_tube_db()
+end
+
+local function read_node_with_vm(pos)
+	local vm = VoxelManip()
+	local MinEdge, MaxEdge = vm:read_from_map(pos, pos)
+	local data = vm:get_data()
+	local area = VoxelArea:new({MinEdge = MinEdge, MaxEdge = MaxEdge})
+	return minetest.get_name_from_content_id(data[area:index(pos.x, pos.y, pos.z)])
+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
+	for key, val in pairs(tubes) do
+		-- skip all non-receivers and the tube that it came from as early as possible, as this is called often
+		if (val.cr == 1 and val.channel == channel and (val.x ~= pos.x or val.y ~= pos.y or val.z ~= pos.z)) then
+			local is_loaded = (minetest.get_node_or_nil(val) ~= nil)
+			local node_name = is_loaded and minetest.get_node(pos).name or read_node_with_vm(val)
+
+			if minetest.registered_nodes[node_name] and minetest.registered_nodes[node_name].is_teleport_tube then
+				table.insert(receivers, val)
+			else
+				tp_tube_db[key] = nil
+				dirty = true
+			end
+		end
+	end
+	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"
+	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
+
+pipeworks.register_tube("pipeworks:teleport_tube", {
+	description = S("Teleporting Pneumatic Tube Segment"),
+	inventory_image = "pipeworks_teleport_tube_inv.png",
+	noctr = { "pipeworks_teleport_tube_noctr.png" },
+	plain = { "pipeworks_teleport_tube_plain.png" },
+	ends = { "pipeworks_teleport_tube_end.png" },
+	short = "pipeworks_teleport_tube_short.png",
+	node_def = {
+		is_teleport_tube = true,
+		tube = {
+			can_go = function(pos,node,velocity,stack)
+				velocity.x = 0
+				velocity.y = 0
+				velocity.z = 0
+
+				local channel = minetest.get_meta(pos):get_string("channel")
+				if channel == "" then return {} end
+
+				local target = get_receivers(pos, channel)
+				if target[1] == nil then return {} end
+
+				local d = math.random(1,#target)
+				pos.x = target[d].x
+				pos.y = target[d].y
+				pos.z = target[d].z
+				return pipeworks.meseadjlist
+			end
+		},
+		on_construct = function(pos)
+			local meta = minetest.get_meta(pos)
+			update_meta(meta, true)
+			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
+			local new_channel = tostring(fields.channel):trim()
+
+			local meta = minetest.get_meta(pos)
+			local can_receive = meta:get_int("can_receive")
+
+			-- check for private channels each time before actually changing anything
+			-- to not even allow switching between can_receive states of private channels
+			if new_channel ~= "" then
+				local sender_name = sender:get_player_name()
+				local name, mode = new_channel:match("^([^:;]+)([:;])")
+				if name and mode and name ~= sender_name then
+					--channels starting with '[name]:' can only be used by the named player
+					if mode == ":" then
+						minetest.chat_send_player(sender_name, 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",
+							new_channel, name))
+						return
+					end
+				end
+			end
+
+			local dirty = false
+
+			-- 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
+				channel = new_channel
+				meta:set_string("channel", channel)
+				dirty = true
+			end
+
+			-- test if a can_receive button was pressed
+			if fields.cr0 and can_receive ~= 0 then
+				can_receive = 0
+				update_meta(meta, false)
+				dirty = true
+			elseif fields.cr1 and can_receive ~= 1 then
+				can_receive = 1
+				update_meta(meta, true)
+				dirty = true
+			end
+
+			-- save if we changed something, handle the empty channel while we're at it
+			if dirty then
+				if channel ~= "" then
+					set_tube(pos, channel, can_receive)
+					local cr_description = (can_receive == 1) and "sending and receiving" or "sending"
+					meta:set_string("infotext", S("Teleportation Tube @1 on '@2'", cr_description, channel))
+				else
+					-- remove empty channel tubes, to not have to search through them
+					remove_tube(pos)
+					meta:set_string("infotext", S("Unconfigured Teleportation Tube"))
+				end
+			end
+		end,
+		on_destruct = function(pos)
+			remove_tube(pos)
+		end
+	},
+})
+minetest.register_craft( {
+	output = "pipeworks:teleport_tube_1 2",
+	recipe = {
+	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+	        { "default:desert_stone", "default:mese", "default:desert_stone" },
+	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+	},
+})
+
+if minetest.get_modpath("mesecons_mvps") ~= nil then
+	mesecon.register_on_mvps_move(function(moved_nodes)
+		for _, n in ipairs(moved_nodes) do
+			if string.find(n.node.name, "pipeworks:teleport_tube") ~= nil then
+				local meta = minetest.get_meta(n.pos)
+				set_tube(n.pos, meta:get_string("channel"), meta:get_int("can_receive"))
+			end
+		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

@@ -10,9 +10,7 @@ minetest.register_node("pipeworks:trashcan", {
 		"pipeworks_trashcan_side.png",
 		"pipeworks_trashcan_side.png",
 	},
-	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
+	groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1},
 	tube = {
 		insert_object = function(pos, node, stack, direction)
 			return ItemStack("")
@@ -22,24 +20,17 @@ minetest.register_node("pipeworks:trashcan", {
 	},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		local size = "10.2,9"
-		local list_background = ""
-		if minetest.get_modpath("i3") or minetest.get_modpath("mcl_formspec") then
-			list_background = "style_type[box;colors=#666]box[4.5,2;1,1;]"
-		end
 		meta:set_string("formspec",
-			"formspec_version[2]" ..
-			"size["..size.."]"..
-			pipeworks.fs_helpers.get_prepends(size) ..
-			"item_image[0.5,0.5;1,1;pipeworks:trashcan]"..
-			"label[1.5,1;"..S("Trash Can").."]"..
-			list_background..
-			"list[context;trash;4.5,2;1,1;]"..
-			--"list[current_player;main;0,3;8,4;]" ..
-			pipeworks.fs_helpers.get_inv(4)..
-			"listring[context;trash]"..
-			"listring[current_player;main]"
-		)
+				"size[8,7]"..
+				"item_image[0,0;1,1;pipeworks:trashcan]"..
+				"label[1,0;"..S("Trash Can").."]"..
+				"list[context;trash;3.5,1;1,1;]"..
+				default.gui_bg..
+				default.gui_bg_img..
+				default.gui_slots..
+				default.get_hotbar_bg(0,3) ..
+				"list[current_player;main;0,3;8,4;]" ..
+				"listring[]")
 		meta:set_string("infotext", S("Trash Can"))
 		meta:get_inventory():set_size("trash", 1)
 	end,
@@ -50,3 +41,12 @@ minetest.register_node("pipeworks:trashcan", {
 	end,
 })
 pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:trashcan"
+
+minetest.register_craft({
+	output = "pipeworks:trashcan",
+	recipe = {
+		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "default:steel_ingot", "", "default:steel_ingot" },
+		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+	},
+})

tube_registration.lua

@@ -61,13 +61,13 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 		outimgs[vti[v]] = ends[v]
 	end
 
-	local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+	local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1}
 	local tubedesc = string.format("%s %s", desc, dump(connects))
 	local iimg = type(plain[1]) == "table" and plain[1].name or plain[1]
 	local wscale = {x = 1, y = 1, z = 1}
 
 	if #connects == 0 then
-		tgroups = {snappy = 3, tube = 1, tubedevice = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}
+		tgroups = {snappy = 3, tube = 1, tubedevice = 1}
 		tubedesc = desc
 		iimg=inv
 		outimgs = {
@@ -80,10 +80,6 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 		wscale = {x = 1, y = 1, z = 0.01}
 	end
 
-	for i, tile in ipairs(outimgs) do
-		outimgs[i] = pipeworks.make_tube_tile(tile)
-	end
-
 	local rname = string.format("%s_%s", name, tname)
 	table.insert(tubenodes, rname)
 
@@ -106,11 +102,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
 			fixed = outboxes
 		},
 		groups = tgroups,
-		is_ground_content = false,
-		_mcl_hardness=0.8,
-		_sound_def = {
-			key = "node_sound_wood_defaults",
-		},
+		sounds = default.node_sound_wood_defaults(),
 		walkable = true,
 		stack_max = 99,
 		basename = name,
@@ -228,7 +220,6 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
 				description = S("Pneumatic tube segment (legacy)"),
 				after_place_node = pipeworks.after_place,
 				groups = {not_in_creative_inventory = 1, tube_to_update = 1, tube = 1},
-				is_ground_content = false,
 				tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}},
 				drop = name.."_1",
 			})

tubes/embedded_tube.lua

@@ -1,69 +0,0 @@
-local materials = xcompat.materials
-local S = minetest.get_translator("pipeworks")
-
-local straight = function(pos, node, velocity, stack) return {velocity} end
-local steel_tex = "[combine:16x16^[noalpha^[colorize:#D3D3D3"
-if minetest.get_modpath("default") then steel_tex = "default_steel_block.png" end
-
--- register an embedded tube
-function pipeworks.register_embedded_tube(nodename, opts)
-	minetest.register_node(nodename, {
-		description = opts.description,
-		tiles = {
-			opts.base_texture,
-			opts.base_texture,
-			opts.base_texture,
-			opts.base_texture,
-			opts.base_texture .. "^pipeworks_tube_connection_metallic.png",
-			opts.base_texture .. "^pipeworks_tube_connection_metallic.png",
-		},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {
-			cracky = 1,
-			oddly_breakable_by_hand = 1,
-			tubedevice = 1,
-			dig_glass = 2,
-			pickaxey=1,
-			handy=1
-		},
-		is_ground_content = false,
-		_mcl_hardness = 0.8,
-		legacy_facedir_simple = true,
-		_sound_def = {
-			key = "node_sound_stone_defaults",
-		},
-		tube = {
-			connect_sides = {
-				front = 1,
-				back = 1
-			},
-			priority = 50,
-			can_go = straight,
-			can_insert = function(pos, node, stack, direction)
-				local dir = minetest.facedir_to_dir(node.param2)
-				return vector.equals(dir, direction) or vector.equals(vector.multiply(dir, -1), direction)
-			end
-		},
-		after_place_node = pipeworks.after_place,
-		after_dig_node = pipeworks.after_dig,
-		on_rotate = pipeworks.on_rotate,
-	})
-
-	minetest.register_craft( {
-		output = nodename .. " 1",
-		recipe = {
-			{ opts.base_ingredient, opts.base_ingredient, opts.base_ingredient },
-			{ opts.base_ingredient, "pipeworks:tube_1", opts.base_ingredient },
-			{ opts.base_ingredient, opts.base_ingredient, opts.base_ingredient }
-		},
-	})
-	pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = nodename
-end
-
--- steelblock embedded tube
-pipeworks.register_embedded_tube("pipeworks:steel_block_embedded_tube", {
-	description = S("Airtight steelblock embedded tube"),
-	base_texture = steel_tex,
-	base_ingredient = materials.steel_ingot
-})

tubes/pane_embedded_tube.lua

@@ -1,53 +0,0 @@
-local S = minetest.get_translator("pipeworks")
-
-local straight = function(pos, node, velocity, stack) return {velocity} end
-
-local pane_box = {
-	type = "fixed",
-	fixed = {
-		{ -9/64, -9/64, -8/16, 9/64, 9/64, 8/16 }, -- tube
-		{ -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"),
-	tiles = {
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_sides.png^[transformR90"),
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_sides.png^[transformR90"),
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_sides.png"),
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_sides.png"),
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_ends.png"),
-		pipeworks.make_tube_tile("pipeworks_pane_embedded_tube_ends.png"),
-	},
-	use_texture_alpha = texture_alpha_mode,
-	node_box = pane_box,
-	selection_box = pane_box,
-	collision_box = pane_box,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2, pickaxey=1, handy=1},
-	is_ground_content = false,
-	_mcl_hardness=0.8,
-	legacy_facedir_simple = true,
-	_sound_def = {
-		key = "node_sound_stone_defaults",
-	},
-	tube = {
-		connect_sides = {front = 1, back = 1,},
-		priority = 50,
-		can_go = straight,
-		can_insert = function(pos, node, stack, direction)
-			local dir = minetest.facedir_to_dir(node.param2)
-			return vector.equals(dir, direction) or vector.equals(vector.multiply(dir, -1), direction)
-		end,
-	},
-	after_place_node = pipeworks.after_place,
-	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"

tubes/tags.lua

@@ -1,139 +0,0 @@
-local S = minetest.get_translator("pipeworks")
-local fs_helpers = pipeworks.fs_helpers
-
-if not pipeworks.enable_item_tags or not pipeworks.enable_tag_tube then return end
-
-local help_text = minetest.formspec_escape(
-	S("Separate multiple tags using commas.").."\n"..
-	S("Use \"<none>\" to match items without tags.")
-)
-
-local update_formspec = function(pos)
-	local meta = minetest.get_meta(pos)
-	local buttons_formspec = ""
-	for i = 0, 5 do
-		buttons_formspec = buttons_formspec .. fs_helpers.cycling_button(meta,
-			"image_button[9," .. (i + (i * 0.25) + 0.5) .. ";1,0.6", "l" .. (i + 1) .. "s",
-			{
-				pipeworks.button_off,
-				pipeworks.button_on
-			}
-		)
-	end
-	local size = "10.2,9"
-	meta:set_string("formspec",
-		"formspec_version[2]" ..
-		"size[" .. size .. "]" ..
-		pipeworks.fs_helpers.get_prepends(size) ..
-		"field[1.5,0.25;7.25,1;tags1;;${tags1}]" ..
-		"field[1.5,1.5;7.25,1;tags2;;${tags2}]" ..
-		"field[1.5,2.75;7.25,1;tags3;;${tags3}]" ..
-		"field[1.5,4.0;7.25,1;tags4;;${tags4}]" ..
-		"field[1.5,5.25;7.25,1;tags5;;${tags5}]" ..
-		"field[1.5,6.5;7.25,1;tags6;;${tags6}]" ..
-
-		"image[0.22,0.25;1,1;pipeworks_white.png]" ..
-		"image[0.22,1.50;1,1;pipeworks_black.png]" ..
-		"image[0.22,2.75;1,1;pipeworks_green.png]" ..
-		"image[0.22,4.00;1,1;pipeworks_yellow.png]" ..
-		"image[0.22,5.25;1,1;pipeworks_blue.png]" ..
-		"image[0.22,6.50;1,1;pipeworks_red.png]" ..
-		buttons_formspec ..
-		"label[0.22,7.9;"..help_text.."]"..
-		"button[7.25,7.8;1.5,0.8;set_item_tags;" .. S("Set") .. "]"
-	)
-end
-
-pipeworks.register_tube("pipeworks:tag_tube", {
-	description = S("Tag Sorting Pneumatic Tube Segment"),
-	inventory_image = "pipeworks_tag_tube_inv.png",
-	noctr = { "pipeworks_tag_tube_noctr_1.png", "pipeworks_tag_tube_noctr_2.png", "pipeworks_tag_tube_noctr_3.png",
-		"pipeworks_tag_tube_noctr_4.png", "pipeworks_tag_tube_noctr_5.png", "pipeworks_tag_tube_noctr_6.png" },
-	plain = { "pipeworks_tag_tube_plain_1.png", "pipeworks_tag_tube_plain_2.png", "pipeworks_tag_tube_plain_3.png",
-		"pipeworks_tag_tube_plain_4.png", "pipeworks_tag_tube_plain_5.png", "pipeworks_tag_tube_plain_6.png" },
-	ends = { "pipeworks_tag_tube_end.png" },
-	short = "pipeworks_tag_tube_short.png",
-	no_facedir = true, -- Must use old tubes, since the textures are rotated with 6d ones
-	node_def = {
-		tube = {
-			can_go = function(pos, node, velocity, stack, tags)
-				local tbl, tbln = {}, 0
-				local found, foundn = {}, 0
-				local meta = minetest.get_meta(pos)
-				local tag_hash = {}
-				if #tags > 0 then
-					for _,tag in ipairs(tags) do
-						tag_hash[tag] = true
-					end
-				else
-					tag_hash["<none>"] = true  -- Matches items without tags
-				end
-				for i, vect in ipairs(pipeworks.meseadjlist) do
-					local npos = vector.add(pos, vect)
-					local node = minetest.get_node(npos)
-					local reg_node = minetest.registered_nodes[node.name]
-					if meta:get_int("l" .. i .. "s") == 1 and reg_node then
-						local tube_def = reg_node.tube
-						if not tube_def or not tube_def.can_insert or
-							tube_def.can_insert(npos, node, stack, vect) then
-							local side_tags = meta:get_string("tags" .. i)
-							if side_tags ~= "" then
-								side_tags = pipeworks.sanitize_tags(side_tags)
-								for _,tag in ipairs(side_tags) do
-									if tag_hash[tag] then
-										foundn = foundn + 1
-										found[foundn] = vect
-										break
-									end
-								end
-							else
-								tbln = tbln + 1
-								tbl[tbln] = vect
-							end
-						end
-					end
-				end
-				return (foundn > 0) and found or tbl
-			end
-		},
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			for i = 1, 6 do
-				meta:set_int("l" .. tostring(i) .. "s", 1)
-			end
-			update_formspec(pos)
-			meta:set_string("infotext", S("Tag 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_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
-
-			local meta = minetest.get_meta(pos)
-			for i = 1, 6 do
-				local field_name = "tags" .. tostring(i)
-				if fields[field_name] then
-					local tags = pipeworks.sanitize_tags(fields[field_name])
-					meta:set_string(field_name, table.concat(tags, ","))
-				end
-			end
-
-			fs_helpers.on_receive_fields(pos, fields)
-			update_formspec(pos)
-		end,
-		can_dig = function(pos, player)
-			return true
-		end,
-	},
-})

tubes/teleport.lua

@@ -1,374 +0,0 @@
-
-local S = minetest.get_translator("pipeworks")
-local filename = minetest.get_worldpath().."/teleport_tubes"  -- Only used for backward-compat
-local storage = minetest.get_mod_storage()
-
-local enable_logging = minetest.settings:get_bool("pipeworks_log_teleport_tubes", false)
-
-local has_digilines = minetest.get_modpath("digilines")
-
--- V1: Serialized text file indexed by vector position.
--- V2: Serialized text file indexed by hash position.
--- V3: Mod storage using serialized tables.
--- V4: Mod storage using "<can_receive>:<channel>" format.
-local tube_db_version = 4
-local tube_db = {}
-local receiver_cache = {}
-
-local function hash_pos(pos)
-	vector.round(pos)
-	return string.format("%.0f", minetest.hash_node_position(pos))
-end
-
-local function serialize_tube(tube)
-	return string.format("%d:%s", tube.cr, tube.channel)
-end
-
-local function deserialize_tube(hash, str)
-	local sep = str:sub(2, 2) == ":"
-	local cr = tonumber(str:sub(1, 1))
-	local channel = str:sub(3)
-	if sep and cr and channel then
-		local pos = minetest.get_position_from_hash(tonumber(hash))
-		return {x = pos.x, y = pos.y, z = pos.z, cr = cr, channel = channel}
-	end
-end
-
-local function save_tube_db()
-	receiver_cache = {}
-	local fields = {version = tube_db_version}
-	for key, val in pairs(tube_db) do
-		fields[key] = serialize_tube(val)
-	end
-	storage:from_table({fields = fields})
-end
-
-local function save_tube(hash)
-	local tube = tube_db[hash]
-	receiver_cache[tube.channel] = nil
-	storage:set_string(hash, serialize_tube(tube))
-end
-
-local function remove_tube(pos)
-	local hash = hash_pos(pos)
-	if tube_db[hash] then
-		receiver_cache[tube_db[hash].channel] = nil
-		tube_db[hash] = nil
-		storage:set_string(hash, "")
-	end
-end
-
-local function migrate_tube_db()
-	if storage:get_int("version") == 3 then
-		for key, val in pairs(storage:to_table().fields) do
-			if tonumber(key) then
-				tube_db[key] = minetest.deserialize(val)
-			elseif key ~= "version" then
-				error("Unknown field in teleport tube database: "..key)
-			end
-		end
-		save_tube_db()
-		return
-	end
-	local file = io.open(filename, "r")
-	if file then
-		local content = file:read("*all")
-		io.close(file)
-		if content and content ~= "" then
-			tube_db = minetest.deserialize(content)
-		end
-	end
-	local version = tube_db.version or 0
-	tube_db.version = nil
-	if version < 2 then
-		local tmp_db = {}
-		for _, val in pairs(tube_db) do
-			if val.channel ~= "" then  -- Skip unconfigured tubes
-				tmp_db[hash_pos(val)] = val
-			end
-		end
-		tube_db = tmp_db
-	end
-	save_tube_db()
-end
-
-local function read_tube_db()
-	local version = storage:get_int("version")
-	if version < tube_db_version then
-		migrate_tube_db()
-	elseif version > tube_db_version then
-		error("Cannot read teleport tube database of version "..version)
-	else
-		for key, val in pairs(storage:to_table().fields) do
-			if tonumber(key) then
-				tube_db[key] = deserialize_tube(key, val)
-			elseif key ~= "version" then
-				error("Unknown field in teleport tube database: "..key)
-			end
-		end
-	end
-	tube_db.version = nil
-end
-
-local function set_tube(pos, channel, cr)
-	local hash = hash_pos(pos)
-	local tube = tube_db[hash]
-	if tube then
-		if tube.channel ~= channel or tube.cr ~= cr then
-			tube.channel = channel
-			tube.cr = cr
-			save_tube(hash)
-		end
-	else
-		tube_db[hash] = {x = pos.x, y = pos.y, z = pos.z, channel = channel, cr = cr}
-		save_tube(hash)
-	end
-end
-
-local function get_receivers(pos, channel)
-	local hash = hash_pos(pos)
-	local cache = receiver_cache[channel] or {}
-	if cache[hash] then
-		return cache[hash]
-	end
-	local receivers = {}
-	for key, val in pairs(tube_db) do
-		if val.cr == 1 and val.channel == channel and not vector.equals(val, pos) then
-			minetest.load_area(val)
-			local node_name = minetest.get_node(val).name
-			if node_name:find("pipeworks:teleport_tube") then
-				table.insert(receivers, val)
-			else
-				remove_tube(val)
-			end
-		end
-	end
-	cache[hash] = receivers
-	receiver_cache[channel] = cache
-	return receivers
-end
-
-local help_text = minetest.formspec_escape(
-	S("Channels are public by default").."\n"..
-	S("Use <player>:<channel> for fully private channels").."\n"..
-	S("Use <player>;<channel> for private receivers")
-)
-
-local size = has_digilines and "8,5.9" or "8,4.4"
-
-local formspec = "formspec_version[2]size["..size.."]"..
-	pipeworks.fs_helpers.get_prepends(size)..
-	"image[0.5,0.3;1,1;pipeworks_teleport_tube_inv.png]"..
-	"label[1.75,0.8;"..S("Teleporting Tube").."]"..
-	"field[0.5,1.7;5,0.8;channel;"..S("Channel")..";${channel}]"..
-	"button_exit[5.5,1.7;2,0.8;save;"..S("Save").."]"..
-	"label[6.5,0.6;"..S("Receive").."]"..
-	"label[0.5,2.8;"..help_text.."]"
-
-if has_digilines then
-	formspec = formspec..
-		"field[0.5,4.6;5,0.8;digiline_channel;"..S("Digiline Channel")..";${digiline_channel}]"..
-		"button_exit[5.5,4.6;2,0.8;save;"..S("Save").."]"
-end
-
-local function update_meta(meta)
-	local channel = meta:get_string("channel")
-	local cr = meta:get_int("can_receive") == 1
-	if channel == "" then
-		meta:set_string("infotext", S("Unconfigured Teleportation Tube"))
-	else
-		local desc = cr and "sending and receiving" or "sending"
-		meta:set_string("infotext", S("Teleportation Tube @1 on '@2'", desc, channel))
-	end
-	local state = cr and "on" or "off"
-	meta:set_string("formspec", formspec..
-		"image_button[6.4,0.8;1,0.6;pipeworks_button_"..state..
-		".png;cr_"..state..";;;false;pipeworks_button_interm.png]")
-end
-
-local function update_tube(pos, channel, cr, player_name)
-	local meta = minetest.get_meta(pos)
-	if meta:get_string("channel") == channel and meta:get_int("can_receive") == cr then
-		return
-	end
-	if channel == "" then
-		meta:set_string("channel", "")
-		meta:set_int("can_receive", cr)
-		remove_tube(pos)
-		return
-	end
-	local name, mode = channel:match("^([^:;]+)([:;])")
-	if name and mode and name ~= player_name then
-		if mode == ":" then
-			minetest.chat_send_player(player_name,
-				S("Sorry, channel '@1' is reserved for exclusive use by @2", channel, name))
-			return
-		elseif mode == ";" and cr ~= 0 then
-			minetest.chat_send_player(player_name,
-				S("Sorry, receiving from channel '@1' is reserved for @2", channel, name))
-			return
-		end
-	end
-	meta:set_string("channel", channel)
-	meta:set_int("can_receive", cr)
-	set_tube(pos, channel, cr)
-end
-
-local function receive_fields(pos, _, fields, sender)
-	if not fields.channel or not pipeworks.may_configure(pos, sender) then
-		return
-	end
-	local meta = minetest.get_meta(pos)
-	local channel = fields.channel:trim()
-	local cr = meta:get_int("can_receive")
-	if fields.cr_on then
-		cr = 0
-	elseif fields.cr_off then
-		cr = 1
-	end
-	if has_digilines and fields.digiline_channel then
-		meta:set_string("digiline_channel", fields.digiline_channel)
-	end
-	update_tube(pos, channel, cr, sender:get_player_name())
-	update_meta(meta)
-end
-
-local function can_go(pos, node, velocity, stack)
-	velocity.x = 0
-	velocity.y = 0
-	velocity.z = 0
-	local src_meta = minetest.get_meta(pos)
-	local channel = src_meta:get_string("channel")
-	if channel == "" then
-		return {}
-	end
-	local receivers = get_receivers(pos, channel)
-	if #receivers == 0 then
-		return {}
-	end
-	local target = receivers[math.random(1, #receivers)]
-	if enable_logging then
-		local src_owner = src_meta:get_string("owner")
-		local dst_meta = minetest.get_meta(pos)
-		local dst_owner = dst_meta:get_string("owner")
-		minetest.log("action", string.format("[pipeworks] %s teleported from %s (owner=%s) to %s (owner=%s) via %s",
-			stack:to_string(), minetest.pos_to_string(pos), src_owner, minetest.pos_to_string(target), dst_owner, channel
-		))
-	end
-	pos.x = target.x
-	pos.y = target.y
-	pos.z = target.z
-	return pipeworks.meseadjlist
-end
-
-local function repair_tube(pos, node)
-	minetest.swap_node(pos, {name = node.name, param2 = node.param2})
-	pipeworks.scan_for_tube_objects(pos)
-	local meta = minetest.get_meta(pos)
-	local channel = meta:get_string("channel")
-	if channel ~= "" then
-		set_tube(pos, channel, meta:get_int("can_receive"))
-	end
-	update_meta(meta)
-end
-
-local function digiline_action(pos, _, digiline_channel, msg)
-	local meta = minetest.get_meta(pos)
-	if digiline_channel ~= meta:get_string("digiline_channel") then
-		return
-	end
-	local channel = meta:get_string("channel")
-	local can_receive = meta:get_int("can_receive")
-	if type(msg) == "string" then
-		channel = msg
-	elseif type(msg) == "table" then
-		if type(msg.channel) == "string" then
-			channel = msg.channel
-		end
-		if msg.can_receive == 1 or msg.can_receive == true then
-			can_receive = 1
-		elseif msg.can_receive == 0 or msg.can_receive == false then
-			can_receive = 0
-		end
-	else
-		return
-	end
-	local player_name = meta:get_string("owner")
-	update_tube(pos, channel, can_receive, player_name)
-	update_meta(meta)
-end
-
-local def = {
-	tube = {
-		can_go = can_go,
-		on_repair = repair_tube,
-	},
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_int("can_receive", 1)  -- Enabled by default
-		update_meta(meta)
-	end,
-	on_receive_fields = receive_fields,
-	on_destruct = remove_tube,
-}
-
-if has_digilines then
-	def.after_place_node = function(pos, placer)
-		-- Set owner for digilines
-		minetest.get_meta(pos):set_string("owner", placer:get_player_name())
-		pipeworks.after_place(pos)
-	end
-	def.digiline = {
-		receptor = {
-			rules = pipeworks.digilines_rules,
-		},
-		effector = {
-			rules = pipeworks.digilines_rules,
-			action = digiline_action,
-		}
-	}
-end
-
-pipeworks.register_tube("pipeworks:teleport_tube", {
-	description = S("Teleporting Pneumatic Tube Segment"),
-	inventory_image = "pipeworks_teleport_tube_inv.png",
-	noctr = { "pipeworks_teleport_tube_noctr.png" },
-	plain = { "pipeworks_teleport_tube_plain.png" },
-	ends = { "pipeworks_teleport_tube_end.png" },
-	short = "pipeworks_teleport_tube_short.png",
-	node_def = def,
-})
-
-if minetest.get_modpath("mesecons_mvps") then
-	-- Update tubes when moved by pistons
-	mesecon.register_on_mvps_move(function(moved_nodes)
-		for _, n in ipairs(moved_nodes) do
-			if n.node.name:find("pipeworks:teleport_tube") then
-				local meta = minetest.get_meta(n.pos)
-				set_tube(n.pos, meta:get_string("channel"), meta:get_int("can_receive"))
-			end
-		end
-	end)
-end
-
--- Expose teleport tube database API for other mods
-pipeworks.tptube = {
-	version = tube_db_version,
-	hash = hash_pos,
-	get_db = function() return tube_db end,
-	save_tube_db = save_tube_db,
-	remove_tube = remove_tube,
-	set_tube = set_tube,
-	save_tube = save_tube,
-	update_tube = update_tube,
-	update_meta = function(meta, cr)
-		-- Legacy behaviour
-		if cr ~= nil then
-			meta:set_int("can_receive", cr and 1 or 0)
-		end
-		update_meta(meta)
-	end,
-}
-
--- Load the database
-read_tube_db()

tubes/vacuum.lua

@@ -1,114 +0,0 @@
-
-local S = minetest.get_translator("pipeworks")
-
-local enable_max = minetest.settings:get_bool("pipeworks_enable_items_per_tube_limit", true)
-local max_items = tonumber(minetest.settings:get("pipeworks_max_items_per_tube")) or 30
-max_items = math.ceil(max_items / 2)  -- Limit vacuuming to half the max limit
-
-local function vacuum(pos, radius)
-	radius = radius + 0.5
-	local min_pos = vector.subtract(pos, radius)
-	local max_pos = vector.add(pos, radius)
-	local count = 0
-	for _, obj in pairs(minetest.get_objects_in_area(min_pos, max_pos)) do
-		local entity = obj:get_luaentity()
-		if entity and entity.name == "__builtin:item" then
-			if entity.itemstring ~= "" then
-				pipeworks.tube_inject_item(pos, pos, vector.new(0, 0, 0), entity.itemstring)
-				entity.itemstring = ""
-				count = count + 1
-			end
-			obj:remove()
-			if enable_max and count >= max_items then
-				return  -- Don't break tube by vacuuming too many items
-			end
-		end
-	end
-end
-
-local function set_timer(pos)
-	local timer = minetest.get_node_timer(pos)
-	-- Randomize timer so not all tubes vacuum at the same time
-	timer:start(math.random(10, 20) * 0.1)
-end
-
-local function repair_tube(pos, was_node)
-	minetest.swap_node(pos, {name = was_node.name, param2 = was_node.param2})
-	pipeworks.scan_for_tube_objects(pos)
-	set_timer(pos)
-end
-
-if pipeworks.enable_sand_tube then
-	pipeworks.register_tube("pipeworks:sand_tube", {
-		description = S("Vacuuming Pneumatic Tube Segment"),
-		inventory_image = "pipeworks_sand_tube_inv.png",
-		short = "pipeworks_sand_tube_short.png",
-		noctr = {"pipeworks_sand_tube_noctr.png"},
-		plain = {"pipeworks_sand_tube_plain.png"},
-		ends = {"pipeworks_sand_tube_end.png"},
-		node_def = {
-			groups = {vacuum_tube = 1},
-			tube = {
-				on_repair = repair_tube,
-			},
-			on_construct = set_timer,
-			on_timer = function(pos, elapsed)
-				vacuum(pos, 2)
-				set_timer(pos)
-			end,
-		},
-	})
-end
-
-if pipeworks.enable_mese_sand_tube then
-	local formspec = "formspec_version[2]size[8,3]"..
-		pipeworks.fs_helpers.get_prepends("8,3")..
-		"image[0.5,0.3;1,1;pipeworks_mese_sand_tube_inv.png]"..
-		"label[1.75,0.8;"..S("Adjustable Vacuuming Tube").."]"..
-		"field[0.5,1.7;5,0.8;dist;"..S("Radius")..";${dist}]"..
-		"button_exit[5.5,1.7;2,0.8;save;"..S("Save").."]"
-
-	pipeworks.register_tube("pipeworks:mese_sand_tube", {
-		description = S("Adjustable Vacuuming Tube"),
-		inventory_image = "pipeworks_mese_sand_tube_inv.png",
-		short = "pipeworks_mese_sand_tube_short.png",
-		noctr = {"pipeworks_mese_sand_tube_noctr.png"},
-		plain = {"pipeworks_mese_sand_tube_plain.png"},
-		ends = {"pipeworks_mese_sand_tube_end.png"},
-		node_def = {
-			groups = {vacuum_tube = 1},
-			tube = {
-				on_repair = repair_tube,
-			},
-			on_construct = function(pos)
-				local meta = minetest.get_meta(pos)
-				meta:set_int("dist", 2)
-				meta:set_string("formspec", formspec)
-				meta:set_string("infotext", S("Adjustable Vacuuming Tube (@1m)", 2))
-				set_timer(pos)
-			end,
-			on_timer = function(pos, elapsed)
-				local radius = minetest.get_meta(pos):get_int("dist")
-				vacuum(pos, radius)
-				set_timer(pos)
-			end,
-			on_receive_fields = function(pos, _, fields, sender)
-				if not fields.dist or not pipeworks.may_configure(pos, sender) then
-					return
-				end
-				local meta = minetest.get_meta(pos)
-				local dist = math.min(math.max(tonumber(fields.dist) or 0, 0), 8)
-				meta:set_int("dist", dist)
-				meta:set_string("infotext", S("Adjustable Vacuuming Tube (@1m)", dist))
-			end,
-		},
-	})
-end
-
-minetest.register_lbm({
-	label = "Vacuum tube node timer starter",
-	name = "pipeworks:vacuum_tube_start",
-	nodenames = {"group:vacuum_tube"},
-	run_at_every_load = false,
-	action = set_timer,
-})

vacuum_tubes.lua

@@ -0,0 +1,128 @@
+local S = minetest.get_translator("pipeworks")
+if pipeworks.enable_sand_tube then
+	pipeworks.register_tube("pipeworks:sand_tube", {
+		description = S("Vacuuming Pneumatic Tube Segment"),
+		inventory_image = "pipeworks_sand_tube_inv.png",
+		short = "pipeworks_sand_tube_short.png",
+		noctr = {"pipeworks_sand_tube_noctr.png"},
+		plain = {"pipeworks_sand_tube_plain.png"},
+		ends  = {"pipeworks_sand_tube_end.png"},
+		node_def = {groups = {vacuum_tube = 1}},
+	})
+
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_1 2",
+		recipe = {
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
+			{"group:sand",                 "group:sand",                 "group:sand"},
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}
+		},
+	})
+
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_1",
+		recipe = {
+			{"group:sand", "pipeworks:tube_1", "group:sand"},
+		},
+	})
+end
+
+if pipeworks.enable_mese_sand_tube then
+	pipeworks.register_tube("pipeworks:mese_sand_tube", {
+			description = S("Adjustable Vacuuming Pneumatic Tube Segment"),
+			inventory_image = "pipeworks_mese_sand_tube_inv.png",
+			short = "pipeworks_mese_sand_tube_short.png",
+			noctr = {"pipeworks_mese_sand_tube_noctr.png"},
+			plain = {"pipeworks_mese_sand_tube_plain.png"},
+			ends  = {"pipeworks_mese_sand_tube_end.png"},
+			node_def = {
+				groups = {vacuum_tube = 1},
+				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("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
+
+					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))
+					end
+				end,
+			},
+	})
+
+	minetest.register_craft( {
+		output = "pipeworks:mese_sand_tube_1 2",
+		recipe = {
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{"group:sand",                 "default:mese_crystal",       "group:sand" },
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_sand_tube_1",
+		recipe = {
+			"pipeworks:sand_tube_1",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment"
+		},
+	})
+end
+
+local function vacuum(pos, radius)
+	radius = radius + 0.5
+	for _, object in pairs(minetest.get_objects_inside_radius(pos, math.sqrt(3) * radius)) do
+		local lua_entity = object:get_luaentity()
+		if not object:is_player() and lua_entity and lua_entity.name == "__builtin:item" then
+			local obj_pos = object:get_pos()
+			local minpos = vector.subtract(pos, radius)
+			local maxpos = vector.add(pos, radius)
+			if  obj_pos.x >= minpos.x and obj_pos.x <= maxpos.x
+			and obj_pos.y >= minpos.y and obj_pos.y <= maxpos.y
+			and obj_pos.z >= minpos.z and obj_pos.z <= maxpos.z then
+				if lua_entity.itemstring ~= "" then
+					pipeworks.tube_inject_item(pos, pos, vector.new(0, 0, 0), lua_entity.itemstring)
+					lua_entity.itemstring = ""
+				end
+				object:remove()
+			end
+		end
+	end
+end
+
+minetest.register_abm({nodenames = {"group:vacuum_tube"},
+	interval = 1,
+	chance = 1,
+	label = "Vacuum tubes",
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		if node.name:find("pipeworks:sand_tube") then
+			vacuum(pos, 2)
+		else
+			local radius = minetest.get_meta(pos):get_int("dist")
+			vacuum(pos, radius)
+		end
+	end
+})

wielder.lua

@@ -6,28 +6,13 @@ local function delay(x)
 end
 
 local function set_wielder_formspec(data, meta)
-	local size = "10.2,"..(7+data.wield_inv_height)
-	local list_background = ""
-	if minetest.get_modpath("i3") or minetest.get_modpath("mcl_formspec") then
-		list_background = "style_type[box;colors=#666]"
-		for i=0, data.wield_inv_height-1 do
-			for j=0, data.wield_inv_width-1 do
-				list_background = list_background .. "box[".. ((10-data.wield_inv_width)*0.5)+(i*1.25) ..",".. 1+(j*1.25) ..";1,1;]"
-			end
-		end
-	end
 	meta:set_string("formspec",
-		"formspec_version[2]" ..
-		"size["..size.."]"..
-		pipeworks.fs_helpers.get_prepends(size)..
-		"item_image[0.5,0.5;1,1;"..data.name_base.."_off]"..
-		"label[1.5,1;"..minetest.formspec_escape(data.description).."]"..
-		list_background ..
-		"list[context;"..minetest.formspec_escape(data.wield_inv_name)..";"..((10-data.wield_inv_width)*0.5)..",1;"..data.wield_inv_width..","..data.wield_inv_height..";]"..
-		pipeworks.fs_helpers.get_inv((2+data.wield_inv_height)) ..
-		"listring[context;"..minetest.formspec_escape(data.wield_inv_name).."]" ..
-		"listring[current_player;main]"
-	)
+			"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..";]"..
+			"list[current_player;main;0,"..(2+data.wield_inv_height)..";8,4;]" ..
+			"listring[]")
 	meta:set_string("infotext", data.description)
 end
 
@@ -146,7 +131,7 @@ local function register_wielder(data)
 	data.fixup_node = data.fixup_node or function (pos, node) end
 	data.fixup_oldmetadata = data.fixup_oldmetadata or function (m) return m end
 	for _, state in ipairs({ "off", "on" }) do
-		local groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon=2, tubedevice=1, tubedevice_receiver=1, axey=1, handy=1, pickaxey=1 }
+		local groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon=2, tubedevice=1, tubedevice_receiver=1 }
 		if state == "on" then groups.not_in_creative_inventory = 1 end
 		local tile_images = {}
 		for _, face in ipairs({ "top", "bottom", "side2", "side1", "back", "front" }) do
@@ -195,14 +180,11 @@ local function register_wielder(data)
 					return stack:get_count()
 				end,
 			},
-			is_ground_content = false,
+			is_ground_content = true,
 			paramtype2 = "facedir",
 			tubelike = 1,
 			groups = groups,
-			_mcl_hardness=0.6,
-			_sound_def = {
-				key = "node_sound_stone_defaults",
-			},
+			sounds = default.node_sound_stone_defaults(),
 			drop = data.name_base.."_off",
 			on_construct = function(pos)
 				local meta = minetest.get_meta(pos)
@@ -225,6 +207,7 @@ local function register_wielder(data)
 					local node = minetest.get_node(pos)
 					node.param2 = minetest.dir_to_facedir(dir, true)
 					minetest.set_node(pos, node)
+					minetest.log("action", "real (6d) facedir: " .. node.param2)
 				end
 				minetest.get_meta(pos):set_string("owner", placer:get_player_name())
 			end,
@@ -336,10 +319,6 @@ if pipeworks.enable_node_breaker then
 		masquerade_as_owner = true,
 		sneak = false,
 		act = function(virtplayer, pointed_thing)
-			if minetest.is_protected(vector.add(virtplayer:get_pos(), assumed_eye_pos), virtplayer:get_player_name()) then
-				return
-			end
-
 			--local dname = "nodebreaker.act() "
 			local wieldstack = virtplayer:get_wielded_item()
 			local oldwieldstack = ItemStack(wieldstack)
@@ -393,6 +372,14 @@ if pipeworks.enable_node_breaker then
 	}
 	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 = {
+			{ "basic_materials:gear_steel", "basic_materials:gear_steel",   "basic_materials:gear_steel"    },
+			{ "default:stone", "mesecons:piston",   "default:stone" },
+			{ "group:wood",    "mesecons:mesecon",  "group:wood" },
+		}
+	})
 	-- aliases for when someone had technic installed, but then uninstalled it but not pipeworks
 	minetest.register_alias("technic:nodebreaker_off", "pipeworks:nodebreaker_off")
 	minetest.register_alias("technic:nodebreaker_on", "pipeworks:nodebreaker_on")
@@ -431,16 +418,20 @@ if pipeworks.enable_deployer then
 		masquerade_as_owner = true,
 		sneak = false,
 		act = function(virtplayer, pointed_thing)
-			if minetest.is_protected(vector.add(virtplayer:get_pos(), assumed_eye_pos), virtplayer:get_player_name()) then
-				return
-			end
-
 			local wieldstack = virtplayer:get_wielded_item()
 			virtplayer:set_wielded_item((minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) or wieldstack)
 		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 = {
+			{ "group:wood",    "default:chest",    "group:wood"    },
+			{ "default:stone", "mesecons:piston",  "default:stone" },
+			{ "default:stone", "mesecons:mesecon", "default:stone" },
+		}
+	})
 	-- aliases for when someone had technic installed, but then uninstalled it but not pipeworks
 	minetest.register_alias("technic:deployer_off", "pipeworks:deployer_off")
 	minetest.register_alias("technic:deployer_on", "pipeworks:deployer_on")
@@ -469,4 +460,12 @@ if pipeworks.enable_dispenser then
 		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 = {
+			{ "default:desert_sand", "default:chest",    "default:desert_sand" },
+			{ "default:stone",       "mesecons:piston",  "default:stone"       },
+			{ "default:stone",       "mesecons:mesecon", "default:stone"       },
+		}
+	})
 end