add homedecor_foyer

homedecor_common/materials.lua

@@ -20,6 +20,10 @@ homedecor.materials = {
     paper = "default:paper",
     book = "default:book",
     iron_lump = "default:iron_lump",
+    wool_grey = "wool:grey",
+    wool_green = "wool:green",
+    wool_dark_green = "wool:dark_green",
+    wool_brown = "wool:brown"
 }
 
 if minetest.get_modpath("moreores") then

homedecor_foyer/.luacheckrc

@@ -1,21 +0,0 @@
-unused_args = false
-allow_defined_top = true
-max_comment_line_length = 999
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"unpack",
-	"dump",
-	table = { fields = { "copy", "getn" } },
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"default",
-	"homedecor",
-	"screwdriver",
-}
-
-globals = {
-}
-

homedecor_foyer/init.lua

@@ -4,8 +4,10 @@ homedecor.register("coatrack_wallmount", {
 	tiles = { homedecor.plain_wood },
 	inventory_image = "homedecor_coatrack_wallmount_inv.png",
 	description = S("Wall-mounted coat rack"),
-	groups = {snappy=3},
-	sounds = default.node_sound_wood_defaults(),
+	groups = {snappy=3, dig_tree=2},
+	_sound_def = {
+		key = "node_sound_wood_defaults",
+	},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -20,6 +22,13 @@ homedecor.register("coatrack_wallmount", {
 			{0.0525, 0.025, 0.352697, 0.135, 0.115, 0.375}, -- NodeBox9
 		}
 	},
+	crafts = {
+		{
+			recipe = {
+				{ "group:stick", "homedecor:curtainrod_wood", "group:stick" },
+			},
+		}
+	}
 })
 
 homedecor.register("coat_tree", {
@@ -30,8 +39,10 @@ homedecor.register("coat_tree", {
 	},
 	inventory_image = "homedecor_coatrack_inv.png",
 	description = S("Coat tree"),
-	groups = {snappy=3},
-	sounds = default.node_sound_wood_defaults(),
+	groups = {snappy=3, dig_tree=2},
+	_sound_def = {
+		key = "node_sound_wood_defaults",
+	},
 	expand = { top="placeholder" },
 	walkable = false,
 	selection_box = {
@@ -39,16 +50,59 @@ homedecor.register("coat_tree", {
 		fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 }
 	},
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
+	crafts = {
+		{
+			recipe = {
+				{ "group:stick", "group:stick", "group:stick" },
+				{ "", "group:stick", "" },
+				{ "", "group:wood", "" }
+			},
+		}
+	}
 })
 
+local grey = {{
+    output = "homedecor:welcome_mat_grey 2",
+    recipe = {
+		{ "", "dye_black", "" },
+		{ "wool_grey", "wool_grey", "wool_grey" },
+    },
+}}
+
+local brown = {{
+    output = "homedecor:welcome_mat_brown 2",
+    recipe = {
+		{ "", "dye_black", "" },
+		{ "wool_brown", "wool_brown", "wool_brown" },
+    },
+}}
+
+local green = {
+	{
+		output = "homedecor:welcome_mat_green 2",
+		recipe = {
+			{ "", "dye_white", "" },
+			{ "wool_dark_green", "wool_dark_green", "wool_dark_green" },
+		},
+	},
+	{
+		output = "homedecor:welcome_mat_green 2",
+		recipe = {
+			{ "", "dye_white", "" },
+			{ "dye_black", "dye_black", "dye_black" },
+			{ "wool_green", "wool_green", "wool_green" },
+		},
+	}
+}
+
 local mat_colors = {
-	{ "green", S("Green welcome mat") },
-	{ "brown", S("Brown welcome mat") },
-	{ "grey",  S("Grey welcome mat") },
+	{ "green", S("Green welcome mat"), green },
+	{ "brown", S("Brown welcome mat"), brown },
+	{ "grey",  S("Grey welcome mat"), grey },
 }
 
 for _, mat in ipairs(mat_colors) do
-	local color, desc = unpack(mat)
+	local color, desc, crafts = unpack(mat)
 	homedecor.register("welcome_mat_"..color, {
 		description = desc,
 		tiles = {
@@ -56,65 +110,14 @@ for _, mat in ipairs(mat_colors) do
 			"homedecor_welcome_mat_bottom.png",
 			"homedecor_welcome_mat_"..color..".png",
 		},
-		groups = {crumbly=3},
-		sounds = default.node_sound_dirt_defaults({
-			footstep = {name="default_grass_footstep", gain=0.25},
-		}),
+		groups = {crumbly=3, dig_tree=2},
+		_sound_def = {
+			key = "node_sound_dirt_defaults",
+		},
 		node_box = {
 			type = "fixed",
 			fixed = { -0.5, -0.5, -0.375, 0.5, -0.46875, 0.375 }
-		}
+		},
+		crafts = crafts
 	})
-end
-
--- crafting
-
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_grey 2",
-    recipe = {
-		{ "", "dye:black", "" },
-		{ "wool:grey", "wool:grey", "wool:grey" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_brown 2",
-    recipe = {
-		{ "", "dye:black", "" },
-		{ "wool:brown", "wool:brown", "wool:brown" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_green 2",
-    recipe = {
-		{ "", "dye:white", "" },
-		{ "wool:dark_green", "wool:dark_green", "wool:dark_green" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_green 2",
-    recipe = {
-		{ "", "dye:white", "" },
-		{ "dye:black", "dye:black", "dye:black" },
-		{ "wool:green", "wool:green", "wool:green" },
-    },
-})
-
-minetest.register_craft( {
-        output = "homedecor:coat_tree",
-        recipe = {
-			{ "group:stick", "group:stick", "group:stick" },
-			{ "", "group:stick", "" },
-			{ "", "group:wood", "" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:coatrack_wallmount",
-        recipe = {
-			{ "group:stick", "homedecor:curtainrod_wood", "group:stick" },
-        },
-})
+end

homedecor_foyer/mod.conf

@@ -1,4 +1,4 @@
 name = homedecor_foyer
 description = Homedecor mod: foyer
-depends = homedecor_common, default, dye
-optional_depends = screwdriver
+depends = homedecor_common
+optional_depends = screwdriver, default, dye