Tim7
/
VoxeLibre
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix deprecated get_metadata() usage 

Items are instead written as a serialized string into ItemStackMetaRef, and read from there as well. Old itemstacks get converted to the new format automatically.
This commit is contained in:
Mikita Wiśniewski 2024-07-13 10:48:03 +07:00 committed by the-real-herowl
parent 347305eaea
commit 567d112942
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mods/ITEMS/mcl_chests/shulkers.lua
View File

@ -136,12 +136,20 @@ for color, desc in pairs(boxtypes) do
end, end,
after_place_node = function(pos, placer, itemstack, pointed_thing) after_place_node = function(pos, placer, itemstack, pointed_thing)
local nmeta = minetest.get_meta(pos) local nmeta = minetest.get_meta(pos)
local imetadata = itemstack:get_metadata() local imeta = itemstack:get_meta()
local iinv_main = minetest.deserialize(imetadata)
-- Convert old itemstacks to not use get_metadata()
if not imeta:contains("inv") and
(itemstack:get_metadata() ~= "") then
imeta:set_string("inv", itemstack:get_metadata())
itemstack:set_metadata("") -- clear
end
local iinv_main = minetest.deserialize(imeta:get_string("inv"))
local ninv = nmeta:get_inventory() local ninv = nmeta:get_inventory()
ninv:set_list("main", iinv_main) ninv:set_list("main", iinv_main)
ninv:set_size("main", 9 * 3) ninv:set_size("main", 9 * 3)
set_shulkerbox_meta(nmeta, itemstack:get_meta()) set_shulkerbox_meta(nmeta, imeta)
if minetest.is_creative_enabled(placer:get_player_name()) then if minetest.is_creative_enabled(placer:get_player_name()) then
if not ninv:is_empty("main") then if not ninv:is_empty("main") then
@ -158,11 +166,11 @@ for color, desc in pairs(boxtypes) do
if minetest.registered_nodes[dropnode.name].buildable_to then if minetest.registered_nodes[dropnode.name].buildable_to then
minetest.set_node(droppos, { name = small_name, param2 = minetest.dir_to_facedir(dropdir) }) minetest.set_node(droppos, { name = small_name, param2 = minetest.dir_to_facedir(dropdir) })
local ninv = minetest.get_inventory({ type = "node", pos = droppos }) local ninv = minetest.get_inventory({ type = "node", pos = droppos })
local imetadata = stack:get_metadata() local imeta = stack:get_meta()
local iinv_main = minetest.deserialize(imetadata) local iinv_main = minetest.deserialize(imeta:get_string("inv"))
ninv:set_list("main", iinv_main) ninv:set_list("main", iinv_main)
ninv:set_size("main", 9 * 3) ninv:set_size("main", 9 * 3)
set_shulkerbox_meta(minetest.get_meta(droppos), stack:get_meta()) set_shulkerbox_meta(minetest.get_meta(droppos), imeta)
stack:take_item() stack:take_item()
end end
return stack return stack
@ -213,12 +221,20 @@ for color, desc in pairs(boxtypes) do
end, end,
after_place_node = function(pos, placer, itemstack, pointed_thing) after_place_node = function(pos, placer, itemstack, pointed_thing)
local nmeta = minetest.get_meta(pos) local nmeta = minetest.get_meta(pos)
local imetadata = itemstack:get_metadata() local imeta = itemstack:get_meta()
local iinv_main = minetest.deserialize(imetadata)
-- Convert old itemstacks to not use get_metadata()
if not imeta:contains("inv") and
(itemstack:get_metadata() ~= "") then
imeta:set_string("inv", itemstack:get_metadata())
itemstack:set_metadata("") -- clear
end
local iinv_main = minetest.deserialize(imeta:get_string("inv"))
local ninv = nmeta:get_inventory() local ninv = nmeta:get_inventory()
ninv:set_list("main", iinv_main) ninv:set_list("main", iinv_main)
ninv:set_size("main", 9 * 3) ninv:set_size("main", 9 * 3)
set_shulkerbox_meta(nmeta, itemstack:get_meta()) set_shulkerbox_meta(nmeta, imeta)
if minetest.is_creative_enabled(placer:get_player_name()) then if minetest.is_creative_enabled(placer:get_player_name()) then
if not ninv:is_empty("main") then if not ninv:is_empty("main") then
@ -252,7 +268,7 @@ for color, desc in pairs(boxtypes) do
local boxitem_meta = boxitem:get_meta() local boxitem_meta = boxitem:get_meta()
boxitem_meta:set_string("description", meta:get_string("description")) boxitem_meta:set_string("description", meta:get_string("description"))
boxitem_meta:set_string("name", meta:get_string("name")) boxitem_meta:set_string("name", meta:get_string("name"))
boxitem:set_metadata(data) boxitem_meta:set_string("inv", data)
if minetest.is_creative_enabled("") then if minetest.is_creative_enabled("") then
if not inv:is_empty("main") then if not inv:is_empty("main") then