+-- creative/inventory.lua
+
+-- support for MT game translation.
+local S = creative.get_translator
+
local player_inventory = {}
local inventory_cache = {}
player_inventory[player_name] = {
size = 0,
filter = "",
- start_i = 0
+ start_i = 0,
+ old_filter = nil, -- use only for caching in update_creative_inventory
+ old_content = nil
}
minetest.create_detached_inventory("creative_" .. player_name, {
return player_inventory[player_name]
end
+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
+end
+
function creative.update_creative_inventory(player_name, tab_content)
- local creative_list = {}
local inv = player_inventory[player_name] or
creative.init_creative_inventory(minetest.get_player_by_name(player_name))
local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name})
+ if inv.filter == inv.old_filter and tab_content == inv.old_content then
+ return
+ end
+ inv.old_filter = inv.filter
+ inv.old_content = tab_content
+
local items = inventory_cache[tab_content] or init_creative_cache(tab_content)
+ local creative_list = {}
+ local order = {}
for name, def in pairs(items) do
- if def.name:find(inv.filter, 1, true) or
- def.description:lower():find(inv.filter, 1, true) then
+ local m = match(def.description, inv.filter) or match(def.name, inv.filter)
+ if m then
creative_list[#creative_list+1] = name
+ -- Sort by description length first so closer matches appear earlier
+ order[name] = string.format("%02d", m) .. name
end
end
- table.sort(creative_list)
+ table.sort(creative_list, function(a, b) return order[a] < order[b] end)
+
player_inv:set_size("main", #creative_list)
player_inv:set_list("main", creative_list)
inv.size = #creative_list
local player_name = player:get_player_name()
creative.update_creative_inventory(player_name, items)
local inv = player_inventory[player_name]
- local start_i = inv.start_i or 0
- local pagenum = math.floor(start_i / (3*8) + 1)
- local pagemax = math.ceil(inv.size / (3*8))
+ local pagenum = math.floor(inv.start_i / (4*8) + 1)
+ local pagemax = math.ceil(inv.size / (4*8))
+ local esc = minetest.formspec_escape
return sfinv.make_formspec(player, context,
- "label[6.2,3.35;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" ..
+ "label[5.8,4.15;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" ..
[[
- image[4.06,3.4;0.8,0.8;creative_trash_icon.png]
+ image[4.08,4.2;0.8,0.8;creative_trash_icon.png]
listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]
- list[current_player;main;0,4.7;8,1;]
- list[current_player;main;0,5.85;8,3;8]
- list[detached:creative_trash;main;4,3.3;1,1;]
+ list[detached:creative_trash;main;4.02,4.1;1,1;]
listring[]
- image_button[5.4,3.25;0.8,0.8;creative_prev_icon.png;creative_prev;]
- image_button[7.2,3.25;0.8,0.8;creative_next_icon.png;creative_next;]
- image_button[2.1,3.25;0.8,0.8;creative_search_icon.png;creative_search;]
- image_button[2.75,3.25;0.8,0.8;creative_clear_icon.png;creative_clear;]
- tooltip[creative_search;Search]
- tooltip[creative_clear;Reset]
- tooltip[creative_prev;Previous page]
- tooltip[creative_next;Next page]
- listring[current_player;main]
- field_close_on_enter[creative_filter;false]
+ image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;]
+ image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;]
+ image_button[2.63,4.05;0.8,0.8;creative_search_icon.png;creative_search;]
+ image_button[3.25,4.05;0.8,0.8;creative_clear_icon.png;creative_clear;]
]] ..
- "field[0.3,3.5;2.2,1;creative_filter;;" .. minetest.formspec_escape(inv.filter) .. "]" ..
+ "tooltip[creative_search;" .. esc(S("Search")) .. "]" ..
+ "tooltip[creative_clear;" .. esc(S("Reset")) .. "]" ..
+ "tooltip[creative_prev;" .. esc(S("Previous page")) .. "]" ..
+ "tooltip[creative_next;" .. esc(S("Next page")) .. "]" ..
+ "listring[current_player;main]" ..
+ "field_close_on_enter[creative_filter;false]" ..
+ "field[0.3,4.2;2.8,1.2;creative_filter;;" .. esc(inv.filter) .. "]" ..
"listring[detached:creative_" .. player_name .. ";main]" ..
- "list[detached:creative_" .. player_name .. ";main;0,0;8,3;" .. tostring(start_i) .. "]" ..
- default.get_hotbar_bg(0,4.7) ..
- default.gui_bg .. default.gui_bg_img .. default.gui_slots
- .. creative.formspec_add, false)
+ "list[detached:creative_" .. player_name .. ";main;0,0;8,4;" .. tostring(inv.start_i) .. "]" ..
+ creative.formspec_add, true)
end,
on_enter = function(self, player, context)
local player_name = player:get_player_name()
if fields.creative_clear then
inv.start_i = 0
inv.filter = ""
- creative.update_creative_inventory(player_name, items)
sfinv.set_player_inventory_formspec(player, context)
elseif fields.creative_search or
fields.key_enter_field == "creative_filter" then
inv.start_i = 0
inv.filter = fields.creative_filter:lower()
- creative.update_creative_inventory(player_name, items)
sfinv.set_player_inventory_formspec(player, context)
elseif not fields.quit then
local start_i = inv.start_i or 0
if fields.creative_prev then
- start_i = start_i - 3*8
+ start_i = start_i - 4*8
if start_i < 0 then
- start_i = inv.size - (inv.size % (3*8))
+ start_i = inv.size - (inv.size % (4*8))
if inv.size == start_i then
- start_i = math.max(0, inv.size - (3*8))
+ start_i = math.max(0, inv.size - (4*8))
end
end
elseif fields.creative_next then
- start_i = start_i + 3*8
+ start_i = start_i + 4*8
if start_i >= inv.size then
start_i = 0
end
})
end
-creative.register_tab("all", "All", minetest.registered_items)
-creative.register_tab("nodes", "Nodes", minetest.registered_nodes)
-creative.register_tab("tools", "Tools", minetest.registered_tools)
-creative.register_tab("craftitems", "Items", minetest.registered_craftitems)
+creative.register_tab("all", S("All"), minetest.registered_items)
+creative.register_tab("nodes", S("Nodes"), minetest.registered_nodes)
+creative.register_tab("tools", S("Tools"), minetest.registered_tools)
+creative.register_tab("craftitems", S("Items"), minetest.registered_craftitems)
local old_homepage_name = sfinv.get_homepage_name
function sfinv.get_homepage_name(player)
projects / oweals / minetest_game.git / blobdiff