Add files via upload

.luacheckrc

@@ -0,0 +1,27 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+	"lwcomponents",
+	"intllib",
+	"mesecon",
+	"digiline",
+	"digilines",
+	"hopper",
+	"pipeworks",
+	"unifieddyes",
+	"digistuff",
+}
+
+globals = {
+}

breaker.lua

@@ -12,7 +12,7 @@ local break_interval = 1.0
 
 
 local function get_breaker_side (pos, param2, side)
-	local base = nil
+	local base
 
 	if side == "left" then
 		base = { x = -1, y = pos.y, z = 0 }
@@ -138,7 +138,7 @@ local function can_break_node (pos, breakpos)
 			if node_def then
 				-- try tool first
 				local tool = get_tool (pos)
-				local dig_params = nil
+				local dig_params
 
 				if tool then
 					local tool_def = minetest.registered_items[tool:get_name ()]
@@ -222,6 +222,35 @@ end
 
 
 
+local function eject_item (pos, stack, eject_pos)
+	if utils.pipeworks_supported then
+		local node = utils.get_far_node (eject_pos)
+
+		if node and minetest.get_item_group (node.name, "tube") > 0 then
+			local owner = nil
+			local meta = minetest.get_meta (pos)
+
+			if meta then
+				local o = meta:get_string ("owner")
+
+				if o ~= "" then
+					owner = o
+				end
+			end
+
+			local vel = vector.subtract (eject_pos, pos)
+
+			pipeworks.tube_inject_item (pos, pos, vel, stack, owner)
+
+			return
+		end
+	end
+
+	utils.item_drop (stack, nil, eject_pos)
+end
+
+
+
 local function break_node (pos, range)
 	local node = minetest.get_node_or_nil (pos)
 
@@ -242,7 +271,7 @@ local function break_node (pos, range)
 						local eject_pos = get_breaker_side (pos, node.param2, "back")
 
 						for i = 1, #drops do
-							utils.item_drop (drops[i], nil, eject_pos)
+							eject_item (pos, drops[i], eject_pos)
 						end
 
 						add_wear (pos, wear)
@@ -324,7 +353,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local spec =
 	"formspec_version[3]\n"..
@@ -342,6 +371,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 
 	inv:set_size ("tool", 1)
 	inv:set_width ("tool", 1)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -350,7 +386,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -359,6 +395,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Breaker (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -478,7 +516,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -577,12 +614,126 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "tool",
+			connect_sides = { left = 1, right = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("tool", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				if stack and not stack:is_empty () then
+					local def = utils.find_item_def (stack:get_name ())
+
+					if def and def.tool_capabilities then
+						local meta = minetest.get_meta (pos)
+						local inv = (meta and meta:get_inventory ()) or nil
+
+						if inv then
+							return inv:room_for_item ("tool", stack)
+						end
+					end
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("tool")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("tool", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("tool")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("tool", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("tool", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("tool", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local breaker_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	breaker_groups.tubedevice = 1
+	breaker_groups.tubedevice_receiver = 1
+end
+
+
+
+local breaker_on_groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 }
+if utils.pipeworks_supported then
+	breaker_on_groups.tubedevice = 1
+	breaker_on_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:breaker", {
 	description = S("Breaker"),
 	tiles = { "lwbreaker.png", "lwbreaker.png", "lwbreaker.png",
 				 "lwbreaker.png", "lwbreaker_rear.png", "lwbreaker_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (breaker_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -594,9 +745,11 @@ minetest.register_node("lwcomponents:breaker", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node,
 	on_blast = on_blast,
 	on_timer = on_timer,
@@ -611,7 +764,7 @@ minetest.register_node("lwcomponents:breaker_locked", {
 	tiles = { "lwbreaker.png", "lwbreaker.png", "lwbreaker.png",
 				 "lwbreaker.png", "lwbreaker_rear.png", "lwbreaker_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (breaker_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -623,9 +776,11 @@ minetest.register_node("lwcomponents:breaker_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node_locked,
 	on_blast = on_blast,
 	on_timer = on_timer,
@@ -641,7 +796,7 @@ minetest.register_node("lwcomponents:breaker_on", {
 	tiles = { "lwbreaker.png", "lwbreaker.png", "lwbreaker.png",
 				 "lwbreaker.png", "lwbreaker_rear.png", "lwbreaker_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (breaker_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -654,9 +809,11 @@ minetest.register_node("lwcomponents:breaker_on", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node,
 	on_blast = on_blast,
 	on_timer = on_timer,
@@ -671,7 +828,7 @@ minetest.register_node("lwcomponents:breaker_locked_on", {
 	tiles = { "lwbreaker.png", "lwbreaker.png", "lwbreaker.png",
 				 "lwbreaker.png", "lwbreaker_rear.png", "lwbreaker_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (breaker_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -684,9 +841,11 @@ minetest.register_node("lwcomponents:breaker_locked_on", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node_locked,
 	on_blast = on_blast,
 	on_timer = on_timer,

camera.lua

@@ -7,18 +7,6 @@ if utils.digilines_supported then
 
 
 
-local function is_drop (obj)
-	if obj then
-		local entity = obj.get_luaentity and obj:get_luaentity ()
-
-		return (entity and entity.name and entity.name == "__builtin:item")
-	end
-
-	return false
-end
-
-
-
 local function get_entity_dims (obj)
 	local dims = { -0.5, 0, -0.5, 0.5, 2, 0.5 }
 	local found = false
@@ -88,7 +76,7 @@ local function get_entity (pos)
 					end
 				end
 
-				if not is_drop (obj) then
+				if not utils.is_drop (obj) then
 					local epos =  vector.new (obj:get_pos ())
 					local dims = get_entity_dims (obj)
 
@@ -133,7 +121,7 @@ local function camera_scan (pos, resolution, distance)
 					local horz = (x - (resolution / 2)) * scale * view
 					local vert = (y - (resolution / 2)) * scale * view
 
-					local tpos = nil
+					local tpos
 					if dir.x ~= 0 then
 						tpos = vector.round ({ x = (dist * dir.x) + pos.x, y = pos.y - vert, z = horz + pos.z })
 					else
@@ -158,9 +146,9 @@ local function camera_scan (pos, resolution, distance)
 							last_color = string.format ("0000%02X", color)
 							image[y][x] = last_color
 						else
-							local node = utils.get_far_node (tpos)
+							local tnode = utils.get_far_node (tpos)
 
-							if node and node.name ~= "air" then
+							if tnode and tnode.name ~= "air" then
 								local color = (((distance - dist) / distance) * 98) + 30
 
 								last_color = string.format ("%02X%02X%02X", color, color, color)
@@ -305,7 +293,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end

cannon.lua

@@ -15,7 +15,7 @@ local function get_cannon_barrel (pos)
 	local barrel_pos = { x = pos.x, y = pos.y + 0.65, z = pos.z }
 	local objects = minetest.get_objects_inside_radius (barrel_pos, 0.1)
 
-	for i = 1, #objects do
+	for i = 1, #objects, 1 do
 		if not objects[i]:is_player () then
 			if objects[i].get_luaentity and objects[i]:get_luaentity () and
 				objects[i]:get_luaentity ().name and
@@ -29,18 +29,6 @@ end
 
 
 
-local function get_barrel_pos (pos)
-	local barrel = get_cannon_barrel (pos)
-
-	if barrel then
-		return barrel:get_pos ()
-	end
-
-	return nil
-end
-
-
-
 local function get_barrel_angle (pos)
 	local node = minetest.get_node_or_nil (pos)
 	local barrel = get_cannon_barrel (pos)
@@ -181,11 +169,7 @@ end
 
 
 local function aim_barrel_delayed (pos, aimpos)
-	local x = tonumber (aimpos.x) or 0
-	local y = tonumber (aimpos.y) or 0
-	local z = tonumber (aimpos.z) or 0
-
-	if z < 1 then
+	if (tonumber (aimpos.z) or 0) < 1 then
 		return
 	end
 
@@ -230,7 +214,8 @@ local function fire_cannon (pos)
 						if ammo_pos and ammo_angle then
 							local dir = vector.rotate ({ x = 0, y = 0, z = -1 }, ammo_angle)
 							local owner = meta:get_string ("owner")
-							local obj, cancel = nil, false
+							local obj = nil
+							local cancel
 							local spawn_pos = { x = ammo_pos.x + dir.x,
 													  y = ammo_pos.y + dir.y,
 													  z = ammo_pos.z + dir.z }
@@ -395,7 +380,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 
 	meta:set_string ("sensitive", "true")
@@ -407,6 +392,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 	inv:set_width ("main", 1)
 
 	meta:set_string ("formspec", get_formspec (pos))
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -415,7 +407,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -424,6 +416,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Cannon (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -455,7 +449,7 @@ local function on_place (itemstack, placer, pointed_thing)
 		minetest.set_node (pos, { name = "lwcomponents:cannon", param1 = 0, param2 = param2 })
 		after_place_node (pos, placer, itemstack, pointed_thing)
 
-		if not utils.is_creative (player) then
+		if not utils.is_creative (placer) then
 			itemstack:set_count (itemstack:get_count () - 1)
 		end
 	end
@@ -490,7 +484,7 @@ local function on_place_locked (itemstack, placer, pointed_thing)
 		minetest.set_node (pos, { name = "lwcomponents:cannon_locked", param1 = 0, param2 = param2 })
 		after_place_node_locked (pos, placer, itemstack, pointed_thing)
 
-		if not utils.is_creative (player) then
+		if not utils.is_creative (placer) then
 			itemstack:set_count (itemstack:get_count () - 1)
 		end
 	end
@@ -612,7 +606,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						on_destruct (pos)
 						minetest.remove_node (pos)
@@ -838,6 +831,106 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, front = 1, back = 1, bottom = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local cannon_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	cannon_groups.tubedevice = 1
+	cannon_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:cannon_blank", {
 	description = S("Cannon blank"),
 	drawtype = "airlike",
@@ -917,7 +1010,7 @@ minetest.register_node("lwcomponents:cannon", {
 	wield_image = "lwcannon_item.png",
 	inventory_image = "lwcannon_item.png",
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (cannon_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -928,12 +1021,14 @@ minetest.register_node("lwcomponents:cannon", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_construct = on_construct,
 	on_destruct = on_destruct,
 	on_place = on_place,
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick,
@@ -979,7 +1074,7 @@ minetest.register_node("lwcomponents:cannon_locked", {
 	wield_image = "lwcannon_item.png",
 	inventory_image = "lwcannon_item.png",
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (cannon_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -990,12 +1085,14 @@ minetest.register_node("lwcomponents:cannon_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_construct = on_construct,
 	on_destruct = on_destruct,
 	on_place = on_place_locked,
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node_locked,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick,

cannon_shell.lua

@@ -153,8 +153,13 @@ local function register_shell (name, description, texture, inventory_image,
 						end
 
 					elseif c.type == "object" then
+						local c_name = (c.object.get_luaentity and
+											 c.object:get_luaentity () and
+											 c.object:get_luaentity ().name) or ""
+						local s_name = (self.name) or ""
+
 						-- explode at this pos
-						if c.object:get_armor_groups ().immortal then
+						if c.object:get_armor_groups ().immortal or s_name == c_name then
 							self.object:set_velocity (c.old_velocity)
 						else
 							explode_pos = vector.new (c.object:get_pos ())
@@ -198,7 +203,6 @@ local function register_shell (name, description, texture, inventory_image,
 				local obj = minetest.add_entity (spawn_pos, name.."_entity")
 
 				if obj then
-					obj:set_armor_groups ({ immortal = 1 })
 					obj:set_acceleration ({ x = 0, y = -9.81, z = 0 })
 					obj:set_rotation (vector.dir_to_rotation (vector.multiply (spawner_dir, shell_speed)))
 					obj:set_velocity (vector.multiply (spawner_dir, shell_speed))

change.log

@@ -53,7 +53,7 @@ v0.1.8
 *	Made changes to lwcomponents.register_spawner api - called function
 	must now set velocity, can use force parameter.
 *	Removed spawning from this mod. Created lwcomponents_spawners to
-	register spawers.
+	register spawners.
 
 
 v0.1.9
@@ -108,3 +108,66 @@ v0.1.19
 v0.1.20
 *	Valid distance and resolution for camera set by digilines message.
 *	Imposed maximum resolution of 128 for cameras.
+
+
+v0.1.21
+*	Minor bug fix, movefloor global.
+*	Fixed movefloor so player doesn't fall through floor.
+*	Transfer timer in moved nodes for pistons.
+
+
+v0.1.22
+*	Added storage.
+
+
+v0.1.23
+*	Fixed storage indexer not taking items from storage properly.
+*	Added pipeworks support for:
+		Storage Indexer
+		Dropper
+		Collector
+		Dispenser
+		Breaker
+		Deployer
+		Cannon
+		Conduit
+*	Conduits now work in unloaded blocks.
+*	Fixed conduits sending items in groups.
+*	Fixed player attached to controller moving forever when they get blown up.
+*	Fixed pistons being powered from the pusher side.
+
+
+v0.1.24
+*	Limited requested count from storage indexer from digilines message to max stack.
+*	Fixed receptor state in detector.
+*	Fixed receptor state in digiswitch.
+*	Fixed bug in utils.is_same_item ().
+*	Added force field generators.
+*	Removed immortal from cannon shells (shells test for same type of shell and ignore).
+
+
+v0.1.25
+*	Added hoppers.
+*	Added "inventory" message to conduits.
+*	Removed digilines or mesecons requirement for conduits.
+*	Improved unescaping item description.
+*	Fixed custom item output from storage.
+*	Added filtering to conduit forms.
+
+
+v0.1.26
+*	Added support for stickblocks to pistons.
+*	Changed description of hoppers to avoid confusion.
+*	Added destroyer.
+*	Cleaned up hopper code.
+*	Fixed recipe for solid conductor blocks.
+
+
+v0.1.27
+*	Bug fixes and code cleanup.
+*	Fixed receptor state in detector.
+*	Improved receptor state in digiswitch.
+
+
+v0.1.28
+*	Added support for lwwires. Wires will not connect to conduits.

collector.lua

@@ -148,7 +148,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local is_off = itemstack and (itemstack:get_name () == "lwcomponents:collector" or
 											itemstack:get_name () == "lwcomponents:collector_locked")
@@ -162,6 +162,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 	inv:set_width ("main", 4)
 	inv:set_size ("filter", 8)
 	inv:set_width ("filter", 2)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -170,7 +177,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -179,6 +186,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Collector (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -307,7 +316,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						on_destruct (pos)
 						minetest.remove_node (pos)
@@ -427,12 +435,120 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, front = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local collector_groups = { cracky = 3 }
+if utils.pipeworks_supported then
+	collector_groups.tubedevice = 1
+	collector_groups.tubedevice_receiver = 1
+end
+
+
+
+local collector_on_groups = { cracky = 3, not_in_creative_inventory = 1 }
+if utils.pipeworks_supported then
+	collector_on_groups.tubedevice = 1
+	collector_on_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:collector", {
 	description = S("Collector"),
 	tiles = { "lwcollector.png", "lwcollector.png", "lwcollector.png",
 				 "lwcollector.png", "lwcollector.png", "lwcollector.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (collector_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -441,11 +557,13 @@ minetest.register_node("lwcomponents:collector", {
 	_digistuff_channelcopier_fieldname = "channel",
 
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick
@@ -458,7 +576,7 @@ minetest.register_node("lwcomponents:collector_locked", {
 	tiles = { "lwcollector.png", "lwcollector.png", "lwcollector.png",
 				 "lwcollector.png", "lwcollector.png", "lwcollector.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (collector_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -467,11 +585,13 @@ minetest.register_node("lwcomponents:collector_locked", {
 	_digistuff_channelcopier_fieldname = "channel",
 
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick
@@ -484,7 +604,7 @@ minetest.register_node("lwcomponents:collector_on", {
 	tiles = { "lwcollector_on.png", "lwcollector_on.png", "lwcollector_on.png",
 				 "lwcollector_on.png", "lwcollector_on.png", "lwcollector_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (collector_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -493,11 +613,13 @@ minetest.register_node("lwcomponents:collector_on", {
 	_digistuff_channelcopier_fieldname = "channel",
 
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick
@@ -510,7 +632,7 @@ minetest.register_node("lwcomponents:collector_locked_on", {
 	tiles = { "lwcollector_on.png", "lwcollector_on.png", "lwcollector_on.png",
 				 "lwcollector_on.png", "lwcollector_on.png", "lwcollector_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (collector_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -519,11 +641,13 @@ minetest.register_node("lwcomponents:collector_locked_on", {
 	_digistuff_channelcopier_fieldname = "channel",
 
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick

conduit.lua

@@ -3,15 +3,15 @@ local S = utils.S
 
 
 
-if utils.digilines_supported or utils.mesecon_supported then
-
-
-
 local transfer_rate = 0.1
 local conduit_interval = 1.0
 local conduit_connections = utils.connections:new (mod_storage, "conduit_connections")
 
 
+-- forward declare
+local run_initialize = nil
+
+
 
 local function get_target_list (pos)
 	local tlist = conduit_connections:get_connected_ids (pos)
@@ -51,6 +51,34 @@ end
 
 
 
+local function get_target_for_item (meta, inv, stack)
+	if meta then
+		if inv then
+			local slots = inv:get_size ("filter")
+
+			for slot = 1, slots, 1 do
+				local s = inv:get_stack ("filter", slot)
+
+				if s and not s:is_empty () and utils.is_same_item (s, stack) then
+					local target = meta:get_string ("target"..slot)
+
+					if target ~= "" then
+						return target
+					end
+				end
+			end
+		end
+
+		if meta:get_string ("target") ~= "" then
+			return meta:get_string ("target")
+		end
+	end
+
+	return nil
+end
+
+
+
 local function deliver_slot (pos, slot)
 	local meta = minetest.get_meta (pos)
 
@@ -62,6 +90,10 @@ local function deliver_slot (pos, slot)
 			local item = inv:get_stack ("transfer", slot)
 
 			if transfer_data[slot] and item and not item:is_empty () then
+				local tnode = utils.get_far_node (transfer_data[slot].pos)
+
+				if tnode and (tnode.name == "lwcomponents:conduit" or
+								  tnode.name == "lwcomponents:conduit_locked") then
 					local tmeta = minetest.get_meta (transfer_data[slot].pos)
 
 					if tmeta then
@@ -69,8 +101,7 @@ local function deliver_slot (pos, slot)
 
 						if tinv then
 							tinv:add_item ("main", item)
-
-						--send_conduit_message (pos, target, slot)
+						end
 					end
 				end
 			end
@@ -138,7 +169,7 @@ end
 
 
 
-local function delivered_earliest (pos)
+local function deliver_earliest (pos)
 	local meta = minetest.get_meta (pos)
 
 	if meta then
@@ -194,7 +225,8 @@ local function add_to_send_list (pos, item, destpos, distance)
 	local slot = get_transfer_free_slot (pos)
 
 	while slot < 1 do
-		delivered_earliest (pos)
+		deliver_earliest (pos)
+		slot = get_transfer_free_slot (pos)
 	end
 
 	local meta = minetest.get_meta (pos)
@@ -210,15 +242,11 @@ local function add_to_send_list (pos, item, destpos, distance)
 				due = minetest.get_us_time () + (transfer_rate * 1000000 * distance)
 			}
 
-			inv:add_item ("transfer", item)
+			inv:set_stack ("transfer", slot, item)
 
 			meta:set_string ("transfer_data", minetest.serialize (transfer_data))
 
-			local timer = minetest.get_node_timer (pos)
-
-			if not timer:is_started () then
-				timer:start (conduit_interval)
-			end
+			run_initialize (pos)
 		end
 	end
 end
@@ -231,9 +259,7 @@ local function send_to_target (pos, target, slot)
 	if meta then
 		local inv = meta:get_inventory ()
 
-		target = (target and tostring (target)) or meta:get_string ("target")
-
-		if inv and target:len () > 0 then
+		if inv then
 			if not slot then
 				local slots = inv:get_size ("main")
 
@@ -241,10 +267,12 @@ local function send_to_target (pos, target, slot)
 					local stack = inv:get_stack ("main", i)
 
 					if not stack:is_empty () and stack:get_count () > 0 then
+						if target or get_target_for_item (meta, inv, stack) then
 							slot = i
 							break
 						end
 					end
+				end
 
 			elseif type (slot) == "string" then
 				local name = slot
@@ -271,11 +299,13 @@ local function send_to_target (pos, target, slot)
 			if slot then
 				local stack = inv:get_stack ("main", slot)
 
-				if not stack:is_empty () and stack:get_count () > 0 then
-					local name = stack:get_name ()
+				if stack and not stack:is_empty () then
 					local item = ItemStack (stack)
 
-					if item then
+					target = (target and tostring (target)) or
+								get_target_for_item (meta, inv, stack)
+
+					if item and target then
 						item:set_count (1)
 
 						local tpos, distance = conduit_connections:is_connected (pos, target)
@@ -292,8 +322,6 @@ local function send_to_target (pos, target, slot)
 									stack:set_count (stack:get_count () - 1)
 									inv:set_stack ("main", slot, stack)
 
-									--send_conduit_message (pos, target, slot)
-
 									return true, target, slot
 								end
 							end
@@ -309,42 +337,173 @@ end
 
 
 
-local function run_conduit (pos)
-	local meta = minetest.get_meta (pos)
-	local automatic = false
-
-	if meta then
-		automatic = meta:get_string ("automatic") == "true"
-	end
-
-	if automatic then
-		send_to_target (pos)
-	end
-
-	return run_deliveries (pos) or automatic
-end
-
-
-
 local function get_formspec (pos)
 	local meta = minetest.get_meta (pos)
 	local automatic = "false"
+	local filters = ""
 
 	if meta then
 		automatic = meta:get_string ("automatic")
 	end
 
+	for i = 1, 8, 1 do
+		filters = string.format ("%sfield[12.7,%0.2f;3.0,0.8;target%d;;${target%d}]"..
+										 "button[15.9,%0.2f;1.5,0.8;settarget%d;Set]",
+										 filters,
+										 (i * 1.25) + 0.35,
+										 i,
+										 i,
+										 (i * 1.25) + 0.35,
+										 i)
+	end
+
 	return
-		"formspec_version[3]\n"..
-		"size[11.75,12.25;true]\n"..
-		"field[1.0,1.5;3.0,0.8;channel;Channel;${channel}]\n"..
-		"button[4.2,1.5;1.5,0.8;setchannel;Set]\n"..
-		"field[1.0,3.0;3.0,0.8;target;Target;${target}]\n"..
-		"button[4.2,3.0;1.5,0.8;settarget;Set]\n"..
-		"checkbox[1.0,4.5;automatic;Automatic;"..automatic.."]\n"..
-		"list[context;main;6.0,1.0;4,4;]\n"..
-		"list[current_player;main;1.0,6.5;8,4;]\n"..
-		"listring[]"
+		"formspec_version[3]"..
+		"size[18.4,12.25;true]"..
+		"field[1.0,1.5;3.0,0.8;channel;Channel;${channel}]"..
+		"button[4.2,1.5;1.5,0.8;setchannel;Set]"..
+		"field[1.0,3.0;3.0,0.8;target;Target;${target}]"..
+		"button[4.2,3.0;1.5,0.8;settarget;Set]"..
+		"checkbox[1.0,4.5;automatic;Automatic;"..automatic.."]"..
+		"list[context;main;6.0,1.0;4,4;]"..
+		"list[current_player;main;1.0,6.5;8,4;]"..
+		"listring[]"..
+		"label[11.5,1.25;Filter]"..
+		"list[context;filter;11.5,1.5;1,8;]"..
+		filters
+end
+
+
+
+local function run_conduit (pos, id)
+	local node = utils.get_far_node (pos)
+
+	if node then
+		if node.name == "lwcomponents:conduit" or
+				node.name == "lwcomponents:conduit_locked" then
+			local meta = minetest.get_meta (pos)
+
+			if meta and id == meta:get_int ("conduit_id") then
+				local automatic = meta:get_string ("automatic") == "true"
+
+				if automatic then
+					send_to_target (pos)
+				end
+
+				if run_deliveries (pos) or automatic then
+					minetest.after (conduit_interval, run_conduit, pos, id)
+				else
+					meta:set_int ("run_active", 0)
+				end
+			end
+		else
+			conduit_connections:remove_node (pos)
+		end
+	end
+end
+
+
+
+run_initialize = function (pos)
+	local meta = minetest.get_meta (pos)
+
+	if meta then
+		if meta:get_int ("run_active") == 0 then
+			meta:set_int ("run_active", 1)
+			minetest.after (conduit_interval, run_conduit, pos, meta:get_int ("conduit_id"))
+		end
+	end
+end
+
+
+
+local function count_table_keys (t)
+	local count = 0
+
+	for k, v in pairs (t) do
+		count = count + 1
+	end
+
+	return count
+end
+
+
+
+local function send_inventory_message (pos)
+	if utils.digilines_supported then
+		local meta = minetest.get_meta (pos)
+		local inv = (meta and meta:get_inventory ()) or nil
+
+		if meta and inv then
+			local channel = meta:get_string ("channel")
+
+			if channel:len () > 0 then
+				local inventory = { }
+				local slots = inv:get_size ("main")
+
+				for slot = 1, slots, 1 do
+					local stack = inv:get_stack ("main", slot)
+
+					if stack and not stack:is_empty () then
+						local name = stack:get_name ()
+						local description
+						local custom = false
+						local pallet_index = nil
+						local tstack = stack:to_table ()
+
+						if tstack and tstack.meta and count_table_keys (tstack.meta) > 0 then
+							custom = true
+
+							pallet_index = tstack.meta.palette_index
+						end
+
+						if stack:get_short_description () ~= "" then
+							description = stack:get_short_description ()
+						elseif stack:get_description () ~= "" then
+							description = stack:get_description ()
+						else
+							description = name
+
+							local def = utils.find_item_def (name)
+
+							if def then
+								if def.short_description then
+									description = def.short_description
+								elseif def.description then
+									description = def.description
+								end
+							end
+						end
+
+						inventory[slot] =
+						{
+							name = stack:get_name (),
+							description = utils.unescape_description (description),
+							count = stack:get_count (),
+							custom = custom,
+							pallet_index = pallet_index,
+						}
+					else
+						inventory[slot] =
+						{
+							name = "",
+							description = "",
+							count = 0,
+							custom = false,
+							pallet_index = nil,
+						}
+					end
+				end
+
+				utils.digilines_receptor_send (pos,
+														 utils.digilines_default_rules,
+														 channel,
+														 { action = "inventory",
+															inventory = inventory })
+			end
+		end
+	end
+
 end
 
 
@@ -362,7 +521,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local spec =
 	"formspec_version[3]"..
@@ -370,10 +529,11 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 	"field[0.5,1.0;6.0,0.8;channel;Channel;${channel}]"..
 	"button[2.0,2.3;3.0,0.8;setchannel;Set]"
 
-	meta:set_string ("inventory", "{ main = { }, transfer = { } }")
+	meta:set_string ("inventory", "{ main = { }, transfer = { }, filter = { } }")
 	meta:set_string ("formspec", spec)
 	meta:set_string ("transfer_data", minetest.serialize({ }))
 	meta:set_string ("automatic", "false")
+	meta:set_int ("conduit_id", math.random (1000000))
 
 	local inv = meta:get_inventory ()
 
@@ -383,6 +543,16 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 	inv:set_size ("transfer", 32)
 	inv:set_width ("transfer", 8)
 
+	inv:set_size ("filter", 8)
+	inv:set_width ("filter", 1)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -390,7 +560,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -399,6 +569,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Conduit (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -492,10 +664,22 @@ local function on_receive_fields (pos, formname, fields, sender)
 			meta:set_string ("automatic", fields.automatic)
 			meta:set_string ("formspec", get_formspec (pos))
 
-			local timer = minetest.get_node_timer (pos)
+			if fields.automatic == "true" then
+				meta:set_int ("run_active", 0)
+			end
 
-			if not timer:is_started () then
-				timer:start (conduit_interval)
+			run_initialize (pos)
+		end
+	end
+
+	for i = 1, 8, 1 do
+		if fields[string.format ("settarget%d", i)] then
+			local meta = minetest.get_meta (pos)
+
+			if meta then
+				local name = string.format ("target%d", i)
+
+				meta:set_string (name, fields[name])
 			end
 		end
 	end
@@ -552,7 +736,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						on_destruct (pos)
 						minetest.remove_node (pos)
@@ -592,8 +775,83 @@ end
 
 
 
-local function on_timer (pos, elapsed)
-	return run_conduit (pos)
+local function allow_metadata_inventory_put (pos, listname, index, stack, player)
+	if listname == "filter" then
+		local meta = minetest.get_meta (pos)
+
+		if meta then
+			local inv = meta:get_inventory ()
+
+			if inv then
+				inv:set_stack ("filter", index, ItemStack (stack:get_name ()))
+			end
+		end
+
+		return 0
+	end
+
+	return stack:get_stack_max ()
+end
+
+
+
+local function allow_metadata_inventory_take (pos, listname, index, stack, player)
+	if listname == "filter" then
+		local meta = minetest.get_meta (pos)
+
+		if meta then
+			local inv = meta:get_inventory ()
+
+			if inv then
+				inv:set_stack ("filter", index, nil)
+			end
+		end
+
+		return 0
+	end
+
+	return stack:get_stack_max ()
+end
+
+
+
+local function allow_metadata_inventory_move (pos, from_list, from_index,
+															 to_list, to_index, count, player)
+	local meta = minetest.get_meta (pos)
+
+	if meta then
+		local inv = meta:get_inventory ()
+
+		if inv then
+			if from_list == "filter" then
+				if to_list == "filter" then
+					return 1
+				end
+
+				inv:set_stack ("filter", from_index, nil)
+
+				return 0
+
+			elseif to_list == "filter" then
+				local stack = inv:get_stack (from_list, from_index)
+
+				if stack and not stack:is_empty () then
+					inv:set_stack ("filter", to_index, ItemStack (stack:get_name ()))
+				end
+
+				return 0
+
+			else
+				local stack = inv:get_stack (from_list, from_index)
+
+				if stack and not stack:is_empty () then
+					return stack:get_stack_max ()
+				end
+			end
+		end
+	end
+
+	return utils.settings.default_stack_max
 end
 
 
@@ -631,6 +889,9 @@ local function digilines_support ()
 								elseif m[1] == "transfer" then
 									send_to_target (pos)
 
+								elseif m[1] == "inventory" then
+									send_inventory_message (pos)
+
 								end
 
 							elseif type (msg) == "table" then
@@ -671,14 +932,151 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, front = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local conduit_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	conduit_groups.tubedevice = 1
+	conduit_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:conduit", {
 	description = S("Conduit"),
-	drawtype = "glasslike_framed",
-	tiles = { "lwconduit_edge.png", "lwconduit.png" },
+	short_description = S("Conduit"),
+	tiles = { "lwconduit.png" },
+	drawtype = "nodebox",
+	node_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
+	connect_sides = { "top", "bottom", "front", "back", "left", "right" },
+	connects_to = { "lwcomponents:conduit", "lwcomponents:conduit_locked",
+						 "lwcomponents:hopper", "lwcomponents:hopper_horz",
+						 "hopper:hopper", "hopper:hopper_side",
+						 "group:tube", "pipeworks:filter", "pipeworks:mese_filter",
+						 "pipeworks:digiline_filter" },
+	selection_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
+	collision_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (conduit_groups),
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "none",
 	param2 = 0,
@@ -687,27 +1085,69 @@ minetest.register_node("lwcomponents:conduit", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_construct = on_construct,
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
-	on_timer = on_timer,
-	on_rightclick = on_rightclick
+	on_rightclick = on_rightclick,
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+	allow_metadata_inventory_move = allow_metadata_inventory_move
+
 })
 
 
 
 minetest.register_node("lwcomponents:conduit_locked", {
 	description = S("Conduit (locked)"),
-	drawtype = "glasslike_framed",
-	tiles = { "lwconduit_edge.png", "lwconduit.png" },
+	short_description = S("Conduit (locked)"),
+	tiles = { "lwconduit.png" },
+	drawtype = "nodebox",
+	node_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
+	connect_sides = { "top", "bottom", "front", "back", "left", "right" },
+	connects_to = { "lwcomponents:conduit", "lwcomponents:conduit_locked",
+						 "lwcomponents:hopper", "lwcomponents:hopper_horz",
+						 "hopper:hopper", "hopper:hopper_side",
+						 "group:tube", "pipeworks:filter", "pipeworks:mese_filter",
+						 "pipeworks:digiline_filter" },
+	selection_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
+	collision_box = {
+		type = "connected",
+		fixed = 				{ -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
+		connect_top = 		{ -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
+		connect_bottom =	{ -0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125 }, -- down
+		connect_front = 	{ -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
+		connect_back =  	{ -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
+		connect_left =  	{ -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
+		connect_right = 	{ 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
+	},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (conduit_groups),
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "none",
 	param2 = 0,
@@ -716,15 +1156,19 @@ minetest.register_node("lwcomponents:conduit_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_construct = on_construct,
 	on_destruct = on_destruct,
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
-	on_timer = on_timer,
-	on_rightclick = on_rightclick
+	on_rightclick = on_rightclick,
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+	allow_metadata_inventory_move = allow_metadata_inventory_move
 })
 
 
@@ -745,4 +1189,79 @@ utils.hopper_add_container({
 
 
 
-end -- utils.digilines_supported or utils.mesecon_supported
+-- legacy code v0.1.23 (24-2-22)
+local function convert_conduits ()
+	local list = conduit_connections:get_full_list ()
+
+	for _, data in ipairs (list) do
+		local node = utils.get_far_node (data.pos)
+
+		if node and (node.name == "lwcomponents:conduit" or
+						 node.name == "lwcomponents:conduit_locked") then
+			local meta = minetest.get_meta (data.pos)
+
+			if meta then
+				if meta:get_int ("conduit_id") == 0 then
+					meta:set_int ("conduit_id", math.random (1000000))
+
+					if meta:get_string ("automatic") == "true" then
+						meta:set_int ("run_active", 1)
+					else
+						local inv = meta:get_inventory ()
+
+						if inv and not inv:is_empty ("transfer") then
+							meta:set_int ("run_active", 1)
+						end
+					end
+				end
+
+				-- added v0.1.25 (2-3-22)
+				local tmeta = meta:to_table ()
+
+				if tmeta and tmeta.inventory then
+					if not tmeta.inventory.filter then
+						tmeta.inventory.filter =
+						{
+							[1] = "", [2] = "", [3] = "", [4] = "",
+							[5] = "", [6] = "", [7] = "", [8] = ""
+						}
+
+						meta:from_table (tmeta)
+
+						if meta:get_string ("channel") ~= "" then
+							meta:set_string ("formspec", get_formspec (data.pos))
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+
+local function restart_conduits ()
+	convert_conduits ()
+
+	local list = conduit_connections:get_id_list ()
+
+	for _, data in ipairs (list) do
+		local meta = minetest.get_meta (data.pos)
+
+		if meta and meta:get_int ("run_active") ~= 0 then
+			minetest.after (conduit_interval + (math.random (10) / 10),
+								 run_conduit, data.pos, meta:get_int ("conduit_id"))
+		end
+	end
+
+end
+
+
+
+minetest.register_on_mods_loaded (function ()
+	minetest.after (3.0, restart_conduits)
+end)
+
+
+
+--

connections.lua

@@ -293,6 +293,40 @@ end
 
 
 
+function connections:get_id_list ()
+	local list = { }
+
+	for spos, data in pairs (self.connector_list) do
+		if data.id then
+			list[#list + 1] =
+			{
+				pos = minetest.string_to_pos (spos),
+				id = data.id
+			}
+		end
+	end
+
+	return list
+end
+
+
+
+function connections:get_full_list ()
+	local list = { }
+
+	for spos, data in pairs (self.connector_list) do
+		list[#list + 1] =
+		{
+			pos = minetest.string_to_pos (spos),
+			id = data.id
+		}
+	end
+
+	return list
+end
+
+
+
 return connections
 
 

crafting.lua

@@ -1,5 +1,4 @@
 local utils = ...
-local S = utils.S
 
 
 
@@ -23,6 +22,94 @@ minetest.register_craft( {
 })
 
 
+minetest.register_craft( {
+	output = "lwcomponents:storage_unit 2",
+	recipe = {
+		{ "default:steel_ingot", "group:wood", "group:wood" },
+		{ "group:wood", "", "group:wood" },
+		{ "group:wood", "group:wood", "default:chest" },
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:storage_unit_locked 2",
+	recipe = {
+		{ "default:steel_ingot", "group:wood", "group:wood" },
+		{ "group:wood", "", "group:wood" },
+		{ "group:wood", "group:wood", "default:chest_locked" },
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:storage_indexer",
+	recipe = {
+		{ "default:steel_ingot", "group:wood" },
+		{ "group:wood", "default:chest" }
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:storage_indexer_locked",
+	recipe = {
+		{ "default:steel_ingot", "group:wood" },
+		{ "group:wood", "default:chest_locked" }
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:force_field",
+	recipe = {
+		{ "default:steel_ingot", "default:mese_crystal", "group:wood" },
+		{ "default:mese_crystal", "default:diamondblock", "default:mese_crystal" },
+		{ "default:stone", "default:mese_crystal", "default:chest" }
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:force_field_locked",
+	recipe = {
+		{ "default:steel_ingot", "default:mese_crystal", "group:wood" },
+		{ "default:mese_crystal", "default:diamondblock", "default:mese_crystal" },
+		{ "default:stone", "default:mese_crystal", "default:chest_locked" }
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:conduit 5",
+	recipe = {
+		{ "default:stone", "", "default:stone" },
+		{ "", "default:chest", "" },
+		{ "default:stone", "default:steel_ingot", "default:stone" },
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:conduit_locked 5",
+	recipe = {
+		{ "default:stone", "", "default:stone" },
+		{ "", "default:chest_locked", "" },
+		{ "default:stone", "default:steel_ingot", "default:stone" },
+	},
+})
+
+
+minetest.register_craft( {
+	output = "lwcomponents:destroyer",
+	recipe = {
+		{ "default:stone", "", "group:wood" },
+		{ "", "default:steel_ingot", "" },
+		{ "group:wood", "", "default:stone" }
+	},
+})
+
+
 minetest.register_craft( {
 	output = "lwcomponents:cannon_shell 10",
 	recipe = {
@@ -42,6 +129,7 @@ minetest.register_craft( {
 
 
 if minetest.global_exists ("fire") then
+
 minetest.register_craft( {
 	output = "lwcomponents:cannon_fire_shell 10",
 	recipe = {
@@ -49,6 +137,7 @@ minetest.register_craft( {
 		{ "default:iron_lump", "default:coalblock" },
 	},
 })
+
 end -- minetest.global_exists ("fire")
 
 
@@ -66,6 +155,18 @@ minetest.register_craft( {
 end -- utils.mesecon_supported
 
 
+if utils.hopper_supported then
+
+minetest.register_craft( {
+	output = "lwcomponents:hopper",
+	recipe = {
+		{ "default:stone", "default:steel_ingot", "default:stone" },
+		{ "", "default:stone", "" },
+	},
+})
+
+end
+
 
 if utils.digilines_supported or utils.mesecon_supported then
 
@@ -213,26 +314,6 @@ minetest.register_craft( {
 })
 
 
-minetest.register_craft( {
-	output = "lwcomponents:conduit 5",
-	recipe = {
-		{ "default:stone", "", "default:stone" },
-		{ "", "default:chest", "" },
-		{ "default:stone", "default:steel_ingot", "default:stone" },
-	},
-})
-
-
-minetest.register_craft( {
-	output = "lwcomponents:conduit_locked 5",
-	recipe = {
-		{ "default:stone", "", "default:stone" },
-		{ "", "default:chest_locked", "" },
-		{ "default:stone", "default:steel_ingot", "default:stone" },
-	},
-})
-
-
 minetest.register_craft({
 	output = "lwcomponents:piston 2",
 	recipe = {
@@ -332,7 +413,7 @@ end -- utils.digilines_supported and utils.digistuff_supported
 
 
 
-if utils.mesecon_supported and mesecon.mvps_push then
+if utils.mesecon_supported then
 
 minetest.register_craft ({
    output = "lwcomponents:movefloor",
@@ -343,7 +424,7 @@ minetest.register_craft ({
    }
 })
 
-end -- utils.mesecon_supported and mesecon.mvps_push
+end -- utils.mesecon_supported
 
 
 
@@ -365,7 +446,7 @@ end -- utils.digilines_supported and utils.mesecon_supported
 if utils.unifieddyes_supported and utils.mesecon_supported then
 
 minetest.register_craft ({
-	output = "lwcomputers:solid_conductor_off 3",
+	output = "lwcomponents:solid_conductor_off 3",
 	recipe = {
 		{ "default:mese_crystal_fragment", "group:wood", ""},
 		{ "group:wood", "group:wood", "dye:white" },
@@ -374,7 +455,7 @@ minetest.register_craft ({
 
 
 minetest.register_craft ({
-	output = "lwcomputers:solid_horizontal_conductor_off 3",
+	output = "lwcomponents:solid_horizontal_conductor_off 3",
 	recipe = {
 		{ "group:wood", "group:wood", ""},
 		{ "default:mese_crystal_fragment", "group:wood", "dye:white" },

depends.txt

@@ -5,3 +5,5 @@ unifieddyes?
 intllib?
 hopper?
 digistuff?
+pipeworks?
+lwwires?

deployer.lua

@@ -145,7 +145,7 @@ local function place_node (item, pos)
 
 				if not result then
 					if utils.settings.alert_handler_errors then
-						minetest.log ("error", "after_place_node handler for "..nodename.." crashed - "..msg)
+						minetest.log ("error", "after_place_node handler for "..stack:get_name ().." crashed - "..msg)
 					end
 				end
 			end
@@ -262,7 +262,7 @@ end
 
 
 
-local function deployer_on (pos, node, slot, range)
+local function deployer_on (pos, _node, slot, range)
 	local node = minetest.get_node (pos)
 
 	range = tonumber (range) or 1
@@ -292,7 +292,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local spec =
 	"formspec_version[3]\n"..
@@ -310,6 +310,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 
 	inv:set_size ("main", 16)
 	inv:set_width ("main", 4)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -318,7 +325,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -327,6 +334,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Deployer (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -419,7 +428,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -530,12 +538,120 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local deployer_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	deployer_groups.tubedevice = 1
+	deployer_groups.tubedevice_receiver = 1
+end
+
+
+
+local deployer_on_groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 }
+if utils.pipeworks_supported then
+	deployer_on_groups.tubedevice = 1
+	deployer_on_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:deployer", {
 	description = S("Deployer"),
 	tiles = { "lwdeployer.png", "lwdeployer.png", "lwdeployer.png",
 				 "lwdeployer.png", "lwdeployer.png", "lwdeployer_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (deployer_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -546,10 +662,12 @@ minetest.register_node("lwcomponents:deployer", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick
@@ -562,7 +680,7 @@ minetest.register_node("lwcomponents:deployer_locked", {
 	tiles = { "lwdeployer.png", "lwdeployer.png", "lwdeployer.png",
 				 "lwdeployer.png", "lwdeployer.png", "lwdeployer_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (deployer_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -573,10 +691,12 @@ minetest.register_node("lwcomponents:deployer_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_timer = on_timer,
 	on_rightclick = on_rightclick
@@ -590,7 +710,7 @@ minetest.register_node("lwcomponents:deployer_on", {
 	tiles = { "lwdeployer.png", "lwdeployer.png", "lwdeployer.png",
 				 "lwdeployer.png", "lwdeployer.png", "lwdeployer_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (deployer_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -603,9 +723,11 @@ minetest.register_node("lwcomponents:deployer_on", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node,
 	on_blast = on_blast,
 	on_timer = on_timer,
@@ -619,7 +741,7 @@ minetest.register_node("lwcomponents:deployer_locked_on", {
 	tiles = { "lwdeployer.png", "lwdeployer.png", "lwdeployer.png",
 				 "lwdeployer.png", "lwdeployer.png", "lwdeployer_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = table.copy (deployer_on_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -632,9 +754,11 @@ minetest.register_node("lwcomponents:deployer_locked_on", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	after_place_node = after_place_node_locked,
 	on_blast = on_blast,
 	on_timer = on_timer,

destroyer.lua

@@ -0,0 +1,164 @@
+local utils = ...
+local S = utils.S
+
+
+
+local function trash (pos)
+	local meta = minetest.get_meta (pos)
+	local inv = (meta and meta:get_inventory ()) or nil
+
+	if inv then
+		local stack = inv:get_stack ("trash", 1)
+
+		if stack and not stack:is_empty () then
+			utils.on_destroy (stack)
+
+			inv:set_stack ("trash", 1, nil)
+		end
+	end
+end
+
+
+
+local function trash_delayed (pos)
+	minetest.after (0.1, trash, pos)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	local meta = minetest.get_meta (pos)
+
+	if meta then
+		local inv = meta:get_inventory ()
+
+		if inv then
+			meta:set_string ("inventory", "{ trash = { [1] = '' } }")
+			meta:set_string ("formspec",
+				"formspec_version[3]"..
+				"size[11.75,8.5,false]"..
+				"label[5.15,1.0;Destroy]"..
+				"list[context;trash;5.3,1.25;1,1;]"..
+				"list[current_player;main;1.0,2.75;8,4;]"..
+				"listring[]")
+
+			inv:set_size ("trash", 1)
+			inv:set_width ("trash", 1)
+		end
+	end
+
+	utils.pipeworks_after_place (pos)
+
+	-- If return true no item is taken from itemstack
+	return false
+end
+
+
+
+local function on_metadata_inventory_put (pos, listname, index, stack, player)
+	if listname == "trash" then
+		trash_delayed (pos)
+	end
+end
+
+
+
+local function on_metadata_inventory_move (pos, from_list, from_index,
+														 to_list, to_index, count, player)
+	if to_list == "trash" then
+		trash_delayed (pos)
+	end
+end
+
+
+
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "trash",
+			connect_sides = { left = 1, right = 1, front = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					trash_delayed (pos)
+
+					return inv:add_item ("trash", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("trash", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				return stack
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local destroyer_groups = { cracky = 3 }
+if utils.pipeworks_supported then
+	destroyer_groups.tubedevice = 1
+	destroyer_groups.tubedevice_receiver = 1
+end
+
+
+
+minetest.register_node("lwcomponents:destroyer", {
+	description = S("Destroyer"),
+	drawtype = "normal",
+	tiles = { "lwcomponents_destroyer_top.png", "lwcomponents_destroyer_top.png",
+				 "lwcomponents_destroyer_side.png", "lwcomponents_destroyer_side.png",
+				 "lwcomponents_destroyer_side.png", "lwcomponents_destroyer_side.png" },
+	is_ground_content = false,
+	groups = table.copy (destroyer_groups),
+	sounds = default.node_sound_stone_defaults (),
+	paramtype = "none",
+	param1 = 0,
+	paramtype2 = "none",
+	param2 = 0,
+	floodable = false,
+
+	tube = pipeworks_support (),
+
+	after_place_node = after_place_node,
+	after_dig_node = utils.pipeworks_after_dig,
+	on_metadata_inventory_put = on_metadata_inventory_put,
+	on_metadata_inventory_move = on_metadata_inventory_move,
+})
+
+
+
+utils.hopper_add_container({
+	{"bottom", "lwcomponents:destroyer", "trash"}, -- insert items below from hopper above
+	{"side", "lwcomponents:destroyer", "trash"}, -- insert items from hopper at side
+})
+
+
+
+--

detector.lua

@@ -18,6 +18,17 @@ local function mesecons_on (pos)
 		if meta:get_int ("power_on") == 0 then
 			utils.mesecon_receptor_on (pos, utils.mesecon_default_rules)
 			meta:set_int ("power_on", 1)
+			local node = utils.get_far_node (pos)
+
+			if node then
+				if node.name == "lwcomponents:detector_locked_on" then
+					node.name = "lwcomponents:detector_locked_on_on"
+				elseif node.name == "lwcomponents:detector_on" then
+					node.name = "lwcomponents:detector_on_on"
+				end
+
+				minetest.swap_node (pos, node)
+			end
 		end
 	end
 end
@@ -31,6 +42,17 @@ local function mesecons_off (pos)
 		if meta:get_int ("power_on") ~= 0 then
 			utils.mesecon_receptor_off (pos, utils.mesecon_default_rules)
 			meta:set_int ("power_on", 0)
+			local node = utils.get_far_node (pos)
+
+			if node then
+				if node.name == "lwcomponents:detector_locked_on_on" then
+					node.name = "lwcomponents:detector_locked_on"
+				elseif node.name == "lwcomponents:detector_on_on" then
+					node.name = "lwcomponents:detector_on"
+				end
+
+				minetest.swap_node (pos, node)
+			end
 		end
 	end
 end
@@ -130,10 +152,10 @@ end
 
 local function get_entity_height (objref)
 	if objref.get_luaentity then
-		entity = objref:get_luaentity ()
+		local entity = objref:get_luaentity ()
 
 		if entity and entity.name then
-			def = minetest.registered_entities[entity.name]
+			local def = minetest.registered_entities[entity.name]
 
 			if def and type (def.collisionbox) == "table" and
 				type (def.collisionbox[5]) == "number" then
@@ -331,30 +353,21 @@ end
 
 local function start_detector (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:detector" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:detector_on"
 
 			minetest.swap_node (pos, node)
 			minetest.get_node_timer (pos):start (detect_interval)
 			update_form_spec (pos)
-			end
 
 		elseif node.name == "lwcomponents:detector_locked" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:detector_locked_on"
 
 			minetest.swap_node (pos, node)
 			minetest.get_node_timer (pos):start (detect_interval)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -364,32 +377,25 @@ end
 
 local function stop_detector (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
-		if node.name == "lwcomponents:detector_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
+	if node then
+		if node.name == "lwcomponents:detector_on" or
+				node.name == "lwcomponents:detector_on_on" then
 			node.name = "lwcomponents:detector"
 
 			minetest.swap_node (pos, node)
 			minetest.get_node_timer (pos):stop ()
 			mesecons_off (pos)
 			update_form_spec (pos)
-			end
 
-		elseif node.name == "lwcomponents:detector_locked_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
+		elseif node.name == "lwcomponents:detector_locked_on" or
+				 node.name == "lwcomponents:detector_locked_on_on" then
 			node.name = "lwcomponents:detector_locked"
 
 			minetest.swap_node (pos, node)
 			minetest.get_node_timer (pos):stop ()
 			mesecons_off (pos)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -410,7 +416,6 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 	local is_off = itemstack and (itemstack:get_name () == "lwcomponents:detector" or
 											itemstack:get_name () == "lwcomponents:detector_locked")
 
-	meta:set_string ("inventory", "{ main = { }, filter = { } }")
 	meta:set_string ("formspec", get_form_spec (is_off, 1, 0, 0, 0, 0, 1))
 
 	meta:set_string ("entities", "false")
@@ -554,7 +559,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						on_destruct (pos)
 						minetest.remove_node (pos)
@@ -687,7 +691,24 @@ end
 
 
 
-local function mesecon_support ()
+local function mesecon_support_on ()
+	if utils.mesecon_supported then
+		return
+		{
+			receptor =
+			{
+				state = utils.mesecon_state_on,
+				rules = utils.mesecon_default_rules
+			}
+		}
+	end
+
+	return nil
+end
+
+
+
+local function mesecon_support_off ()
 	if utils.mesecon_supported then
 		return
 		{
@@ -709,7 +730,7 @@ minetest.register_node("lwcomponents:detector", {
 	tiles = { "lwdetector_face.png", "lwdetector_face.png", "lwdetector.png",
 				 "lwdetector.png", "lwdetector.png", "lwdetector_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -719,7 +740,7 @@ minetest.register_node("lwcomponents:detector", {
 	drop = "lwcomponents:detector",
 	_digistuff_channelcopier_fieldname = "channel",
 
-	mesecons = mesecon_support (),
+	mesecons = mesecon_support_off (),
 	digiline = digilines_support (),
 
 	on_destruct = on_destruct,
@@ -738,7 +759,7 @@ minetest.register_node("lwcomponents:detector_locked", {
 	tiles = { "lwdetector_face.png", "lwdetector_face.png", "lwdetector.png",
 				 "lwdetector.png", "lwdetector.png", "lwdetector_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -748,7 +769,7 @@ minetest.register_node("lwcomponents:detector_locked", {
 	drop = "lwcomponents:detector_locked",
 	_digistuff_channelcopier_fieldname = "channel",
 
-	mesecons = mesecon_support (),
+	mesecons = mesecon_support_off (),
 	digiline = digilines_support (),
 
 	on_destruct = on_destruct,
@@ -767,7 +788,7 @@ minetest.register_node("lwcomponents:detector_on", {
 	tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
 				 "lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -777,7 +798,7 @@ minetest.register_node("lwcomponents:detector_on", {
 	drop = "lwcomponents:detector",
 	_digistuff_channelcopier_fieldname = "channel",
 
-	mesecons = mesecon_support (),
+	mesecons = mesecon_support_off (),
 	digiline = digilines_support (),
 
 	on_destruct = on_destruct,
@@ -796,7 +817,7 @@ minetest.register_node("lwcomponents:detector_locked_on", {
 	tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
 				 "lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -806,7 +827,65 @@ minetest.register_node("lwcomponents:detector_locked_on", {
 	drop = "lwcomponents:detector_locked",
 	_digistuff_channelcopier_fieldname = "channel",
 
-	mesecons = mesecon_support (),
+	mesecons = mesecon_support_off (),
+	digiline = digilines_support (),
+
+	on_destruct = on_destruct,
+	on_receive_fields = on_receive_fields,
+	can_dig = can_dig,
+	after_place_node = after_place_node_locked,
+	on_blast = on_blast,
+	on_timer = on_timer,
+	on_rightclick = on_rightclick
+})
+
+
+
+minetest.register_node("lwcomponents:detector_on_on", {
+	description = S("Detector"),
+	tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
+				 "lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
+	is_ground_content = false,
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
+	sounds = default.node_sound_stone_defaults (),
+	paramtype = "none",
+	param1 = 0,
+	paramtype2 = "facedir",
+	param2 = 1,
+	floodable = false,
+	drop = "lwcomponents:detector",
+	_digistuff_channelcopier_fieldname = "channel",
+
+	mesecons = mesecon_support_on (),
+	digiline = digilines_support (),
+
+	on_destruct = on_destruct,
+	on_receive_fields = on_receive_fields,
+	can_dig = can_dig,
+	after_place_node = after_place_node,
+	on_blast = on_blast,
+	on_timer = on_timer,
+	on_rightclick = on_rightclick
+})
+
+
+
+minetest.register_node("lwcomponents:detector_locked_on_on", {
+	description = S("Detector (locked)"),
+	tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
+				 "lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
+	is_ground_content = false,
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
+	sounds = default.node_sound_stone_defaults (),
+	paramtype = "none",
+	param1 = 0,
+	paramtype2 = "facedir",
+	param2 = 1,
+	floodable = false,
+	drop = "lwcomponents:detector_locked",
+	_digistuff_channelcopier_fieldname = "channel",
+
+	mesecons = mesecon_support_on (),
 	digiline = digilines_support (),
 
 	on_destruct = on_destruct,

digiswitch.lua

@@ -8,12 +8,10 @@ if utils.digilines_supported and utils.mesecon_supported then
 
 
 local function get_mesecon_rule_for_side (side)
-	local base = nil
-
 	if side == "white" then
 		return { { x = 0, y = 1, z = 0 } }
 	elseif side == "black" then
-		return { { x = 0, y = -1, z = 0 } } -- down doesn't work
+		return { { x = 0, y = -1, z = 0 } }
 	elseif side == "red" then
 		return { { x = -1, y = 0, z = 0 } }
 	elseif side == "green" then
@@ -32,13 +30,154 @@ local function get_mesecon_rule_for_side (side)
 			{ x =  0, y =  0, z =  1 },
 			{ x =  0, y =  0, z = -1 },
 			{ x =  0, y =  1, z =  0 },
-			{ x =  0, y = -1, z =  0 }, -- down doesn't work
+			{ x =  0, y = -1, z =  0 },
 		}
 	end
 end
 
 
 
+local side_bits =
+{
+	["white"]	= 0,
+	["black"]	= 1,
+	["red"]		= 2,
+	["green"]	= 3,
+	["blue"]		= 4,
+	["yellow"]	= 5
+}
+
+
+
+local function get_side_bit (side)
+	if side then
+		if side == "switch" then
+			return 64
+		end
+
+		local bit = side_bits[side]
+
+		if bit then
+			return math.pow (2, bit)
+		end
+	end
+
+	return 63
+end
+
+
+
+local function is_side_on (bits, side)
+	local bit = get_side_bit (side)
+
+	for i = 0, 6, 1 do
+		if (bit % 2) == 1 and (bits % 2) ~= 1 then
+			return false
+		end
+
+		bit = math.floor (bit / 2)
+		bits = math.floor (bits / 2)
+	end
+
+	return true
+end
+
+
+
+local function set_side_bit (bits, side, on)
+	local bit = get_side_bit (side)
+	local result = 0
+
+	for i = 0, 6, 1 do
+		if (bit % 2) == 1 then
+			if on then
+				result = result + math.pow (2, i)
+			end
+		elseif (bits % 2) == 1 then
+			result = result + math.pow (2, i)
+		end
+
+		bit = math.floor (bit / 2)
+		bits = math.floor (bits / 2)
+	end
+
+	return result
+end
+
+
+
+local function get_powered_rules (node)
+	local rules = { }
+
+	if is_side_on (node.param1, "switch") then
+		rules = table.copy (utils.mesecon_default_rules)
+
+		if is_side_on (node.param1, "white") then
+			rules[#rules + 1] = get_mesecon_rule_for_side ("white")[1]
+		end
+
+		if is_side_on (node.param1, "black") then
+			rules[#rules + 1] = get_mesecon_rule_for_side ("black")[1]
+		end
+	else
+		local sides =
+		{
+			"white",
+			"black",
+			"red",
+			"green",
+			"blue",
+			"yellow",
+		}
+
+		for _, side in ipairs (sides) do
+			if is_side_on (node.param1, side) then
+				rules[#rules + 1] = get_mesecon_rule_for_side (side)[1]
+			end
+		end
+	end
+
+	return rules
+end
+
+
+
+local function get_node_name (node)
+	if node.param1 ~= 0 then
+		return "lwcomponents:digiswitch_on"
+	end
+
+	return "lwcomponents:digiswitch"
+end
+
+
+
+local function switch_on (pos, side)
+	utils.mesecon_receptor_on (pos, get_mesecon_rule_for_side (side))
+
+	local node = utils.get_far_node (pos)
+	if node then
+		node.param1 = set_side_bit (node.param1, side, true)
+		node.name = get_node_name (node)
+		minetest.swap_node (pos, node)
+	end
+end
+
+
+
+local function switch_off (pos, side)
+	utils.mesecon_receptor_off (pos, get_mesecon_rule_for_side (side))
+
+	local node = utils.get_far_node (pos)
+	if node then
+		node.param1 = set_side_bit (node.param1, side, false)
+		node.name = get_node_name (node)
+		minetest.swap_node (pos, node)
+	end
+end
+
+
+
 local function digilines_support ()
 	return
 	{
@@ -80,9 +219,9 @@ local function digilines_support ()
 							end
 
 							if words[1] == "on" then
-								utils.mesecon_receptor_on (pos, get_mesecon_rule_for_side (words[2]))
+								switch_on (pos, words[2])
 							elseif words[1] == "off" then
-								utils.mesecon_receptor_off (pos, get_mesecon_rule_for_side (words[2]))
+								switch_off (pos, words[2])
 							end
 						end
 					end
@@ -102,12 +241,20 @@ local function mesecon_support ()
 			state = mesecon.state.off,
 			rules =
 			{
+				{ x =  0, y =  0, z = -1 },
 				{ x =  1, y =  0, z =  0 },
 				{ x = -1, y =  0, z =  0 },
 				{ x =  0, y =  0, z =  1 },
-				{ x =  0, y =  0, z = -1 },
+				{ x =  1, y =  1, z =  0 },
+				{ x =  1, y = -1, z =  0 },
+				{ 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 =  0, y =  1, z = -1 },
+				{ x =  0, y = -1, z = -1 },
 				{ x =  0, y =  1, z =  0 },
-				{ x =  0, y = -1, z =  0 }, -- down doesn't work
+				{ x =  0, y = -1, z =  0 }
 			}
 		},
 	}
@@ -115,6 +262,19 @@ end
 
 
 
+local function mesecon_support_on ()
+	return
+	{
+		receptor =
+		{
+			state = mesecon.state.on,
+			rules = get_powered_rules
+		},
+	}
+end
+
+
+
 local function on_construct (pos)
 	local meta = minetest.get_meta (pos)
 
@@ -124,7 +284,7 @@ local function on_construct (pos)
 		local formspec =
 		"formspec_version[3]\n"..
 		"size[6.0,4.0]\n"..
-		"field[1.0,0.8;4.0,1.0;channel;Channel;]\n"..
+		"field[1.0,0.8;4.0,1.0;channel;Channel;${channel}]\n"..
 		"button_exit[2.0,2.5;2.0,1.0;set;Set]\n"
 
 		meta:set_string ("formspec", formspec)
@@ -134,7 +294,15 @@ end
 
 
 local function on_destruct (pos)
-	utils.mesecon_receptor_off (pos, get_mesecon_rule_for_side ())
+	local node = utils.get_far_node (pos)
+
+	if node then
+		local rules = get_powered_rules (node)
+
+		if #rules > 0 then
+			utils.mesecon_receptor_off (pos, rules)
+		end
+	end
 end
 
 
@@ -145,14 +313,6 @@ local function on_receive_fields (pos, formname, fields, sender)
 
 		if meta then
 			meta:set_string ("channel", fields.channel or "")
-
-			local formspec =
-			"formspec_version[3]\n"..
-			"size[6.0,4.0]\n"..
-			"field[1.0,0.8;4.0,1.0;channel;Channel;"..minetest.formspec_escape (meta:get_string ("channel")).."]\n"..
-			"button_exit[2.0,2.5;2.0,1.0;set;Set]\n"
-
-			meta:set_string ("formspec", formspec)
 		end
 	end
 end
@@ -172,7 +332,9 @@ minetest.register_node ("lwcomponents:digiswitch", {
          {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
       }
    },
-	groups = { cracky = 2, oddly_breakable_by_hand = 2 },
+	paramtype = "none",
+	param1 = 0,
+	groups = { cracky = 2, oddly_breakable_by_hand = 2, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
@@ -185,4 +347,32 @@ minetest.register_node ("lwcomponents:digiswitch", {
 
 
 
+minetest.register_node ("lwcomponents:digiswitch_on", {
+   description = S("Digilines Switch"),
+   tiles = { "lwdigiswitch_white.png", "lwdigiswitch_black.png",
+				 "lwdigiswitch_green.png", "lwdigiswitch_red.png",
+				 "lwdigiswitch_yellow.png", "lwdigiswitch_blue.png" },
+   sunlight_propagates = false,
+   drawtype = "normal",
+   node_box = {
+      type = "fixed",
+      fixed = {
+         {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+      }
+   },
+	paramtype = "none",
+	param1 = 0,
+	groups = { cracky = 2, oddly_breakable_by_hand = 2, not_in_creative_inventory = 1, wires_connect = 1 },
+	sounds = default.node_sound_stone_defaults (),
+	mesecons = mesecon_support_on (),
+	digiline = digilines_support (),
+	_digistuff_channelcopier_fieldname = "channel",
+
+   on_construct = on_construct,
+   on_destruct = on_destruct,
+	on_receive_fields = on_receive_fields,
+})
+
+
+
 end -- utils.digilines_supported and utils.mesecon_supported

dispenser.lua

@@ -139,7 +139,8 @@ local function dispense_item (pos, node, slot)
 						item:set_count (1)
 						local spawn_pos = dispense_pos (pos, node)
 						local owner = meta:get_string ("owner")
-						local obj, cancel = nil, false
+						local obj = nil
+						local cancel
 
 						if utils.settings.spawn_mobs then
 							obj, cancel = utils.spawn_registered (name,
@@ -182,7 +183,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local spec =
 	"formspec_version[3]\n"..
@@ -200,6 +201,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 
 	inv:set_size ("main", 16)
 	inv:set_width ("main", 4)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -208,7 +216,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -217,6 +225,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Dispenser (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -309,7 +319,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -412,12 +421,112 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local dispenser_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	dispenser_groups.tubedevice = 1
+	dispenser_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:dispenser", {
 	description = S("Dispenser"),
 	tiles = { "lwdispenser.png", "lwdispenser.png", "lwdispenser.png",
 				 "lwdispenser.png", "lwdispenser.png", "lwdispenser_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (dispenser_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -428,10 +537,12 @@ minetest.register_node("lwcomponents:dispenser", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick
 })
@@ -443,7 +554,7 @@ minetest.register_node("lwcomponents:dispenser_locked", {
 	tiles = { "lwdispenser.png", "lwdispenser.png", "lwdispenser.png",
 				 "lwdispenser.png", "lwdispenser.png", "lwdispenser_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (dispenser_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -454,10 +565,12 @@ minetest.register_node("lwcomponents:dispenser_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick
 })

docs/breaker.txt

@@ -3,11 +3,13 @@ Breaker
 * This block is only available if digilines and/or mesecons are loaded.
 
 Breakers dig the node up to 5 nodes directly in front of them and drop
-the item at the back of them. The node is only dug if the breaker has a
-tool that can dig it or if it can be dug by hand, and there are no nodes
-before of it. ie. cannot dig 2nd node if 1st node has something in it.
-The tool is worn if used. Also acts as a digilines conductor. If the
-hopper mod is loaded, will take tools from the top and sides.
+the item at the back of them, or into a pipeworks tube if one is placed
+behind it. The node is only dug if the breaker has a tool that can dig it
+or if it can be dug by hand, and there are no nodes before of it. ie.
+cannot dig 2nd node if 1st node has something in it. The tool is worn if
+used. Also acts as a digilines conductor. If the hopper mod is loaded,
+will take tools from the top and sides. Pipeworks tubes can push items
+into and pull items from the inventory.
 
 Only the owner can dig or access the form of the locked version.
 

docs/cannon.txt

@@ -5,7 +5,8 @@ manually.
 
 Contains a single inventory slot and shoots an item on command.
 If the hopper mod is loaded, will take items from the top and sides, and
-release them from the bottom.
+release them from the bottom. Pipeworks tubes can push items into and pull
+items from the inventory.
 
 Cannon rotation range:
 side to side - +/-60 degrees (- = left, + = right)

docs/collector.txt

@@ -4,7 +4,8 @@ Collector
 
 Picks up dropped items in adjacent block, with optional filtering. Also
 acts as a digilines conductor. If the hopper mod is loaded, will take items
-from the top and sides, and release them from the bottom.
+from the top and sides, and release them from the bottom. Pipeworks tubes
+can push items into and pull items from the inventory.
 
 Only the owner can dig or access the form of the locked version.
 

docs/conduit.txt

@@ -1,32 +1,47 @@
 Conduit
 -------
-* This block is only available if digilines and/or mesecons are loaded.
 
 Conduits are connected in a circuit, and can move items from their
 inventory to another conduit in the same circuit.
 
 When a conduit node is placed it has a simple form that asks for a channel.
 This channel is both the digilines' channel and the target id of this
-conduit within the circuit. A conduit does not have to be given a name.
+conduit within the circuit. A conduit does not have to be given a channel.
 Most of them are just used to connect other conduits together.
 
-Transfer of items takes 0.1 seconds per conduit node moved.
+Transfer of items takes 0.1 seconds per conduit node moved, and will work
+in unloaded blocks.
+
+Filtering of items can be done by placing an item into a filter slot and
+setting a target for that item. If an item is not filtered it is sent to
+the main target. Filtering can also be implemented through digilines.
+
+Conduits also act as a digilines conductor. If the hopper mod is loaded,
+the conduit will take items from the top and sides, and release them from
+the bottom. Be aware that hoppers from the hopper mod have some deficits
+that can cause some nodes from this mod to not function correctly in
+multi-player environments. The hoppers from this mod are more compatible.
+Pipeworks tubes can push items into and pull items from the inventory.
+
+Note that if a sending conduit is moved (as with a piston) while in the
+process of sending items, when the conduit is moved back into a circuit
+a duplicate of the last sent item/s can be resent.
 
-Also acts as a digilines conductor. If the hopper mod is loaded, will
-take items from the top and sides, and release them from the bottom.
 
 Only the owner can dig or access the form of the locked version.
 
 UI
 
-Channel - digilines channel/target id of circuit.
-Target - target id/channel of circuit this circuit will transfer to.
+Channel - digilines channel/target id of conduit.
+Target - target id/channel of conduit this conduit will transfer to.
 Automatic - if checked transfers next item every second without command.
-Top right 16 slot inventory - storage of items.
+Top center 16 slot inventory - storage of items.
 Bottom 32 slot inventory - player's inventory.
+Filter - 8 vertical slot inventory on the right, each with their accompanying
+			target field.
 
 Mesecons
-	Transfers the next item when power is turned on to the target circuit.
+	Transfers the next item when power is turned on to the target conduit.
 
 Digilines messages
 "target <id>"
@@ -44,7 +59,7 @@ Digilines messages
 
 "transfer"
 	Simple transfer. Transfers the next item in the inventory to the target
-	circuit (same as mesecons power).
+	conduit (same as mesecons power).
 
 table message
 {
@@ -54,13 +69,41 @@ table message
 	item = "<itemname>"
 }
 
-	If target is not given, the circuit's set target is used.
+	If target is not given, the conduit determines the target from it's
+	own settings.
 
 	slot should be a number between 1 to 16. If the slot is empty nothing
 	is transferred.
 
-	item should be the registered item name. If the circuit's inventory
+	item should be the registered item name. If the conduit's inventory
 	does not contain any nothing is transferred.
 
 	Only slot or item should be given. If both are given slot is used. If
 	neither are given the next item in the inventory is transferred.
+
+"inventory"
+	Sends a digilines message with it's own channel in the following form:
+	{
+		action = "inventory",
+		inventory = {
+			<items>
+		}
+	}
+		The inventory key is an indexed list of items in the conduit in slot
+		order. Each item entry is a table with the following keys:
+		{
+			name -- string, the name of the item, as <mod>:<name>
+			description -- string, description of the item, same as in UI
+			count -- number, the total number of this item in storage
+			custom -- true if a custom item (has metadata), false if not
+			pallet_index -- string if the item has a pallet index, otherwise nil
+		}
+			The description is derived from the short description, if none
+			then the description, and if none then the item's name, as
+			<mod>:<name>.
+
+Note: When sending transfer messages the simple item name, as <mod>:<name>,
+will work for most items, but not for custom items. With custom items, or
+to play it safe, use the table form of the transfer message and use the
+index for the item from an inventory message as the slot for the transfer
+message.

docs/deployer.txt

@@ -7,6 +7,7 @@ node is only placed if there are no nodes before of it which are not
 replaceable. ie. cannot place 2nd node if 1st node has something in it.
 Also acts as a digilines conductor. If the hopper mod is loaded, will
 take items from the top and sides, and release them from the bottom.
+Pipeworks tubes can push items into and pull items from the inventory.
 
 Only the owner can dig or access the form of the locked version.
 

docs/destroyer.txt

@@ -0,0 +1,11 @@
+Destroyer
+---------
+
+Destroyers dispose of items placed in their single slot inventory (basically
+a trash). Items can be push into destroyers with tubes from pipeworks or
+hoppers attached to the top or sides, so they are suitable for automation.
+Items cannot be pulled out of destroyers.
+
+Note that destroyers act when an item is placed in their inventory, as with
+storage indexers it is best to use the hopper from this mod to feed them
+in multi-player games.

docs/digistuff-touchscreen.txt

@@ -0,0 +1,160 @@
+
+1st right click - set channel, can't be changed after that.
+Following right clicks displays touchscreen form.
+
+Sent message as a table. Each command can be sent individually or as
+indexes of a table to run as batch.
+
+
+Clears the current form.
+{
+	command = "clear"
+}
+
+
+Adds elements to the form. The form is size[10,8]. The parameters are as
+for formspec (see api docs). No version is specified.
+
+{
+	command = "realcoordinates",
+	enabled = true or false
+}
+
+{
+	command = "addimage",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	texture_name = string
+}
+
+{
+	command = "addfield",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	label = string,
+	default = string
+}
+
+{
+	command = "addpwdfield",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	label = string
+}
+
+{
+	command = "addtextarea",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	label = string,
+	default = string
+}
+
+{
+	command = "addlabel",
+	X = n,
+	Y = n,
+	label = string
+}
+
+{
+	command = "addvertlabel",
+	X = n,
+	Y = n,
+	label = string
+}
+
+{
+	command = "addbutton",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	label = string
+}
+
+{
+	command = "addbutton_exit",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	label = string
+}
+
+{
+	command = "addimage_button",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	image = string,
+	name = string,
+	label = string
+}
+
+{
+	command = "addimage_button_exit",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	image = string,
+	name = string,
+	label = string
+}
+
+{
+	command = "adddropdown",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	name = string,
+	selected_id = n,
+	choices = { string [, string ... ] }
+}
+
+{
+	command = "addtextlist",
+	X = n,
+	Y = n,
+	W = n,
+	H = n,
+	transparent = true/false,
+	name = string,
+	selected_id = n,
+	listelements = { string [, string ... ] }
+}
+
+
+If unlocked ignores protection.
+
+{
+	command = "lock"
+}
+
+
+{
+	command = "locked"
+}
+
+
+
+When the touchscreen form is accessed a message is sent with the
+touchscreen's channel with the 'fields' parameter from the on_receive_fields
+handler, with an additional field 'clicker' with the name of the player
+that accessed the form.

docs/digiswitch.txt

@@ -1,21 +1,31 @@
-DigiSwitch
-----------
+Digilines Switch
+----------------
 * This block is only available if both digilines and mesecons are loaded.
 
-Digiswitches act as both a digilines message target and a digilines cable,
-as well as a mesecons power source. They can be placed beside each other
-to form a bank, horizontally or vertically.
+Digilines switches act as both a digilines message target and a digilines
+cable, as well as a mesecons power source. They can be placed beside each
+other to form a bank, horizontally or vertically.
 
-Right click the digiswitch to give it a channel.
+Right click the digilines switch to give it a channel.
 
-Mesecon power can be delivered at 6 sides of the digiswitch, the adjacent
-4 in the (x, z), above and below. Around the connector on these sides are a
-colored border indicating the side. The sides are named "red", "green",
-"blue", "yellow", "white" and "black".
+Mesecon power can be delivered at 6 sides of the digilines switch, the
+adjacent 4 in the (x, z), above and below. Around the connector on these
+sides are a colored border indicating the side. The sides are named "red",
+"green", "blue", "yellow", "white" and "black".
 
-The digilines message sent to the digiswitch dictates the action, "on" or
-"off". The action can be followed with the side to act upon, separated by
-a space. eg. "on white". If a side is stated only that side is acted upon.
-If the side is omitted (or is invalid) all 6 sides are acted upon. If the
-side name "switch" is give the power is supplied the same as a mesecons
-switch (all horizontal sides, one below, this height and one above).
+The digilines message sent to the digilines switch dictates the action,
+"on" or "off". The action can be followed with the side to act upon,
+separated by a space. eg. "on white". If a side is stated only that side
+is acted upon. If the side is omitted (or is invalid) all 6 sides are
+acted upon. If the side name "switch" is given the power is supplied the
+same as a mesecons switch (all horizontal sides, one below, this height
+and one above).
+
+A note on connecting mesecons wires. Mesecons does not appear to allow
+for some sides to be on and some off on receptors (power sources). When
+any side is on the state of the digilines switch is on, but only rules for
+the powered sides are defined. This means if wires are placed while in
+this state only the sides that are powered will connect. When no side is
+powered the state of the digilines switch is off with rules defined for
+all potentially connected sides. In this state (as when first placed)
+mesecons wires will connect correctly.

docs/dispenser.txt

@@ -4,7 +4,8 @@ Dispenser
 
 Contains an inventory and dispenses (with velocity) an item on command.
 Also acts as a digilines conductor. If the hopper mod is loaded, will take
-items from the top and sides, and release them from the bottom.
+items from the top and sides, and release them from the bottom. Pipeworks
+tubes can push items into and pull items from the inventory.
 
 To spawn entities from dispensers include the lwcomponents_spawners mod.
 

docs/dropper.txt

@@ -4,7 +4,8 @@ Dropper
 
 Contains an inventory and drops an item on command. Also acts as a
 digilines conductor. If the hopper mod is loaded, will take items from the
-top and sides, and release them from the bottom.
+top and sides, and release them from the bottom. Pipeworks tubes can push
+items into and pull items from the inventory.
 
 Only the owner can dig or access the form of the locked version.
 

docs/force_field_generator.txt

@@ -0,0 +1,67 @@
+Force Field Generator
+---------------------
+
+Force field generators repel players and mobs within a given radius from
+the generator. The radius can be 5 to 25 and is in all directions. An
+'electric dome' appears marking the field. The generator consumes fuel
+relative to the radius. A radius of 25 uses 1 coal in 10 seconds, 5 uses
+1 coal in 50 seconds. Each time an entity is repelled it cost 1 fuel value
+(1/40 of a coal). Any players or mobs permitted inside the field can be
+added to the Permit list. Each entry must be on a new line with no extra
+spaces. Empty lines (not even a space) are ignored. The mob's registered
+name or tag can be used. The owner of a locked generator will not be
+repelled. When something is repelled it takes a small amount of damage.
+
+Only the owner can dig or access the form of the locked version.
+
+UI
+Channel - digilines channel of generator.
+Radius - the node radius to repel, in every direction. 5 to 25.
+Permit - list of players or mobs to allow within field. Mobs can be registered
+			entity name or tag.
+Start/Stop button - starts and stops the field.
+Fuel - single slot inventory.
+Player inventor - 32 slot inventory at bottom.
+
+
+Mesecons
+	Turns the generator on and off.
+
+
+Digilines messages
+
+"start"
+	Start the generator.
+
+"stop"
+	Stop the generator.
+
+"radius n"
+	Set the radius to n, where n is a number between 5 to 25.
+
+"add <name>"
+	Add a name to the permit list.
+
+"remove <name>"
+	Remove a name from the permit list.
+
+"status"
+	Query the status of the generator. The generator will send a digilines
+	message with its own channel as the following table:
+	{
+		action = "status",
+		state = "on" | "off",
+		radius = n, -- radius as number
+		permit =
+		{
+			<list of names>
+		},
+		fuel =
+		{
+			name = name, -- eg. "default:coal_lump", will be "" if empty
+			count = n, -- count of fuel
+		}
+	}
+
+
+Hoppers and pipeworks tubes can be used to push or pull the fuel.

docs/hopper.txt

@@ -0,0 +1,12 @@
+Hopper
+------
+* This block is only available if the hopper mod is loaded.
+
+This version of a hopper will transfer items from a drop or inventory in
+the node at the wide end of the hopper to the inventory in the node at the
+narrow end of the hopper. The hopper has no inventory itself, and always
+moves items one at a time, every second. These hoppers cannot be chained
+to transfer items, but work in unloaded blocks. This hopper uses the
+hopper mod's registered list of nodes, and should work with nodes with
+hopper support. These hoppers can be rotated with a screwdriver, but
+function as their typical placement when rotated.

docs/movefloor.txt

@@ -1,6 +1,6 @@
 MoveFloor
 ---------
-* This block is only available if mesecons and mesecons_mvps is loaded.
+* This block is only available if mesecons is loaded.
 
 The MoveFloor block responds to a mesecons power source in the 4 horizontal
 directions. If the power source is one higher the MoveFloor moves up to

docs/pistons.txt

@@ -7,6 +7,18 @@ of the pusher when extended. Sticky piston draw back a single node in
 front of the pusher when retracted. Piston also act as a digilines
 conductor.
 
+Sticky blocks are also supported. Any sticky block structure attached to
+the pusher will also be pushed, up to the maximum setting. Any free blocks
+(not attached to the sticky blocks) in front will be pushed up to the
+maximum setting. This limit is from the pusher, not the sticky block. When
+retracting a maximum of one free block depth will be pulled. Any sticky
+block structure extending laterally by more than half the maximum limit
+will not be pushed.
+
+Any entities in front of or standing on a moving node are pushed/pulled,
+if nothing is in the way of their base position. Any entities against a
+sticky face are not pulled.
+
 UI
 
 Channel - digilines channel of piston.

docs/storage.txt

@@ -0,0 +1,105 @@
+Storage
+-------
+
+Storage is accommodated with two nodes, Storage Unit and Storage Indexer.
+Storage units can be interacted with like a basic chest, each with 32 slots,
+and visually join together when placed adjacent to each other. Units are
+generally accessed via indexers, which action all adjoining units as a
+single storage block. Multiple indexers can action a single storage block.
+
+Only the owner can dig or access the form of the locked versions.
+
+Unowned indexers can only access unowned units. Owned indexers can access
+units of the same owner or unowned units.
+
+UI
+Search - top left.
+List - left.
+Channel - digilines channel of indexer.
+Input - middle.
+Output - top right.
+Filter - center right.
+Player inventor - lower right.
+
+When the UI is accessed the storage is scanned, and its contents are
+displayed in the list. The list contains the following columns:
+Item button - pressing will place one of these items from storage into the
+				  output.
+10 button - pressing will place 10 of the item.
+<stack> button - pressing places a full stack.
+Count - the total number of this item in storage.
+Description - description of the item.
+
+Note that the 10 and stack buttons may vary in number or not appear
+depending on the requirements of that item.
+
+The form does not update while open. A request for more items than in
+storage will only deliver the amount in storage.
+
+Terms can be entered into the search field, and when enter is pressed or
+the Search button is pressed, only items whose description contains these
+terms are shown in the list. That is if they match any of the space
+separated terms.
+
+Any items placed into the input are placed into storage. If the filter
+is clear all items are accepted. If the filter contains items only these
+items will be accepted. Any items not accepted or that do not fit into
+storage are placed into the output.
+
+When items are placed into the filter a copy is used and the item returns
+to where it was taken from. When items are removed from the filter they
+are disposed of.
+
+Hoppers placed to the top or sides of an indexer will feed items into the
+input. Hoppers placed below an indexer will take items from the output.
+Note, when a hopper from the hopper mod is used to place items into the
+input, if the player that placed the hopper leaves the game the input will
+not be pulled into storage.
+
+Pipeworks tubes can push items into the input, and pull items from the
+output.
+
+Every 20 inputs the storage is consolidated to minimize fragmentation.
+
+
+Digilines messages
+
+"output <item> <count>"
+or
+{
+	action = "output",
+	item = "<item>",
+	count = <count>
+}
+	Moves the item/s to the output. If count is omitted defaults to 1. If
+	the requested amount is greater than in storage, only the stored amount
+	is moved. If the requested amount is greater than a full stack of the
+	item a full stack is moved.
+
+
+"inventory"
+	Sends a digilines message with it's own channel in the following form:
+	{
+		action = "inventory",
+		inventory = {
+			<items>
+		}
+	}
+		The inventory key is an indexed list of items in storage. Each item
+		entry is a table with the following keys:
+		{
+			name -- string, the name of the item, as <mod>:<name>
+			description -- string, description of the item, same as in UI
+			count -- number, the total number of this item in storage
+			custom -- true if a custom item (has metadata), false if not
+			pallet_index -- string if the item has a pallet index, otherwise nil
+			id -- string, unique id of the item in storage
+		}
+			The description is derived from the short description, if none
+			then the description, and if none then the item's name, as
+			<mod>:<name>.
+
+Note: When sending output messages the simple item name, as <mod>:<name>,
+will work for most items, but not for custom items. With custom items, or
+to play it safe, use the table form of the output message and set the item
+field with the id field for the item from a returned inventory.

dropper.lua

@@ -118,7 +118,7 @@ end
 
 
 
-local function after_place_node (pos, placer, itemstack, pointed_thing)
+local function after_place_base (pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta (pos)
 	local spec =
 	"formspec_version[3]\n"..
@@ -136,6 +136,13 @@ local function after_place_node (pos, placer, itemstack, pointed_thing)
 
 	inv:set_size ("main", 16)
 	inv:set_width ("main", 4)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
+	utils.pipeworks_after_place (pos)
 
 	-- If return true no item is taken from itemstack
 	return false
@@ -144,7 +151,7 @@ end
 
 
 local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
-	after_place_node (pos, placer, itemstack, pointed_thing)
+	after_place_base (pos, placer, itemstack, pointed_thing)
 
 	if placer and placer:is_player () then
 		local meta = minetest.get_meta (pos)
@@ -153,6 +160,8 @@ local function after_place_node_locked (pos, placer, itemstack, pointed_thing)
 		meta:set_string ("infotext", "Dropper (owned by "..placer:get_player_name ()..")")
 	end
 
+	utils.pipeworks_after_place (pos)
+
 	-- If return true no item is taken from itemstack
 	return false
 end
@@ -245,7 +254,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -348,12 +356,112 @@ end
 
 
 
+local function pipeworks_support ()
+	if utils.pipeworks_supported then
+		return
+		{
+			priority = 100,
+			input_inventory = "main",
+			connect_sides = { left = 1, right = 1, back = 1, bottom = 1, top = 1 },
+
+			insert_object = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:add_item ("main", stack)
+				end
+
+				return stack
+			end,
+
+			can_insert = function (pos, node, stack, direction)
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					return inv:room_for_item ("main", stack)
+				end
+
+				return false
+			end,
+
+			can_remove = function (pos, node, stack, dir)
+				-- returns the maximum number of items of that stack that can be removed
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (stack, s) then
+							return s:get_count ()
+						end
+					end
+				end
+
+				return 0
+			end,
+
+			remove_items = function (pos, node, stack, dir, count)
+				-- removes count items and returns them
+				local meta = minetest.get_meta (pos)
+				local inv = (meta and meta:get_inventory ()) or nil
+				local left = count
+
+				if inv then
+					local slots = inv:get_size ("main")
+
+					for i = 1, slots, 1 do
+						local s = inv:get_stack ("main", i)
+
+						if s and not s:is_empty () and utils.is_same_item (s, stack) then
+							if s:get_count () > left then
+								s:set_count (s:get_count () - left)
+								inv:set_stack ("main", i, s)
+								left = 0
+							else
+								left = left - s:get_count ()
+								inv:set_stack ("main", i, nil)
+							end
+						end
+
+						if left == 0 then
+							break
+						end
+					end
+				end
+
+				local result = ItemStack (stack)
+				result:set_count (count - left)
+
+				return result
+			end
+		}
+	end
+
+	return nil
+end
+
+
+
+local dropper_groups = { cracky = 3, wires_connect = 1 }
+if utils.pipeworks_supported then
+	dropper_groups.tubedevice = 1
+	dropper_groups.tubedevice_receiver = 1
+end
+
+
+
 minetest.register_node("lwcomponents:dropper", {
 	description = S("Dropper"),
 	tiles = { "lwdropper.png", "lwdropper.png", "lwdropper.png",
 				 "lwdropper.png", "lwdropper.png", "lwdropper_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (dropper_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -364,10 +472,12 @@ minetest.register_node("lwcomponents:dropper", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick
 })
@@ -379,7 +489,7 @@ minetest.register_node("lwcomponents:dropper_locked", {
 	tiles = { "lwdropper.png", "lwdropper.png", "lwdropper.png",
 				 "lwdropper.png", "lwdropper.png", "lwdropper_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = table.copy (dropper_groups),
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -390,10 +500,12 @@ minetest.register_node("lwcomponents:dropper_locked", {
 
 	mesecons = mesecon_support (),
 	digiline = digilines_support (),
+	tube = pipeworks_support (),
 
 	on_receive_fields = on_receive_fields,
 	after_place_node = after_place_node_locked,
 	can_dig = can_dig,
+	after_dig_node = utils.pipeworks_after_dig,
 	on_blast = on_blast,
 	on_rightclick = on_rightclick
 })

dummy_player.lua

@@ -0,0 +1,437 @@
+
+
+local function get_dummy_player (as_player, name, pos, look_dir, controls, velocity,
+											hp, armor_groups, properties, nametag, breath)
+	local obj_as_player = as_player ~= false
+	local obj_name = name or ""
+	local obj_pos = vector.new (pos or { x = 0, y = 0, z = 0 })
+	local obj_look_dir = vector.new (look_dir or { x = 0, y = 0, z = 0 })
+	local obj_controls = table.copy (controls or { })
+	local obj_velocity = vector.new (velocity or { x = 0, y = 0, z = 0 })
+	local obj_hp = hp or 20
+	local obj_armor_groups = table.copy (armor_groups or { })
+	local obj_properties = table.copy (properties or { })
+	local obj_nametag = table.copy (nametag or { })
+	local obj_breath = breath or 20
+
+	local object = { }
+
+	-- common
+	object.get_pos = function (self)
+		return vector.new (obj_pos)
+	end
+
+
+	object.set_pos = function (self, _pos)
+		obj_pos = vector.new (_pos)
+	end
+
+
+	object.get_velocity = function (self)
+		return vector.new (obj_velocity)
+	end
+
+
+	object.add_velocity = function (self, vel)
+		obj_velocity = vector.add (obj_velocity, vel)
+	end
+
+
+	object.move_to = function (self, _pos, continuous)
+		obj_pos = vector.new (_pos)
+	end
+
+
+	object.punch = function (self, puncher, time_from_last_punch, tool_capabilities, direction)
+	end
+
+
+	object.right_click = function (self, clicker)
+	end
+
+
+	object.get_hp = function (self)
+		return obj_hp
+	end
+
+
+	object.set_hp = function (self, _hp, reason)
+		obj_hp = _hp
+	end
+
+
+	object.get_inventory = function (self)
+		return nil
+	end
+
+
+	object.get_wield_list = function (self)
+		return nil
+	end
+
+
+	object.get_wield_index = function (self)
+		return nil
+	end
+
+
+	object.get_wielded_item = function (self)
+		return nil
+	end
+
+
+	object.set_wielded_item = function (self, item)
+	end
+
+
+	object.set_armor_groups = function (self, groups)
+		obj_armor_groups = groups
+	end
+
+
+	object.get_armor_groups = function (self)
+		return table.copy (obj_armor_groups)
+	end
+
+
+	object.set_animation = function (self, frame_range, frame_speed, frame_blend, frame_loop)
+	end
+
+
+	object.get_animation = function (self)
+		return { x = 1, y = 1 }, 15.0, 0.0, true
+	end
+
+
+	object.set_animation_frame_speed = function (self, frame_speed)
+	end
+
+
+	object.set_attach = function (self, parent, bone, position, rotation, forced_visible)
+	end
+
+
+	object.get_attach = function (self)
+		return nil
+	end
+
+
+	object.get_children = function (self)
+		return { }
+	end
+
+
+	object.set_detach = function (self)
+	end
+
+
+	object.set_bone_position = function (self, bone, position, rotation)
+	end
+
+
+	object.get_bone_position = function (self)
+		return nil
+	end
+
+
+	object.set_properties = function (self, _properties)
+		obj_properties = table.copy (_properties or { })
+	end
+
+
+	object.get_properties = function (self)
+		return table.copy (obj_properties)
+	end
+
+
+	object.is_player = function (self)
+		return obj_as_player
+	end
+
+
+	object.get_nametag_attributes = function (self)
+		return obj_nametag
+	end
+
+
+	object.set_nametag_attributes = function (self, attributes)
+		obj_nametag = table.copy (attributes)
+	end
+
+
+
+	-- player
+	object.get_player_name = function (self)
+		return obj_name
+	end
+
+
+	object.get_player_velocity = function (self)
+		return table.copy (obj_velocity)
+	end
+
+
+	object.add_player_velocity = function (self, vel)
+		obj_velocity =  vector.add (obj_velocity, vel)
+	end
+
+
+	object.get_look_dir = function (self)
+		return table.copy (obj_look_dir)
+	end
+
+
+	object.get_look_vertical = function (self)
+		return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).x
+	end
+
+
+	object.get_look_horizontal = function (self)
+		return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).y
+	end
+
+
+	object.set_look_vertical = function (self, radians)
+		obj_look_dir = vector.new ({ x = radians, y = obj_look_dir.y, z = obj_look_dir.z })
+	end
+
+
+	object.set_look_horizontal = function (self, radians)
+		obj_look_dir = vector.new ({ x = obj_look_dir.x, y = radians, z = obj_look_dir.z })
+	end
+
+
+	object.get_look_pitch = function (self)
+		return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).x
+	end
+
+
+	object.get_look_yaw = function (self)
+		return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).y
+	end
+
+
+	object.set_look_pitch = function (self, radians)
+		obj_look_dir = vector.new ({ x = radians, y = obj_look_dir.y, z = obj_look_dir.z })
+	end
+
+
+	object.set_look_yaw = function (self, radians)
+		obj_look_dir = vector.new ({ x = obj_look_dir.x, y = radians, z = obj_look_dir.z })
+	end
+
+
+	object.get_breath = function (self)
+		return obj_breath
+	end
+
+
+	object.set_breath = function (self, value)
+		obj_breath = value
+	end
+
+
+	object.get_fov = function (self)
+		return 0, false, 0
+	end
+
+
+	object.set_fov = function (self, fov, is_multiplier, transition_time)
+	end
+
+
+	object.get_attribute = function (self, attribute)
+		return nil
+	end
+
+
+	object.set_attribute = function (self, attribute, value)
+	end
+
+
+	object.get_meta = function (self)
+		return nil
+	end
+
+
+	object.set_inventory_formspec = function (self, formspec)
+	end
+
+
+	object.get_inventory_formspec = function (self)
+		return ""
+	end
+
+
+	object.set_formspec_prepend = function (self, formspec)
+	end
+
+
+	object.get_formspec_prepend = function (self)
+		return ""
+	end
+
+
+	object.get_player_control = function (self)
+		return table.copy (obj_controls)
+	end
+
+
+	object.set_physics_override = function (self, override_table)
+	end
+
+
+	object.get_physics_override = function (self)
+		return { }
+	end
+
+
+	object.hud_add = function (self, definition)
+		return nil
+	end
+
+
+	object.hud_remove = function (self, id)
+	end
+
+
+	object.hud_change = function (self, id, stat, value)
+	end
+
+
+	object.hud_get = function (self, id)
+		return nil
+	end
+
+
+	object.hud_set_flags = function (self, flags)
+	end
+
+
+	object.hud_get_flags = function (self)
+		return { }
+	end
+
+
+	object.hud_set_hotbar_itemcount = function (self, count)
+	end
+
+
+	object.hud_get_hotbar_itemcount = function (self)
+		return 0
+	end
+
+
+	object.hud_set_hotbar_image = function (self, texturename)
+	end
+
+
+	object.hud_get_hotbar_image = function (self)
+		return ""
+	end
+
+
+	object.hud_set_hotbar_selected_image = function (self, texturename)
+	end
+
+
+	object.hud_get_hotbar_selected_image = function (self)
+		return ""
+	end
+
+
+	object.set_minimap_modes = function (self, modes, selected_mode)
+	end
+
+
+	object.set_sky = function (self, sky_parameters)
+	end
+
+
+	object.get_sky = function (self)
+		return nil
+	end
+
+
+	object.get_sky_color = function (self)
+		return nil
+	end
+
+
+	object.set_sun = function (self, sun_parameters)
+	end
+
+
+	object.get_sun = function (self)
+		return { }
+	end
+
+
+	object.set_moon = function (self, moon_parameters)
+	end
+
+
+	object.get_moon = function (self)
+		return { }
+	end
+
+
+	object.set_stars = function (self, star_parameters)
+	end
+
+
+	object.get_stars = function (self)
+		return { }
+	end
+
+
+	object.set_clouds = function (self, cloud_parameters)
+	end
+
+
+	object.get_clouds = function (self)
+		return { }
+	end
+
+
+	object.override_day_night_ratio = function (self, ratio)
+	end
+
+
+	object.get_day_night_ratio = function (self)
+		return nil
+	end
+
+
+	object.set_local_animation = function (self, idle, walk, dig, walk_while_dig, frame_speed)
+	end
+
+
+	object.get_local_animation = function (self)
+		return { x = 0, y = 0 }, { x = 0, y = 0 }, { x = 0, y = 0 }, { x = 0, y = 0 }, 30
+	end
+
+
+	object.set_eye_offset = function (self, firstperson, thirdperson)
+	end
+
+
+	object.get_eye_offset = function (self)
+		return { x = 0, y = 0, z = 0 }, { x = 0, y = 0, z = 0 }
+	end
+
+
+	object.send_mapblock = function (self, blockpos)
+		return false
+	end
+
+
+	return object
+end
+
+
+
+return get_dummy_player
+
+
+--

explode.lua

@@ -70,24 +70,6 @@ end
 
 
 
-local function is_same_item (stack1, stack2)
-	local copy1 = ItemStack (stack1)
-	local copy2 = ItemStack (stack2)
-
-	if copy1 and copy2 then
-		copy1:set_count (1)
-		copy2:set_count (1)
-
-		if copy1:to_string () == copy2:to_string () then
-			return true
-		end
-	end
-
-	return false
-end
-
-
-
 local function dig_node (pos, toolname)
 	local node = utils.get_far_node (pos)
 	local dig = false
@@ -143,7 +125,7 @@ local function add_drops (drops, drop)
 			if item and not item:is_empty () then
 				local existing = drops[item:get_name ()]
 
-				if existing and is_same_item (item, existing) then
+				if existing and utils.is_same_item (item, existing) then
 					existing:set_count (existing:get_count () + item:get_count ())
 				else
 					drops[item:get_name ()] = item
@@ -228,7 +210,9 @@ end
 local function explode_entities (pos, radius, damage, drops)
 	local objs = minetest.get_objects_inside_radius (pos, radius)
 
-	for _, obj in pairs (objs) do
+	for _, obj in ipairs (objs) do
+		-- could be detached player from controller
+		if obj.get_pos and obj:get_pos () then
 			local obj_pos = obj:get_pos ()
 			local dir = vector.direction (pos, obj_pos)
 			local dist = vector.length (vector.subtract (obj_pos, pos))
@@ -243,8 +227,13 @@ local function explode_entities (pos, radius, damage, drops)
 				local reason = { type = "set_hp", from = "lwcomponents" }
 
 				if obj:is_player() then
-				obj:add_velocity (vel)
+					local parent = obj:get_attach ()
 
+					if parent then
+						obj:set_detach ()
+					end
+
+					obj:add_velocity (vel)
 					obj:set_hp (obj:get_hp () - ent_damage, reason)
 
 				else
@@ -252,6 +241,20 @@ local function explode_entities (pos, radius, damage, drops)
 
 					-- object might have disappeared somehow
 					if luaobj then
+						if luaobj.name == "digistuff:controller_entity" then
+							for _, child in ipairs (obj:get_children ()) do
+								if child:is_player () then
+									local def = utils.find_item_def ("digistuff:controller_programmed")
+
+									if def and def.on_rightclick then
+										def.on_rightclick (obj:get_pos (), ItemStack (), child)
+
+										child:add_velocity (vel)
+										child:set_hp (child:get_hp () - ent_damage, reason)
+									end
+								end
+							end
+						else
 							local do_damage = true
 							local do_knockback = true
 							local entity_drops = {}
@@ -275,6 +278,8 @@ local function explode_entities (pos, radius, damage, drops)
 				end
 			end
 		end
+	end
+end
 
 
 
@@ -309,7 +314,7 @@ local function add_effects (pos, radius, drops)
 		collisiondetection = false,
 		vertical = false,
 		texture = "lwcomponents_boom.png",
-		glow = 15,
+		glow = 14,
 	})
 
 	minetest.add_particlespawner ({
@@ -404,7 +409,7 @@ function utils.boom (pos,									-- center of explosion
 	if not utils.is_protected (pos, nil) then
 		local center_node = utils.get_far_node (pos)
 
-		if not node or node.name == "air" then
+		if not center_node or center_node.name == "air" then
 			center_free = true
 		end
 	end

fan.lua

@@ -45,7 +45,6 @@ end
 
 
 local function blow (pos)
-	local meta = minetest.get_meta (pos)
 	local node = minetest.get_node (pos)
 	local dir = direction_vector (node)
 	local reach = 5
@@ -211,7 +210,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -343,7 +341,7 @@ minetest.register_node("lwcomponents:fan", {
 	tiles = { "lwfan.png", "lwfan.png", "lwfan.png",
 				 "lwfan.png", "lwfan.png", "lwfan_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -371,7 +369,7 @@ minetest.register_node("lwcomponents:fan_locked", {
 	tiles = { "lwfan.png", "lwfan.png", "lwfan.png",
 				 "lwfan.png", "lwfan.png", "lwfan_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -399,7 +397,7 @@ minetest.register_node("lwcomponents:fan_on", {
 	tiles = { "lwfan.png", "lwfan.png", "lwfan.png",
 				 "lwfan.png", "lwfan.png", "lwfan_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -428,7 +426,7 @@ minetest.register_node("lwcomponents:fan_locked_on", {
 	tiles = { "lwfan.png", "lwfan.png", "lwfan.png",
 				 "lwfan.png", "lwfan.png", "lwfan_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,

hologram.lua

@@ -126,14 +126,14 @@ local function draw_map (pos, map)
 					end
 
 					if draw then
-						local holonode = hologram_block[line[z]]
+						local colornode = hologram_block[line[z]]
 
 						if node then
 							utils.destroy_node (holopos)
 						end
 
-						if holonode then
-							minetest.set_node (holopos, { name = holonode.node })
+						if colornode then
+							minetest.set_node (holopos, { name = colornode.node })
 
 							local nodemeta = minetest.get_meta (holopos)
 
@@ -231,7 +231,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end

hopper.lua

@@ -0,0 +1,459 @@
+local utils, mod_storage = ...
+local S = utils.S
+
+
+
+if utils.hopper_supported then
+
+
+
+local hopper_interval = 1.0
+
+
+
+local hopper_list = minetest.deserialize (mod_storage:get_string ("hopper_list"))
+if type (hopper_list) ~= "table" then
+	hopper_list = {}
+end
+
+
+
+local function add_hopper_to_list (pos)
+	hopper_list[minetest.pos_to_string (pos, 0)] = true
+
+	mod_storage:set_string ("hopper_list", minetest.serialize (hopper_list))
+end
+
+
+
+local function remove_hopper_from_list (pos)
+	hopper_list[minetest.pos_to_string (pos, 0)] = nil
+
+	mod_storage:set_string ("hopper_list", minetest.serialize (hopper_list))
+end
+
+
+
+local input_dir =
+{
+	[0] = { x = 0, y = 1, z = 0 },
+	{ x = 0, y = 0, z = 1 },
+	{ x = 0, y = 0, z = -1 },
+	{ x = 1, y = 0, z = 0 },
+	{ x = -1, y = 0, z = 0 },
+	{ x = 0, y = -1, z = 0 }
+}
+
+local function get_input_dir (node)
+	return input_dir[math.floor (node.param2 / 4)]
+end
+
+
+
+local function get_output_dir (node)
+	if node then
+		if node.name == "lwcomponents:hopper" then
+			return vector.multiply (get_input_dir (node), -1)
+		elseif node.name == "lwcomponents:hopper_horz" then
+			return minetest.facedir_to_dir (node.param2)
+		end
+	end
+
+	return nil
+end
+
+
+
+local function get_drop (pos)
+	local objs = minetest.get_objects_inside_radius (pos, 1)
+
+	for _, obj in pairs (objs) do
+		local obj_pos = (obj.get_pos and obj:get_pos ())
+
+		if obj_pos and utils.is_drop (obj) then
+			obj_pos = vector.round (obj_pos)
+
+			if vector.equals (pos, obj_pos) then
+				local stack = ItemStack (obj:get_luaentity ().itemstring)
+
+				if stack and not stack:is_empty () then
+					stack:set_count (1)
+
+					return stack, obj
+				end
+			end
+		end
+	end
+end
+
+
+
+local function take_drop (obj)
+	if utils.is_drop (obj) then
+		local stack = ItemStack (obj:get_luaentity ().itemstring)
+
+		if stack and not stack:is_empty () then
+			stack:set_count (stack:get_count () - 1)
+
+			if stack:is_empty () then
+				obj:get_luaentity().itemstring = ""
+				obj:remove()
+			else
+				obj:get_luaentity().itemstring = stack:to_string ()
+			end
+		end
+	end
+end
+
+
+
+local function next_item_to_take (src_pos, src_node, src_inv_name)
+	if not src_inv_name or not minetest.registered_nodes[src_node.name] then
+		return
+	end
+
+	local src_meta = minetest.get_meta (src_pos)
+	local src_inv = (src_meta and src_meta:get_inventory ()) or nil
+
+	if src_inv then
+		local slots = src_inv:get_size (src_inv_name)
+
+		for slot = 1, slots, 1 do
+			local stack = src_inv:get_stack (src_inv_name, slot)
+
+			if stack and not stack:is_empty () then
+				stack:set_count (1)
+
+				return stack, slot
+			end
+		end
+	end
+end
+
+
+
+local function take_item (src_pos, src_inv_name, slot)
+	local src_meta = minetest.get_meta (src_pos)
+	local src_inv = (src_meta and src_meta:get_inventory ()) or nil
+
+	if src_inv then
+		local stack = src_inv:get_stack (src_inv_name, slot)
+
+		if stack and not stack:is_empty () then
+			stack:set_count (stack:get_count () - 1)
+
+			src_inv:set_stack (src_inv_name, slot, stack)
+		end
+	end
+end
+
+
+
+local function call_allow_metadata_inventory_put (def, pos, listname, index, stack, placer)
+	if def.allow_metadata_inventory_put and placer then
+		local result, count = pcall (def.allow_metadata_inventory_put,
+											  pos, listname, index, stack, placer)
+
+		if result then
+			return count
+		end
+	end
+
+	return utils.settings.default_stack_max
+end
+
+
+
+local function call_on_metadata_inventory_put (def, pos, listname, index, stack, placer)
+	if def.on_metadata_inventory_put and placer then
+		pcall (def.on_metadata_inventory_put, pos, listname, index, stack, placer)
+	end
+end
+
+
+
+local function place_item (dest_pos, dest_node, dest_inv_name, stack, placer)
+	local dest_def = minetest.registered_nodes[dest_node.name]
+
+	if not dest_inv_name or not dest_def then
+		return
+	end
+
+	local dest_meta = minetest.get_meta (dest_pos)
+	local dest_inv = (dest_meta and dest_meta:get_inventory ()) or nil
+
+	if dest_inv then
+		local slots = dest_inv:get_size (dest_inv_name)
+
+		-- find existing stack
+		for slot = 1, slots, 1 do
+			local inv_stack = dest_inv:get_stack (dest_inv_name, slot)
+
+			if inv_stack and not inv_stack:is_empty () and
+				utils.is_same_item (inv_stack, stack) and
+				inv_stack:get_count () < inv_stack:get_stack_max () and
+				(call_allow_metadata_inventory_put (dest_def, dest_pos, dest_inv_name, slot, stack, placer) > 0) then
+
+				inv_stack:set_count (inv_stack:get_count () + 1)
+				dest_inv:set_stack (dest_inv_name, slot, inv_stack)
+
+				call_on_metadata_inventory_put (dest_def, dest_pos, dest_inv_name, slot, stack, placer)
+
+				return true
+			end
+		end
+
+		-- find empty slot
+		for slot = 1, slots, 1 do
+			local inv_stack = dest_inv:get_stack (dest_inv_name, slot)
+
+			if not inv_stack or inv_stack:is_empty () and
+				(call_allow_metadata_inventory_put (dest_def, dest_pos, dest_inv_name, slot, stack, placer) > 0) then
+
+				dest_inv:set_stack (dest_inv_name, slot, stack)
+
+				call_on_metadata_inventory_put (dest_def, dest_pos, dest_inv_name, slot, stack, placer)
+
+				return true
+			end
+		end
+	end
+
+	return false
+end
+
+
+
+local function get_player_object (pos)
+	local meta = minetest.get_meta (pos)
+	local placer_name = "<unknown>"
+
+	if meta then
+		placer_name = meta:get_string ("placer_name")
+		local placer = minetest.get_player_by_name (placer_name)
+
+		if placer then
+			return placer
+		end
+
+		if placer_name == "" then
+			placer_name = "<unknown>"
+		end
+	end
+
+	return utils.get_dummy_player (true, placer_name)
+end
+
+
+
+local function run_hopper_action (pos)
+	local node = utils.get_far_node (pos)
+	local dest_dir = get_output_dir (node)
+
+	if dest_dir then
+		local dest_pos = vector.add (pos, dest_dir)
+		local dest_node = utils.get_far_node (dest_pos)
+
+		if dest_node then
+			local registered_dest_invs = hopper.get_registered_inventories_for (dest_node.name)
+
+			if registered_dest_invs then
+				local placer = get_player_object (pos)
+				local src_pos = vector.add (pos, get_input_dir (node))
+				local drop
+				local stack
+				local slot = nil
+				local src_inv_name = nil
+
+				stack, drop = get_drop (src_pos)
+
+				if not stack then
+					local src_node = utils.get_far_node (src_pos)
+
+					if src_node then
+						local registered_src_invs = hopper.get_registered_inventories_for (src_node.name)
+
+						if registered_src_invs then
+							src_inv_name = registered_src_invs["top"]
+							stack, slot = next_item_to_take (src_pos, src_node, src_inv_name)
+						end
+					end
+				end
+
+				if stack then
+					local dest_side = (node.name == "lwcomponents:hopper" and "bottom") or "side"
+					local dest_inv_name = registered_dest_invs[dest_side]
+
+					if place_item (dest_pos, dest_node, dest_inv_name, stack, placer) then
+						if drop then
+							take_drop (drop)
+						else
+							take_item (src_pos, src_inv_name, slot)
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+
+local function on_construct (pos)
+	add_hopper_to_list (pos)
+end
+
+
+
+local function on_destruct (pos)
+	remove_hopper_from_list (pos)
+end
+
+
+
+local function after_place_node (pos, placer, itemstack, pointed_thing)
+	local meta = minetest.get_meta (pos)
+
+	meta:set_string ("placer_name", (placer and placer:get_player_name ()) or "")
+
+	-- If return true no item is taken from itemstack
+	return false
+end
+
+
+
+local function on_place (itemstack, placer, pointed_thing)
+	if pointed_thing and pointed_thing.type == "node" then
+		local stack = ItemStack (itemstack)
+		local dir = vector.direction (pointed_thing.above, pointed_thing.under)
+
+		if dir.y == 0 then
+			minetest.item_place (ItemStack ("lwcomponents:hopper_horz"), placer, pointed_thing)
+
+			if not utils.is_creative (placer) then
+				stack:set_count (stack:get_count () - 1)
+			end
+
+			return stack
+		end
+	end
+
+	return minetest.item_place (itemstack, placer, pointed_thing)
+end
+
+
+
+minetest.register_node ("lwcomponents:hopper", {
+   description = S("Conduit Hopper"),
+   tiles = { "lwcomponents_hopper_top.png", "lwcomponents_hopper_vert_spout.png",
+				 "lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png",
+				 "lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png" },
+   drawtype = "nodebox",
+   node_box = {
+      type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.3125, 0.3125, -0.25, 0.3125}, -- spout_vert
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, -- funnel_1
+			{-0.5, 0, 0.3125, 0.5, 0.5, 0.5}, -- funnel_2
+			{-0.5, 0, -0.5, 0.5, 0.5, -0.3125}, -- funnel_3
+			{0.3125, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel_4
+		}
+   },
+   selection_box = {
+      type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.3125, 0.3125, -0.25, 0.3125}, -- spout_vert
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
+		}
+   },
+   collision_box = {
+      type = "fixed",
+		fixed = {
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
+			{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
+		}
+   },
+	paramtype = "light",
+	param1 = 0,
+	paramtype2 = "facedir",
+	param2 = 0,
+	drop = "lwcomponents:hopper",
+	groups = { cracky = 3 },
+	sounds = default.node_sound_stone_defaults (),
+
+   on_construct = on_construct,
+   on_destruct = on_destruct,
+	after_place_node = after_place_node,
+	on_place = on_place,
+})
+
+
+
+minetest.register_node ("lwcomponents:hopper_horz", {
+   description = S("Conduit Hopper"),
+   tiles = { "lwcomponents_hopper_top.png", "lwcomponents_hopper_bottom.png",
+				 "lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png",
+				 "lwcomponents_hopper_side_spout.png", "lwcomponents_hopper_side.png" },
+   drawtype = "nodebox",
+   node_box = {
+      type = "fixed",
+		fixed = {
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, -- funnel_1
+			{-0.5, 0, 0.3125, 0.5, 0.5, 0.5}, -- funnel_2
+			{-0.5, 0, -0.5, 0.5, 0.5, -0.3125}, -- funnel_3
+			{0.3125, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel_4
+			{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
+		}
+   },
+   selection_box = {
+      type = "fixed",
+		fixed = {
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
+			{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
+		}
+   },
+   collision_box = {
+      type = "fixed",
+		fixed = {
+			{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
+			{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
+			{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
+		}
+   },
+	paramtype = "light",
+	param1 = 0,
+	paramtype2 = "facedir",
+	param2 = 0,
+	drop = "lwcomponents:hopper",
+	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	sounds = default.node_sound_stone_defaults (),
+
+   on_construct = on_construct,
+   on_destruct = on_destruct,
+	after_place_node = after_place_node,
+})
+
+
+
+local function run_hoppers ()
+	for spos, _ in pairs (hopper_list) do
+		run_hopper_action (minetest.string_to_pos (spos))
+	end
+
+	minetest.after (hopper_interval, run_hoppers)
+end
+
+
+
+minetest.register_on_mods_loaded (function ()
+	minetest.after (3.0, run_hoppers)
+end)
+
+
+
+end -- utils.hopper_supported

init.lua

@@ -1,4 +1,4 @@
-local version = "0.1.20"
+local version = "0.1.28"
 local mod_storage = minetest.get_mod_storage ()
 
 
@@ -16,7 +16,8 @@ local utils = { }
 local modpath = minetest.get_modpath ("lwcomponents")
 
 loadfile (modpath.."/settings.lua") (utils)
-loadfile (modpath.."/utils.lua") (utils, mod_storage)
+utils.get_dummy_player = loadfile (modpath.."/dummy_player.lua") ()
+loadfile (modpath.."/utils.lua") (utils)
 loadfile (modpath.."/explode.lua") (utils)
 loadfile (modpath.."/api.lua") (utils)
 utils.connections = loadfile (modpath.."/connections.lua") ()
@@ -32,11 +33,15 @@ loadfile (modpath.."/breaker.lua") (utils)
 loadfile (modpath.."/deployer.lua") (utils)
 loadfile (modpath.."/fan.lua") (utils)
 loadfile (modpath.."/conduit.lua") (utils, mod_storage)
+loadfile (modpath.."/hopper.lua") (utils, mod_storage)
 loadfile (modpath.."/cannon.lua") (utils)
 loadfile (modpath.."/cannon_shell.lua") (utils)
 loadfile (modpath.."/pistons.lua") (utils)
 loadfile (modpath.."/through_wire.lua") (utils)
 loadfile (modpath.."/camera.lua") (utils)
+loadfile (modpath.."/storage.lua") (utils)
+loadfile (modpath.."/force_field.lua") (utils)
+loadfile (modpath.."/destroyer.lua") (utils)
 loadfile (modpath.."/extras.lua") (utils)
 loadfile (modpath.."/digiswitch.lua") (utils)
 loadfile (modpath.."/movefloor.lua") (utils)

license.txt

@@ -15,6 +15,8 @@ https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
 
 Mesecons through wire code was adapted from mesecons_receiver.
 
+Fragments of code were gleaned from tnt mod.
+
 
 
 lwsiren-buzz.ogg
@@ -61,6 +63,24 @@ https://creativecommons.org/licenses/by/4.0/
 
 
 
+lwmovefloor.ogg
+---------------
+https://www.freesoundslibrary.com/elevator-sound-effect-elevator-ride-doors-closing-and-opening/
+
+License: Attribution 4.0 International (CC BY 4.0). You are allowed to use
+sound effects free of charge and royalty free in your multimedia projects
+for commercial or non-commercial purposes.
+
+
+lwforce_field_zap.ogg
+---------------------
+https://orangefreesounds.com/electricity-zap/
+
+Licence: The sound effect is permitted for non-commercial use under license
+Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)
+
+
+
 Media license
 -------------
 siren images derived from images from https://openclipart.org, which is
@@ -72,6 +92,9 @@ public domain.
 camera lens images derived from images from https://openclipart.org, which
 is public domain.
 
+storage nodes images derived from images from https://openclipart.org, which
+is public domain.
+
 player button images derived from mesecons button image.
 
 cannon firing and explosion sound from tnt (TumeniNodes/steveygos93),

mod.conf

@@ -3,4 +3,4 @@ description = Various components for mesecons and digilines.
 title = LWComponents
 name = lwcomponents
 depends = default
-optional_depends = mesecons, digilines, unifieddyes, intllib, hopper, digistuff
+optional_depends = mesecons, digilines, unifieddyes, intllib, hopper, digistuff, pipeworks, lwwires

movefloor.lua

@@ -3,7 +3,7 @@ local S = utils.S
 
 
 
-if utils.mesecon_supported and mesecon.mvps_push then
+if utils.mesecon_supported then
 
 
 
@@ -21,14 +21,10 @@ local mesecon_rules =
 
 
 
--- use mesecons movestone settings
-local timer_interval = 1 / mesecon.setting ("movestone_speed", 3)
 local max_push = 3
-local max_pull = 3
 
 
 
--- helper functions:
 local function get_movefloor_direction (rulename)
 	if rulename.y > 0 then
 		return { x = 0, y = 1, z = 0 }
@@ -38,6 +34,7 @@ local function get_movefloor_direction (rulename)
 end
 
 
+
 local function add_movefloor_list (pos, list)
 	for i = 1, #list do
 		if list[i].x == pos.x and
@@ -76,10 +73,289 @@ end
 
 
 
--- copied from mesecons movestone
-local function movefloor_move (pos, node, rulename, is_sticky)
+local function get_node_height (node)
+	local height = 0
+	local def = minetest.registered_nodes[node.name]
+
+	if def and type (def.collision_box) == "table" then
+		if def.collision_box.type and def.collision_box.type == "regular" then
+			height = 1
+
+		else
+			for _, box in pairs (def.collision_box) do
+				if type (box) == "table" then
+					if type (box[5]) == "number" then
+						height = box[5]
+					else
+						for _, b in ipairs (box) do
+							if type (b[5]) == "number" and b[5] > height then
+								height = b[5]
+							end
+						end
+					end
+				end
+			end
+
+		end
+	end
+
+	return height
+end
+
+
+
+local function get_affected_nodes (floor_list)
+	local list = { }
+	local max_height = 0
+	local protected = false
+
+	for _, fpos in ipairs (floor_list) do
+		for y = 0, max_push, 1 do
+			local npos = vector.add (fpos, { x = 0, y = y, z = 0 })
+			local node = utils.get_far_node (npos)
+
+			if node and node.name ~= "air" then
+				local meta = minetest.get_meta (npos)
+				local timer = minetest.get_node_timer (npos)
+				local h = get_node_height (node) + npos.y - fpos.y - 0.5
+
+				list[#list + 1] =
+				{
+					pos = npos,
+					node = node,
+					meta = (meta and meta:to_table ()),
+					timeout = (timer and timer:get_timeout ()) or 0,
+					elapsed = (timer and timer:get_elapsed ()) or 0
+				}
+
+				if h > max_height then
+					max_height = h
+				end
+
+				if utils.is_protected (npos, nil) then
+					protected = true
+				end
+			end
+		end
+	end
+
+	return list, math.ceil (max_height), protected
+end
+
+
+
+local function get_entity_height (obj, base)
+	local height = 0
+
+	if obj.get_pos then
+		local pos = obj:get_pos ()
+
+		if obj.get_luaentity then
+			local entity = obj:get_luaentity ()
+
+			if entity and entity.name then
+				local def = minetest.registered_entities[entity.name]
+
+				if def and type (def.collisionbox) == "table" and
+					type (def.collisionbox[5]) == "number" then
+
+					height = def.collisionbox[5] + pos.y - base
+				end
+			end
+		end
+
+		local props = obj:get_properties ()
+		if props and props.collisionbox and type (props.collisionbox) == "table" and
+			type (props.collisionbox[5]) == "number" then
+
+			if props.collisionbox[5] > height then
+				height = props.collisionbox[5] + pos.y - base
+			end
+		end
+	end
+
+	return height
+end
+
+
+
+local function get_affected_entities (floor_list)
+	local list = { }
+	local max_height = 0
+
+	for _, fpos in pairs (floor_list) do
+		local min_pos = vector.subtract (fpos, { x = 0.4999, y = 0.4999, z = 0.4999 })
+		local max_pos = vector.add (fpos, { x = 0.4999, y = max_push + 0.4999, z = 0.4999 })
+
+		local objects = minetest.get_objects_in_area (min_pos, max_pos)
+
+		for _, obj in ipairs (objects) do
+			local h = get_entity_height (obj, fpos.y + 0.5)
+
+			list[#list + 1] =
+			{
+				pos = obj:get_pos (),
+				obj = obj
+			}
+
+			if h > max_height then
+				max_height = h
+			end
+		end
+	end
+
+	return list, math.ceil (max_height)
+end
+
+
+
+local function is_obstructed (floor_list, height)
+	for _, fpos in pairs (floor_list) do
+		local npos = vector.add (fpos, { x = 0, y = height, z = 0 })
+
+		if utils.is_protected (npos, nil) then
+			return true
+		end
+
+		local node = utils.get_far_node (npos)
+
+		if node and node.name ~= "air" then
+			local def = minetest.registered_nodes[node.name]
+
+			if not def or not def.buildable_to then
+				return true
+			end
+		end
+	end
+
+	return false
+end
+
+
+
+local function move_entities (list, move, players)
+	for _, entry in ipairs (list) do
+		if entry.obj then
+			if players or not entry.obj:is_player () then
+				local pos
+
+				if entry.obj:is_player () then
+					pos = vector.add (entry.pos, { x = move.x, y = move.y + 0.1, z = move.z })
+				else
+					pos = vector.add (entry.pos, move)
+				end
+
+				if entry.obj.move_to then
+					entry.obj:move_to (pos)
+				elseif entry.set_pos then
+					entry.obj:set_pos (pos)
+				end
+			end
+		end
+	end
+end
+
+
+
+local function update_player_position (list)
+	for _, entry in ipairs (list) do
+		local player = minetest.get_player_by_name (entry.name)
+
+		if player then
+			local pos = player:get_pos ()
+
+			if pos.y < entry.pos.y then
+				pos.y = entry.pos.y + 0.1
+				player:set_pos (pos)
+			end
+		end
+	end
+end
+
+
+
+local function queue_player_update (list, move)
+	local players = { }
+
+	for _, entry in ipairs (list) do
+		if entry.obj and entry.obj:is_player () then
+			players[#players + 1] =
+			{
+				pos = vector.add (entry.pos, move),
+				name = entry.obj:get_player_name ()
+			}
+		end
+	end
+
+	if #players > 0 then
+		minetest.after(0.1, update_player_position, players)
+	end
+end
+
+
+
+local function move_nodes (list, move)
+	if move.y > 0 then
+		for i = #list, 1, -1 do
+			local pos = vector.add (list[i].pos, move)
+
+			minetest.remove_node (list[i].pos)
+			minetest.set_node (pos, list[i].node)
+
+			if list[i].meta then
+				local meta = minetest.get_meta (pos)
+
+				if meta then
+					meta:from_table (list[i].meta)
+				end
+			end
+
+			if list[i].timeout > 0 then
+				local timer = minetest.get_node_timer (pos)
+
+				if timer then
+					timer:set (list[i].timeout, list[i].elapsed)
+				end
+			end
+		end
+	else
+		for i = 1, #list, 1 do
+			local pos = vector.add (list[i].pos, move)
+
+			minetest.remove_node (list[i].pos)
+			minetest.set_node (pos, list[i].node)
+
+			if list[i].meta then
+				local meta = minetest.get_meta (pos)
+
+				if meta then
+					meta:from_table (list[i].meta)
+				end
+			end
+
+			if list[i].timeout > 0 then
+				local timer = minetest.get_node_timer (pos)
+
+				if timer then
+					timer:set (list[i].timeout, list[i].elapsed)
+				end
+			end
+		end
+	end
+end
+
+
+
+local function check_for_falling (list)
+	for _, pos in ipairs (list) do
+		minetest.check_for_falling (vector.add (pos, { x = 0, y = max_push + 1, z = 0 }))
+	end
+end
+
+
+
+local function movefloor_move (pos, node, rulename)
 	local direction = get_movefloor_direction (rulename)
-	local play_sound = false
 
 	local list =
 	{
@@ -88,68 +364,34 @@ local function movefloor_move (pos, node, rulename, is_sticky)
 
 	find_adjoining_movefloor (pos, list)
 
-	for i = 1, #list do
-		local frontpos = vector.add (list[i], direction)
-		local meta = minetest.get_meta (list[i])
-		local owner = meta:get_string ("owner")
-		local continue = true
+	local nodes, height, protected = get_affected_nodes (list)
 
-		-- ### Step 1: Push nodes in front ###
-		local success, stack, oldstack = mesecon.mvps_push (frontpos, direction, max_push, owner)
-		if not success then
-			if stack == "protected" then
-				meta:set_string ("infotext", "Can't move: protected area on the way")
-			else
-				minetest.get_node_timer (list[i]):start (timer_interval)
-				continue = false
-			end
-		end
-
-		if continue then
-			mesecon.mvps_move_objects (frontpos, direction, oldstack)
-
-			-- ### Step 2: Move the movestone ###
-			minetest.set_node (frontpos, node)
-			local meta2 = minetest.get_meta (frontpos)
-			meta2:set_string ("owner", owner)
-			minetest.remove_node (list[i])
-			mesecon.on_dignode (list[i], node)
-			mesecon.on_placenode (frontpos, node)
-			minetest.get_node_timer (frontpos):start (timer_interval)
-			play_sound = true
-
-			-- ### Step 3: If sticky, pull stack behind ###
-			if is_sticky and direction.y < 0 then
-				local backpos = vector.subtract (list[i], direction)
-				success, stack, oldstack = mesecon.mvps_pull_all (backpos, direction, max_pull, owner)
-				if success then
-					mesecon.mvps_move_objects (backpos, vector.multiply (direction, -1), oldstack, -1)
-				end
-			end
-
-			-- ### Step 4: Let things fall ###
-			minetest.check_for_falling (vector.add (list[i], { x = 0, y = 1, z = 0 }))
-		end
-	end
-
-	if play_sound then
-		minetest.sound_play("movestone", { pos = list[i], max_hear_distance = 20, gain = 0.5 }, true)
-	end
-
-end
-
-
-
-local function on_timer (pos, elapsed)
-	local sourcepos = mesecon.is_powered (pos)
-
-	if not sourcepos then
+	if protected then
 		return
 	end
 
-	local rulename = vector.subtract (sourcepos[1], pos)
+	local entities, h = get_affected_entities (list)
 
-	mesecon.activate (pos, minetest.get_node (pos), rulename, 0)
+	if h > height then
+		height = h
+	end
+
+	if is_obstructed (list, (direction.y > 0 and height + 1) or -1) then
+		return
+	end
+
+	if direction.y > 0 then
+		move_entities (entities, direction, true)
+		move_nodes (nodes, direction)
+		queue_player_update (entities, direction)
+	else
+		move_nodes (nodes, direction)
+		move_entities (entities, direction, false)
+		check_for_falling (list)
+		queue_player_update (entities, direction)
+	end
+
+	minetest.sound_play ("lwmovefloor", { pos = pos, max_hear_distance = 10, gain = 1.0 }, true)
 end
 
 
@@ -164,8 +406,8 @@ local function mesecon_support ()
 			action_on = function (pos, node, rulename)
 				-- do something to turn the effector on
 
-				if rulename and not minetest.get_node_timer (pos):is_started () then
-					movefloor_move (pos, node, rulename, true)
+				if rulename then
+					movefloor_move (pos, node, rulename)
 				end
 			end
 		}
@@ -190,8 +432,6 @@ minetest.register_node("lwcomponents:movefloor", {
 	groups = { cracky = 2 },
 	sounds = default.node_sound_wood_defaults (),
 	mesecons = mesecon_support (),
-
-	on_timer = on_timer,
 })
 
 

pistons.lua

@@ -43,33 +43,36 @@ end
 
 
 
-local function push_entities (pos, vec)
-	local tpos = vector.add (pos, vec)
-	local tnode = utils.get_far_node (tpos)
-	local can_move = false
+local function push_entities (pos, movedir, entity_list, upper_limit)
+	local objects = minetest.get_objects_inside_radius (pos, 1.5)
 
-	if tnode then
-		if tnode.name == "air" then
-			can_move = true
-		else
-			local tdef = utils.find_item_def (tnode.name)
-
-			can_move = tdef and not tdef.walkable
-		end
-	end
-
-	if can_move then
-		local object = minetest.get_objects_inside_radius (pos, 1.5)
-
-		for j = 1, #object do
-			if object[j].get_pos then
-				local opos = object[j]:get_pos ()
+	for _, obj in ipairs (objects) do
+		if obj.get_pos and obj.move_to then
+			local opos = obj:get_pos ()
 
 			if opos.x > (pos.x - 0.5) and opos.x < (pos.x + 0.5) and
 					opos.z > (pos.z - 0.5) and opos.z < (pos.z + 0.5) and
-					opos.y > (pos.y - 0.5) and opos.y < (pos.y + 0.5) then
+					opos.y >= (pos.y - 0.5) and opos.y < (pos.y + upper_limit) then
 
-					object[j]:set_pos (vector.add (opos, vec))
+				local newpos = vector.add (opos, movedir)
+				local node = utils.get_far_node (vector.round (newpos))
+				local def = (node and utils.find_item_def (node.name)) or nil
+
+				if (node.name == "air") or (def and not def.walkable) then
+
+					entity_list[#entity_list + 1] =
+					{
+						obj = obj,
+						pos = newpos
+					}
+
+					obj:move_to (newpos)
+				else
+					entity_list[#entity_list + 1] =
+					{
+						obj = obj,
+						pos = opos
+					}
 				end
 			end
 		end
@@ -78,65 +81,261 @@ end
 
 
 
-local function push_nodes (pos, extent)
+local function update_player_position (player_list)
+	for _, entry in ipairs (player_list) do
+		local player = minetest.get_player_by_name (entry.name)
+
+		if player then
+			local pos = player:get_pos ()
+
+			if pos.y < entry.pos.y then
+				pos.y = entry.pos.y
+				player:set_pos (pos)
+			end
+		end
+	end
+end
+
+
+
+local function queue_player_update (entity_list, movedir)
+	local players = { }
+
+	for _, entry in ipairs (entity_list) do
+		if entry.obj and entry.obj:is_player () then
+			players[#players + 1] =
+			{
+				pos = entry.pos,
+				name = entry.obj:get_player_name ()
+			}
+		end
+	end
+
+	if #players > 0 then
+		minetest.after(0.1, update_player_position, players)
+	end
+end
+
+
+
+local rules_alldirs =
+{
+	{x =  1, y =  0,  z =  0},
+	{x = -1, y =  0,  z =  0},
+	{x =  0, y =  1,  z =  0},
+	{x =  0, y = -1,  z =  0},
+	{x =  0, y =  0,  z =  1},
+	{x =  0, y =  0,  z = -1},
+}
+
+
+
+local function add_pos_to_list (pos, dir, movedir, node_list, check_list)
+	local hash = minetest.hash_node_position (pos)
+
+	if not check_list[hash] then
+		if minetest.is_protected (pos, "") then
+			return 0
+		end
+
 		local node = utils.get_far_node (pos)
 
-	if node then
-		local vec = direction_vector (node)
-		local last = vector.add (pos, vector.multiply (vec, extent))
-		local maxnodes = utils.settings.max_piston_nodes + 1
-		local count = 0
-
-		for i = 1, maxnodes do
-			local tnode = utils.get_far_node (last)
-
-			if not tnode then
-				return false
+		if not node then
+			return 0
 		end
 
-			local tdef = utils.find_item_def (tnode.name)
+		local def = utils.find_item_def (node.name)
 
-			if tnode.name == "air" or (tdef and not tdef.walkable) then
-				count = i - 1
+		if node.name == "air" or (def and def.buildable_to) then
+			return 1
+		end
+
+		local meta = minetest.get_meta (pos)
+		local timer = minetest.get_node_timer (pos)
+
+		check_list[hash] = true
+
+		node_list[#node_list + 1] =
+		{
+			node = node,
+			def = def,
+			pos = vector.new (pos),
+			newpos = vector.add (pos, movedir),
+			meta = (meta and meta:to_table ()) or { },
+			node_timer =
+			{
+				(timer and timer:get_timeout ()) or 0,
+				(timer and timer:get_elapsed ()) or 0
+			}
+		}
+
+		if def.mvps_sticky then
+			local sides = def.mvps_sticky (pos, node)
+
+			for _, r in ipairs (sides) do
+				if add_pos_to_list (r, dir, movedir, node_list, check_list) == 0 then
+					return 0
+				end
+			end
+		end
+
+		-- If adjacent node is sticky block and connects add that
+		-- position to the connected table
+		for _, r in ipairs (rules_alldirs) do
+			local apos = vector.add (pos, r)
+			local anode = utils.get_far_node (apos)
+			local adef = (anode and minetest.registered_nodes[anode.name]) or nil
+
+			if adef and adef.mvps_sticky then
+				local sides = adef.mvps_sticky (apos, anode)
+
+				-- connects to this position?
+				for _, link in ipairs (sides) do
+					if vector.equals (link, pos) then
+						if add_pos_to_list (apos, dir, movedir, node_list, check_list) == 0 then
+							return 0
+						end
+
+						break
+					end
+				end
+			end
+		end
+	end
+
+	return 2
+end
+
+
+
+local function node_list_last_pos (pos, node_list, length)
+	local movedir = node_list.movedir
+	local base_pos = node_list.base_pos
+
+	if movedir then
+		if movedir.x ~= 0 then
+			return vector.new ({
+				x = base_pos.x + (movedir.x * length),
+				y = pos.y,
+				z = pos.z
+			})
+		elseif movedir.z ~= 0 then
+			return vector.new ({
+				x = pos.x,
+				y = pos.y,
+				z = base_pos.z + (movedir.z * length)
+			})
+		elseif movedir.y ~= 0 then
+			return vector.new ({
+				x = pos.x,
+				y = base_pos.y + (movedir.y * length),
+				z = pos.z
+			})
+		end
+	end
+
+	return pos
+end
+
+
+
+local function get_node_list (pos, extent, length, maxnodes, pushing, node_list, check_list)
+	local node = utils.get_far_node (pos)
+	node_list = node_list or { }
+	check_list = check_list or { }
+
+	if node then
+		local dir = vector.round (direction_vector (node))
+		local movedir = vector.round ((pushing and dir) or vector.multiply (dir, -1))
+
+		node_list.dir = dir
+		node_list.movedir = movedir
+		node_list.base_pos = vector.add (pos, vector.multiply (dir, extent))
+		node_list.length = length
+		node_list.maxnodes = maxnodes
+
+		check_list[minetest.hash_node_position (vector.add (pos, vector.multiply (dir, extent - 1)))] = true
+
+		for i = 0, length - 1, 1 do
+			local tpos = vector.add (pos, vector.multiply (dir, extent + i))
+
+			local result = add_pos_to_list (tpos, dir, movedir, node_list, check_list)
+
+			if result == 0 then
+				return false
+			elseif result == 1 then
+				break
+			end
+		end
+
+		-- get any ahead of stickyblocks to limit
+		local copy_list = table.copy (node_list)
+
+		for _, n in ipairs (copy_list) do
+			local hash = minetest.hash_node_position (n.newpos)
+
+			if not check_list[hash] then
+				local last_pos = node_list_last_pos (n.newpos, node_list, length)
+				local this_pos = vector.new (n.newpos)
+				local count = 0
+
+				while not vector.equals (this_pos, last_pos) and count < length do
+					local result = add_pos_to_list (this_pos, dir, movedir, node_list, check_list)
+
+					if result == 0 then
+						return false
+					elseif result == 1 then
 						break
 					end
 
-			if i == maxnodes then
+					count = count + 1
+					this_pos = vector.add (this_pos, movedir)
+				end
+			end
+		end
+
+		return true
+	end
+
 	return false
 end
 
-			last = vector.add (last, vec)
-		end
 
-		push_entities (last, vec)
 
-		for i = 1, count, 1 do
-			local cpos = vector.subtract (last, vec)
-			local cnode = utils.get_far_node (cpos)
-			local cmeta = minetest.get_meta (cpos)
+local function can_node_list_move (node_list, check_list)
+	local movedir = node_list.movedir
+	local radius = math.floor (node_list.maxnodes / 2)
+	local base_pos = node_list.base_pos
 
-			if not cnode or not cmeta then
+	if movedir then
+		for _, n in ipairs (node_list) do
+			-- check connected stickyblocks don't extend too far laterally
+			if movedir.x ~= 0 then
+				if math.abs (n.pos.y - base_pos.y) > radius or
+						math.abs (n.pos.z - base_pos.z) > radius then
 					return false
 				end
-
-			local tmeta = cmeta:to_table ()
-
-			push_entities (cpos, vec)
-
-			minetest.remove_node (cpos)
-			minetest.set_node (last, cnode)
-
-			if tmeta then
-				cmeta = minetest.get_meta (last)
-
-				if not cmeta then
+			elseif movedir.z ~= 0 then
+				if math.abs (n.pos.y - base_pos.y) > radius or
+						math.abs (n.pos.x - base_pos.x) > radius then
+					return false
+				end
+			elseif movedir.y ~= 0 then
+				if math.abs (n.pos.x - base_pos.x) > radius or
+						math.abs (n.pos.z - base_pos.z) > radius then
 					return false
 				end
-
-				cmeta:from_table (tmeta)
 			end
 
-			last = cpos
+			-- check moving to is clear
+			if not check_list[minetest.hash_node_position (n.newpos)] then
+				local node = utils.get_far_node (n.newpos)
+				local def = (node and utils.find_item_def (node.name)) or nil
+
+				if node.name ~= "air" and def and not def.buildable_to then
+					return false
+				end
+			end
 		end
 	end
 
@@ -145,36 +344,239 @@ end
 
 
 
+local function sort_node_list (node_list)
+	local movedir = node_list.movedir
+
+	if movedir then
+		if movedir.x > 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.x > n2.pos.x
+			end)
+		elseif movedir.x < 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.x < n2.pos.x
+			end)
+		elseif movedir.z > 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.z > n2.pos.z
+			end)
+		elseif movedir.z < 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.z < n2.pos.z
+			end)
+		elseif movedir.y > 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.y > n2.pos.y
+			end)
+		elseif movedir.y < 0 then
+			table.sort (node_list , function (n1, n2)
+				return n1.pos.y < n2.pos.y
+			end)
+		end
+	end
+end
+
+
+
+local on_mvps_move = function (node_list)
+end
+
+
+
+local is_mvps_stopper = function (node, movedir, node_list, id)
+	return false
+end
+
+
+
+local update_mesecons_connections_removed = function (node_list)
+end
+
+
+
+local update_mesecons_connections_added = function (node_list)
+end
+
+
+if utils.mesecon_supported then
+	if mesecon.on_mvps_move then
+		on_mvps_move = function (node_list)
+			for _, callback in ipairs (mesecon.on_mvps_move) do
+				callback (node_list)
+			end
+		end
+	end
+
+	if mesecon.is_mvps_stopper then
+		is_mvps_stopper = function (node, movedir, node_list, id)
+			return mesecon.is_mvps_stopper (node, movedir, node_list, id)
+		end
+	end
+
+	if mesecon.on_dignode then
+		update_mesecons_connections_removed = function (node_list)
+			for _, node in ipairs (node_list) do
+				mesecon.on_dignode (node.oldpos, node.node)
+			end
+		end
+	end
+
+	if mesecon.on_placenode then
+		update_mesecons_connections_added = function (node_list)
+			for _, node in ipairs (node_list) do
+				mesecon.on_placenode (node.pos, utils.get_far_node (node.pos))
+			end
+		end
+	end
+end
+
+
+
+local function push_nodes (pos, extent)
+	local node_list = { }
+	local check_list = { }
+	local entity_list = { }
+	local maxnodes = utils.settings.max_piston_nodes
+
+	if not get_node_list (pos, extent, maxnodes, maxnodes, true, node_list, check_list) then
+		return false
+	end
+
+	if not can_node_list_move (node_list, check_list, maxnodes) then
+		return false
+	end
+
+	sort_node_list (node_list)
+
+	for id, node in ipairs (node_list) do
+		if is_mvps_stopper (node.node, node_list.movedir, node_list, id) then
+			return false
+		end
+	end
+
+	for _, node in ipairs (node_list) do
+		node.oldpos = vector.new (node.pos)
+		node.pos = vector.new (node.newpos)
+		node.newpos = nil
+
+		minetest.remove_node (node.oldpos)
+	end
+
+	update_mesecons_connections_removed (node_list)
+
+	-- push entities in front first
+	for _, node in ipairs (node_list) do
+		if not check_list[minetest.hash_node_position (node.pos)] then
+			push_entities (node.pos, node_list.movedir, entity_list, 0.5)
+		end
+	end
+
+	for _, node in ipairs (node_list) do
+		push_entities (node.oldpos, node_list.movedir, entity_list, 1.0)
+
+		minetest.set_node (node.pos, node.node)
+
+		if node.meta then
+			local meta = minetest.get_meta (node.pos)
+
+			if meta then
+				meta:from_table (node.meta)
+			end
+		end
+
+		if node.node_timer[1] > 0 then
+			local timer = minetest.get_node_timer (node.pos)
+
+			if timer then
+				timer:set (node.node_timer[1], node.node_timer[2])
+			end
+		end
+	end
+
+	-- push any entities in front of pusher
+	push_entities (node_list.base_pos, node_list.movedir, entity_list, 0.5)
+
+	on_mvps_move (node_list)
+	update_mesecons_connections_added (node_list)
+
+	if node_list.movedir.y >= 0 then
+		queue_player_update (entity_list, node_list.movedir)
+	end
+
+	return true
+end
+
+
+
 local function pull_node (pos, extent)
-	local node = utils.get_far_node (pos)
+	local node_list = { }
+	local check_list = { }
+	local entity_list = { }
+	local maxnodes = utils.settings.max_piston_nodes
 
-	if node then
-		local vec = direction_vector (node)
-		local cpos = vector.add (pos, vector.multiply (vec, extent))
-		local cnode = utils.get_far_node (cpos)
-		local cdef = cnode and utils.find_item_def (cnode.name)
+	if not get_node_list (pos, extent, 1, maxnodes, false, node_list, check_list) then
+		return false
+	end
 
-		if cnode and cnode.name ~= "air" and cdef and cdef.walkable then
+	if not can_node_list_move (node_list, check_list, maxnodes) then
+		return false
+	end
 
-			local cmeta = minetest.get_meta (cpos)
+	sort_node_list (node_list)
 
-			if cmeta then
-				local tpos = vector.subtract (cpos, vec)
-				local tmeta = cmeta:to_table ()
+	for id, node in ipairs (node_list) do
+		if is_mvps_stopper (node.node, node_list.movedir, node_list, id) then
+			return false
+		end
+	end
 
-				minetest.remove_node (cpos)
-				minetest.set_node (tpos, cnode)
+	for _, node in ipairs (node_list) do
+		node.oldpos = vector.new (node.pos)
+		node.pos = vector.new (node.newpos)
+		node.newpos = nil
 
-				if tmeta then
-					cmeta = minetest.get_meta (tpos)
+		minetest.remove_node (node.oldpos)
+	end
 
-					if cmeta then
-						cmeta:from_table (tmeta)
-					end
+	update_mesecons_connections_removed (node_list)
+
+	-- push entities in front first
+	for _, node in ipairs (node_list) do
+		if not check_list[minetest.hash_node_position (node.pos)] then
+			push_entities (node.pos, node_list.movedir, entity_list, 0.5)
+		end
+	end
+
+	for _, node in ipairs (node_list) do
+		push_entities (node.oldpos, node_list.movedir, entity_list, 1.0)
+
+		minetest.set_node (node.pos, node.node)
+
+		if node.meta then
+			local meta = minetest.get_meta (node.pos)
+
+			if meta then
+				meta:from_table (node.meta)
+			end
+		end
+
+		if node.node_timer[1] > 0 then
+			local timer = minetest.get_node_timer (node.pos)
+
+			if timer then
+				timer:set (node.node_timer[1], node.node_timer[2])
 			end
 		end
 	end
+
+	on_mvps_move (node_list)
+	update_mesecons_connections_added (node_list)
+
+	if node_list.movedir.y >= 0 then
+		queue_player_update (entity_list, node_list.movedir)
 	end
+
+	return true
 end
 
 
@@ -482,7 +884,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -613,7 +1014,18 @@ local function mesecon_support ()
 		{
 			effector =
 			{
-				rules = utils.mesecon_default_rules,
+				rules = function (node)
+					local dir = vector.multiply (minetest.facedir_to_dir (node.param2), -1)
+					local rules = table.copy (utils.mesecon_default_rules)
+
+					for i = #rules, 1, -1 do
+						if vector.equals (rules[i], dir) then
+							table.remove (rules, i)
+						end
+					end
+
+					return rules
+				end,
 
 				action_on = function (pos, node)
 					-- do something to turn the effector on
@@ -657,7 +1069,7 @@ minetest.register_node("lwcomponents:piston_blank_1", {
 minetest.register_node("lwcomponents:piston_blank_2", {
 	description = S("Piston blank"),
 	drawtype = "airlike",
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -679,7 +1091,6 @@ minetest.register_node("lwcomponents:piston_blank_2", {
 	is_ground_content = false,
 	drop = "",
 	groups = { not_in_creative_inventory = 1 },
-	paramtype = "light",
 	-- unaffected by explosions
 	on_blast = function() end,
 })
@@ -692,9 +1103,9 @@ minetest.register_node("lwcomponents:piston", {
 				 "lwcomponents_piston_right.png", "lwcomponents_piston_left.png",
 				 "lwcomponents_piston_base.png", "lwcomponents_piston_pusher.png" },
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -739,9 +1150,9 @@ minetest.register_node("lwcomponents:piston_1", {
 		},
 	},
 	is_ground_content = false,
-	groups = { cracky = 3 , not_in_creative_inventory = 1 },
+	groups = { cracky = 3 , not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -786,9 +1197,9 @@ minetest.register_node("lwcomponents:piston_2", {
 		},
 	},
 	is_ground_content = false,
-	groups = { cracky = 3 , not_in_creative_inventory = 1 },
+	groups = { cracky = 3 , not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -816,9 +1227,9 @@ minetest.register_node("lwcomponents:piston_sticky", {
 				 "lwcomponents_piston_right.png", "lwcomponents_piston_left.png",
 				 "lwcomponents_piston_base.png", "lwcomponents_piston_pusher_sticky.png" },
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -863,9 +1274,9 @@ minetest.register_node("lwcomponents:piston_sticky_1", {
 		},
 	},
 	is_ground_content = false,
-	groups = { cracky = 3 , not_in_creative_inventory = 1 },
+	groups = { cracky = 3 , not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,
@@ -910,9 +1321,9 @@ minetest.register_node("lwcomponents:piston_sticky_2", {
 		},
 	},
 	is_ground_content = false,
-	groups = { cracky = 3 , not_in_creative_inventory = 1 },
+	groups = { cracky = 3 , not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
-	paramtype = "none",
+	paramtype = "light",
 	param1 = 0,
 	paramtype2 = "facedir",
 	param2 = 0,

player_button.lua

@@ -69,7 +69,6 @@ end
 
 local function player_button_turnoff (pos)
 	local node = minetest.get_node(pos)
-	local meta = minetest.get_meta(pos)
 
 	if node.name == "lwcomponents:player_button_on" then
 		node.name = "lwcomponents:player_button_off"
@@ -85,7 +84,7 @@ end
 
 
 minetest.register_node ("lwcomponents:player_button", {
-	description = "Player Button",
+	description = S("Player Button"),
 	drawtype = "nodebox",
 	tiles = {
 	"lwplayer_button_side.png",
@@ -134,7 +133,7 @@ minetest.register_node ("lwcomponents:player_button", {
 
 
 minetest.register_node ("lwcomponents:player_button_off", {
-	description = "Player Button",
+	description = S("Player Button"),
 	drawtype = "nodebox",
 	tiles = {
 	"lwplayer_button_side.png",
@@ -184,7 +183,7 @@ minetest.register_node ("lwcomponents:player_button_off", {
 
 
 minetest.register_node ("lwcomponents:player_button_on", {
-	description = "Player Button",
+	description = S("Player Button"),
 	drawtype = "nodebox",
 	tiles = {
 	"lwplayer_button_side.png",
@@ -226,7 +225,9 @@ minetest.register_node ("lwcomponents:player_button_on", {
 	},
 
 	after_destruct = digistuff.remove_receiver,
---	on_rightclick = player_button_push,
+	on_rightclick = function (pos, node, clicker, itemstack, pointed_thing)
+		-- so clicking when depressed doesn't place node
+	end,
 	on_timer = player_button_turnoff,
 })
 

puncher.lua

@@ -97,13 +97,8 @@ local function punch (pos)
 						punched = true
 					end
 
-				elseif object[i].get_luaentity and object[i]:get_luaentity () and
-						 object[i]:get_luaentity ().name and
-						 object[i]:get_luaentity ().name == "__builtin:item" then
-
-					-- don't punch drops
-
-				elseif object[i].get_pos and object[i]:get_pos () then
+				elseif not utils.is_drop (object[i]) and object[i].get_pos
+							and object[i]:get_pos () then
 
 					-- entity
 					if meta:get_string ("entities") == "true" then
@@ -180,28 +175,19 @@ end
 
 local function start_puncher (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:puncher" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:puncher_on"
 
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		elseif node.name == "lwcomponents:puncher_locked" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:puncher_locked_on"
 
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -211,28 +197,19 @@ end
 
 local function stop_puncher (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:puncher_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:puncher"
 
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		elseif node.name == "lwcomponents:puncher_locked_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:puncher_locked"
 
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -365,7 +342,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						minetest.remove_node (pos)
 					end
@@ -506,7 +482,7 @@ minetest.register_node("lwcomponents:puncher", {
 	tiles = { "lwpuncher_face.png", "lwpuncher_face.png", "lwpuncher.png",
 				 "lwpuncher.png", "lwpuncher.png", "lwpuncher_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -533,7 +509,7 @@ minetest.register_node("lwcomponents:puncher_locked", {
 	tiles = { "lwpuncher_face.png", "lwpuncher_face.png", "lwpuncher.png",
 				 "lwpuncher.png", "lwpuncher.png", "lwpuncher_face.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -560,7 +536,7 @@ minetest.register_node("lwcomponents:puncher_on", {
 	tiles = { "lwpuncher_face_on.png", "lwpuncher_face_on.png", "lwpuncher.png",
 				 "lwpuncher.png", "lwpuncher.png", "lwpuncher_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -587,7 +563,7 @@ minetest.register_node("lwcomponents:puncher_locked_on", {
 	tiles = { "lwpuncher_face_on.png", "lwpuncher_face_on.png", "lwpuncher.png",
 				 "lwpuncher.png", "lwpuncher.png", "lwpuncher_face_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,

readme.txt

@@ -13,7 +13,7 @@ CC BY-SA 3.0
 
 Version
 =======
-0.1.20
+0.1.28
 
 
 Minetest Version
@@ -34,6 +34,8 @@ unifieddyes
 intllib
 hopper
 digistuff
+pipeworks
+lwwires
 
 
 Installation
@@ -58,15 +60,19 @@ Various components for mesecons and digilines.
 *	Puncher, punches players or entities within a given reach.
 *	Player button, sends digilines message with player name.
 *	Breaker, digs the nodes directly in front.
-*	Deployers, places the nodes directly in front.
+*	Deployer, places the nodes directly in front.
+*	Destroyer, automated trash.
 *	Hologram, projects a hologram above the hologram node.
 *	Fan, blows any entity, player or drop in front of the fan.
 *	Conduit, connected in a circuit to move items.
 *	Cannon, shoots an item on command with directional aiming (plus 3 shells).
 *	Double (optionally single) reach pistons and sticky pistons.
-*	Digiswitch, digilines controlled mesecons power.
+*	Digilines Switch, digilines controlled mesecons power.
 *	Movefloor, similar to vertical mesecons movestone.
 *	Camera, takes a representative image.
+*	Storage, indexed storage units.
+*	Hoppers, that are more compatible with this mod.
+*	Force Field Generator, repels players and mobs within a radius.
 *	Mesecons Through Wire, transmits through 1 to 2 solid blocks.
 *	Solid color conductor blocks, same as Solid Color Block but also mesecons
 	and digilines conductor.

settings.lua

@@ -12,6 +12,9 @@ utils.settings.alert_handler_errors =
 utils.settings.max_piston_nodes =
 	tonumber (minetest.settings:get ("lwcomponents_max_piston_nodes") or 15)
 
+utils.settings.default_stack_max =
+	tonumber (minetest.settings:get ("default_stack_max")) or 99
+
 
 
 --

siren.lua

@@ -103,30 +103,21 @@ end
 
 local function start_siren (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:siren" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_on"
 
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		elseif node.name == "lwcomponents:siren_locked" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_locked_on"
 
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -136,34 +127,25 @@ end
 
 local function stop_siren (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:siren_on" or
 				node.name == "lwcomponents:siren_alarm" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren"
 
 			minetest.get_node_timer (pos):stop ()
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		elseif node.name == "lwcomponents:siren_locked_on" or
 					node.name == "lwcomponents:siren_locked_alarm" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_locked"
 
 			minetest.get_node_timer (pos):stop ()
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
 			update_form_spec (pos)
-			end
 
 		end
 	end
@@ -173,30 +155,21 @@ end
 
 local function start_alarm (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:siren_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_alarm"
 
 			minetest.get_node_timer (pos):start (sound_interval)
 			start_sound (pos)
 			minetest.swap_node (pos, node)
-			end
 
 		elseif node.name == "lwcomponents:siren_locked_on" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_locked_alarm"
 
 			minetest.get_node_timer (pos):start (sound_interval)
 			start_sound (pos)
 			minetest.swap_node (pos, node)
-			end
 
 		end
 	end
@@ -206,30 +179,21 @@ end
 
 local function stop_alarm (pos)
 	local node = minetest.get_node (pos)
-	local meta = minetest.get_meta (pos)
 
-	if node and meta then
+	if node then
 		if node.name == "lwcomponents:siren_alarm" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_on"
 
 			minetest.get_node_timer (pos):stop ()
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
-			end
 
 		elseif node.name == "lwcomponents:siren_locked_alarm" then
-			local meta = minetest.get_meta (pos)
-
-			if meta then
 			node.name = "lwcomponents:siren_locked_on"
 
 			minetest.get_node_timer (pos):stop ()
 			stop_sound (pos)
 			minetest.swap_node (pos, node)
-			end
 
 		end
 	end
@@ -365,7 +329,6 @@ local function on_blast (pos, intensity)
 					local stack = ItemStack (items[1])
 
 					if stack then
-						preserve_metadata (pos, node, meta, { stack })
 						utils.item_drop (stack, nil, pos)
 						on_destruct (pos)
 						minetest.remove_node (pos)
@@ -528,7 +491,7 @@ minetest.register_node("lwcomponents:siren", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren.png",
 				 "lwsiren.png", "lwsiren.png", "lwsiren.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -555,7 +518,7 @@ minetest.register_node("lwcomponents:siren_locked", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren.png",
 				 "lwsiren.png", "lwsiren.png", "lwsiren.png"},
 	is_ground_content = false,
-	groups = { cracky = 3 },
+	groups = { cracky = 3, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -582,7 +545,7 @@ minetest.register_node("lwcomponents:siren_on", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren_on.png",
 				 "lwsiren_on.png", "lwsiren_on.png", "lwsiren_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -609,7 +572,7 @@ minetest.register_node("lwcomponents:siren_locked_on", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren_on.png",
 				 "lwsiren_on.png", "lwsiren_on.png", "lwsiren_on.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -636,7 +599,7 @@ minetest.register_node("lwcomponents:siren_alarm", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren_alarm.png",
 				 "lwsiren_alarm.png", "lwsiren_alarm.png", "lwsiren_alarm.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,
@@ -664,7 +627,7 @@ minetest.register_node("lwcomponents:siren_locked_alarm", {
 	tiles = { "lwsiren_base.png", "lwsiren_base.png", "lwsiren_alarm.png",
 				 "lwsiren_alarm.png", "lwsiren_alarm.png", "lwsiren_alarm.png"},
 	is_ground_content = false,
-	groups = { cracky = 3, not_in_creative_inventory = 1 },
+	groups = { cracky = 3, not_in_creative_inventory = 1, wires_connect = 1 },
 	sounds = default.node_sound_stone_defaults (),
 	paramtype = "none",
 	param1 = 0,

solid_conductor.lua

@@ -35,6 +35,7 @@ mesecon.register_node (":lwcomponents:solid_conductor",
 		groups = {
 			dig_immediate = 2,
 			ud_param2_colorable = 1,
+			wires_connect = 1
 		},
 	},
 	{
@@ -51,7 +52,8 @@ mesecon.register_node (":lwcomponents:solid_conductor",
 		groups = {
 			dig_immediate = 2,
 			ud_param2_colorable = 1,
-			not_in_creative_inventory = 1
+			not_in_creative_inventory = 1,
+			wires_connect = 1
 		},
 	}
 )
@@ -101,6 +103,7 @@ mesecon.register_node (":lwcomponents:solid_horizontal_conductor",
 		groups = {
 			dig_immediate = 2,
 			ud_param2_colorable = 1,
+			wires_connect = 1
 		},
 	},
 	{
@@ -117,7 +120,8 @@ mesecon.register_node (":lwcomponents:solid_horizontal_conductor",
 		groups = {
 			dig_immediate = 2,
 			ud_param2_colorable = 1,
-			not_in_creative_inventory = 1
+			not_in_creative_inventory = 1,
+			wires_connect = 1
 		},
 	}
 )

utils.lua

@@ -1,4 +1,4 @@
-local utils, mod_storage = ...
+local utils = ...
 
 
 
@@ -101,6 +101,21 @@ end
 
 
 
+-- check for pipeworks
+if minetest.global_exists ("pipeworks") then
+	utils.pipeworks_supported = true
+	utils.pipeworks_after_place = pipeworks.after_place
+	utils.pipeworks_after_dig = pipeworks.after_dig
+else
+	utils.pipeworks_supported = false
+	utils.pipeworks_after_place = function (pos)
+	end
+	utils.pipeworks_after_dig = function (pos)
+	end
+end
+
+
+
 function utils.on_destroy (itemstack)
 	local stack = ItemStack (itemstack)
 
@@ -210,6 +225,91 @@ end
 
 
 
+function utils.table_equal (t1, t2)
+	for k, v in pairs (t1) do
+		if type (t2[k]) ~= type (v) then
+			return false
+		end
+
+		if type (v) == "table" then
+			if not utils.table_equal (v, t2[k]) then
+				return false
+			end
+		elseif v ~= t2[k] then
+			return false
+		end
+	end
+
+	for k, v in pairs (t2) do
+		if type (t1[k]) ~= type (v) then
+			return false
+		end
+
+		if type (v) == "table" then
+			if not utils.table_equal (v, t1[k]) then
+				return false
+			end
+		elseif v ~= t1[k] then
+			return false
+		end
+	end
+
+	return true
+end
+
+
+
+function utils.is_same_item (item1, item2)
+	local copy1 = ItemStack (item1)
+	local copy2 = ItemStack (item2)
+
+	if copy1 and copy2 then
+		copy1:set_count (1)
+		copy2:set_count (1)
+
+		return utils.table_equal (copy1:to_table (), copy2:to_table ())
+	end
+
+	return false
+end
+
+
+
+function utils.unescape_description (description)
+	description = description:gsub (string.char (27, 70), ""):
+									  gsub (string.char (27, 69), ""):
+									  gsub ("\n", " ")
+
+	local first = description:find (string.char (27, 40, 84, 64), 1, true)
+	while first do
+		local last = description:find (")", first + 4, true)
+
+		if not last then
+			last = first + 3
+		end
+
+		description = description:sub (1, first - 1)..description:sub (last + 1)
+
+		first = description:find (string.char (27, 40, 84, 64), 1, true)
+	end
+
+	return description
+end
+
+
+
+function utils.is_drop (obj)
+	if obj then
+		local entity = obj.get_luaentity and obj:get_luaentity ()
+
+		return (entity and entity.name and entity.name == "__builtin:item")
+	end
+
+	return false
+end
+
+
+
 function utils.destroy_node (pos)
 	local node = utils.get_far_node (pos)