minetest/minetest_game
1
0
Fork 2
mirror of https://github.com/minetest/minetest_game.git synced 2024-12-22 15:00:18 +01:00
Code Issues Releases Wiki Activity

Implement searching for translated names in creative inventory (#2675)

Browse Source
This commit is contained in:
sfan5 2020-06-05 14:29:34 +02:00 committed by GitHub
parent 6e345cf136
commit b1ab8d5123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mods/creative/inventory.lua
View File

@ -61,6 +61,7 @@ function creative.init_creative_inventory(player)
return player_inventory[player_name] return player_inventory[player_name]
end end
local NO_MATCH = 999
local function match(s, filter) local function match(s, filter)
if filter == "" then if filter == "" then
return 0 return 0
@ -68,7 +69,15 @@ local function match(s, filter)
if s:lower():find(filter, 1, true) then if s:lower():find(filter, 1, true) then
return #s - #filter return #s - #filter
end 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 end
function creative.update_creative_inventory(player_name, tab_content) function creative.update_creative_inventory(player_name, tab_content)
@ -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 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 creative_list = {}
local order = {} local order = {}
for name, def in pairs(items) do for name, def in pairs(items) do
local m = match(def.description, inv.filter) or match(def.name, inv.filter) local m = match(description(def), inv.filter)
if m then 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 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 order[name] = string.format("%02d", m) .. name
end end
end end