Mirrorlandia_minetest/techpack
1
0
Fork 0
mirror of https://github.com/joe7575/techpack.git synced 2024-07-07 16:25:21 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38 from andrenete/distributor-invput-check-fix

Browse Source 
Fixes to distributor inventory functions
This commit is contained in:
Joachim Stolberg 2019-08-12 21:25:29 +02:00 committed by GitHub
commit b654abe45f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
releasenotes.md
View File

@ -2,6 +2,19 @@
## V2.03.06 (2019-08-08)
### Additions
### Removals
### Changes
### Fixes
- Fixes to distributor metadata_inventory functions
## V2.03.05 (2019-08-06)
### Additions

77
tubelib/distributor.lua
View File

@ -138,39 +138,6 @@ local function num_items(moved_items, name, filter_item_names, rejected_item_nam
end
end
local function allow_metadata_inventory_put(pos, listname, index, stack, player)
local meta = M(pos)
local inv = meta:get_inventory()
local list = inv:get_list(listname)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
if listname == "src" then
if State:get_state(M(pos)) == tubelib.STANDBY then
State:start(pos, meta)
end
return stack:get_count()
elseif invlist_num_entries(list) < MAX_NUM_PER_CYC then
return stack:get_count()
end
return 0
end
local function allow_metadata_inventory_take(pos, listname, index, stack, player)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
return stack:get_count()
end
local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
local meta = M(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack(from_list, from_index)
return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
end
local SlotColors = {"red", "green", "blue", "yellow"}
local Num2Ascii = {"B", "L", "F", "R"} -- color to side translation
local FilterCache = {} -- local cache for filter settings
@ -204,6 +171,50 @@ local function filter_settings(pos)
}
end
local function allow_metadata_inventory_put(pos, listname, index, stack, player)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
local meta = M(pos)
local inv = meta:get_inventory()
local list = inv:get_list(listname)
local stack_count = stack:get_count()
if listname == "src" then
if State:get_state(M(pos)) == tubelib.STANDBY then
State:start(pos, meta)
end
return stack_count
end
local space_left = MAX_NUM_PER_CYC - invlist_num_entries(list)
if space_left <= 0 then -- < 0 case is possible if distributor is already misconfigured
return 0
end
filter_settings(pos)
return math.min(stack_count, space_left)
end
local function allow_metadata_inventory_take(pos, listname, index, stack, player)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
if listname ~= "src" then
filter_settings(pos)
end
return stack:get_count()
end
local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
local meta = M(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack(from_list, from_index)
return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
end
-- move items from configured filters to the output
local function distributing(pos, meta)
local player_name = meta:get_string("player_name")

28
tubelib_addons3/distributor.lua
View File

@ -143,30 +143,38 @@ local function filter_settings(pos)
end
local function allow_metadata_inventory_put(pos, listname, index, stack, player)
local meta = M(pos)
local inv = meta:get_inventory()
local list = inv:get_list(listname)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
local meta = M(pos)
local inv = meta:get_inventory()
local list = inv:get_list(listname)
local stack_count = stack:get_count()
if listname == "src" then
if State:get_state(M(pos)) == tubelib.STANDBY then
State:start(pos, meta)
end
return stack:get_count()
elseif invlist_num_entries(list) < NUM_FILTER_ELEM then
filter_settings(pos)
return 1
return stack_count
end
return 0
local space_left = NUM_FILTER_ELEM - invlist_num_entries(list)
if space_left <= 0 then
return 0
end
filter_settings(pos)
return 1
end
local function allow_metadata_inventory_take(pos, listname, index, stack, player)
if minetest.is_protected(pos, player:get_player_name()) then
return 0
end
filter_settings(pos)
if listname ~= "src" then
filter_settings(pos)
end
return stack:get_count()
end