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

Digiline Filter-Injector tweaks

Browse Source 
* Made digiline filter-injectors not pull a whole stack if the count is exactly 1
* Made digiline filter-injectors pull a whole stack if no count specified
  * `default:dirt` still has a count of 1, but `{name="name"}` has no count
This commit is contained in:
electrodude 2016-05-25 02:44:42 -04:00 committed by Auke Kok
parent 6e0e7c47d0
commit 36d9e1fc08
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filter-injector.lua
View File

@ -52,7 +52,7 @@ local function set_filter_formspec(data, meta)
end end
-- todo SOON: this function has *way too many* parameters -- todo SOON: this function has *way too many* parameters
local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all) local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all,digiline)
local sposes = {} local sposes = {}
for spos,stack in ipairs(frominv:get_list(frominvname)) do for spos,stack in ipairs(frominv:get_list(frominvname)) do
local matches local matches
@ -104,10 +104,11 @@ local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,fromi
local count local count
if all then if all then
count = math.min(stack:get_count(), doRemove) count = math.min(stack:get_count(), doRemove)
if filterfor.count and filterfor.count > 1 then if filterfor.count and (filterfor.count > 1 or digiline) then
if exmatch_mode ~= 0 and filterfor.count > count then if exmatch_mode ~= 0 and filterfor.count > count then
return false return false -- not enough, fail
else else
-- limit quantity to filter amount
count = math.min(filterfor.count, count) count = math.min(filterfor.count, count)
end end
end end
@ -207,13 +208,13 @@ local function punch_filter(data, filtpos, filtnode, msg)
end end
if type(msg.name) == "string" then if type(msg.name) == "string" then
table.insert(filters, {name = msg.name, count = tonumber(msg.count) or 1}) table.insert(filters, {name = msg.name, count = tonumber(msg.count)})
else else
for _, filter in ipairs(msg) do for _, filter in ipairs(msg) do
local t_filter = type(filter) local t_filter = type(filter)
if t_filter == "table" then if t_filter == "table" then
if type(filter.name) == "string" then if type(filter.name) == "string" then
table.insert(filters, {name = filter.name, count = tonumber(filter.count) or 1}) table.insert(filters, {name = filter.name, count = tonumber(filter.count)})
end end
elseif t_filter == "string" then elseif t_filter == "string" then
local filterstack = ItemStack(filter) local filterstack = ItemStack(filter)
@ -252,7 +253,7 @@ local function punch_filter(data, filtpos, filtnode, msg)
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
for _, filterfor in ipairs(filters) do for _, filterfor in ipairs(filters) do
if grabAndFire(data, slotseq_mode, exact_match, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise) then if grabAndFire(data, slotseq_mode, exact_match, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise, data.digiline) then
done = true done = true
break break
end end