mirror of
https://github.com/minetest-mods/craftguide.git
synced 2024-11-29 13:53:43 +01:00
Strip newline in item description
This commit is contained in:
parent
f075e67be9
commit
7ef62f4f8b
21
init.lua
21
init.lua
@ -711,6 +711,10 @@ local function is_fav(data)
|
|||||||
return fav, i
|
return fav, i
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function check_newline(def)
|
||||||
|
return def and def.description and find(def.description, "\n")
|
||||||
|
end
|
||||||
|
|
||||||
local function get_desc(name)
|
local function get_desc(name)
|
||||||
if sub(name, 1, 1) == "_" then
|
if sub(name, 1, 1) == "_" then
|
||||||
name = sub(name, 2)
|
name = sub(name, 2)
|
||||||
@ -828,11 +832,15 @@ local function get_output_fs(data, fs, L)
|
|||||||
fs[#fs + 1] = fmt("item_image_button[%f,%f;%f,%f;%s;%s;%s]",
|
fs[#fs + 1] = fmt("item_image_button[%f,%f;%f,%f;%s;%s;%s]",
|
||||||
output_X, Y, 1.1, 1.1, item, _name, "")
|
output_X, Y, 1.1, 1.1, item, _name, "")
|
||||||
|
|
||||||
|
|
||||||
|
local def = reg_items[name]
|
||||||
|
|
||||||
local infos = {
|
local infos = {
|
||||||
unknown = not reg_items[name] or nil,
|
unknown = not def or nil,
|
||||||
burntime = fuel_cache[name],
|
burntime = fuel_cache[name],
|
||||||
repair = repairable(name),
|
repair = repairable(name),
|
||||||
rarity = L.rarity,
|
rarity = L.rarity,
|
||||||
|
newline = check_newline(def),
|
||||||
}
|
}
|
||||||
|
|
||||||
if next(infos) then
|
if next(infos) then
|
||||||
@ -939,12 +947,15 @@ local function get_grid_fs(data, fs, rcp, spacing)
|
|||||||
fs[#fs + 1] = fmt(FMT.item_image_button,
|
fs[#fs + 1] = fmt(FMT.item_image_button,
|
||||||
X, Y, btn_size, btn_size, item, item, label)
|
X, Y, btn_size, btn_size, item, item, label)
|
||||||
|
|
||||||
|
local def = reg_items[name]
|
||||||
|
|
||||||
local infos = {
|
local infos = {
|
||||||
unknown = not reg_items[name] or nil,
|
unknown = not def or nil,
|
||||||
groups = groups,
|
groups = groups,
|
||||||
burntime = fuel_cache[name],
|
burntime = fuel_cache[name],
|
||||||
cooktime = cooktime,
|
cooktime = cooktime,
|
||||||
replace = replace,
|
replace = replace,
|
||||||
|
newline = check_newline(def),
|
||||||
}
|
}
|
||||||
|
|
||||||
if next(infos) then
|
if next(infos) then
|
||||||
@ -2061,13 +2072,11 @@ function craftguide.show(name, item, show_usages)
|
|||||||
if not recipes and not usages then
|
if not recipes and not usages then
|
||||||
if not recipes_cache[item] and not usages_cache[item] then
|
if not recipes_cache[item] and not usages_cache[item] then
|
||||||
return false, msg(name, fmt("%s: %s",
|
return false, msg(name, fmt("%s: %s",
|
||||||
S"No recipe or usage for this item",
|
S"No recipe or usage for this item", get_desc(item)))
|
||||||
get_desc(item)))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return false, msg(name, fmt("%s: %s",
|
return false, msg(name, fmt("%s: %s",
|
||||||
S"You don't know a recipe or usage for this item",
|
S"You don't know a recipe or usage for this item", get_desc(item)))
|
||||||
get_desc(item)))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
data.query_item = item
|
data.query_item = item
|
||||||
|
Loading…
Reference in New Issue
Block a user