From f25426911df7ac950b23cb9d25df50364cb1f3ea Mon Sep 17 00:00:00 2001 From: Maksim Date: Fri, 10 Jul 2020 21:58:45 +0200 Subject: [PATCH 1/3] Fix teleport sounds when teleport fails (#155) --- api.lua | 2 ++ register.lua | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api.lua b/api.lua index d24135b..81dd8f3 100644 --- a/api.lua +++ b/api.lua @@ -188,7 +188,9 @@ function unified_inventory.go_home(player) local pos = unified_inventory.home_pos[player:get_player_name()] if pos then player:set_pos(pos) + return true end + return false end -- register_craft diff --git a/register.lua b/register.lua index f958a6d..017e4af 100644 --- a/register.lua +++ b/register.lua @@ -76,9 +76,9 @@ unified_inventory.register_button("home_gui_go", { action = function(player) local player_name = player:get_player_name() if minetest.check_player_privs(player_name, {home=true}) then - minetest.sound_play("teleport", - {to_player=player:get_player_name(), gain = 1.0}) - unified_inventory.go_home(player) + if unified_inventory.go_home(player) then + minetest.sound_play("teleport", {to_player = player_name}) + end else minetest.chat_send_player(player_name, S("You don't have the \"home\" privilege!")) From d86592841e34be2a4cb3bc1020dea328849ac520 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sat, 11 Jul 2020 19:51:42 +0200 Subject: [PATCH 2/3] Remove unused 0.4.x files, multiline description --- depends.txt | 5 ----- description.txt | 1 - mod.conf | 5 ++++- 3 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 depends.txt delete mode 100644 description.txt diff --git a/depends.txt b/depends.txt deleted file mode 100644 index cb3d2b4..0000000 --- a/depends.txt +++ /dev/null @@ -1,5 +0,0 @@ -default -creative? -sfinv? -datastorage? -farming? diff --git a/description.txt b/description.txt deleted file mode 100644 index b541fdf..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide. diff --git a/mod.conf b/mod.conf index 4fe3375..bca70ca 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,7 @@ name = unified_inventory depends = default optional_depends = creative, sfinv, datastorage, farming -description = Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide. +description = """ +Unified Inventory replaces the default survival and creative inventory. +It adds a nicer interface and a number of features, such as a crafting guide. +""" From 341a438267765ee69fc12c2b5ce855a4623f3eeb Mon Sep 17 00:00:00 2001 From: Louis Royer <55180044+louisroyer@users.noreply.github.com> Date: Wed, 15 Jul 2020 20:21:06 +0200 Subject: [PATCH 3/3] Search items by English and translated description (#156) This works only with Minetest version >= 5.3.0, nothing is changed for older versions. --- internal.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal.lua b/internal.lua index ee8b4a9..eeab695 100644 --- a/internal.lua +++ b/internal.lua @@ -290,10 +290,14 @@ function unified_inventory.apply_filter(player, filter, search_dir) return true end else + local lang = minetest.get_player_information(player_name).lang_code ffilter = function(name, def) local lname = string.lower(name) local ldesc = string.lower(def.description) + local llocaldesc = minetest.get_translated_string + and string.lower(minetest.get_translated_string(lang, def.description)) return string.find(lname, lfilter, 1, true) or string.find(ldesc, lfilter, 1, true) + or llocaldesc and string.find(llocaldesc, lfilter, 1, true) end end unified_inventory.filtered_items_list[player_name]={}