Updated mesecons, pipeworks and homedecor

- Homedecor now using an inventory texture for lamps
- Reoganized pipeworks' code
- Added secure fix in pipeworks
- Added meshnodes, sounds and fixes in mesecons
- Removed "mesecons_compatibility"

mods/homedecor_modpack/computer/miscitems.lua

@@ -5,12 +5,7 @@
 -- This file defines some items in order to not have to depend on other mods.
 
 -- Boilerplate to support localized strings if intllib mod is installed.
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 
 if (not minetest.get_modpath("homedecor")) then
 

mods/homedecor_modpack/homedecor/handlers/registration.lua

@@ -51,13 +51,22 @@ end
 
 --wrapper around minetest.register_node that sets sane defaults and interprets some specialized settings
 function homedecor.register(name, def)
-	def.paramtype = def.paramtype or "light"
-	def.paramtype2 = def.paramtype2 or "facedir"
-
 	def.drawtype = def.drawtype
 			or (def.mesh and "mesh")
 			or (def.node_box and "nodebox")
 
+	def.paramtype = def.paramtype or "light"
+
+	-- avoid facedir for some drawtypes as they might be used internally for something else
+	-- even if undocumented
+	if not (def.drawtype == "glasslike_framed"
+		or def.drawtype == "raillike"
+		or def.drawtype == "plantlike"
+		or def.drawtype == "firelike") then
+
+		def.paramtype2 = def.paramtype2 or "facedir"
+	end
+
 	local infotext = def.infotext
 	--def.infotext = nil -- currently used to set locked refrigerator infotexts
 

mods/homedecor_modpack/homedecor/init.lua

@@ -16,15 +16,9 @@ homedecor.debug = 0
 homedecor.detail_level = 16
 
 homedecor.modpath = minetest.get_modpath("homedecor")
-homedecor.intllib_modpath = minetest.get_modpath("intllib")
 
 -- Boilerplate to support localized strings if intllib mod is installed.
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 homedecor.gettext = S
 
 -- debug

mods/homedecor_modpack/homedecor/lighting.lua

@@ -338,6 +338,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
 		description = S("Table Lamp "..colordesc),
 		mesh = "homedecor_table_lamp.obj",
 		tiles = { "homedecor_table_standing_lamp"..lampcolor.."_"..suffix..".png" },
+		inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png",
 		walkable = false,
 		light_source = light,
 		selection_box = tlamp_cbox,

mods/homedecor_modpack/itemframes/init.lua

@@ -38,11 +38,14 @@ minetest.register_entity("itemframes:item",{
 		return ""
 	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 remove_item = function(pos, node)
 	local objs = nil
 	if node.name == "itemframes:frame" then
@@ -58,6 +61,7 @@ local remove_item = function(pos, node)
 		end
 	end
 end
+
 local update_item = function(pos, node)
 	remove_item(pos, node)
 	local meta = minetest.get_meta(pos)
@@ -130,9 +134,11 @@ minetest.register_node("itemframes:frame",{
 		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,
 })
 
 minetest.register_craft({
@@ -181,9 +187,11 @@ function itemframes.register_pedestal(subname, recipeitem, groups, images, descr
 		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,
 })
 
 minetest.register_craft({

mods/homedecor_modpack/signs_lib/init.lua

@@ -3,10 +3,16 @@
 -- PilzAdam's original text-on-signs mod and rewritten by Vanessa Ezekowitz
 -- and Diego Martinez
 
+-- textpos = {
+--		{ delta = {entity position for 0° yaw}, exact yaw expression }
+--		{ delta = {entity position for 180° yaw}, exact yaw expression }
+--		{ delta = {entity position for 270° yaw}, exact yaw expression }
+--		{ delta = {entity position for 90° yaw}, exact yaw expression }
+-- }
+
 signs_lib = {}
 
 signs_lib.modpath = minetest.get_modpath("signs_lib")
-signs_lib.intllib_modpath = minetest.get_modpath("intllib")
 
 signs_lib.wall_sign_model = {
 	nodebox = {
@@ -30,10 +36,10 @@ signs_lib.yard_sign_model = {
 		}
 	},
 	textpos = {
-		{delta = {x =  0,      y = 0.07, z = -0.063}, yaw = 0},
-		{delta = {x = -0.063,  y = 0.07, z =  0    }, yaw = math.pi / -2},
-		{delta = {x =  0,      y = 0.07, z =  0.063}, yaw = math.pi},
-		{delta = {x =  0.063,  y = 0.07, z =  0    }, yaw = math.pi / 2},
+		{delta = {x =  0,      y = 0.07, z = -0.068}, yaw = 0},
+		{delta = {x = -0.068,  y = 0.07, z =  0    }, yaw = math.pi / -2},
+		{delta = {x =  0,      y = 0.07, z =  0.068}, yaw = math.pi},
+		{delta = {x =  0.068,  y = 0.07, z =  0    }, yaw = math.pi / 2},
 	}
 }
 
@@ -70,12 +76,7 @@ signs_lib.sign_post_model = {
 }
 
 -- Boilerplate to support localized strings if intllib mod is installed.
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 signs_lib.gettext = S
 
 -- the list of standard sign nodes