From 2d332913c582bac90654c585b97272d30f80c004 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Fri, 4 Oct 2019 00:52:06 +0200 Subject: [PATCH] Fix messages in craft command --- init.lua | 30 +++++++++++++++--------------- locale/template | 5 ++--- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/init.lua b/init.lua index 8e60293..b4075b9 100644 --- a/init.lua +++ b/init.lua @@ -1745,23 +1745,23 @@ function craftguide.show(name, item, show_usages) reset_data(data) item = reg_items[item] and item or query_item + local recipes, usages = get_recipes(item, data, player) + + if not recipes and not usages then + if not recipes_cache[item] and not usages_cache[item] then + return false, msg(name, fmt("%s: %s", + S("No recipe or usage for this item"), + get_desc(item))) + end + + return false, msg(name, fmt("%s: %s", + S("You don't know a recipe or usage for this item"), + get_desc(item))) + end data.query_item = item - data.recipes, data.usages = get_recipes(item, data, player) - - if not data.recipes and not data.usages then - if recipes_cache[item] then - return false, msg(name, S("You don't know a recipe for this node")) - end - - if usages_cache[item] then - return false, msg(name, S("You don't know an usage for this node")) - end - - if not recipes_cache[item] and not usages_cache[item] then - return false, msg(name, S("No recipe or usage for this node")) - end - end + data.recipes = recipes + data.usages = usages if sfinv_only then data.show_usages = show_usages diff --git a/locale/template b/locale/template index 71f932c..842dec9 100644 --- a/locale/template +++ b/locale/template @@ -19,9 +19,8 @@ No item to show= Collect items to reveal more recipes= Show recipe(s) of the pointed node= No node pointed= -You don't know a recipe for this node= -You don't know an usage for this node= -No recipe or usage for this node= +You don't know a recipe or usage for this item= +No recipe or usage for this item= Node= Entity= Craftitem=