X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=itemframe.lua;h=9b795f341c554fc2e4b36b0a4de0332abdb1d93f;hb=8fea48634705cb692e24082d8ab9d1f645be657a;hp=b1dcddac529a6095185879a5f2b6c937ca7daddb;hpb=6231ecaed3670d9c464f3f04ba15e373d209cc25;p=xdecor.git

diff --git a/itemframe.lua b/itemframe.lua
index b1dcdda..9b795f3 100644
--- a/itemframe.lua
+++ b/itemframe.lua
@@ -5,28 +5,28 @@ minetest.register_entity("xdecor:f_item", {
 	hp_max = 1,
 	visual = "wielditem",
 	visual_size = {x=.33, y=.33},
-	collisionbox = {0, 0, 0, 0, 0, 0},
+	collisionbox = {0},
 	physical = false,
 	textures = {"air"},
 	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
 			tmp.nodename = nil
 			self.texture = tmp.texture
 			tmp.texture = nil
-		elseif staticdata ~= nil and staticdata ~= "" then
+		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 ~= nil then
+		if self.texture then
 			self.object:set_properties({textures={self.texture}})
 		end
 	end,
 	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
 		end
 		return ""
@@ -34,8 +34,7 @@ minetest.register_entity("xdecor:f_item", {
 })
 
 local remove_item = function(pos, node)
-	local objs = nil
-	objs = minetest.get_objects_inside_radius(pos, .5)
+	local objs = minetest.get_objects_inside_radius(pos, 0.5)
 	if not objs then return end
 
 	for _, obj in pairs(objs) do
@@ -55,87 +54,89 @@ facedir[3] = {x=-1, y=0, z=0}
 local update_item = function(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
+	if not posad or itemstring == "" 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()
+	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)
 end
 
 local drop_item = function(pos, node)
 	local meta = minetest.get_meta(pos)
 	if meta:get_string("item") == "" then return end
+
 	minetest.add_item(pos, meta:get_string("item"))
 	meta:set_string("item", "")
 	remove_item(pos, node)
 end
 
 xdecor.register("frame", {
-	description = "Item frame",
-	groups = {choppy=3, snappy=2},
-	sounds = xdecor.wood,
+	description = "Item Frame",
+	groups = {choppy=3, oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
 	on_rotate = screwdriver.disallow,
-	node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
-	},
+	sunlight_propagates = true,
+	inventory_image = "xdecor_frame.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_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..")")
+		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
+
+		if player ~= meta:get_string("owner") or not itemstack then
+			return
+		end
 
 		drop_item(pos, node)
-		local s = itemstack:take_item()
-		meta:set_string("item", s:to_string())
+		local itemstring = itemstack:take_item():to_string()
+		meta:set_string("item", itemstring)
 		update_item(pos, node)
+
 		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")
+		local owner = meta:get_string("owner")
+
+		if not player or player:get_player_name() ~= owner then
+			return false
+		end
+
+		return true
 	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
+	after_destruct = remove_item
 })
 
 minetest.register_abm({
 	nodenames = {"xdecor:frame"},
-	interval = 10, chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		local num
-		if node.name ~= "xdecor:frame" then return end
-		num = #minetest.get_objects_inside_radius(pos, 0.5)
+	interval = 15, chance = 1,
+	action = function(pos, node)
+		local num = #minetest.get_objects_inside_radius(pos, 0.5)
 		if num > 0 then return end
 		update_item(pos, node)
 	end