Added kitchen metallic hangers and cultlery organisers, fixed the kitchen cabinet with drawer and doors

craft_ingredients/init.lua

@@ -268,7 +268,7 @@ minetest.register_craft(
 {
 	type = "shapeless",
 	output = "multidecor:wool_cloth 7",
-	recipe = {"default:wool", "multidecor:steel_scissors"},
+	recipe = {"wool:white", "multidecor:steel_scissors"},
 	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 })
 

craft_ingredients/mod.conf

@@ -1,4 +1,5 @@
 name = craft_ingredients
 description = Set of items necessary for crafting the furniture
 depends = bucket, default, doors
+optional_depends = moreores
 author = Andrey01

decor_api/register.lua

@@ -446,6 +446,7 @@ function multidecor.register.register_garniture(def)
 			form_shelf_data("three_floor_drw_door", "drawer", objects[7], thf_drw_d_s.pos_upper),
 			form_shelf_data("three_floor_drw_door", "sym_doors", objects[2], thf_drw_d_s.pos_left, thf_drw_d_s.pos_right)
 		}
+		three_floor_drw_door.add_properties.shelves_data[2].visual_size_adds = {x=0, y=-1.75, z=0}
 
 		multidecor.register.register_table(three_floor_drw_door.add_properties.shelves_data.common_name, three_floor_drw_door)
 	end

decor_api/shelves.lua

@@ -288,7 +288,6 @@ multidecor.shelves.default_on_activate = function(self, staticdata)
 					local sound_handle = minetest.sound_play("multidecor_hum", {object=obj, fade=1.0, max_hear_distance=10, loop=true})
 					minetest.get_meta(self.connected_to.pos):set_string("sound_handle", minetest.serialize(sound_handle))
 					self.cook_info = {output, 0, total_time, self.inv, fire_fs, cook_active_fs}
-					minetest.debug("cook_info:" .. dump(self.cook_info))
 				end
 			end
 		})
@@ -331,11 +330,10 @@ end
 
 
 local function cook_step(self, dtime)
-	minetest.debug("1")
 	if not self.cook_info then
 		return
 	end
-	minetest.debug("2")
+
 	self.cook_info[2] = self.cook_info[2] + dtime
 	local elapsed_time = self.cook_info[2]
 
@@ -344,7 +342,7 @@ local function cook_step(self, dtime)
 	local str_perc = tostring(math.round(percents)) .. " %"
 	self.inv = self.cook_info[4]:sub(1, i-1) .. self.cook_info[6]:format(percents) .. self.cook_info[4]:sub(i) .. self.cook_info[5]:format(str_perc)
 
-	minetest.debug("3")
+
 	local meta = minetest.get_meta(self.connected_to.pos)
 	meta:set_string("infotext", "Cooked to: " .. str_perc)
 
@@ -353,7 +351,7 @@ local function cook_step(self, dtime)
 	local inv_list = multidecor.helpers.build_name_from_tmp(shelves_data.common_name, "list", self.shelf_data_i, self.connected_to.pos)
 	local inv = minetest.get_inventory({type="detached", name=inv_name})
 
-	minetest.debug("4")
+
 	local time_elapsed = self.cook_info and self.cook_info[2] >= self.cook_info[3]
 	if inv:is_empty(inv_list) or time_elapsed then
 		if time_elapsed then
@@ -362,7 +360,7 @@ local function cook_step(self, dtime)
 			output:set_wear(self.cook_info[1].item.wear)
 			inv:set_stack(inv_list, 1, output)
 		end
-		minetest.debug("5")
+
 		self.inv = self.cook_info[4]
 		self.cook_info = nil
 		meta:set_string("infotext", "")
@@ -372,7 +370,6 @@ local function cook_step(self, dtime)
 			name="multidecor:" .. shelves_data.common_name,
 			param2=minetest.get_node(self.connected_to.pos).param2
 		})
-		minetest.debug("6")
 	end
 
 	local show_to
@@ -384,13 +381,11 @@ local function cook_step(self, dtime)
 		end
 	end
 
-	minetest.debug("7")
 	local i, f = math.modf(elapsed_time)
 
 	if show_to and (f > 0 and f < 0.05) then
 		minetest.show_formspec(show_to, multidecor.helpers.build_name_from_tmp(shelves_data.common_name, "fs", self.shelf_data_i, self.connected_to.pos), self.inv)
 	end
-	minetest.debug("8")
 end
 
 multidecor.shelves.default_drawer_on_step = function(self, dtime)

modern/kitchen.lua

@@ -69,8 +69,8 @@ local cmpnts = {
 		bounding_boxes = cab_bboxes,
 		shelves_data = {
 			pos_upper = {x=0, y=0.3, z=0},
-			pos_left = {x=0.425, y=0, z=0.4},
-			pos_right = {x=-0.425, y=0, z=0.4},
+			pos_left = {x=0.425, y=-0.125, z=0.4},
+			pos_right = {x=-0.425, y=-0.125, z=0.4},
 			inv_size = {w=8, h=2}
 		}
 	},
@@ -789,11 +789,11 @@ multidecor.register.register_furniture_unit("napkins_rack", {
 },
 {
 	recipe = {
-		{"multidecor:steel_sheet", "", ""},
-		{"wool:white", "", ""},
+		{"multidecor:steel_sheet", "multidecor:wool_cloth", ""},
+		{"multidecor:wool_cloth", "multidecor:wool_cloth", "multidecor:wool_cloth"},
 		{"" , "", ""}
 	},
-	count = 3
+	count = 2
 })
 
 multidecor.register.register_furniture_unit("saucepans_set", {
@@ -958,59 +958,146 @@ multidecor.register.register_furniture_unit("porcelain_teapot", {
 	replacements = {{"bucker:bucker_water", "bucket:bucket_empty"}}
 })
 
-multidecor.register.register_furniture_unit("kitchen_ceramic_tile_1", {
+local tiles = {
+	["kitchen_ceramic_tile_1"] = {
+		"Kitchen Wall Ceramic Tile",
+		"multidecor_kitchen_ceramic_tile1.png",
+		{
+			{"default:clay_lump", "default:clay_lump", "dye:yellow"},
+			{"", "", ""},
+			{"", "", ""}
+		}
+	},
+	["kitchen_ceramic_tile_2"] = {
+		"Kitchen Wall Ceramic Tile",
+		"multidecor_kitchen_ceramic_tile2.png",
+		{
+			{"default:clay_lump", "default:clay_lump", "dye:brown"},
+			{"", "", ""},
+			{"", "", ""}
+		}
+	},
+	["kitchen_marble_tile"] = {
+		"Kitchen Wall Marble Tile",
+		"multidecor_kitchen_marble_tile.png",
+		{
+			{"default:clay_lump", "default:clay_lump", "dye:white"},
+			{"dye:grey", "dye:dark_grey", ""},
+			{"", "", ""}
+		}
+	},
+	["kitchen_floor_black_tile"] = {
+		"Kitchen Floor Black Tile",
+		"multidecor_kitchen_floor_black_tile.png",
+		{
+			{"default:clay_lump", "default:clay_lump", "dye:black"},
+			{"", "", ""},
+			{"", "", ""}
+		}
+	},
+	["kitchen_floor_white_tile"] = {
+		"Kitchen Floor White Tile",
+		"multidecor_kitchen_floor_white_tile.png",
+		{
+			{"default:clay_lump", "default:clay_lump", "dye:white"},
+			{"", "", ""},
+			{"", "", ""}
+		}
+	},
+}
+
+for name, def in pairs(tiles) do
+	minetest.register_node(":multidecor:" .. name, {
+		description = def[1],
+		visual_scale = 0.5,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		tiles = {def[2]},
+		groups = {cracky=1.5},
+		sounds = default.node_sound_stone_defaults()
+	})
+
+	minetest.register_craft({
+		output = "multidecor:" .. name,
+		recipe = def[3]
+	})
+end
+
+
+multidecor.register.register_furniture_unit("kitchen_metallic_hanger", {
 	type = "decoration",
 	style = "modern",
-	material = "stone",
-	description = "Kitchen Wall Ceramic Tile",
-	visual_scale = 1.0,
-	drawtype = "nodebox",
-	tiles = {"multidecor_kitchen_ceramic_tile1.png"},
-	bounding_boxes = {{-0.5, -0.5, 0.45, 0.5, 0.5, 0.5}}
+	material = "metal",
+	description = "Kitchen Metallic Hanger",
+	mesh = "multidecor_kitchen_metallic_hanger.b3d",
+	visual_scale = 0.5,
+	tiles = {
+		"multidecor_metal_material3.png",
+		"multidecor_coarse_metal_material.png",
+	},
+	bounding_boxes = {
+		{-0.425, 0.175, 0.225, 0.425, 0.275, 0.3},
+		{-0.5, 0.1, 0.195, -0.425, 0.3, 0.5},
+		{0.425, 0.1, 0.195, 0.5, 0.3, 0.5}
+	}
+},
+{
+	recipe = {
+		{"technic:cast_iron_ingot", "multidecor:metal_bar", ""},
+		{"", "", ""},
+		{"", "", ""}
+	}
 })
 
-multidecor.register.register_furniture_unit("kitchen_ceramic_tile_2", {
+multidecor.register.register_furniture_unit("kitchen_metallic_hanger_with_ladle_and_board", {
 	type = "decoration",
 	style = "modern",
-	material = "stone",
-	description = "Kitchen Wall Ceramic Tile",
-	visual_scale = 1.0,
-	drawtype = "nodebox",
-	tiles = {"multidecor_kitchen_ceramic_tile2.png"},
-	bounding_boxes = {{-0.5, -0.5, 0.45, 0.5, 0.5, 0.5}}
+	material = "metal",
+	description = "Kitchen Metallic Hanger With Ladle And Board",
+	mesh = "multidecor_kitchen_metallic_hanger_with_ladle_and_board.b3d",
+	visual_scale = 0.5,
+	tiles = {
+		"multidecor_metal_material3.png",
+		"multidecor_coarse_metal_material.png",
+		"multidecor_wood.png",
+		"multidecor_metal_material.png",
+		"multidecor_kitchen_cooker_black_metal.png"
+	},
+	bounding_boxes = {
+		{-0.425, 0.175, 0.225, 0.425, 0.275, 0.3},
+		{-0.5, 0.1, 0.195, -0.425, 0.3, 0.5},
+		{0.425, 0.1, 0.195, 0.5, 0.3, 0.5}
+	}
+},
+{
+	recipe = {
+		{"technic:cast_iron_ingot", "multidecor:metal_bar", "multidecor:metal_bar"},
+		{"technic:cast_iron_ingot", "multidecor:board", ""},
+		{"", "", ""}
+	}
 })
 
-multidecor.register.register_furniture_unit("kitchen_marble_tile", {
+multidecor.register.register_furniture_unit("kitchen_organiser", {
 	type = "decoration",
 	style = "modern",
-	material = "stone",
-	description = "Kitchen Wall Marble Tile",
-	visual_scale = 1.0,
-	drawtype = "nodebox",
-	tiles = {"multidecor_kitchen_marble_tile.png"},
-	bounding_boxes = {{-0.5, -0.5, 0.45, 0.5, 0.5, 0.5}}
+	material = "plastic",
+	description = "Kitchen Cutlery Organiser",
+	mesh = "multidecor_kitchen_cutlery_organiser.b3d",
+	visual_scale = 0.5,
+	tiles = {
+		"multidecor_kitchen_cooker_black_metal.png",
+		"multidecor_metal_material.png",
+		"multidecor_metal_material4.png"
+	},
+	bounding_boxes = {
+		{-0.15, -0.5, 0, 0.15, 0.15, 0.3}
+	}
+},
+{
+	recipe = {
+		{"multidecor:steel_sheet", "multidecor:plastic_sheet", "dye:black"},
+		{"multidecor:steel_sheet", "multidecor:steel_scissors", ""},
+		{"", "", ""}
+	},
+	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 })
-
-multidecor.register.register_furniture_unit("kitchen_floor_white_tile", {
-	type = "decoration",
-	style = "modern",
-	material = "stone",
-	description = "Kitchen Floor White Tile",
-	visual_scale = 1.0,
-	drawtype = "nodebox",
-	tiles = {"multidecor_kitchen_floor_white_tile.png"},
-	bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}}
-})
-
-multidecor.register.register_furniture_unit("kitchen_floor_black_tile", {
-	type = "decoration",
-	style = "modern",
-	material = "stone",
-	description = "Kitchen Floor Black Tile",
-	visual_scale = 1.0,
-	drawtype = "nodebox",
-	tiles = {"multidecor_kitchen_floor_black_tile.png"},
-	bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}}
-})
-
-

modern/lamps.lua

@@ -292,7 +292,7 @@ multidecor.register.register_light("ceiling_wooden_lamp", {
 },
 {
 	recipe = {
-		{"multidecor:jungle_plank", "xpanes:pane_flat", ""},
+		{"multidecor:jungleplank", "xpanes:pane_flat", ""},
 		{"multidecor:wolfram_wire", "multidecor:saw", ""},
 		{"", "", ""}
 	},

modern/living_room.lua

@@ -264,19 +264,11 @@ local floors_defs = {
 
 for name, def in pairs(floors_defs) do
 	minetest.register_node(":multidecor:" .. name, {
-		drawtype = "nodebox",
 		description = def[1],
+		visual_scale = 0.5,
 		paramtype = "light",
 		paramtype2 = "facedir",
 		tiles = {def[2]},
-		node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}
-		},
 		groups = {choppy=1.5}
 	})
 

modern/mod.conf

@@ -1,4 +1,5 @@
 name = modern
 description = Modern-style furniture
 depends = beds, decor_api, flowers
+optional_depends = moreores, technic_worldgen
 author = Andrey01