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

Enable to specify size for stacks a stackwise filter takes

Browse Source
This commit is contained in:
est31 2015-02-03 06:28:17 +01:00
parent dc58fe8467
commit 3041ebb81b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
filter-injector.lua
View File

@ -26,14 +26,14 @@ 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,filtmeta,frominv,frominvname,frompos,fromnode,filtername,fromtube,fromdef,dir,fakePlayer,all) local function grabAndFire(data,slotseq_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all)
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
if filtername == "" then if filterfor == "" then
matches = stack:get_name() ~= "" matches = stack:get_name() ~= ""
else else
matches = stack:get_name() == filtername matches = stack:get_name() == filterfor.name
end end
if matches then table.insert(sposes, spos) end if matches then table.insert(sposes, spos) end
end end
@ -78,6 +78,9 @@ local function grabAndFire(data,slotseq_mode,filtmeta,frominv,frominvname,frompo
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 > 1 then
count = math.min(filterfor.count, count)
end
else else
count = 1 count = 1
end end
@ -118,7 +121,8 @@ local function punch_filter(data, filtpos, filtnode)
local filters = {} local filters = {}
for _, filterstack in ipairs(filtinv:get_list("main")) do for _, filterstack in ipairs(filtinv:get_list("main")) do
local filtername = filterstack:get_name() local filtername = filterstack:get_name()
if filtername ~= "" then table.insert(filters, filtername) end local filtercount = filterstack:get_count()
if filtername ~= "" then table.insert(filters, {name = filtername, count = filtercount}) end
end end
if #filters == 0 then table.insert(filters, "") end if #filters == 0 then table.insert(filters, "") end
local slotseq_mode = filtmeta:get_int("slotseq_mode") local slotseq_mode = filtmeta:get_int("slotseq_mode")
@ -127,8 +131,8 @@ local function punch_filter(data, filtpos, filtnode)
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
for _, filtername in ipairs(filters) do for _, filterfor in ipairs(filters) do
if grabAndFire(data, slotseq_mode, filtmeta, frominv, frominvname, frompos, fromnode, filtername, fromtube, fromdef, dir, fakePlayer, data.stackwise) then if grabAndFire(data, slotseq_mode, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise) then
done = true done = true
break break
end end