Merge branch 'Patch-1' of https://github.com/Jat15/homedecor_modpack

building_blocks/depends.txt

@@ -1 +1,2 @@
 default
+moreblocks?

building_blocks/init.lua

@@ -135,6 +135,7 @@ minetest.register_node("building_blocks:grate", {
 	sunlight_propagates = true,
 	is_ground_content = true,
 	groups = {cracky=1},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("building_blocks:Fireplace", {
@@ -252,10 +253,71 @@ minetest.register_node("building_blocks:hardwood", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-bb_stairs = {}
+if moreblocks then
 
--- Node will be called stairs:stair_<subname>
+	stairsplus:register_all(
-function bb_stairs.register_stair(subname, recipeitem, groups, images, description)
+		"building_blocks", 
+		"marble",
+		"building_blocks:Marble",
+		{
+			description = "Marble",
+			tiles = {"building_blocks_marble.png"},
+			groups = {cracky=3},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"hardwood",
+		"building_blocks:hardwood",
+		{
+			description = "Hardwood",
+			tiles = {"building_blocks_hardwood.png"},
+			groups = {choppy=1,flammable=1},
+			sounds = default.node_sound_wood_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"fakegrass",
+		"building_blocks:fakegrass",
+		{
+			description = "Grass",
+			tiles = {"default_grass.png"},
+			groups = {crumbly=3},
+			sounds = default.node_sound_dirt_defaults({
+				footstep = {name="default_grass_footstep", gain=0.4},
+			}),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"tar",
+		"building_blocks:Tar",
+		{
+			description = "Tar",
+			tiles = {"building_blocks_tar.png"},
+			groups = {crumbly=1},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"grate",
+		"building_blocks:grate",
+		{
+			description = "Grate",
+			tiles = {"building_blocks_grate.png"},
+			groups = {cracky=1},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	
+else
+	bb_stairs = {}
+
+	-- Node will be called stairs:stair_<subname>
+	function bb_stairs.register_stair(subname, recipeitem, groups, images, description)
 		minetest.register_node("building_blocks:stair_" .. subname, {
 			description = description,
 			drawtype = "nodebox",
@@ -291,10 +353,10 @@ function bb_stairs.register_stair(subname, recipeitem, groups, images, descripti
 				{recipeitem, recipeitem, recipeitem},
 			},
 		})
-end
+	end
 
--- Node will be called stairs:slab_<subname>
+	-- Node will be called stairs:slab_<subname>
-function bb_stairs.register_slab(subname, recipeitem, groups, images, description)
+	function bb_stairs.register_slab(subname, recipeitem, groups, images, description)
 		minetest.register_node("building_blocks:slab_" .. subname, {
 			description = description,
 			drawtype = "nodebox",
@@ -318,38 +380,46 @@ function bb_stairs.register_slab(subname, recipeitem, groups, images, descriptio
 				{recipeitem, recipeitem, recipeitem},
 			},
 		})
-end
+	end
 
--- Nodes will be called stairs:{stair,slab}_<subname>
+	-- Nodes will be called stairs:{stair,slab}_<subname>
-function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab)
+	function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab)
 		bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair)
 		bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab)
-end
+	end
-bb_stairs.register_stair_and_slab("marble","building_blocks:Marble",
+	bb_stairs.register_stair_and_slab("marble","building_blocks:Marble",
 		{cracky=3},
 		{"building_blocks_marble.png"},
 		"Marble stair",
-	"Marble slab")
+		"Marble slab"
-bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood",
+	)
-		{snappy=1,choppy=1,flammable=1},
+	bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood",
+		{choppy=1,flammable=1},
 		{"building_blocks_hardwood.png"},
 		"Hardwood stair",
-		"Hardwood slab")
+		"Hardwood slab"
-bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass",
+	)
+	bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass",
 		{crumbly=3},
 		{"default_grass.png"},
 		"Grass stair",
-		"Grass slab")
+		"Grass slab"
-bb_stairs.register_stair_and_slab("tar","building_blocks:Tar",
+	)
+	bb_stairs.register_stair_and_slab("tar","building_blocks:Tar",
 		{crumbly=1},
 		{"building_blocks_tar.png"},
 		"Tar stair",
-		"Tar slab")
+		"Tar slab"
-bb_stairs.register_stair_and_slab("grate","building_blocks:grate",
+	)
-		{crumbly=1},
+	bb_stairs.register_stair_and_slab("grate","building_blocks:grate",
+		{cracky=1},
 		{"building_blocks_grate.png"},
 		"Grate Stair",
-		"Grate Slab")
+		"Grate Slab"
+	)
+end
+
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "building_blocks:hardwood",