Option to hide uncraftable items (#240)

This setting only applies to non-creative players.
This commit is contained in:
SmallJoker 2024-01-06 12:35:54 +01:00 committed by GitHub
parent e7d03626b4
commit eb3bb03ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 16 deletions

View File

@ -51,6 +51,7 @@ minetest.after(0.01, function()
end end
end end
end end
table.sort(ui.items_list) table.sort(ui.items_list)
ui.items_list_size = #ui.items_list ui.items_list_size = #ui.items_list
print("Unified Inventory. Inventory size: "..ui.items_list_size) print("Unified Inventory. Inventory size: "..ui.items_list_size)

View File

@ -53,8 +53,9 @@ unified_inventory = {
standard_background = "bgcolor[#0000]background9[0,0;1,1;ui_formbg_9_sliced.png;true;16]", standard_background = "bgcolor[#0000]background9[0,0;1,1;ui_formbg_9_sliced.png;true;16]",
hide_disabled_buttons = minetest.settings:get_bool("unified_inventory_hide_disabled_buttons", false), hide_disabled_buttons = minetest.settings:get_bool("unified_inventory_hide_disabled_buttons", false),
hide_uncraftable_items = minetest.settings:get_bool("unified_inventory_hide_uncraftable_items", false),
version = 4 version = 5
} }
local ui = unified_inventory local ui = unified_inventory

View File

@ -270,8 +270,8 @@ local function formspec_add_item_browser(player, formspec, ui_peruser)
button_name, minetest.formspec_escape(tooltip) button_name, minetest.formspec_escape(tooltip)
) )
n = n + 2 n = n + 2
list_index = list_index + 1
end end
list_index = list_index + 1
end end
end end
formspec[n] = "style[page_number;content_offset=0]" formspec[n] = "style[page_number;content_offset=0]"
@ -349,12 +349,25 @@ function ui.apply_filter(player, filter, search_dir)
end end
local player_name = player:get_player_name() local player_name = player:get_player_name()
-- Whether to show uncraftable items
local fprefilter = function(_)
return true
end
if ui.hide_uncraftable_items and not ui.is_creative(player_name) then
fprefilter = function(name)
return ui.get_recipe_list(name)
end
end
local registered_items = minetest.registered_items
local lfilter = string.lower(filter) local lfilter = string.lower(filter)
local ffilter local ffilter
if lfilter:sub(1, 6) == "group:" then if lfilter:sub(1, 6) == "group:" then
-- Group filter: all groups of the item must match -- Group filter: all groups of the item must match
local groups = lfilter:sub(7):split(",") local groups = lfilter:sub(7):split(",")
ffilter = function(name, def) ffilter = function(name)
local def = registered_items[name]
for _, group in ipairs(groups) do for _, group in ipairs(groups) do
if not def.groups[group] if not def.groups[group]
or def.groups[group] <= 0 then or def.groups[group] <= 0 then
@ -368,7 +381,8 @@ function ui.apply_filter(player, filter, search_dir)
local player_info = minetest.get_player_information(player_name) local player_info = minetest.get_player_information(player_name)
local lang = player_info and player_info.lang_code or "" local lang = player_info and player_info.lang_code or ""
ffilter = function(name, def) ffilter = function(name)
local def = registered_items[name]
local lname = string.lower(name) local lname = string.lower(name)
local ldesc = string.lower(def.description) local ldesc = string.lower(def.description)
local llocaldesc = minetest.get_translated_string local llocaldesc = minetest.get_translated_string
@ -378,32 +392,29 @@ function ui.apply_filter(player, filter, search_dir)
end end
end end
local is_itemdef_listable = ui.is_itemdef_listable
local filtered_items = {} local filtered_items = {}
local category = ui.current_category[player_name] or 'all' local category = ui.current_category[player_name] or 'all'
if category == 'all' then if category == 'all' then
for name, def in pairs(minetest.registered_items) do for _, name in ipairs(ui.items_list) do
if is_itemdef_listable(def) if fprefilter(name) and ffilter(name) then
and ffilter(name, def) then
table.insert(filtered_items, name) table.insert(filtered_items, name)
end end
end end
elseif category == 'uncategorized' then elseif category == 'uncategorized' then
for name, def in pairs(minetest.registered_items) do for _, name in ipairs(ui.items_list) do
if is_itemdef_listable(def) if not ui.find_category(name)
and not ui.find_category(name) and fprefilter(name)
and ffilter(name, def) then and ffilter(name) then
table.insert(filtered_items, name) table.insert(filtered_items, name)
end end
end end
else else
-- Any other category is selected -- Any other category is selected
for name, exists in pairs(ui.registered_category_items[category]) do for name, exists in pairs(ui.registered_category_items[category]) do
local def = minetest.registered_items[name] if exists
if exists and def and fprefilter(name)
and is_itemdef_listable(def) and ffilter(name) then
and ffilter(name, def) then
table.insert(filtered_items, name) table.insert(filtered_items, name)
end end
end end

View File

@ -16,6 +16,10 @@ unified_inventory_waypoints (Enable waypoints) bool true
# If enabled, disabled buttons will be hidden instead of grayed out. # If enabled, disabled buttons will be hidden instead of grayed out.
unified_inventory_hide_disabled_buttons (Hide disabled buttons) bool false unified_inventory_hide_disabled_buttons (Hide disabled buttons) bool false
# Hides items with no known craft recipe from the category "all" (default).
# This setting has no effect on players in creative mode.
unified_inventory_hide_uncraftable_items (Hide uncraftable items) bool false
# Automatically categorizes registered items based on their # Automatically categorizes registered items based on their
# groups. This is based on a fuzzy match, thus is not 100% accurate. # groups. This is based on a fuzzy match, thus is not 100% accurate.
unified_inventory_automatic_categorization (Categories: add items automatically) bool true unified_inventory_automatic_categorization (Categories: add items automatically) bool true