Drop items from frames when dug, ABM and clean-up

This commit is contained in:
jp 2015-08-05 18:30:03 +02:00
parent e534e11c8c
commit 6231ecaed3

View File

@ -14,13 +14,11 @@ minetest.register_entity("xdecor:f_item", {
tmp.nodename = nil tmp.nodename = nil
self.texture = tmp.texture self.texture = tmp.texture
tmp.texture = nil tmp.texture = nil
else elseif staticdata ~= nil and staticdata ~= "" then
if staticdata ~= nil and staticdata ~= "" then local data = staticdata:split(";")
local data = staticdata:split(";") if data and data[1] and data[2] then
if data and data[1] and data[2] then self.nodename = data[1]
self.nodename = data[1] self.texture = data[2]
self.texture = data[2]
end
end end
end end
if self.texture ~= nil then if self.texture ~= nil then
@ -38,13 +36,12 @@ minetest.register_entity("xdecor:f_item", {
local remove_item = function(pos, node) local remove_item = function(pos, node)
local objs = nil local objs = nil
objs = minetest.get_objects_inside_radius(pos, .5) objs = minetest.get_objects_inside_radius(pos, .5)
if not objs then return end
if objs then for _, obj in pairs(objs) do
for _, obj in ipairs(objs) do if obj and obj:get_luaentity() and
if obj and obj:get_luaentity() and obj:get_luaentity().name == "xdecor:f_item" then
obj:get_luaentity().name == "xdecor:f_item" then obj:remove()
obj:remove()
end
end end
end end
end end
@ -59,35 +56,32 @@ local update_item = function(pos, node)
remove_item(pos, node) remove_item(pos, node)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local str_item = meta:get_string("item") local str_item = meta:get_string("item")
if str_item == "" then return end
local posad = facedir[node.param2]
if not posad then return end
pos.x = pos.x + posad.x * 6.5/16
pos.y = pos.y + posad.y * 6.5/16
pos.z = pos.z + posad.z * 6.5/16
tmp.nodename = node.name
tmp.texture = ItemStack(str_item):get_name()
if str_item ~= "" then local e = minetest.add_entity(pos, "xdecor:f_item")
local posad = facedir[node.param2] local yaw = math.pi*2 - node.param2 * math.pi/2
if not posad then return end e:setyaw(yaw)
pos.x = pos.x + posad.x * 6.5/16
pos.y = pos.y + posad.y * 6.5/16
pos.z = pos.z + posad.z * 6.5/16
tmp.nodename = node.name
tmp.texture = ItemStack(str_item):get_name()
local e = minetest.add_entity(pos, "xdecor:f_item")
local yaw = math.pi*2 - node.param2 * math.pi/2
e:setyaw(yaw)
end
end end
local drop_item = function(pos, node) local drop_item = function(pos, node)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if meta:get_string("item") ~= "" then if meta:get_string("item") == "" then return end
minetest.add_item(pos, meta:get_string("item")) minetest.add_item(pos, meta:get_string("item"))
meta:set_string("item", "") meta:set_string("item", "")
end
remove_item(pos, node) remove_item(pos, node)
end end
xdecor.register("frame", { xdecor.register("frame", {
description = "Item frame", description = "Item frame",
groups = {snappy=3}, groups = {choppy=3, snappy=2},
sounds = xdecor.wood, sounds = xdecor.wood,
on_rotate = screwdriver.disallow, on_rotate = screwdriver.disallow,
node_box = { node_box = {
@ -108,34 +102,41 @@ xdecor.register("frame", {
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end if not itemstack then return end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if clicker:get_player_name() == meta:get_string("owner") then local player = clicker:get_player_name()
drop_item(pos, node) if player ~= meta:get_string("owner") then return end
local s = itemstack:take_item()
meta:set_string("item", s:to_string())
update_item(pos, node)
end
drop_item(pos, node)
local s = itemstack:take_item()
meta:set_string("item", s:to_string())
update_item(pos, node)
return itemstack return itemstack
end, end,
on_punch = function(pos, node, puncher) on_punch = function(pos, node, puncher)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if puncher:get_player_name() == meta:get_string("owner") then local player = puncher:get_player_name()
drop_item(pos, node) if player ~= meta:get_string("owner") then return end
end drop_item(pos, node)
end, end,
can_dig = function(pos, player) can_dig = function(pos, player)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
return player:get_player_name() == meta:get_string("owner") return player:get_player_name() == meta:get_string("owner")
end, end,
after_destruct = remove_item on_destruct = function(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
if meta:get_string("item") == "" then return end
drop_item(pos, node)
end
}) })
minetest.register_abm({ minetest.register_abm({
nodenames = {"xdecor:frame"}, nodenames = {"xdecor:frame"},
interval = 10, interval = 10, chance = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
if #minetest.get_objects_inside_radius(pos, 0.5) > 0 then return end local num
if node.name ~= "xdecor:frame" then return end
num = #minetest.get_objects_inside_radius(pos, 0.5)
if num > 0 then return end
update_item(pos, node) update_item(pos, node)
end end
}) })