diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index eae05dd3..c3e7fbb8 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -106,7 +106,7 @@ homedecor.register("towel_rod", { walkable = false, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,dig_tree=2}, _sound_def = { - key = "node_sound_defaults", + key = "node_sound_default", }, crafts = { { @@ -274,7 +274,7 @@ homedecor.register("toilet_paper", { walkable = false, groups = {snappy=3,oddly_breakable_by_hand=3, dig_stone = 2}, _sound_def = { - key = "node_sound_defaults", + key = "node_sound_default", }, crafts = { { diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua index 2997cf60..a6b81717 100644 --- a/homedecor_common/materials.lua +++ b/homedecor_common/materials.lua @@ -44,6 +44,7 @@ homedecor.materials = { stone = "default:stone", cobble = "default:cobble", brick = "default:brick", + obsidian_glass = "default:obsidian_glass", } if minetest.get_modpath("moreores") then diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index 1ffef060..8a835f7c 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -362,7 +362,7 @@ homedecor_exterior.shrub_colors = { local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } for color, color_loc in pairs(homedecor_exterior.shrub_colors) do - minetest.register_node(":homedecor:shrubbery_large_"..color, { + homedecor.register("shrubbery_large_"..color, { description = S("Shrubbery (large, @1)", color_loc), drawtype = "mesh", mesh = "homedecor_cube.obj", @@ -384,7 +384,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do } }) - minetest.register_node(":homedecor:shrubbery_"..color, { + homedecor.register("shrubbery_"..color, { description = S("Shrubbery (@1)", color_loc), drawtype = "mesh", mesh = "homedecor_shrubbery.obj", diff --git a/homedecor_furniture_medieval/init.lua b/homedecor_furniture_medieval/init.lua index bcde356a..5dde4f20 100644 --- a/homedecor_furniture_medieval/init.lua +++ b/homedecor_furniture_medieval/init.lua @@ -79,6 +79,15 @@ homedecor.register("chains", { _sound_def = { key = "node_sound_stone_defaults", }, + crafts = { + { + output = "homedecor:chains 4", + recipe = { + { "steel_ingot","" }, + { "homedecor:bars","homedecor:bars" }, + }, + } + } }) minetest.register_alias("3dforniture:bars", "homedecor:bars") diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua index 8d63dd7c..348da60a 100644 --- a/homedecor_gastronomy/init.lua +++ b/homedecor_gastronomy/init.lua @@ -109,7 +109,7 @@ homedecor.register("wine_rack", { selection_box = wine_cbox, collision_box = wine_cbox, _sound_def = { - key = "node_sound_defaults", + key = "node_sound_default", }, }) diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index a5486844..f7bee821 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1750,6 +1750,22 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:rope_light_on_floor_off", + type= "shapeless", + recipe = { + "homedecor:rope_light_on_ceiling_off" + } +}) + +minetest.register_craft({ + output = "homedecor:rope_light_on_ceiling_off", + type= "shapeless", + recipe = { + homedecor.materials.steel_ingot, "homedecor:ceiling_lamp" + } +}) + minetest.register_craft({ output = "homedecor:ceiling_lamp", recipe = { diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index f1d387f0..81e57e41 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -290,6 +290,14 @@ homedecor.register("dvd_cd_cabinet", { _sound_def = { key = "node_sound_wood_defaults", }, + crafts = { + { + type = "shapeless", + recipe = { + "homedecor:dvd_player", "homedecor:kitchen_cabinet_colorable" + } + } + } }) local pooltable_cbox = { diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index 41697f1b..13cca903 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -128,7 +128,7 @@ homedecor.register("calendar", { groups = {choppy=2,attached_node=1, dig_tree=2}, legacy_wallmounted = true, _sound_def = { - key = "node_sound_defaults", + key = "node_sound_default", }, infotext = S("Date (right-click to update):\n@1", os.date("%Y-%m-%d")), -- ISO 8601 format on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 830f9c53..9c0d1a56 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -14,6 +14,7 @@ minetest.register_node(":homedecor:skylight", { key = "node_sound_glass_defaults", }, selection_box = homedecor.nodebox.slab_y(0.1), + collision_box = homedecor.nodebox.slab_y(0.1), }) minetest.register_node(":homedecor:skylight_frosted", { @@ -29,6 +30,7 @@ minetest.register_node(":homedecor:skylight_frosted", { key = "node_sound_glass_defaults", }, selection_box = homedecor.nodebox.slab_y(0.1), + collision_box = homedecor.nodebox.slab_y(0.1), }) for s, s_loc in pairs({ ["asphalt"] = S("asphalt"), ["terracotta"] = S("terracotta"), ["wood"] = S("wood") }) do diff --git a/homedecor_seating/misc.lua b/homedecor_seating/misc.lua index 481295ce..f1b5748b 100644 --- a/homedecor_seating/misc.lua +++ b/homedecor_seating/misc.lua @@ -18,6 +18,9 @@ homedecor.register("deckchair", { selection_box = dc_cbox, collision_box = dc_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) + end }) minetest.register_alias("homedecor:deckchair_foot", "homedecor:deckchair") @@ -35,6 +38,9 @@ homedecor.register("deckchair_striped_blue", { selection_box = dc_cbox, collision_box = dc_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) + end }) homedecor.register("simple_bench", { @@ -52,6 +58,9 @@ homedecor.register("simple_bench", { _sound_def = { key = "node_sound_wood_defaults", }, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) + end }) local bl1_sbox = { @@ -142,9 +151,7 @@ homedecor.register("kitchen_chair_wood", { after_place_node = unifieddyes.fix_rotation_nsew, on_rotate = unifieddyes.fix_after_screwdriver_nsew, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - pos.y = pos.y+0 -- where do I put my ass ? - homedecor.sit(pos, node, clicker) - return itemstack + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) end }) @@ -170,9 +177,7 @@ homedecor.register("kitchen_chair_padded", { on_dig = unifieddyes.on_dig, on_rotate = unifieddyes.fix_after_screwdriver_nsew, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - pos.y = pos.y+0 -- where do I put my ass ? - homedecor.sit(pos, node, clicker) - return itemstack + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) end }) @@ -210,6 +215,9 @@ for _, c in pairs(chairs) do collision_box = ofchairs_cbox, expand = { top = "placeholder" }, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) + end }) end diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua index 1974fa90..c345fa58 100644 --- a/homedecor_wardrobe/init.lua +++ b/homedecor_wardrobe/init.lua @@ -199,7 +199,7 @@ end minetest.register_craft( { output = "homedecor:wardrobe", recipe = { - { "homedecor:drawer_small", "homedecor:kitchen_cabinet" }, + { "homedecor:drawer_small", "homedecor:kitchen_cabinet_colorable" }, { "homedecor:drawer_small", "group:wood" }, { "homedecor:drawer_small", "group:wood" } },