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

give more possibilities to mods (#194)

Browse Source 
* add owner to tubed items

* allow custom inventories
This commit is contained in:
DS 2017-08-21 00:05:08 +02:00 committed by Vanessa Ezekowitz
parent c57a35d5bd
commit a5e1bfa0e8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
filter-injector.lua
View File

@ -156,7 +156,7 @@ local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,fromi
end end
local pos = vector.add(frompos, vector.multiply(dir, 1.4)) local pos = vector.add(frompos, vector.multiply(dir, 1.4))
local start_pos = vector.add(frompos, dir) local start_pos = vector.add(frompos, dir)
local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item) local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item, fakePlayer:get_player_name())
return true-- only fire one item, please return true-- only fire one item, please
end end
end end
@ -317,8 +317,17 @@ local function punch_filter(data, filtpos, filtnode, msg)
exact_match = filtmeta:get_int("exmatch_mode") exact_match = filtmeta:get_int("exmatch_mode")
end end
local frommeta = minetest.get_meta(frompos) local frominv
local frominv = frommeta:get_inventory() if fromtube.return_input_invref then
local pos = vector.add(filtpos, vector.multiply(dir, -1))
frominv = fromtube.return_input_invref(pos, fromnode, dir, owner)
if not frominv then
return
end
else
local frommeta = minetest.get_meta(frompos)
frominv = frommeta:get_inventory()
end
if fromtube.before_filter then fromtube.before_filter(frompos) end if fromtube.before_filter then fromtube.before_filter(frompos) end
for _, frominvname in ipairs(type(fromtube.input_inventory) == "table" and fromtube.input_inventory or {fromtube.input_inventory}) do for _, frominvname in ipairs(type(fromtube.input_inventory) == "table" and fromtube.input_inventory or {fromtube.input_inventory}) do
local done = false local done = false

11
item_transport.lua
View File

@ -7,13 +7,14 @@ function pipeworks.tube_item(pos, item)
error("obsolete pipeworks.tube_item() called; change caller to use pipeworks.tube_inject_item() instead") error("obsolete pipeworks.tube_item() called; change caller to use pipeworks.tube_inject_item() instead")
end end
function pipeworks.tube_inject_item(pos, start_pos, velocity, item) function pipeworks.tube_inject_item(pos, start_pos, velocity, item, owner)
-- Take item in any format -- Take item in any format
local stack = ItemStack(item) local stack = ItemStack(item)
local obj = luaentity.add_entity(pos, "pipeworks:tubed_item") local obj = luaentity.add_entity(pos, "pipeworks:tubed_item")
obj:set_item(stack:to_string()) obj:set_item(stack:to_string())
obj.start_pos = vector.new(start_pos) obj.start_pos = vector.new(start_pos)
obj:setvelocity(velocity) obj:setvelocity(velocity)
obj.owner = owner
--obj:set_color("red") -- todo: this is test-only code --obj:set_color("red") -- todo: this is test-only code
return obj return obj
end end
@ -49,7 +50,7 @@ minetest.register_globalstep(function(dtime)
end end
end) end)
local function go_next(pos, velocity, stack) local function go_next(pos, velocity, stack, owner)
local next_positions = {} local next_positions = {}
local max_priority = 0 local max_priority = 0
local cnode = minetest.get_node(pos) local cnode = minetest.get_node(pos)
@ -84,7 +85,7 @@ local function go_next(pos, velocity, stack)
local tube_priority = (tube_def and tube_def.priority) or 100 local tube_priority = (tube_def and tube_def.priority) or 100
if tubedevice > 0 and tube_priority >= max_priority then if tubedevice > 0 and tube_priority >= max_priority then
if not tube_def or not tube_def.can_insert or if not tube_def or not tube_def.can_insert or
tube_def.can_insert(npos, node, stack, vect) then tube_def.can_insert(npos, node, stack, vect, owner) then
if tube_priority > max_priority then if tube_priority > max_priority then
max_priority = tube_priority max_priority = tube_priority
next_positions = {} next_positions = {}
@ -260,7 +261,7 @@ luaentity.register_entity("pipeworks:tubed_item", {
if moved and minetest.get_item_group(node.name, "tubedevice_receiver") == 1 then if moved and minetest.get_item_group(node.name, "tubedevice_receiver") == 1 then
local leftover local leftover
if minetest.registered_nodes[node.name].tube and minetest.registered_nodes[node.name].tube.insert_object then if minetest.registered_nodes[node.name].tube and minetest.registered_nodes[node.name].tube.insert_object then
leftover = minetest.registered_nodes[node.name].tube.insert_object(self.start_pos, node, stack, vel) leftover = minetest.registered_nodes[node.name].tube.insert_object(self.start_pos, node, stack, vel, self.owner)
else else
leftover = stack leftover = stack
end end
@ -276,7 +277,7 @@ luaentity.register_entity("pipeworks:tubed_item", {
end end
if moved then if moved then
local found_next, new_velocity = go_next(self.start_pos, velocity, stack) -- todo: color local found_next, new_velocity = go_next(self.start_pos, velocity, stack, self.owner) -- todo: color
local rev_vel = vector.multiply(velocity, -1) local rev_vel = vector.multiply(velocity, -1)
local rev_dir = vector.direction(self.start_pos,vector.add(self.start_pos,rev_vel)) local rev_dir = vector.direction(self.start_pos,vector.add(self.start_pos,rev_vel))
local rev_node = minetest.get_node(vector.round(vector.add(self.start_pos,rev_dir))) local rev_node = minetest.get_node(vector.round(vector.add(self.start_pos,rev_dir)))