diff --git a/homedecor_common/textures.lua b/homedecor_common/textures.lua index 39507ba7..77a88307 100644 --- a/homedecor_common/textures.lua +++ b/homedecor_common/textures.lua @@ -17,6 +17,7 @@ homedecor.textures = { wool_white = "[combine:16x16^[noalpha^[colorize:#ffffff", wool_black = "[combine:16x16^[noalpha^[colorize:#000000", wool_grey = "[combine:16x16^[noalpha^[colorize:#313b3c", + wool_dark_grey = "[combine:16x16^[noalpha^[colorize:#313b3c", } if minetest.get_modpath("default") then @@ -28,5 +29,6 @@ if minetest.get_modpath("default") then wool_white = "wool_white.png", wool_black = "wool_black.png", wool_grey = "wool_grey.png", + wool_dark_grey = "wool_dark_grey.png", } end \ No newline at end of file diff --git a/homedecor_seating/armchairs.lua b/homedecor_seating/armchairs.lua index 3adcce7b..048b749e 100644 --- a/homedecor_seating/armchairs.lua +++ b/homedecor_seating/armchairs.lua @@ -19,7 +19,7 @@ minetest.register_node(":lrfurn:armchair", { paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_armchair_inv.png", - groups = {snappy=3, ud_param2_colorable = 1}, + groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, _sound_def = { key = "node_sound_wood_defaults", }, @@ -38,14 +38,14 @@ homedecor.register("armchair", { description = S("Armchair"), mesh = "forniture_armchair.obj", tiles = { - "wool_white.png", - { name = "wool_dark_grey.png", color = 0xffffffff }, - { name = "default_wood.png", color = 0xffffffff } + homedecor.textures.wool_white, + { name = homedecor.textures.wool_dark_grey, color = 0xffffffff }, + { name = homedecor.textures.default_wood, color = 0xffffffff } }, inventory_image = "homedecor_armchair_inv.png", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", - groups = {snappy=3, ud_param2_colorable = 1}, + groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, _sound_def = { key = "node_sound_wood_defaults", }, @@ -66,7 +66,7 @@ minetest.register_craft({ output = "lrfurn:armchair", recipe = { {"wool:white", "", "", }, - {"stairs:slab_wood", "", "", }, + {homedecor.materials.slab_wood, "", "", }, {"group:stick", "", "", } } }) @@ -94,9 +94,9 @@ unifieddyes.register_color_craft({ minetest.register_craft({ output = "homedecor:armchair 2", recipe = { - { "wool:white",""}, + { homedecor.materials.wool_white,""}, { "group:wood","group:wood" }, - { "wool:white","wool:white" }, + { homedecor.materials.wool_white,homedecor.materials.wool_white }, }, }) diff --git a/homedecor_seating/longsofas.lua b/homedecor_seating/longsofas.lua index b63e0114..7f757712 100644 --- a/homedecor_seating/longsofas.lua +++ b/homedecor_seating/longsofas.lua @@ -18,7 +18,7 @@ minetest.register_node(":lrfurn:longsofa", { palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_longsofa_inv.png", wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, - groups = {snappy=3, ud_param2_colorable = 1}, + groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, _sound_def = { key = "node_sound_wood_defaults", }, @@ -51,8 +51,8 @@ minetest.register_node(":lrfurn:longsofa", { minetest.register_craft({ output = "lrfurn:longsofa", recipe = { - {"wool:white", "wool:white", "wool:white", }, - {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", }, + {homedecor.materials.wool_white, homedecor.materials.wool_white, homedecor.materials.wool_white, }, + {homedecor.materials.slab_wood, homedecor.materials.slab_wood, homedecor.materials.slab_wood, }, {"group:stick", "group:stick", "group:stick", } } }) @@ -60,7 +60,7 @@ minetest.register_craft({ minetest.register_craft({ output = "lrfurn:longsofa", recipe = { - {"wool:white", "wool:white", "wool:white", }, + {homedecor.materials.wool_white, homedecor.materials.wool_white, homedecor.materials.wool_white, }, {"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood", }, {"group:stick", "group:stick", "group:stick", } } diff --git a/homedecor_seating/misc.lua b/homedecor_seating/misc.lua index 3e9a062e..481295ce 100644 --- a/homedecor_seating/misc.lua +++ b/homedecor_seating/misc.lua @@ -10,7 +10,7 @@ homedecor.register("deckchair", { mesh = "homedecor_deckchair.obj", tiles = {"homedecor_deckchair.png"}, description = "Deck Chair", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree=2 }, expand = { forward="placeholder" }, _sound_def = { key = "node_sound_wood_defaults", @@ -27,7 +27,7 @@ homedecor.register("deckchair_striped_blue", { mesh = "homedecor_deckchair.obj", tiles = {"homedecor_deckchair_striped_blue.png"}, description = "Deck Chair (blue striped)", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree=2 }, expand = { forward="placeholder" }, _sound_def = { key = "node_sound_wood_defaults", @@ -40,7 +40,7 @@ homedecor.register("deckchair_striped_blue", { homedecor.register("simple_bench", { tiles = { "homedecor_generic_wood_old.png" }, description = "Simple Bench", - groups = {snappy=3}, + groups = {snappy=3, dig_tree=2}, node_box = { type = "fixed", fixed = { @@ -75,7 +75,7 @@ homedecor.register("bench_large_1", { }, description = "Garden Bench (style 1)", inventory_image = "homedecor_bench_large_1_inv.png", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree=2 }, expand = { right="placeholder" }, _sound_def = { key = "node_sound_wood_defaults", @@ -106,7 +106,7 @@ homedecor.register("bench_large_2", { mesh = "homedecor_bench_large_2.obj", tiles = { "homedecor_generic_wood_old.png" }, inventory_image = "homedecor_bench_large_2_inv.png", - groups = {snappy=3}, + groups = {snappy=3, dig_tree=2}, selection_box = bl2_sbox, node_box = bl2_cbox, expand = { right="placeholder" }, @@ -153,7 +153,7 @@ homedecor.register("kitchen_chair_padded", { mesh = "homedecor_kitchen_chair.obj", tiles = { homedecor.plain_wood, - "wool_white.png", + homedecor.textures.wool_white, }, inventory_image = "homedecor_chair_padded_inv.png", paramtype2 = "colorwallmounted", @@ -202,7 +202,7 @@ for _, c in pairs(chairs) do drawtype = "mesh", tiles = { "homedecor_office_chair_"..name..".png" }, mesh = "homedecor_office_chair_"..name..".obj", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree=2 }, _sound_def = { key = "node_sound_wood_defaults", }, @@ -229,7 +229,7 @@ minetest.register_craft( { recipe = { { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, { "group:wood", "group:wood", "group:wood" }, - { "stairs:slab_wood", "", "stairs:slab_wood" } + { homedecor.materials.slab_wood, "", homedecor.materials.slab_wood } }, }) @@ -245,8 +245,8 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:simple_bench", recipe = { - { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, - { "stairs:slab_wood", "", "stairs:slab_wood" } + { homedecor.materials.slab_wood, homedecor.materials.slab_wood, homedecor.materials.slab_wood }, + { homedecor.materials.slab_wood, "", homedecor.materials.slab_wood } }, }) @@ -291,7 +291,7 @@ minetest.register_craft({ output = "homedecor:kitchen_chair_padded", recipe = { "homedecor:kitchen_chair_wood", - "wool:white", + homedecor.materials.wool_white, }, }) @@ -322,8 +322,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:office_chair_basic", recipe = { - { "", "", "wool:black" }, - { "", "wool:black", "default:steel_ingot" }, + { "", "", homedecor.materials.wool_black }, + { "", homedecor.materials.wool_black, homedecor.materials.steel_ingot }, { "group:stick", "basic_materials:steel_bar", "group:stick" } }, }) @@ -331,8 +331,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:office_chair_upscale", recipe = { - { "dye:black", "building_blocks:sticks", "group:wool" }, - { "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" }, + { homedecor.materials.dye_black, "building_blocks:sticks", "group:wool" }, + { "basic_materials:plastic_sheet", "group:wool", homedecor.materials.steel_ingot }, { "building_blocks:sticks", "basic_materials:steel_bar", "building_blocks:sticks" } }, }) diff --git a/homedecor_seating/sofas.lua b/homedecor_seating/sofas.lua index 90912fd3..bed5c6cf 100644 --- a/homedecor_seating/sofas.lua +++ b/homedecor_seating/sofas.lua @@ -18,7 +18,7 @@ minetest.register_node(":lrfurn:sofa", { palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_sofa_inv.png", wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, - groups = {snappy=3, ud_param2_colorable = 1}, + groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, _sound_def = { key = "node_sound_wood_defaults", }, @@ -51,8 +51,8 @@ minetest.register_node(":lrfurn:sofa", { minetest.register_craft({ output = "lrfurn:sofa", recipe = { - {"wool:white", "wool:white", "", }, - {"stairs:slab_wood", "stairs:slab_wood", "", }, + {homedecor.materials.wool_white, homedecor.materials.wool_white, "", }, + {homedecor.materials.slab_wood, homedecor.materials.slab_wood, "", }, {"group:stick", "group:stick", "", } } }) @@ -60,7 +60,7 @@ minetest.register_craft({ minetest.register_craft({ output = "lrfurn:sofa", recipe = { - {"wool:white", "wool:white", "", }, + {homedecor.materials.wool_white, homedecor.materials.wool_white, "", }, {"moreblocks:slab_wood", "moreblocks:slab_wood", "", }, {"group:stick", "group:stick", "", } }