]> git.lizzy.rs Git - xdecor.git/blobdiff - itemframe.lua
Don't crash on nil-player in can_dig and check the right players for attachment in...
[xdecor.git] / itemframe.lua
index 12c91e7e4ce982f4db42c57d2376042de1d8e60a..02d83d6fe7992a4bf104ce933f4bf5ec6871939b 100644 (file)
-local tmp = {}
+local itemframe, tmp = {}, {}
 screwdriver = screwdriver or {}
 
-minetest.register_entity("xdecor:f_item", {
-       hp_max = 1,
-       visual = "wielditem",
-       visual_size = {x=.33, y=.33},
-       collisionbox = {0, 0, 0, 0, 0, 0},
-       physical = false,
-       textures = {"air"},
-       on_activate = function(self, staticdata)
-               if tmp.nodename ~= nil and tmp.texture ~= nil then
-                       self.nodename = tmp.nodename
-                       tmp.nodename = nil
-                       self.texture = tmp.texture
-                       tmp.texture = nil
-               elseif staticdata ~= nil and staticdata ~= "" then
-                       local data = staticdata:split(";")
-                       if data and data[1] and data[2] then
-                               self.nodename = data[1]
-                               self.texture = data[2]
-                       end
-               end
-               if self.texture ~= nil then
-                       self.object:set_properties({textures={self.texture}})
-               end
-       end,
-       get_staticdata = function(self)
-               if self.nodename ~= nil and self.texture ~= nil then
-                       return self.nodename..";"..self.texture
-               end
-               return ""
-       end
-})
-
-local remove_item = function(pos, node)
-       local objs = nil
-       objs = minetest.get_objects_inside_radius(pos, .5)
+local function remove_item(pos, node)
+       local objs = minetest.get_objects_inside_radius(pos, 0.5)
        if not objs then return end
 
        for _, obj in pairs(objs) do
                if obj and obj:get_luaentity() and
-                       obj:get_luaentity().name == "xdecor:f_item" then
-                       obj:remove()
+                               obj:get_luaentity().name == "xdecor:f_item" then
+                       obj:remove() break
                end
        end
 end
 
-local facedir = {}
-facedir[0] = {x=0, y=0, z=1}
-facedir[1] = {x=1, y=0, z=0}
-facedir[2] = {x=0, y=0, z=-1}
-facedir[3] = {x=-1, y=0, z=0}
+local facedir = {
+       [0] = {x=0, y=0, z=1}, {x=1, y=0, z=0}, {x=0, y=0, z=-1}, {x=-1, y=0, z=0}
+}
 
-local update_item = function(pos, node)
+local function update_item(pos, node)
        remove_item(pos, node)
        local meta = minetest.get_meta(pos)
-       local str_item = meta:get_string("item")
-       if str_item == "" then return end
-       
+       local itemstring = meta:get_string("item")
        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
+       if not posad or itemstring == "" then return end
+
+       pos = vector.add(pos, vector.multiply(posad, 6.5/16))
        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
-       e:setyaw(yaw)
+       entity:setyaw(yaw)
+
+       local timer = minetest.get_node_timer(pos)
+       timer:start(15.0)
 end
 
-local drop_item = function(pos, node)
+local function drop_item(pos, node)
        local meta = minetest.get_meta(pos)
-       if meta:get_string("item") == "" then return end
-       minetest.add_item(pos, meta:get_string("item"))
+       local item = meta:get_string("item")
+       if item == "" then return end
+
+       minetest.add_item(pos, item)
        meta:set_string("item", "")
        remove_item(pos, node)
+
+       local timer = minetest.get_node_timer(pos)
+       timer:stop()
 end
 
-xdecor.register("frame", {
-       description = "Item frame",
-       groups = {choppy=3, snappy=2},
-       sounds = sound.wood,
-       on_rotate = screwdriver.disallow,
-       node_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
-       },
-       tiles = {
-               "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png",
-               "xdecor_wood.png", "xdecor_wood.png", "xdecor_frame.png"
-       }, 
-       inventory_image = "xdecor_frame.png",
-       after_place_node = function(pos, placer, itemstack)
-               local meta = minetest.get_meta(pos)
-               local name = placer:get_player_name()
-               meta:set_string("owner", name)
-               meta:set_string("infotext", "Item frame (owned by "..name..")")
-       end,
-       on_rightclick = function(pos, node, clicker, itemstack)
-               if not itemstack then return end
-               local meta = minetest.get_meta(pos)
-               local player = clicker:get_player_name()
-               if player ~= meta:get_string("owner") then return end
-
-               drop_item(pos, node)
-               local s = itemstack:take_item()
-               meta:set_string("item", s:to_string())
+function itemframe.after_place(pos, placer, itemstack)
+       local meta = minetest.get_meta(pos)
+       local name = placer:get_player_name()
+       meta:set_string("owner", name)
+       meta:set_string("infotext", "Item Frame (owned by "..name..")")
+end
+
+function itemframe.timer(pos)
+       local node = minetest.get_node(pos)
+       local meta = minetest.get_meta(pos)
+       local num = #minetest.get_objects_inside_radius(pos, 0.5)
+
+       if num == 0 and meta:get_string("item") ~= "" then
                update_item(pos, node)
+       end
+       return true
+end
+
+function itemframe.rightclick(pos, node, clicker, itemstack)
+       local meta = minetest.get_meta(pos)
+       local player = clicker:get_player_name()
+       local owner = meta:get_string("owner")
+       if player ~= owner or not itemstack then
                return itemstack
-       end,
-       on_punch = function(pos, node, puncher)
-               local meta = minetest.get_meta(pos)
-               local player = puncher:get_player_name()
-               if player ~= meta:get_string("owner") then return end
-               drop_item(pos, node)
-       end,
-       can_dig = function(pos, player)
-               local meta = minetest.get_meta(pos)
-               return player:get_player_name() == meta:get_string("owner")
-       end,
-       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
+
+       drop_item(pos, node)
+       local itemstring = itemstack:take_item():to_string()
+       meta:set_string("item", itemstring)
+       update_item(pos, node)
+
+       return itemstack
+end
+
+function itemframe.punch(pos, node, puncher)
+       local meta = minetest.get_meta(pos)
+       local player = puncher:get_player_name()
+       local owner = meta:get_string("owner")
+
+       if player ~= owner then return end
+       drop_item(pos, node)
+end
+
+function itemframe.dig(pos, player)
+       local meta = minetest.get_meta(pos)
+       local pname = player and player:get_player_name()
+       local owner = meta:get_string("owner")
+
+       return pname == owner
+end
+
+xdecor.register("itemframe", {
+       description = "Item Frame",
+       groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
+       sounds = default.node_sound_wood_defaults(),
+       on_rotate = screwdriver.disallow,
+       sunlight_propagates = true,
+       inventory_image = "xdecor_itemframe.png",
+       node_box = xdecor.nodebox.slab_z(0.9375),
+       tiles = {"xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png",
+                "xdecor_wood.png", "xdecor_wood.png", "xdecor_itemframe.png"},
+       after_place_node = itemframe.after_place,
+       on_timer = itemframe.timer,
+       on_rightclick = itemframe.rightclick,
+       on_punch = itemframe.punch,
+       can_dig = itemframe.dig,
+       after_destruct = remove_item
 })
 
-minetest.register_abm({
-       nodenames = {"xdecor:frame"},
-       interval = 15, chance = 1,
-       action = function(pos, node, _, _)
-               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)
+minetest.register_entity("xdecor:f_item", {
+       visual = "wielditem",
+       visual_size = {x=0.33, y=0.33},
+       collisionbox = {0},
+       physical = false,
+       textures = {"air"},
+       on_activate = function(self, staticdata)
+               local pos = self.object:getpos()
+               if minetest.get_node(pos).name ~= "xdecor:itemframe" then
+                       self.object:remove()
+               end
+
+               if tmp.nodename and tmp.texture then
+                       self.nodename = tmp.nodename
+                       tmp.nodename = nil
+                       self.texture = tmp.texture
+                       tmp.texture = nil
+               elseif staticdata and staticdata ~= "" then
+                       local data = staticdata:split(";")
+                       if data and data[1] and data[2] then
+                               self.nodename = data[1]
+                               self.texture = data[2]
+                       end
+               end
+               if self.texture then
+                       self.object:set_properties({textures={self.texture}})
+               end
+       end,
+       get_staticdata = function(self)
+               if self.nodename and self.texture then
+                       return self.nodename..";"..self.texture
+               end
+               return ""
        end
 })
+