From 3082c64dac5d5107d87c339559edfe3c4113eabe Mon Sep 17 00:00:00 2001 From: Andrey Kozlovskiy Date: Wed, 7 Aug 2019 21:43:21 +0300 Subject: [PATCH 1/5] Fix incorrect count check on item put --- tubelib/distributor.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tubelib/distributor.lua b/tubelib/distributor.lua index d588910..e4a1b27 100644 --- a/tubelib/distributor.lua +++ b/tubelib/distributor.lua @@ -142,19 +142,19 @@ 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) + local stack_count = stack:get_count() 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 + if State:get_state(meta) == 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() + return stack_count end - return 0 + + return math.min(stack_count, MAX_NUM_PER_CYC - invlist_num_entries(list)) end local function allow_metadata_inventory_take(pos, listname, index, stack, player) From 2e14f13c46bc7049dc56e626583b90e82838de53 Mon Sep 17 00:00:00 2001 From: Andrey Kozlovskiy Date: Wed, 7 Aug 2019 21:46:32 +0300 Subject: [PATCH 2/5] Revert "Fix incorrect count check on item put" This reverts commit 3082c64dac5d5107d87c339559edfe3c4113eabe. (incorrect branch) --- tubelib/distributor.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tubelib/distributor.lua b/tubelib/distributor.lua index e4a1b27..d588910 100644 --- a/tubelib/distributor.lua +++ b/tubelib/distributor.lua @@ -142,19 +142,19 @@ 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) - local stack_count = stack:get_count() if minetest.is_protected(pos, player:get_player_name()) then return 0 end if listname == "src" then - if State:get_state(meta) == tubelib.STANDBY then + if State:get_state(M(pos)) == tubelib.STANDBY then State:start(pos, meta) end - return stack_count + return stack:get_count() + elseif invlist_num_entries(list) < MAX_NUM_PER_CYC then + return stack:get_count() end - - return math.min(stack_count, MAX_NUM_PER_CYC - invlist_num_entries(list)) + return 0 end local function allow_metadata_inventory_take(pos, listname, index, stack, player) From db11cc0e928a1b4b375b0589b036aeb0f4ecb34b Mon Sep 17 00:00:00 2001 From: Andrey Kozlovskiy Date: Thu, 8 Aug 2019 16:59:17 +0300 Subject: [PATCH 3/5] Fixes to metadata_inventory functions in distributor code --- tubelib/distributor.lua | 77 +++++++++++++++++++-------------- tubelib_addons3/distributor.lua | 28 +++++++----- 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/tubelib/distributor.lua b/tubelib/distributor.lua index d588910..0d70cad 100644 --- a/tubelib/distributor.lua +++ b/tubelib/distributor.lua @@ -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") diff --git a/tubelib_addons3/distributor.lua b/tubelib_addons3/distributor.lua index bed3ae5..f1dd69b 100644 --- a/tubelib_addons3/distributor.lua +++ b/tubelib_addons3/distributor.lua @@ -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 From b44ddb0bb3784f0831a046565c89ffa25333db03 Mon Sep 17 00:00:00 2001 From: Andrey Kozlovskiy Date: Thu, 8 Aug 2019 19:08:35 +0300 Subject: [PATCH 4/5] Update releasenotes --- releasenotes.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/releasenotes.md b/releasenotes.md index 932dc9a..bf13eec 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -2,6 +2,19 @@ +## V2.03.05 (2019-08-08) + +### Additions + +### Removals + +### Changes + +### Fixes +- Fixes to distributor metadata_inventory functions + + + ## V2.03.05 (2019-08-06) ### Additions From 241d779c421165b70a6e3046640dba35c2f8700c Mon Sep 17 00:00:00 2001 From: Andrey Kozlovskiy Date: Thu, 8 Aug 2019 19:13:17 +0300 Subject: [PATCH 5/5] Change version in releasenotes. --- releasenotes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes.md b/releasenotes.md index bf13eec..2978382 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -2,7 +2,7 @@ -## V2.03.05 (2019-08-08) +## V2.03.06 (2019-08-08) ### Additions