X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=itemframe.lua;h=66d690cf43e01ad396f295f95e2ec8e776b47337;hb=4fc0cb1687b517379ad79d1b910dba0e4174db09;hp=4f73d22761d98d91ba888e285026025a0bc2875a;hpb=727da4cf6582a4a9517e9477c90116241fa7132b;p=xdecor.git

diff --git a/itemframe.lua b/itemframe.lua
index 4f73d22..66d690c 100644
--- a/itemframe.lua
+++ b/itemframe.lua
@@ -1,4 +1,4 @@
-local tmp = {}
+local itemframe, tmp = {}, {}
 screwdriver = screwdriver or {}
 
 local function remove_item(pos, node)
@@ -7,15 +7,14 @@ local function remove_item(pos, node)
 
 	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 = {
-	[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}
+	[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 function update_item(pos, node)
@@ -25,9 +24,7 @@ local function update_item(pos, node)
 	local posad = facedir[node.param2]
 	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
+	pos = vector.add(pos, vector.multiply(posad, 6.5/16))
 	tmp.nodename = node.name
 	tmp.texture = ItemStack(itemstring):get_name()
 
@@ -52,14 +49,85 @@ local function drop_item(pos, node)
 	timer:stop()
 end
 
+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 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:get_player_name()
+	local owner = meta:get_string("owner")
+
+	return player and 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_entity("xdecor:f_item", {
-	hp_max = 1,
 	visual = "wielditem",
-	visual_size = {x=.33, y=.33},
+	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
@@ -84,60 +152,3 @@ minetest.register_entity("xdecor:f_item", {
 	end
 })
 
-xdecor.register("frame", {
-	description = "Item Frame",
-	groups = {choppy=3, oddly_breakable_by_hand=2},
-	sounds = default.node_sound_wood_defaults(),
-	on_rotate = screwdriver.disallow,
-	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"},
-	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_timer = function(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,
-	on_rightclick = function(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 end
-
-		drop_item(pos, node)
-		local itemstring = itemstack:take_item():get_name()
-		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()
-		local owner = meta:get_string("owner")
-
-		if player ~= owner then return end
-		drop_item(pos, node)
-	end,
-	can_dig = function(pos, player)
-		local meta = minetest.get_meta(pos)
-		local pname = player:get_player_name()
-		local owner = meta:get_string("owner")
-
-		return player and pname == owner
-	end,
-	after_destruct = remove_item
-})
-