nalc/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

Fix item transport code

Browse Source
This commit is contained in:
Novatux 2013-12-21 10:16:58 +01:00
parent e5344edf98
commit 75db2c5307
1 changed files with 103 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
item_transport.lua
View File

@ -47,7 +47,7 @@ end
local function grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,dir,all) local function grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,dir,all)
for spos,stack in ipairs(frominv:get_list(frominvname)) do for spos,stack in ipairs(frominv:get_list(frominvname)) do
if ( sname == nil and stack:get_name() ~= "") or stack:get_name()==sname then if (sname == nil and stack:get_name() ~= "") or stack:get_name() == sname then
local doRemove = true local doRemove = true
if tube.can_remove then if tube.can_remove then
doRemove = tube.can_remove(frompos, fromnode, stack, dir) doRemove = tube.can_remove(frompos, fromnode, stack, dir)
@ -65,15 +65,15 @@ local function grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,
end end
if tube.remove_items then if tube.remove_items then
-- it could be the entire stack... -- it could be the entire stack...
item=tube.remove_items(frompos,fromnode,stack,dir,count) item = tube.remove_items(frompos, fromnode, stack, dir, count)
else else
item=stack:take_item(count) item = stack:take_item(count)
frominv:set_stack(frominvname,spos,stack) frominv:set_stack(frominvname, spos, stack)
if idef.on_metadata_inventory_take then if idef.on_metadata_inventory_take then
idef.on_metadata_inventory_take(frompos, "main", spos, item, fakePlayer) idef.on_metadata_inventory_take(frompos, "main", spos, item, fakePlayer)
end end
end end
local item1=pipeworks.tube_item(frompos,item) local item1 = pipeworks.tube_item(frompos, item)
item1:get_luaentity().start_pos = frompos item1:get_luaentity().start_pos = frompos
item1:setvelocity(dir) item1:setvelocity(dir)
item1:setacceleration({x=0, y=0, z=0}) item1:setacceleration({x=0, y=0, z=0})
@ -123,27 +123,27 @@ minetest.register_node("pipeworks:filter", {
local frompos = {x=pos.x - dir.x, y=pos.y - dir.y, z=pos.z - dir.z} local frompos = {x=pos.x - dir.x, y=pos.y - dir.y, z=pos.z - dir.z}
local fromnode=minetest.get_node(frompos) local fromnode=minetest.get_node(frompos)
if not fromnode then return end if not fromnode then return end
local frominv
local idef = minetest.registered_nodes[fromnode.name] local idef = minetest.registered_nodes[fromnode.name]
-- assert(idef) -- assert(idef)
local tube = idef.tube local tube = idef.tube
if not (tube and tube.input_inventory) then if not (tube and tube.input_inventory) then
return return
end end
local frommeta=minetest.get_meta(frompos) local frommeta = minetest.get_meta(frompos)
local frominvname=tube.input_inventory local frominvname = tube.input_inventory
local frominv=frommeta:get_inventory() local frominv = frommeta:get_inventory()
local sname
for _,filter in ipairs(inv:get_list("main")) do for _,filter in ipairs(inv:get_list("main")) do
local sname=filter:get_name() sname = filter:get_name()
if sname ~="" then if sname ~= "" then
-- XXX: that's a lot of parameters -- XXX: that's a lot of parameters
grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,dir) grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir)
end end
end end
if inv:is_empty("main") then if inv:is_empty("main") then
grabAndFire(frominv,frominvname,frompos,fromnode,nil,tube,idef,dir) grabAndFire(frominv,frominvname,frompos,fromnode,nil,tube,idef,dir)
end end
end, end,
}) })
minetest.register_craftitem("pipeworks:mese_filter", { minetest.register_craftitem("pipeworks:mese_filter", {
@ -190,26 +190,26 @@ minetest.register_node("pipeworks:mese_filter", {
local dir = facedir_to_right_dir(node.param2) local dir = facedir_to_right_dir(node.param2)
local frompos = {x=pos.x - dir.x, y=pos.y - dir.y, z=pos.z - dir.z} local frompos = {x=pos.x - dir.x, y=pos.y - dir.y, z=pos.z - dir.z}
local fromnode=minetest.get_node(frompos) local fromnode=minetest.get_node(frompos)
local frominv
local idef = minetest.registered_nodes[fromnode.name] local idef = minetest.registered_nodes[fromnode.name]
-- assert(idef) -- assert(idef)
local tube = idef.tube local tube = idef.tube
if not (tube and tube.input_inventory) then if not (tube and tube.input_inventory) then
return return
end end
local frommeta=minetest.get_meta(frompos) local frommeta = minetest.get_meta(frompos)
local frominvname=minetest.registered_nodes[fromnode.name].tube.input_inventory local frominvname = minetest.registered_nodes[fromnode.name].tube.input_inventory
local frominv=frommeta:get_inventory() local frominv = frommeta:get_inventory()
local sname
for _,filter in ipairs(inv:get_list("main")) do for _,filter in ipairs(inv:get_list("main")) do
local sname=filter:get_name() sname = filter:get_name()
if sname ~="" then if sname ~= "" then
grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,dir,true) grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir, true)
end end
end end
if inv:is_empty("main") then if inv:is_empty("main") then
grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,dir,true) grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir, true)
end end
end, end,
}) })
local function roundpos(pos) local function roundpos(pos)
@ -222,28 +222,23 @@ end
local adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}} local adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
function pipeworks.notvel(tbl,vel) function pipeworks.notvel(tbl, vel)
local tbl2={} local tbl2={}
for _,val in ipairs(tbl) do for _,val in ipairs(tbl) do
if val.x~=-vel.x or val.y~=-vel.y or val.z~=-vel.z then table.insert(tbl2,val) end if val.x ~= -vel.x or val.y ~= -vel.y or val.z ~= -vel.z then table.insert(tbl2, val) end
end end
return tbl2 return tbl2
end end
local function go_next(pos,velocity,stack) local function go_next(pos, velocity, stack)
local chests = {} local chests = {}
local tubes = {} local tubes = {}
local cnode = minetest.get_node(pos) local cnode = minetest.get_node(pos)
local cmeta = minetest.get_meta(pos) local cmeta = minetest.get_meta(pos)
local node
local meta
local tubelike
local tube_receiver
local len = 1
local n local n
local can_go local can_go
local speed = math.abs(velocity.x+velocity.y+velocity.z) local speed = math.abs(velocity.x + velocity.y + velocity.z)
local vel = {x=velocity.x/speed,y=velocity.y/speed,z=velocity.z/speed,speed=speed} local vel = {x = velocity.x/speed, y = velocity.y/speed, z = velocity.z/speed,speed=speed}
if speed >= 4.1 then if speed >= 4.1 then
speed = 4 speed = 4
elseif speed >= 1.1 then elseif speed >= 1.1 then
@ -253,9 +248,9 @@ local function go_next(pos,velocity,stack)
end end
vel.speed=speed vel.speed=speed
if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then
can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos,node,vel,stack) can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos, cnode, vel, stack)
else else
can_go = pipeworks.notvel(adjlist,vel) can_go = pipeworks.notvel(adjlist, vel)
end end
local meta = nil local meta = nil
for _,vect in ipairs(can_go) do for _,vect in ipairs(can_go) do
@ -267,35 +262,35 @@ local function go_next(pos,velocity,stack)
if tube_receiver == 1 then if tube_receiver == 1 then
if minetest.registered_nodes[node.name].tube and if minetest.registered_nodes[node.name].tube and
minetest.registered_nodes[node.name].tube.can_insert and minetest.registered_nodes[node.name].tube.can_insert and
minetest.registered_nodes[node.name].tube.can_insert(npos,node,stack,vect) then minetest.registered_nodes[node.name].tube.can_insert(npos, node, stack, vect) then
local i = #chests + 1 local i = #chests + 1
chests[i]={} chests[i] = {}
chests[i].pos=npos chests[i].pos = npos
chests[i].vect=vect chests[i].vect = vect
end end
elseif tubelike == 1 then elseif tubelike == 1 then
local i = #tubes + 1 local i = #tubes + 1
tubes[i]={} tubes[i] = {}
tubes[i].pos=npos tubes[i].pos = npos
tubes[i].vect=vect tubes[i].vect = vect
end end
end end
if chests[1] == nil then--no chests found if chests[1] == nil then--no chests found
if tubes[1] == nil then if tubes[1] == nil then
return 0 return 0
else else
n = (meta:get_int("tubedir")%(#tubes)) + 1 n = (cmeta:get_int("tubedir")%(#tubes)) + 1
if pipeworks.enable_cyclic_mode then if pipeworks.enable_cyclic_mode then
meta:set_int("tubedir",n) cmeta:set_int("tubedir",n)
end end
velocity.x = tubes[n].vect.x*vel.speed velocity.x = tubes[n].vect.x*vel.speed
velocity.y = tubes[n].vect.y*vel.speed velocity.y = tubes[n].vect.y*vel.speed
velocity.z = tubes[n].vect.z*vel.speed velocity.z = tubes[n].vect.z*vel.speed
end end
else else
n = (meta:get_int("tubedir")%(#chests))+1 n = (cmeta:get_int("tubedir")%(#chests))+1
if pipeworks.enable_cyclic_mode then if pipeworks.enable_cyclic_mode then
meta:set_int("tubedir",n) cmeta:set_int("tubedir",n)
end end
velocity.x = chests[n].vect.x*speed velocity.x = chests[n].vect.x*speed
velocity.y = chests[n].vect.y*speed velocity.y = chests[n].vect.y*speed