From d2ed87776a314944d807b34165c45e25df37bd7d Mon Sep 17 00:00:00 2001 From: Oversword Date: Mon, 29 Mar 2021 03:59:08 +0100 Subject: [PATCH] Typos and stuff --- callbacks.lua | 22 ++++++++++++---------- category.lua | 7 +++---- default-categories.lua | 23 ++++++++++++----------- internal.lua | 2 +- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/callbacks.lua b/callbacks.lua index 2978f94..1f43e39 100644 --- a/callbacks.lua +++ b/callbacks.lua @@ -81,27 +81,29 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end - if clicked_category and clicked_category ~= unified_inventory.current_category[player_name] then unified_inventory.current_category[player_name] = clicked_category - unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange") unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name]) end if fields.next_category then - local scroll = unified_inventory.current_category_scroll[player_name] + 1 - unified_inventory.current_category_scroll[player_name] = math.min(#unified_inventory.category_list-ui_peruser.pagecols, scroll) - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) + local scroll = math.min(#unified_inventory.category_list-ui_peruser.pagecols, unified_inventory.current_category_scroll[player_name] + 1) + if scroll ~= unified_inventory.current_category_scroll[player_name] then + unified_inventory.current_category_scroll[player_name] = scroll + unified_inventory.set_inventory_formspec(player, + unified_inventory.current_page[player_name]) + end end if fields.prev_category then - local scroll = unified_inventory.current_category_scroll[player_name] - 1 - unified_inventory.current_category_scroll[player_name] = math.max(0, scroll) - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) + local scroll = math.max(0, unified_inventory.current_category_scroll[player_name] - 1) + if scroll ~= unified_inventory.current_category_scroll[player_name] then + unified_inventory.current_category_scroll[player_name] = scroll + unified_inventory.set_inventory_formspec(player, + unified_inventory.current_page[player_name]) + end end for i, def in pairs(unified_inventory.buttons) do diff --git a/category.lua b/category.lua index c377061..805ba0c 100644 --- a/category.lua +++ b/category.lua @@ -12,7 +12,7 @@ function update_category_list() index = -2, }) table.insert(category_list, { - name = "uncategorised", + name = "uncategorized", label = "Misc.", symbol = "ui_no.png", index = -1, @@ -23,9 +23,8 @@ function update_category_list() name = category, label = def.label or category, symbol = def.symbol, - index = - def.index or -- sortby defined order - ((b1-64)*0.01)+((b2-64)*0.0001) -- or do a rhudimentary alphabetical sort + index = def.index or -- sortby defined order + ((b1-64)*0.01)+((b2-64)*0.0001) -- or do a rudimentary alphabetical sort }) end table.sort(category_list, function (a,b) diff --git a/default-categories.lua b/default-categories.lua index 96efd1f..6d9c829 100644 --- a/default-categories.lua +++ b/default-categories.lua @@ -618,14 +618,15 @@ unified_inventory.add_category_items('lighting', { "unified_inventory:bag_small", ]] --- LIST UNCATEGORISED AFTER LOAD --- minetest.after(5, function ( ) --- local l = {} --- for name,_ in pairs(minetest.registered_items) do --- if not unified_inventory.find_category(name) then --- table.insert(l, name) --- end --- end --- table.sort(l) --- minetest.log(table.concat(l, '",'.."\n"..'"')) --- end) +--[[ LIST UNCATEGORIZED AFTER LOAD +minetest.after(5, function ( ) + local l = {} + for name,_ in pairs(minetest.registered_items) do + if not unified_inventory.find_category(name) then + table.insert(l, name) + end + end + table.sort(l) + minetest.log(table.concat(l, '",'.."\n"..'"')) +end) +]] \ No newline at end of file diff --git a/internal.lua b/internal.lua index 3781d07..79d7d31 100644 --- a/internal.lua +++ b/internal.lua @@ -312,7 +312,7 @@ function ui.apply_filter(player, filter, search_dir) table.insert(ui.filtered_items_list[player_name], name) end end - elseif category == 'uncategorised' then + elseif category == 'uncategorized' then for name, def in pairs(minetest.registered_items) do if (not ui.find_category(name)) and (not def.groups.not_in_creative_inventory