Modified homedecor's itemframes mod and removed a global var

- Removed x21's global var error
- Changed homedecor's itemframes : now using Shakajiub's fork

mods/fences/init.lua

@@ -78,6 +78,7 @@ local p5 = {2/16, 1/2, 2/16, 2/16, 1/2+8/16, 2/16}
 local x1 = {-2/16, 1/2-4/16, 1/16, -1/2, 1/2-1/16, -1/16}   --oben(quer) -x
 local x12 = {-2/16, -1/2+6/16, 1/16, -1/2, -1/2+9/16, -1/16} --unten(quer) -x
 local x2 = {2/16, 1/2-4/16, -1/16, 1/2, 1/2-1/16, 1/16}   --oben(quer) x
+local x21 = {0, 0, 0, 0, 0, 0} -- just to fix global var use
 local x22 = {2/16, -1/2+6/16, -1/16, 1/2, -1/2+9/16, 1/16} --unten(quer) x
 local z1 = {1/16, 1/2-4/16, -2/16, -1/16, 1/2-1/16, -1/2}   --oben(quer) -z
 local z12 = {1/16, -1/2+6/16, -2/16, -1/16, -1/2+9/16, -1/2} --unten(quer) -z

mods/homedecor_modpack/itemframes/README.txt

@@ -0,0 +1,28 @@
+Minetest 0.4 mod: itemframes
+============================
+
+Original mod found here:
+https://forum.minetest.net/viewtopic.php?f=11&t=5600
+
+This version adds support for multiple pedestals. By default,
+there are pedestals of the exact same materials as in the stairs
+mod. You can add/remove new pedestals easily as much as you like.
+
+License of source code
+----------------------
+This program is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.
+
+License of media (textures)
+---------------------------
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+http://creativecommons.org/licenses/by-sa/3.0/
+
+Authors of media files
+----------------------
+Jere Oikarinen (CC BY-SA 3.0):
+	./textures/itemframes_frame.png
+<oikarinenjere@gmail.com>

mods/homedecor_modpack/itemframes/init.lua

@@ -1,4 +1,7 @@
+-- See README.txt for licensing and other information.
+
 local tmp = {}
+itemframes = {}
 
 minetest.register_entity("itemframes:item",{
 	hp_max = 1,
@@ -25,7 +28,7 @@ minetest.register_entity("itemframes:item",{
 		if self.texture ~= nil then
 			self.object:set_properties({textures={self.texture}})
 		end
-		if self.nodename == "itemframes:pedestal" then
+		if self.nodename ~= "itemframes:frame" then
 			self.object:set_properties({automatic_rotate=1})
 		end
 	end,
@@ -37,7 +40,6 @@ minetest.register_entity("itemframes:item",{
 	end,
 })
 
-
 local facedir = {}
 facedir[0] = {x=0,y=0,z=1}
 facedir[1] = {x=1,y=0,z=0}
@@ -47,9 +49,9 @@ facedir[3] = {x=-1,y=0,z=0}
 local remove_item = function(pos, node)
 	local objs = nil
 	if node.name == "itemframes:frame" then
-		objs = minetest.get_objects_inside_radius(pos, .5)
+		objs = minetest.env:get_objects_inside_radius(pos, .5)
-	elseif node.name == "itemframes:pedestal" then
+	elseif minetest.get_item_group(node.name, "group:pedestal") then
-		objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5)
+		objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5)
 	end
 	if objs then
 		for _, obj in ipairs(objs) do
@@ -62,7 +64,7 @@ end
 
 local update_item = function(pos, node)
 	remove_item(pos, node)
-	local meta = minetest.get_meta(pos)
+	local meta = minetest.env:get_meta(pos)
 	if meta:get_string("item") ~= "" then
 		if node.name == "itemframes:frame" then
 			local posad = facedir[node.param2]
@@ -70,12 +72,12 @@ local update_item = function(pos, node)
 			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
-		elseif node.name == "itemframes:pedestal" then
+		elseif minetest.get_item_group(node.name, "group:pedestal") then
 			pos.y = pos.y + 12/16+.33
 		end
 		tmp.nodename = node.name
 		tmp.texture = ItemStack(meta:get_string("item")):get_name()
-		local e = minetest.add_entity(pos,"itemframes:item")
+		local e = minetest.env:add_entity(pos,"itemframes:item")
 		if node.name == "itemframes:frame" then
 			local yaw = math.pi*2 - node.param2 * math.pi/2
 			e:setyaw(yaw)
@@ -84,12 +86,12 @@ local update_item = function(pos, node)
 end
 
 local drop_item = function(pos, node)
-	local meta = minetest.get_meta(pos)
+	local meta = minetest.env:get_meta(pos)
 	if meta:get_string("item") ~= "" then
 		if node.name == "itemframes:frame" then
-			minetest.add_item(pos, meta:get_string("item"))
+			minetest.env:add_item(pos, meta:get_string("item"))
-		elseif node.name == "itemframes:pedestal" then
+		elseif minetest.get_item_group(node.name, "group:pedestal") then
-			minetest.add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item"))
+			minetest.env:add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item"))
 		end
 		meta:set_string("item","")
 	end
@@ -111,13 +113,13 @@ minetest.register_node("itemframes:frame",{
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
 	after_place_node = function(pos, placer, itemstack)
-		local meta = minetest.get_meta(pos)
+		local meta = minetest.env:get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
 		meta:set_string("infotext","Item frame (owned by "..placer:get_player_name()..")")
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack)
 		if not itemstack then return end
-		local meta = minetest.get_meta(pos)
+		local meta = minetest.env:get_meta(pos)
 		if clicker:get_player_name() == meta:get_string("owner") then
 			drop_item(pos,node)
 			local s = itemstack:take_item()
@@ -127,69 +129,153 @@ minetest.register_node("itemframes:frame",{
 		return itemstack
 	end,
 	on_punch = function(pos,node,puncher)
-		local meta = minetest.get_meta(pos)
+		local meta = minetest.env:get_meta(pos)
 		if puncher:get_player_name() == meta:get_string("owner") then
 			drop_item(pos, node)
 		end
 	end,
 	can_dig = function(pos,player)
-		
+		local meta = minetest.env:get_meta(pos)
-		local meta = minetest.get_meta(pos)
 		return player:get_player_name() == meta:get_string("owner")
 	end,
-	after_destruct = remove_item,
 })
 
-
+minetest.register_craft({
-minetest.register_node("itemframes:pedestal",{
+	output = 'itemframes:frame',
-	description = "Pedestal",
+	recipe = {
-	drawtype = "nodebox",
+		{'group:stick', 'group:stick', 'group:stick'},
-	node_box = { type = "fixed", fixed = {
+		{'group:stick', 'default:paper', 'group:stick'},
-		{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
+		{'group:stick', 'group:stick', 'group:stick'},
-		{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
+	}
-		{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
-		{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
-	} },
-	--selection_box = { type = "fixed", fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16} },
-	tiles = {"itemframes_pedestal.png"},
-	paramtype = "light",
-	groups = { cracky=3 },
-	sounds = default.node_sound_defaults(),
-	after_place_node = function(pos, placer, itemstack)
-		local meta = minetest.get_meta(pos)
-		meta:set_string("owner",placer:get_player_name())
-		meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")")
-	end,
-	on_rightclick = function(pos, node, clicker, itemstack)
-		if not itemstack then return end
-		local meta = minetest.get_meta(pos)
-		if clicker:get_player_name() == meta:get_string("owner") then
-			drop_item(pos,node)
-			local s = itemstack:take_item()
-			meta:set_string("item",s:to_string())
-			update_item(pos,node)
-		end
-		return itemstack
-	end,
-	on_punch = function(pos,node,puncher)
-		local meta = minetest.get_meta(pos)
-		if puncher:get_player_name() == meta:get_string("owner") then
-			drop_item(pos,node)
-		end
-	end,
-	can_dig = function(pos,player)
-		
-		local meta = minetest.get_meta(pos)
-		return player:get_player_name() == meta:get_string("owner")
-	end,
-	after_destruct = remove_item,
 })
 
--- automatically restore entities lost from frames/pedestals
+function itemframes.register_pedestal(subname, recipeitem, groups, images, description, sounds)
--- due to /clearobjects or similar
+	minetest.register_node("itemframes:pedestal_" .. subname, {
+		description = description,
+		drawtype = "nodebox",
+		tiles = images,
+		node_box = { type = "fixed", fixed = {
+			{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
+			{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
+			{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
+			{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
+		}},
+		groups = groups,
+		sounds = sounds,
+		paramtype = "light",
+		after_place_node = function(pos, placer, itemstack)
+			local meta = minetest.env:get_meta(pos)
+			meta:set_string("owner",placer:get_player_name())
+			meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")")
+		end,
+		on_rightclick = function(pos, node, clicker, itemstack)
+			if not itemstack then return end
+			local meta = minetest.env:get_meta(pos)
+			if clicker:get_player_name() == meta:get_string("owner") then
+				drop_item(pos,node)
+				local s = itemstack:take_item()
+				meta:set_string("item",s:to_string())
+				update_item(pos,node)
+			end
+			return itemstack
+		end,
+		on_punch = function(pos,node,puncher)
+			local meta = minetest.env:get_meta(pos)
+			if puncher:get_player_name() == meta:get_string("owner") then
+				drop_item(pos,node)
+			end
+		end,
+		can_dig = function(pos,player)
+			local meta = minetest.env:get_meta(pos)
+			return player:get_player_name() == meta:get_string("owner")
+		end,
+	})
+
+	minetest.register_craft({
+		output = 'itemframes:pedestal_' .. subname,
+		recipe = {
+			{recipeitem, recipeitem, recipeitem},
+			{'', recipeitem, ''},
+			{recipeitem, recipeitem, recipeitem},
+		}
+	})
+end
+
+itemframes.register_pedestal("wood", "default:wood",
+		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,pedestal=1},
+		{"default_wood.png"},
+		"Wooden Pedestal",
+		default.node_sound_wood_defaults()
+)
+
+itemframes.register_pedestal("stone", "default:stone",
+		{cracky=3,pedestal=1},
+		{"default_stone.png"},
+		"Stone Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("cobble", "default:cobble",
+		{cracky=3,pedestal=1},
+		{"default_cobble.png"},
+		"Cobblestone Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("desert_stone", "default:desert_stone",
+		{cracky=3,pedestal=1},
+		{"default_desert_stone.png"},
+		"Desert Stone Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("desert_cobble", "default:desert_cobble",
+		{cracky=3,pedestal=1},
+		{"default_desert_cobble.png"},
+		"Desert Cobblestone Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("desert_stonebrick", "default:desert_stonebrick",
+		{cracky=3,pedestal=1},
+		{"default_desert_stone_brick.png"},
+		"Desert Stone Brick Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("brick", "default:brick",
+		{cracky=3,pedestal=1},
+		{"default_brick.png"},
+		"Brick Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("sandstone", "default:sandstone",
+		{crumbly=2,cracky=2,pedestal=1},
+		{"default_sandstone.png"},
+		"Sandstone Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("sandstonebrick", "default:sandstonebrick",
+		{crumbly=2,cracky=2,pedestal=1},
+		{"default_sandstone_brick.png"},
+		"Sandstone Brick Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+itemframes.register_pedestal("stonebrick", "default:stonebrick",
+		{cracky=3,pedestal=1},
+		{"default_stone_brick.png"},
+		"Stone Brick Pedestal",
+		default.node_sound_stone_defaults()
+)
+
+-- automatically restore entities lost from
+-- frames/pedestals due to /clearobjects or similar
 
 minetest.register_abm({
-	nodenames = { "itemframes:frame", "itemframes:pedestal" },
+	nodenames = {"itemframes:frame", "group:pedestal"},
 	interval = 15,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -198,21 +284,7 @@ minetest.register_abm({
 	end
 })
 
--- crafts
+-- homedecor/itemframes -> itemframes::stone
-
+-- minetest.register_alias("itemframes:pedestal","itemframes:pedestal_stone")
-minetest.register_craft({
+-- itemframes::stone -> homedecor/itemframes
-	output = 'itemframes:frame',
+minetest.register_alias("itemframes:pedestal_stone","itemframes:pedestal")
-	recipe = {
-		{'default:stick', 'default:stick', 'default:stick'},
-		{'default:stick', 'default:paper', 'default:stick'},
-		{'default:stick', 'default:stick', 'default:stick'},
-	}
-})
-minetest.register_craft({
-	output = 'itemframes:pedestal',
-	recipe = {
-		{'default:stone', 'default:stone', 'default:stone'},
-		{'', 'default:stone', ''},
-		{'default:stone', 'default:stone', 'default:stone'},
-	}
-})