jadedctrl/ minetest-i4
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Minor cleaning

This commit is contained in:
Jean-Patrick Guerrero 2022-09-25 18:16:17 +02:00
parent a5ceae07d7
commit a1af79a870
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.lua
View File

@ -327,8 +327,12 @@ local function apply_recipe_filters(recipes, player)
return recipes return recipes
end end
local function recipe_filter_set()
return next(i3.recipe_filters)
end
local function compression_active(data) local function compression_active(data)
return data.collapse and not next(i3.recipe_filters) and data.filter == "" return data.collapse and not recipe_filter_set() and data.filter == ""
end end
local function compressible(item, data) local function compressible(item, data)
@ -684,6 +688,7 @@ local _ = {
get_recipes = get_recipes, get_recipes = get_recipes,
sort_inventory = sort_inventory, sort_inventory = sort_inventory,
sort_by_category = sort_by_category, sort_by_category = sort_by_category,
recipe_filter_set = recipe_filter_set,
apply_recipe_filters = apply_recipe_filters, apply_recipe_filters = apply_recipe_filters,
-- Type checks -- Type checks

10
src/gui.lua
View File

@ -10,11 +10,11 @@ local VoxelArea, VoxelManip = VoxelArea, VoxelManip
IMPORT("vec", "vec_round") IMPORT("vec", "vec_round")
IMPORT("find", "match", "sub", "upper") IMPORT("find", "match", "sub", "upper")
IMPORT("clr", "ESC", "msg", "check_privs") IMPORT("clr", "ESC", "msg", "check_privs")
IMPORT("compression_active", "compressible")
IMPORT("min", "max", "floor", "ceil", "round") IMPORT("min", "max", "floor", "ceil", "round")
IMPORT("true_str", "is_fav", "is_num", "str_to_pos") IMPORT("true_str", "is_fav", "is_num", "str_to_pos")
IMPORT("reg_items", "reg_nodes", "reg_tools", "reg_entities") IMPORT("reg_items", "reg_nodes", "reg_tools", "reg_entities")
IMPORT("get_bag_description", "get_detached_inv", "get_recipes") IMPORT("get_bag_description", "get_detached_inv", "get_recipes")
IMPORT("compression_active", "compressible", "recipe_filter_set")
IMPORT("S", "ES", "translate", "ItemStack", "toupper", "utf8_len") IMPORT("S", "ES", "translate", "ItemStack", "toupper", "utf8_len")
IMPORT("maxn", "sort", "concat", "copy", "insert", "remove", "unpack") IMPORT("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
IMPORT("extract_groups", "groups_to_items", "is_group", "item_has_groups", "get_group") IMPORT("extract_groups", "groups_to_items", "is_group", "item_has_groups", "get_group")
@ -631,7 +631,7 @@ local function show_settings(fs, data)
checkbox(2.6, 10.4, "cb_legacy_inventory", "Legacy inventory", tostring(data.legacy_inventory)) checkbox(2.6, 10.4, "cb_legacy_inventory", "Legacy inventory", tostring(data.legacy_inventory))
checkbox(2.6, 10.85, "cb_wielditem_hud", "HUD description", tostring(data.wielditem_hud)) checkbox(2.6, 10.85, "cb_wielditem_hud", "HUD description", tostring(data.wielditem_hud))
if not next(i3.recipe_filters) then if not recipe_filter_set() then
checkbox(5.3, 10.85, "cb_collapse", "Collapse inventory", tostring(data.collapse)) checkbox(5.3, 10.85, "cb_collapse", "Collapse inventory", tostring(data.collapse))
end end
@ -1365,7 +1365,7 @@ local function hide_items(player, data)
data.items = new data.items = new
end end
if not core.is_creative_enabled(data.player_name) and not next(i3.recipe_filters) then if not core.is_creative_enabled(data.player_name) and not recipe_filter_set() then
local new = {} local new = {}
for i = 1, #data.items do for i = 1, #data.items do
@ -1499,7 +1499,7 @@ local function get_items_fs(fs, data, player, full_height)
local lbl = ES"No item to show" local lbl = ES"No item to show"
local icon, width, offset = PNG.no_result, 4, 2 local icon, width, offset = PNG.no_result, 4, 2
if next(i3.recipe_filters) and #i3.init_items > 0 and data.filter == "" then if recipe_filter_set() and #i3.init_items > 0 and data.filter == "" then
lbl = ES"Collect items to reveal more recipes" -- Progressive mode, etc. lbl = ES"Collect items to reveal more recipes" -- Progressive mode, etc.
icon, width, offset = PNG.find_more, 2.5, 2.75 icon, width, offset = PNG.find_more, 2.5, 2.75
end end
@ -1524,7 +1524,7 @@ local function get_items_fs(fs, data, player, full_height)
local item_btn = fmt("item_image_button", X, Y, size, size, name, item, "") local item_btn = fmt("item_image_button", X, Y, size, size, name, item, "")
if next(i3.recipe_filters) then if recipe_filter_set() then
if data.items_progress[item] then if data.items_progress[item] then
insert(fs, item_btn) insert(fs, item_btn)
else else