Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Implement searching for translated names in creative inventory (#2675)
  • Loading branch information
sfan5 committed Jun 5, 2020
1 parent 6e345cf commit b1ab8d5
Showing 1 changed file with 26 additions and 4 deletions.
30 changes: 26 additions & 4 deletions mods/creative/inventory.lua
Expand Up @@ -61,14 +61,23 @@ function creative.init_creative_inventory(player)
return player_inventory[player_name]
end

local NO_MATCH = 999
local function match(s, filter)
if filter == "" then
return 0
end
if s:lower():find(filter, 1, true) then
return #s - #filter
end
return nil
return NO_MATCH
end

local function description(def, lang_code)
local s = def.description
if lang_code then
s = minetest.get_translated_string(lang_code, s)
end
return s:gsub("\n.*", "") -- First line only
end

function creative.update_creative_inventory(player_name, tab_content)
Expand All @@ -84,13 +93,26 @@ function creative.update_creative_inventory(player_name, tab_content)

local items = inventory_cache[tab_content] or init_creative_cache(tab_content)

local lang
local player_info = minetest.get_player_information(player_name)
if player_info and player_info.lang_code ~= "" then
lang = player_info.lang_code
end

local creative_list = {}
local order = {}
for name, def in pairs(items) do
local m = match(def.description, inv.filter) or match(def.name, inv.filter)
if m then
local m = match(description(def), inv.filter)
if m > 0 then
m = math.min(m, match(description(def, lang), inv.filter))
end
if m > 0 then
m = math.min(m, match(name, inv.filter))
end

if m < NO_MATCH then
creative_list[#creative_list+1] = name
-- Sort by description length first so closer matches appear earlier
-- Sort by match value first so closer matches appear earlier
order[name] = string.format("%02d", m) .. name
end
end
Expand Down

0 comments on commit b1ab8d5

Please sign in to comment.