VanessaE
/
homedecor_modpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'showItemDescription' into 'master' 

improve info with fallback

See merge request VanessaE/homedecor_modpack!15
master
Vanessa Dannenberg 2020-10-14 10:22:12 +00:00
parent f2cd1fbd49 77af2295ae
commit 77bb9636bc
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
itemframes/init.lua
View File

@ -153,12 +153,19 @@ minetest.register_node("itemframes:frame",{
drop_item(pos,node)
local s = itemstack:take_item()
meta:set_string("item",s:to_string())
local description = ""
local item_meta = s:get_meta()
if item_meta then
description = item_meta:get_string("description") or ""
local description = item_meta:get_string("description")
if description == "" then
local item_name = s:get_name()
if minetest.registered_items[item_name]
and minetest.registered_items[item_name].description
then
description = minetest.registered_items[item_name].description
else
description = item_name
end
end
meta:set_string("infotext", S("Item frame (owned by @1)\n@2", name, description))
meta:set_string("infotext", S("Item frame (owned by @1)", name) .. "\n" .. description)
update_item(pos,node)
end
return itemstack
@ -223,12 +230,19 @@ minetest.register_node("itemframes:pedestal",{
drop_item(pos,node)
local s = itemstack:take_item()
meta:set_string("item",s:to_string())
local description = ""
local item_meta = s:get_meta()
if item_meta then
description = item_meta:get_string("description") or ""
local description = item_meta:get_string("description")
if description == "" then
local item_name = s:get_name()
if minetest.registered_items[item_name]
and minetest.registered_items[item_name].description
then
description = minetest.registered_items[item_name].description
else
description = item_name
end
end
meta:set_string("infotext", S("Pedestal (owned by @1)\n@2", name, description))
meta:set_string("infotext", S("Pedestal (owned by @1)", name) .. "\n" .. description)
update_item(pos,node)
end
return itemstack
@ -313,3 +327,4 @@ if minetest.get_modpath("mesecons_mvps") then
mesecon.register_mvps_stopper("itemframes:frame")
mesecon.register_mvps_stopper("itemframes:pedestal")
end