Merge pull request #12 from Novatux/master

Sand tubes, which take nearby items.

autocrafter.lua

@@ -57,7 +57,7 @@ minetest.register_node("pipeworks:autocrafter",{
 		meta:set_string("formspec",
 				"size[8,11]"..
 				"list[current_name;recipe;0,0;3,3;]"..
-				"list[current_name;src;0,3;8,3;]"..
+				"list[current_name;src;0,3.5;8,3;]"..
 				"list[current_name;dst;4,0;4,3;]"..
 				"list[current_player;main;0,7;8,4;]")
 		meta:set_string("infotext", "Autocrafter")

crafts.lua

@@ -137,6 +137,15 @@ if io.open(minetest.get_modpath("pipeworks").."/../technic/init.lua", "r") == ni
 		        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
 		},
 	})
+	
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_000000 2",
+		recipe = {
+		        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		        { "default:sand", "default:sand", "default:sand" },
+		        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 
 	minetest.register_craft( {
 		output = "pipeworks:filter 2",

deployer.lua

@@ -0,0 +1,158 @@
+minetest.register_craft({
+	output = 'pipeworks:deployer_off 1',
+	recipe = {
+		{'default:wood', 'default:chest','default:wood'},
+		{'default:stone', 'mesecons:piston','default:stone'},
+		{'default:stone', 'mesecons:mesecon','default:stone'},
+
+	}
+})
+
+deployer_on = function(pos, node)
+	local pos1={}
+	pos1.x=pos.x
+	pos1.y=pos.y
+	pos1.z=pos.z
+	local pos2={}
+	pos2.x=pos.x
+	pos2.y=pos.y
+	pos2.z=pos.z
+	if node.param2==3 then
+		pos1.x=pos1.x+1
+		pos2.x=pos2.x+2
+	end
+	if node.param2==2 then
+		pos1.z=pos1.z+1
+		pos2.z=pos2.z+2
+	end
+	if node.param2==1 then
+		pos1.x=pos1.x-1
+		pos2.x=pos2.x-2
+	end
+	if node.param2==0 then
+		pos1.z=pos1.z-1
+		pos2.z=pos2.z-2
+	end
+
+	if node.name == "pipeworks:deployer_off" then
+		hacky_swap_node(pos,"pipeworks:deployer_on")
+		nodeupdate(pos)
+			local meta = minetest.env:get_meta(pos);
+		
+		local inv = meta:get_inventory()
+		local invlist=inv:get_list("main")
+		for i,stack in ipairs(invlist) do
+
+		if stack:get_name() ~=nil and stack:get_name() ~="" and minetest.env:get_node(pos1).name == "air" then
+			local placer={}
+			function placer:get_player_name() return "deployer" end
+			function placer:getpos() return pos end
+			local stack2=minetest.item_place(stack,placer,{type="node", under=pos1, above=pos2})
+			invlist[i]=stack2
+			inv:set_list("main",invlist)
+			return
+		end
+		end
+	end
+end
+
+deployer_off = function(pos, node)
+	if node.name == "pipeworks:deployer_on" then
+		hacky_swap_node(pos,"pipeworks:deployer_off")
+		nodeupdate(pos)
+	end
+end
+
+minetest.register_node("pipeworks:deployer_off", {
+	description = "Deployer",
+	tile_images = {"pipeworks_deployer_top.png","pipeworks_deployer_bottom.png","pipeworks_deployer_side2.png","pipeworks_deployer_side1.png",
+			"pipeworks_deployer_back.png","pipeworks_deployer_front_off.png"},
+	mesecons = {effector={action_on=deployer_on,action_off=deployer_off}},
+	tube={insert_object=function(pos,node,stack,direction)
+			local meta=minetest.env:get_meta(pos)
+			local inv=meta:get_inventory()
+			return inv:add_item("main",stack)
+		end,
+		can_insert=function(pos,node,stack,direction)
+			local meta=minetest.env:get_meta(pos)
+			local inv=meta:get_inventory()
+			return inv:room_for_item("main",stack)
+		end,
+		input_inventory="main"},
+	is_ground_content = true,
+	paramtype2 = "facedir",
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, tubedevice_receiver=1},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.env:get_meta(pos)
+		meta:set_string("formspec",
+				"invsize[8,9;]"..
+				"label[0,0;Deployer]"..
+				"list[current_name;main;4,1;3,3;]"..
+				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("infotext", "Deployer")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 3*3)
+	end,
+
+	can_dig = function(pos,player)
+		local meta = minetest.env:get_meta(pos);
+		local inv = meta:get_inventory()
+		return inv:is_empty("main")
+	end,
+	
+})
+
+minetest.register_node("pipeworks:deployer_on", {
+	description = "Deployer",
+	tile_images = {"pipeworks_deployer_top.png","pipeworks_deployer_bottom.png","pipeworks_deployer_side2.png","pipeworks_deployer_side1.png",
+			"pipeworks_deployer_back.png","pipeworks_deployer_front_on.png"},
+	mesecons = {effector={action_on=deployer_on,action_off=deployer_off}},
+	tube={insert_object=function(pos,node,stack,direction)
+			local meta=minetest.env:get_meta(pos)
+			local inv=meta:get_inventory()
+			return inv:add_item("main",stack)
+		end,
+		can_insert=function(pos,node,stack,direction)
+			local meta=minetest.env:get_meta(pos)
+			local inv=meta:get_inventory()
+			return inv:room_for_item("main",stack)
+		end,
+		input_inventory="main"},
+	is_ground_content = true,
+	paramtype2 = "facedir",
+	tubelike=1,
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, tubedevice_receiver=1,not_in_creative_inventory=1},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.env:get_meta(pos)
+		meta:set_string("formspec",
+				"invsize[8,9;]"..
+				"label[0,0;Deployer]"..
+				"list[current_name;main;4,1;3,3;]"..
+				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("infotext", "Deployer")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 3*3)
+	end,
+	can_dig = function(pos,player)
+		local meta = minetest.env:get_meta(pos);
+		local inv = meta:get_inventory()
+		return inv:is_empty("main")
+	end,
+})
+
+function hacky_swap_node(pos,name)
+	local node=minetest.env:get_node(pos)
+	local meta=minetest.env:get_meta(pos)
+	local meta0=meta:to_table()
+	node.name=name
+	minetest.env:add_node(pos, node)
+	local meta=minetest.env:get_meta(pos)
+	meta:from_table(meta0)
+end
+
+
+
+
+

init.lua

@@ -329,4 +329,6 @@ dofile(minetest.get_modpath("pipeworks").."/flowing_logic.lua")
 dofile(minetest.get_modpath("pipeworks").."/compat.lua")
 dofile(minetest.get_modpath("pipeworks").."/item_transport.lua")
 dofile(minetest.get_modpath("pipeworks").."/autocrafter.lua")
+dofile(minetest.get_modpath("pipeworks").."/deployer.lua")
+dofile(minetest.get_modpath("pipeworks").."/node_breaker.lua")
 print("Pipeworks loaded!")

item_transport.lua

@@ -9,8 +9,8 @@ minetest.register_craftitem("pipeworks:filter", {
 
 minetest.register_node("pipeworks:filter", {
 	description = "filter",
-	tiles = {"filter_top.png", "filter_top.png", "filter_output.png",
-		"filter_input.png", "filter_side.png", "filter_top.png"},
+	tiles = {"pipeworks_filter_top.png", "pipeworks_filter_top.png", "pipeworks_filter_output.png",
+		"pipeworks_filter_input.png", "pipeworks_filter_side.png", "pipeworks_filter_top.png"},
 	paramtype2 = "facedir",
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,mesecon=2},
 	legacy_facedir_simple = true,

node_breaker.lua

@@ -0,0 +1,100 @@
+minetest.register_craft({
+	output = 'pipeworks:nodebreaker_off 1',
+	recipe = {
+		{'default:wood', 'default:pick_mese','default:wood'},
+		{'default:stone', 'mesecons:piston','default:stone'},
+		{'default:stone', 'mesecons:mesecon','default:stone'},
+
+	}
+})
+
+
+function hacky_swap_node(pos,name)
+	local node=minetest.env:get_node(pos)
+	local meta=minetest.env:get_meta(pos)
+	local meta0=meta:to_table()
+	node.name=name
+	minetest.env:add_node(pos, node)
+	local meta=minetest.env:get_meta(pos)
+	meta:from_table(meta0)
+end
+
+
+node_breaker_on = function(pos, node)
+	if node.name == "pipeworks:nodebreaker_off" then
+		hacky_swap_node(pos,"pipeworks:nodebreaker_on")
+		break_node (pos,node.param2)
+		nodeupdate(pos)
+	end
+end
+
+node_breaker_off = function(pos, node)
+	if node.name == "pipeworks:nodebreaker_on" then
+		hacky_swap_node(pos,"pipeworks:nodebreaker_off")
+		nodeupdate(pos)
+	end
+end
+
+minetest.register_node("pipeworks:nodebreaker_off", {
+	description = "Node Breaker",
+	tile_images = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png",
+			"pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"},
+	is_ground_content = true,
+	paramtype2 = "facedir",
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1},
+	mesecons= {effector={action_on=node_breaker_on, action_off=node_breaker_off}},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = function(pos)
+	local meta = minetest.env:get_meta(pos)
+	end,
+	
+})
+
+minetest.register_node("pipeworks:nodebreaker_on", {
+	description = "Node Breaker",
+	tile_images = {"pipeworks_nodebreaker_top_on.png","pipeworks_nodebreaker_bottom_on.png","pipeworks_nodebreaker_side2_on.png","pipeworks_nodebreaker_side1_on.png",
+			"pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_on.png"},
+	mesecons= {effector={action_on=node_breaker_on, action_off=node_breaker_off}},
+	is_ground_content = true,
+	paramtype2 = "facedir",
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1,not_in_creative_inventory=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+function break_node (pos,n_param)		
+	local pos1={}
+	local pos2={}
+	pos1.x=pos.x
+	pos1.y=pos.y
+	pos1.z=pos.z
+	pos2.x=pos.x
+	pos2.y=pos.y
+	pos2.z=pos.z
+
+	--param2 3=x+ 1=x- 2=z+ 0=z-
+	local x_velocity=0
+	local z_velocity=0
+
+	if n_param==3 then pos2.x=pos2.x+1 pos1.x=pos1.x-1 x_velocity=-1 end
+	if n_param==2 then pos2.z=pos2.z+1 pos1.z=pos1.z-1 z_velocity=-1 end
+	if n_param==1 then pos2.x=pos2.x-1 pos1.x=pos1.x+1 x_velocity=1 end
+	if n_param==0 then pos2.z=pos2.z-1 pos1.x=pos1.z+1 z_velocity=1 end
+
+	local node=minetest.env:get_node(pos2)
+	if node.name == "air" then return nil end
+	if node.name == "default:lava_source" then return nil end
+	if node.name == "default:lava_flowing" then return nil end
+	if node.name == "default:water_source" then minetest.env:remove_node(pos2) return nil end
+	if node.name == "default:water_flowing" then minetest.env:remove_node(pos2) return nil end
+	if node.name == "ignore" then minetest.env:remove_node(pos2) return nil end
+	local drops = minetest.get_node_drops(node.name, "default:pick_mese")
+		local _, dropped_item
+		for _, dropped_item in ipairs(drops) do
+			local item1=tube_item({x=pos.x,y=pos.y,z=pos.z},dropped_item)
+			item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z}
+			item1:setvelocity({x=x_velocity, y=0, z=z_velocity})
+			item1:setacceleration({x=0, y=0, z=0})
+		end
+	minetest.env:remove_node(pos2)
+end
+

tubes.lua

@@ -315,12 +315,12 @@ register_tube("pipeworks:mese_tube","Mese pneumatic tube segment",mese_plain_tex
 				"list[current_name;line4;1,3;6,1;]"..
 				"list[current_name;line5;1,4;6,1;]"..
 				"list[current_name;line6;1,5;6,1;]"..
-				"image[0,0;1,1;white.png]"..
-				"image[0,1;1,1;black.png]"..
-				"image[0,2;1,1;green.png]"..
-				"image[0,3;1,1;yellow.png]"..
-				"image[0,4;1,1;blue.png]"..
-				"image[0,5;1,1;red.png]"..
+				"image[0,0;1,1;pipeworks_white.png]"..
+				"image[0,1;1,1;pipeworks_black.png]"..
+				"image[0,2;1,1;pipeworks_green.png]"..
+				"image[0,3;1,1;pipeworks_yellow.png]"..
+				"image[0,4;1,1;pipeworks_blue.png]"..
+				"image[0,5;1,1;pipeworks_red.png]"..
 				"button[7,0;1,1;button1;On]"..
 				"button[7,1;1,1;button2;On]"..
 				"button[7,2;1,1;button3;On]"..
@@ -344,12 +344,12 @@ register_tube("pipeworks:mese_tube","Mese pneumatic tube segment",mese_plain_tex
 				"list[current_name;line4;1,3;6,1;]"..
 				"list[current_name;line5;1,4;6,1;]"..
 				"list[current_name;line6;1,5;6,1;]"..
-				"image[0,0;1,1;white.png]"..
-				"image[0,1;1,1;black.png]"..
-				"image[0,2;1,1;green.png]"..
-				"image[0,3;1,1;yellow.png]"..
-				"image[0,4;1,1;blue.png]"..
-				"image[0,5;1,1;red.png]"
+				"image[0,0;1,1;pipeworks_white.png]"..
+				"image[0,1;1,1;pipeworks_black.png]"..
+				"image[0,2;1,1;pipeworks_green.png]"..
+				"image[0,3;1,1;pipeworks_yellow.png]"..
+				"image[0,4;1,1;pipeworks_blue.png]"..
+				"image[0,5;1,1;pipeworks_red.png]"
 		for i=1,6 do
 			local st=meta:get_int("l"..tostring(i).."s")
 			if st==0 then
@@ -416,12 +416,53 @@ register_tube("pipeworks:detector_tube_off","Detector tube segment",detector_pla
 	mesecons={receptor={state="off",
 				rules=mesecons_rules}}})
 
-register_tube("pipeworks:accelerator_tube","Accelerator pneumatic tube segment",plain_textures,noctr_textures,end_textures,
-		short_texture,inv_texture,
+accelerator_noctr_textures={"pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png",
+		"pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png"}
+accelerator_plain_textures={"pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png",
+		"pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png"}
+accelerator_end_textures={"pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png",
+		"pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png"}
+accelerator_short_texture="pipeworks_accelerator_tube_short.png"
+accelerator_inv_texture="pipeworks_accelerator_tube_inv.png"
+
+register_tube("pipeworks:accelerator_tube","Accelerator pneumatic tube segment",accelerator_plain_textures,
+		accelerator_noctr_textures,accelerator_end_textures,accelerator_short_texture,accelerator_inv_texture,
 		{tube={can_go=function(pos,node,velocity,stack)
 			velocity.speed=velocity.speed+1
 			return notvel(meseadjlist,velocity)
 		end}})
 
+sand_noctr_textures={"pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png",
+		"pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png"}
+sand_plain_textures={"pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png",
+		"pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png"}
+sand_end_textures={"pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png",
+		"pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png"}
+sand_short_texture="pipeworks_sand_tube_short.png"
+sand_inv_texture="pipeworks_sand_tube_inv.png"
+
+register_tube("pipeworks:sand_tube","Sand pneumatic tube segment",sand_plain_textures,sand_noctr_textures,sand_end_textures,
+		sand_short_texture,sand_inv_texture,
+		{groups={sand_tube=1},
+		tube={can_go=function(pos,node,velocity,stack)
+			return meseadjlist
+		end}})
+
+minetest.register_abm({nodenames={"group:sand_tube"},interval=1,chance=1,
+	action=function(pos, node, active_object_count, active_object_count_wider)
+		for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 2)) do
+			if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
+				if object:get_luaentity().itemstring ~= "" then
+					local titem=tube_item(pos,object:get_luaentity().itemstring)
+					titem:get_luaentity().start_pos = {x=pos.x,y=pos.y-1,z=pos.z}
+					titem:setvelocity({x=0,y=1,z=0})
+					titem:setacceleration({x=0, y=0, z=0})
+				end
+				object:get_luaentity().itemstring = ""
+				object:remove()
+			end
+		end
+	end})
+
 modpath=minetest.get_modpath("pipeworks")
 dofile(modpath.."/teleport_tube.lua")