wyrrrd/Autofilter
1
0
Fork 0
mirror of https://github.com/Wyrrrd/Autofilter.git synced 2026-06-02 14:22:28 +02:00
Code Issues Releases Activity

Added check for empty filter and whitelist mode

Browse Source 
Avoids overwriting filter on replacing preexisting inserters/ghosts
This commit is contained in:
Wyrrrd
2020-02-24 18:56:01 +01:00
parent 50d63e8e3c
commit 3a859a941d
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.txt
+1
View File
@@ -3,6 +3,7 @@ Version: 0.18.5
Date: 24. 2. 2020
Changes:
- Added hidden dependency to Bob's Adjustable Inserters (fixes setting filter from wrong inventory when pickup location is rotated)
- Added check for empty filter and whitelist mode to avoid overwriting filter on replacing preexisting inserters/ghosts
Locale:
- Added translated mod description
control.lua
+23 -12
View File
@@ -1,6 +1,15 @@
--control.lua
--functions definitions
local function is_filter_empty(inserter)
for slot = 1,inserter.filter_slot_count do
if inserter.get_filter(slot) then
return false
end
return true
end
end
local function get_items_by_content(inserter,inventory)
local items = {}
for item,_ in pairs(inventory.get_contents()) do
@@ -25,18 +34,20 @@ local function on_built_entity(event)
local inserter = event.created_entity
if inserter.type == "inserter" then
if inserter.filter_slot_count then
local pickup = inserter.surface.find_entities_filtered({position = inserter.pickup_position, limit = 1})
if #pickup > 0 then
local inventory = pickup[1].get_output_inventory()
if inventory then
local mode = game.players[event.player_index].mod_settings["Autofilter_Mode"].value
if mode == "content" and not inventory.is_empty() then
for slot,item in pairs(get_items_by_content(inserter,inventory)) do
inserter.set_filter(slot,item)
end
elseif mode == "filter" and inventory.is_filtered() then
for slot,item in pairs(get_items_by_filter(inserter,inventory)) do
inserter.set_filter(slot,item)
if is_filter_empty(inserter) and inserter.inserter_filter_mode == "whitelist" then
local pickup = inserter.surface.find_entities_filtered({position = inserter.pickup_position, limit = 1})
if #pickup > 0 then
local inventory = pickup[1].get_output_inventory()
if inventory then
local mode = game.players[event.player_index].mod_settings["Autofilter_Mode"].value
if mode == "content" and not inventory.is_empty() then
for slot,item in pairs(get_items_by_content(inserter,inventory)) do
inserter.set_filter(slot,item)
end
elseif mode == "filter" and inventory.is_filtered() then
for slot,item in pairs(get_items_by_filter(inserter,inventory)) do
inserter.set_filter(slot,item)
end
end
end
end