Skip to content

Commit

Permalink
Option to hide uncraftable items (#240)
Browse files Browse the repository at this point in the history
This setting only applies to non-creative players.
  • Loading branch information
SmallJoker authored Jan 6, 2024
1 parent e7d0362 commit eb3bb03
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 16 deletions.
1 change: 1 addition & 0 deletions api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ minetest.after(0.01, function()
end
end
end

table.sort(ui.items_list)
ui.items_list_size = #ui.items_list
print("Unified Inventory. Inventory size: "..ui.items_list_size)
Expand Down
3 changes: 2 additions & 1 deletion init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ unified_inventory = {
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_uncraftable_items = minetest.settings:get_bool("unified_inventory_hide_uncraftable_items", false),

version = 4
version = 5
}

local ui = unified_inventory
Expand Down
41 changes: 26 additions & 15 deletions internal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ local function formspec_add_item_browser(player, formspec, ui_peruser)
button_name, minetest.formspec_escape(tooltip)
)
n = n + 2
list_index = list_index + 1
end
list_index = list_index + 1
end
end
formspec[n] = "style[page_number;content_offset=0]"
Expand Down Expand Up @@ -349,12 +349,25 @@ function ui.apply_filter(player, filter, search_dir)
end
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 ffilter

if lfilter:sub(1, 6) == "group:" then
-- Group filter: all groups of the item must match
local groups = lfilter:sub(7):split(",")
ffilter = function(name, def)
ffilter = function(name)
local def = registered_items[name]
for _, group in ipairs(groups) do
if not def.groups[group]
or def.groups[group] <= 0 then
Expand All @@ -368,7 +381,8 @@ function ui.apply_filter(player, filter, search_dir)
local player_info = minetest.get_player_information(player_name)
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 ldesc = string.lower(def.description)
local llocaldesc = minetest.get_translated_string
Expand All @@ -378,32 +392,29 @@ function ui.apply_filter(player, filter, search_dir)
end
end

local is_itemdef_listable = ui.is_itemdef_listable
local filtered_items = {}

local category = ui.current_category[player_name] or 'all'
if category == 'all' then
for name, def in pairs(minetest.registered_items) do
if is_itemdef_listable(def)
and ffilter(name, def) then
for _, name in ipairs(ui.items_list) do
if fprefilter(name) and ffilter(name) then
table.insert(filtered_items, name)
end
end
elseif category == 'uncategorized' then
for name, def in pairs(minetest.registered_items) do
if is_itemdef_listable(def)
and not ui.find_category(name)
and ffilter(name, def) then
for _, name in ipairs(ui.items_list) do
if not ui.find_category(name)
and fprefilter(name)
and ffilter(name) then
table.insert(filtered_items, name)
end
end
else
-- Any other category is selected
for name, exists in pairs(ui.registered_category_items[category]) do
local def = minetest.registered_items[name]
if exists and def
and is_itemdef_listable(def)
and ffilter(name, def) then
if exists
and fprefilter(name)
and ffilter(name) then
table.insert(filtered_items, name)
end
end
Expand Down
4 changes: 4 additions & 0 deletions settingtypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ unified_inventory_waypoints (Enable waypoints) bool true
# If enabled, disabled buttons will be hidden instead of grayed out.
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
# groups. This is based on a fuzzy match, thus is not 100% accurate.
unified_inventory_automatic_categorization (Categories: add items automatically) bool true
Expand Down

0 comments on commit eb3bb03

Please sign in to comment.