diff --git a/homedecor_seating/README.txt b/homedecor_seating/README.txt deleted file mode 100644 index c86df3c2..00000000 --- a/homedecor_seating/README.txt +++ /dev/null @@ -1,67 +0,0 @@ -Living Room Furniture (lrfurn) mod for Minetest - - -by thefamilygrog66 - -Description: -Coloured Long Sofas (3 blocks wide), Sofas (2 blocks wide), Armchairs, Coffee Tables and End Tables, loosely based on PilzAdam's beds mod. There are 9 colours in all: red, orange, yellow, green, blue, violet, black, grey and white. - -When you right-click on a long sofa, sofa or armchair, it transports you onto it, and replenishes your HP. Good if you've just escaped nasty mobs, didn't fare so well in battle, or just had a bad fall. The coffee table - which isn't coloured, just wooden - is pretty much just for decoration. It stands half a block high and nearly 2 blocks long. The end table is similar to the coffee table, though roughly half the length (i.e. only one block) and square. - -Recipes: - - Long Sofa - - +---------------+---------------+---------------+ - | coloured wool | coloured wool | coloured wool | - +---------------+---------------+---------------+ - | wood slab | wood slab | wood slab | - +---------------+---------------+---------------+ - | stick | stick | stick | - +---------------+---------------+---------------+ - - Sofa - - +---------------+---------------+-------+ - | coloured wool | coloured wool | | - +---------------+---------------+-------+ - | wood slab | wood slab | | - +---------------+---------------+-------+ - | stick | stick | | - +---------------+---------------+-------+ - - Armchair - - +---------------+-------+-------+ - | coloured wool | | | - +---------------+-------+-------+ - | wood slab | | | - +---------------+-------+-------+ - | stick | | | - +---------------+-------+-------+ - - Coffee Table (only wood texture) - - +-----------+-----------+-----------+ - | | | | - +-----------+-----------+-----------+ - | wood slab | wood slab | wood slab | - +-----------+-----------+-----------+ - | stick | | stick | - +-----------+-----------+-----------+ - - End Table (only wood texture) - - +-----------+-----------+-----------+ - | | | | - +-----------+-----------+-----------+ - | wood slab | wood slab | | - +-----------+-----------+-----------+ - | stick | stick | | - +-----------+-----------+-----------+ - - -Mod dependencies: default, wool - -See also: -http://minetest.net/ diff --git a/homedecor_seating/armchairs.lua b/homedecor_seating/armchairs.lua index 352e64f2..3adcce7b 100644 --- a/homedecor_seating/armchairs.lua +++ b/homedecor_seating/armchairs.lua @@ -20,7 +20,9 @@ minetest.register_node(":lrfurn:armchair", { palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_armchair_inv.png", groups = {snappy=3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, node_box = armchair_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) @@ -44,7 +46,9 @@ homedecor.register("armchair", { paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", groups = {snappy=3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, node_box = armchair_cbox, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) diff --git a/homedecor_seating/longsofas.lua b/homedecor_seating/longsofas.lua index f273bafd..b63e0114 100644 --- a/homedecor_seating/longsofas.lua +++ b/homedecor_seating/longsofas.lua @@ -19,7 +19,9 @@ minetest.register_node(":lrfurn:longsofa", { inventory_image = "lrfurn_longsofa_inv.png", wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, groups = {snappy=3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = longsofa_cbox, node_box = longsofa_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -31,7 +33,7 @@ minetest.register_node(":lrfurn:longsofa", { local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) if lrfurn.check_right(pos, fdir, true, placer) then - if not creative.is_enabled_for(playername) then + if not minetest.is_creative_enabled(playername) then itemstack:take_item() end else diff --git a/homedecor_seating/misc.lua b/homedecor_seating/misc.lua index 57ddfc5b..3e9a062e 100644 --- a/homedecor_seating/misc.lua +++ b/homedecor_seating/misc.lua @@ -12,7 +12,9 @@ homedecor.register("deckchair", { description = "Deck Chair", groups = { snappy = 3 }, expand = { forward="placeholder" }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = dc_cbox, collision_box = dc_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -27,7 +29,9 @@ homedecor.register("deckchair_striped_blue", { description = "Deck Chair (blue striped)", groups = { snappy = 3 }, expand = { forward="placeholder" }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = dc_cbox, collision_box = dc_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -45,7 +49,9 @@ homedecor.register("simple_bench", { { 0.3, -0.5, 0.1, 0.4, -0.15, 0.3}, } }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, }) local bl1_sbox = { @@ -71,7 +77,9 @@ homedecor.register("bench_large_1", { inventory_image = "homedecor_bench_large_1_inv.png", groups = { snappy = 3 }, expand = { right="placeholder" }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = bl1_sbox, node_box = bl1_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -102,7 +110,9 @@ homedecor.register("bench_large_2", { selection_box = bl2_sbox, node_box = bl2_cbox, expand = { right="placeholder" }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, }) @@ -126,7 +136,9 @@ homedecor.register("kitchen_chair_wood", { selection_box = kc_cbox, collision_box = kc_cbox, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, after_place_node = unifieddyes.fix_rotation_nsew, on_rotate = unifieddyes.fix_after_screwdriver_nsew, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -149,7 +161,9 @@ homedecor.register("kitchen_chair_padded", { selection_box = kc_cbox, collision_box = kc_cbox, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) end, @@ -189,7 +203,9 @@ for _, c in pairs(chairs) do tiles = { "homedecor_office_chair_"..name..".png" }, mesh = "homedecor_office_chair_"..name..".obj", groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = ofchairs_sbox, collision_box = ofchairs_cbox, expand = { top = "placeholder" }, diff --git a/homedecor_seating/mod.conf b/homedecor_seating/mod.conf index 8bf5957e..5d17db39 100644 --- a/homedecor_seating/mod.conf +++ b/homedecor_seating/mod.conf @@ -1,4 +1,4 @@ name = homedecor_seating description = Homedecor mod: seating -depends = default, wool, homedecor_common, unifieddyes, basic_materials -optional_depends = screwdriver +depends = homedecor_common +optional_depends = screwdriver, wool, default, unifieddyes, basic_materials diff --git a/homedecor_seating/sofas.lua b/homedecor_seating/sofas.lua index a26ff867..90912fd3 100644 --- a/homedecor_seating/sofas.lua +++ b/homedecor_seating/sofas.lua @@ -19,7 +19,9 @@ minetest.register_node(":lrfurn:sofa", { inventory_image = "lrfurn_sofa_inv.png", wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, groups = {snappy=3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = sofa_cbox, node_box = sofa_cbox, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -31,7 +33,7 @@ minetest.register_node(":lrfurn:sofa", { local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) if lrfurn.check_right(pos, fdir, false, placer) then - if not creative.is_enabled_for(playername) then + if not minetest.is_creative_enabled(playername) then itemstack:take_item() end else