nalc
/
homedecor_modpack
forked from mtcontrib/homedecor_modpack
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2020-10-14 21:31:35 +02:00
parent e5866b7928 77bb9636bc
commit caaa963eaf
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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