MTSR/xdecor-libre
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Small cleaning of itemframe code

Browse Source
This commit is contained in:
jp 2015-12-23 12:39:46 +01:00
parent c479ec57da
commit 50f77146b5
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
itemframe.lua
View File

@ -5,28 +5,28 @@ minetest.register_entity("xdecor:f_item", {
hp_max = 1, hp_max = 1,
visual = "wielditem", visual = "wielditem",
visual_size = {x=.33, y=.33}, visual_size = {x=.33, y=.33},
collisionbox = {0, 0, 0, 0, 0, 0}, collisionbox = {0},
physical = false, physical = false,
textures = {"air"}, textures = {"air"},
on_activate = function(self, staticdata) on_activate = function(self, staticdata)
if tmp.nodename ~= nil and tmp.texture ~= nil then if tmp.nodename and tmp.texture then
self.nodename = tmp.nodename self.nodename = tmp.nodename
tmp.nodename = nil tmp.nodename = nil
self.texture = tmp.texture self.texture = tmp.texture
tmp.texture = nil tmp.texture = nil
elseif staticdata ~= nil and staticdata ~= "" then elseif staticdata 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
if self.texture ~= nil then if self.texture then
self.object:set_properties({textures={self.texture}}) self.object:set_properties({textures={self.texture}})
end end
end, end,
get_staticdata = function(self) get_staticdata = function(self)
if self.nodename ~= nil and self.texture ~= nil then if self.nodename and self.texture then
return self.nodename..";"..self.texture return self.nodename..";"..self.texture
end end
return "" return ""
@ -34,8 +34,7 @@ minetest.register_entity("xdecor:f_item", {
}) })
local remove_item = function(pos, node) local remove_item = function(pos, node)
local objs = nil local objs = minetest.get_objects_inside_radius(pos, 0.5)
objs = minetest.get_objects_inside_radius(pos, 0.5)
if not objs then return end if not objs then return end
for _, obj in pairs(objs) do for _, obj in pairs(objs) do
@ -55,25 +54,25 @@ facedir[3] = {x=-1, y=0, z=0}
local update_item = function(pos, node) 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 itemstring = meta:get_string("item")
if str_item == "" then return end
local posad = facedir[node.param2] local posad = facedir[node.param2]
if not posad then return end if not posad or itemstring == "" then return end
pos.x = pos.x + posad.x * 6.5/16 pos.x = pos.x + posad.x * 6.5/16
pos.y = pos.y + posad.y * 6.5/16 pos.y = pos.y + posad.y * 6.5/16
pos.z = pos.z + posad.z * 6.5/16 pos.z = pos.z + posad.z * 6.5/16
tmp.nodename = node.name tmp.nodename = node.name
tmp.texture = ItemStack(str_item):get_name() tmp.texture = ItemStack(itemstring):get_name()
local e = minetest.add_entity(pos, "xdecor:f_item") local entity = minetest.add_entity(pos, "xdecor:f_item")
local yaw = math.pi*2 - node.param2 * math.pi/2 local yaw = math.pi*2 - node.param2 * math.pi/2
e:setyaw(yaw) entity:setyaw(yaw)
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 return end 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", "")
remove_item(pos, node) remove_item(pos, node)
@ -87,7 +86,7 @@ xdecor.register("frame", {
sunlight_propagates = true, sunlight_propagates = true,
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} fixed = {-0.5, -0.5, 0.4375, 0.5, 0.5, 0.5}
}, },
tiles = { tiles = {
"xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png",
@ -97,24 +96,29 @@ xdecor.register("frame", {
after_place_node = function(pos, placer, itemstack) after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local name = placer:get_player_name() local name = placer:get_player_name()
meta:set_string("owner", name) meta:set_string("owner", name)
meta:set_string("infotext", "Item frame (owned by "..name..")") meta:set_string("infotext", "Item Frame (owned by "..name..")")
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local player = clicker:get_player_name() local player = clicker:get_player_name()
if player ~= meta:get_string("owner") then return end
if player ~= meta:get_string("owner") or not itemstack then
return
end
drop_item(pos, node) drop_item(pos, node)
local s = itemstack:take_item() local itemstring = itemstack:take_item():to_string()
meta:set_string("item", s:to_string()) meta:set_string("item", itemstring)
update_item(pos, node) 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)
local player = puncher:get_player_name() local player = puncher:get_player_name()
if player ~= meta:get_string("owner") then return end if player ~= meta:get_string("owner") then return end
drop_item(pos, node) drop_item(pos, node)
end, end,
@ -122,12 +126,16 @@ xdecor.register("frame", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner") local owner = meta:get_string("owner")
if not player or player:get_player_name() ~= owner then return false end if not player or player:get_player_name() ~= owner then
return false
end
return true return true
end, end,
on_destruct = function(pos) on_destruct = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
if meta:get_string("item") == "" then return end if meta:get_string("item") == "" then return end
drop_item(pos, node) drop_item(pos, node)
end end
@ -137,9 +145,7 @@ minetest.register_abm({
nodenames = {"xdecor:frame"}, nodenames = {"xdecor:frame"},
interval = 15, chance = 1, interval = 15, chance = 1,
action = function(pos, node, _, _) action = function(pos, node, _, _)
local num local num = #minetest.get_objects_inside_radius(pos, 0.5)
if node.name ~= "xdecor:frame" then return end
num = #minetest.get_objects_inside_radius(pos, 0.5)
if num > 0 then return end if num > 0 then return end
update_item(pos, node) update_item(pos, node)
end end