From 7c5b516d0687b66b9493401bcd9fa9f6bd9fbb9f Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Thu, 28 Apr 2022 20:30:45 -0400 Subject: [PATCH] add hd kitchen --- homedecor_common/furnaces.lua | 10 ++- homedecor_kitchen/.luacheckrc | 21 ----- homedecor_kitchen/init.lua | 162 ++++++++++++++++++++-------------- homedecor_kitchen/mod.conf | 4 +- 4 files changed, 104 insertions(+), 93 deletions(-) delete mode 100644 homedecor_kitchen/.luacheckrc diff --git a/homedecor_common/furnaces.lua b/homedecor_common/furnaces.lua index f0f7a2d1..be4dfc3d 100644 --- a/homedecor_common/furnaces.lua +++ b/homedecor_common/furnaces.lua @@ -143,7 +143,10 @@ function homedecor.register_furnace(name, furnacedef) description = description, tiles = make_tiles(furnacedef.tiles, furnacedef.tile_format, false), groups = furnacedef.groups or {cracky=2}, - sounds = furnacedef.sounds or default.node_sound_wood_defaults(), + sounds = furnacedef.sounds, + _sound_def = { + key = "node_sound_wood_defaults", + }, on_construct = furnace_construct, can_dig = furnace_can_dig, allow_metadata_inventory_put = furnace_allow_put, @@ -158,7 +161,10 @@ function homedecor.register_furnace(name, furnacedef) light_source = 8, drop = "homedecor:" .. name, groups = furnacedef.groups or {cracky=2, not_in_creative_inventory=1}, - sounds = furnacedef.sounds or default.node_sound_stone_defaults(), + sounds = furnacedef.sounds, + _sound_def = { + key = "node_sound_stone_defaults", + }, on_construct = furnace_construct, can_dig = furnace_can_dig, allow_metadata_inventory_put = furnace_allow_put, diff --git a/homedecor_kitchen/.luacheckrc b/homedecor_kitchen/.luacheckrc deleted file mode 100644 index 6718384e..00000000 --- a/homedecor_kitchen/.luacheckrc +++ /dev/null @@ -1,21 +0,0 @@ -unused_args = false -allow_defined_top = true -max_comment_line_length = 999 - -read_globals = { - "DIR_DELIM", - "minetest", "core", - "unpack", - "dump", - table = { fields = { "copy", "getn" } }, - "vector", "nodeupdate", - "VoxelManip", "VoxelArea", - "PseudoRandom", "ItemStack", - "default", - "homedecor", - "screwdriver", -} - -globals = { -} - diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index d8451df6..e940c9ca 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -8,8 +8,10 @@ homedecor.register("refrigerator_steel", { tiles = { "homedecor_refrigerator_steel.png" }, inventory_image = "homedecor_refrigerator_steel_inv.png", description = S("Refrigerator (stainless steel)"), - groups = {snappy=3}, - sounds = default.node_sound_stone_defaults(), + groups = {snappy=3, dig_stone=1}, + _sound_def = { + key = "node_sound_stone_defaults", + }, selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), expand = { top="placeholder" }, @@ -27,10 +29,12 @@ homedecor.register("refrigerator_white", { tiles = { "homedecor_refrigerator_white.png" }, inventory_image = "homedecor_refrigerator_white_inv.png", description = S("Refrigerator"), - groups = {snappy=3}, + groups = {snappy=3, dig_stone=1}, selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), - sounds = default.node_sound_stone_defaults(), + _sound_def = { + key = "node_sound_stone_defaults", + }, expand = { top="placeholder" }, infotext=S("Refrigerator"), inventory = { @@ -115,8 +119,10 @@ homedecor.register("dishwasher", { } }, selection_box = { type = "regular" }, - sounds = default.node_sound_stone_defaults(), - groups = { snappy = 3 }, + _sound_def = { + key = "node_sound_stone_defaults", + }, + groups = { snappy = 3, dig_stone=1 }, }) local materials = { ["granite"] = S("granite"), ["marble"] = S("marble"), ["steel"] = S("steel"), ["wood"] = S("wood") } @@ -132,18 +138,22 @@ homedecor.register("dishwasher_"..m, { "homedecor_dishwasher_back.png", "homedecor_dishwasher_front.png" }, - groups = { snappy = 3 }, - sounds = default.node_sound_stone_defaults(), + groups = { snappy = 3, dig_tree=1 }, + _sound_def = { + key = "node_sound_stone_defaults", + }, }) end -local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" +local wood_tex = "default_wood.png" +if not minetest.get_modpath("default") then wood_tex = "[combine:16x16^[noalpha^[colorize:#654321" end +local cabinet_sides = "("..wood_tex.."^[transformR90)^homedecor_kitchen_cabinet_bevel.png" local cabinet_sides_colored = "(homedecor_generic_wood_plain.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" local ic_cabinet_sides = string.gsub(cabinet_sides, "%^", "&") local ic_cabinet_sides_colored = string.gsub(cabinet_sides_colored, "%^", "&") -local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^homedecor_kitchen_cabinet_bevel.png" +local cabinet_bottom = "("..wood_tex.."^[colorize:#000000:100)^homedecor_kitchen_cabinet_bevel.png" local cabinet_bottom_colored = "homedecor_generic_wood_plain.png^homedecor_kitchen_cabinet_bevel.png" local function N_(x) return x end @@ -183,8 +193,10 @@ for _, mat in ipairs(counter_materials) do palette = "unifieddyes_palette_colorwallmounted.png", airbrush_replacement_node = "homedecor:kitchen_cabinet_colored"..material, place_param2 = 0, - groups = { snappy = 3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, dig_tree=1}, + _sound_def = { + key = "node_sound_stone_defaults", + }, infotext=S("Kitchen Cabinet"), inventory = { size=24, @@ -212,8 +224,10 @@ for _, mat in ipairs(counter_materials) do mesh = "homedecor_kitchen_cabinet.obj", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", - groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Kitchen Cabinet"), inventory = { size=24, @@ -242,8 +256,10 @@ for _, mat in ipairs(counter_materials) do paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", airbrush_replacement_node = "homedecor:kitchen_cabinet_colored_with_drawers"..material, - groups = { snappy = 3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, dig_tree=1}, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Kitchen Cabinet with drawers"), inventory = { size=24, @@ -271,8 +287,10 @@ for _, mat in ipairs(counter_materials) do mesh = "homedecor_kitchen_cabinet.obj", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", - groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Kitchen Cabinet with drawers"), inventory = { size=24, @@ -283,8 +301,8 @@ for _, mat in ipairs(counter_materials) do end }) - homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet"..material - homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet"..material.."_locked" + homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1]="homedecor:kitchen_cabinet"..material + homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1]="homedecor:kitchen_cabinet"..material.."_locked" end @@ -307,8 +325,10 @@ homedecor.register("kitchen_cabinet_colorable_half", { place_param2 = 0, selection_box = kitchen_cabinet_half_box, node_box = kitchen_cabinet_half_box, - groups = { snappy = 3, ud_param2_colorable = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Kitchen Cabinet"), inventory = { size=12, @@ -337,8 +357,10 @@ homedecor.register("kitchen_cabinet_colored_half", { palette = "unifieddyes_palette_colorwallmounted.png", selection_box = kitchen_cabinet_half_box, node_box = kitchen_cabinet_half_box, - groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Kitchen Cabinet"), inventory = { size=12, @@ -368,8 +390,10 @@ homedecor.register("kitchen_cabinet_colorable_with_sink", { palette = "unifieddyes_palette_colorwallmounted.png", airbrush_replacement_node = "homedecor:kitchen_cabinet_colored_with_sink", place_param2 = 0, - groups = { snappy = 3, ud_param2_colorable = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Under-sink cabinet"), inventory = { size=16, @@ -413,8 +437,10 @@ homedecor.register("kitchen_cabinet_colored_with_sink", { .."{"..ic_cabinet_sides_colored, paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", - groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1, dig_tree=1 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, infotext=S("Under-sink cabinet"), inventory = { size=16, @@ -448,7 +474,7 @@ homedecor.register("copper_pans", { mesh = "homedecor_copper_pans.obj", tiles = { "homedecor_polished_copper.png" }, inventory_image = "homedecor_copper_pans_inv.png", - groups = { snappy=3 }, + groups = { snappy=3, dig_stone=1 }, selection_box = cp_cbox, walkable = false, on_place = minetest.rotate_node @@ -464,7 +490,7 @@ homedecor.register("kitchen_faucet", { tiles = { "homedecor_generic_metal_bright.png" }, inventory_image = "homedecor_kitchen_faucet_inv.png", description = S("Kitchen Faucet"), - groups = {snappy=3}, + groups = {snappy=3, dig_stone=1}, selection_box = kf_cbox, walkable = false, on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, @@ -489,11 +515,11 @@ homedecor.register("paper_towel", { mesh = "homedecor_paper_towel.obj", tiles = { "homedecor_generic_quilted_paper.png", - "default_wood.png" + wood_tex }, inventory_image = "homedecor_paper_towel_inv.png", description = S("Paper towels"), - groups = { snappy=3 }, + groups = { snappy=3, dig_tree=1 }, walkable = false, selection_box = { type = "fixed", @@ -507,18 +533,18 @@ homedecor.register("paper_towel", { minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, - {"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", }, - {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, + {"basic_materials:heating_element", homedecor.materials.steel_ingot, "basic_materials:heating_element", }, + {homedecor.materials.steel_ingot, "moreblocks:iron_glass", homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, "basic_materials:heating_element", homedecor.materials.steel_ingot, }, } }) minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, - {"default:steel_ingot", "default:glass", "default:steel_ingot", }, - {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, + {"basic_materials:heating_element", homedecor.materials.steel_ingot, "basic_materials:heating_element", }, + {homedecor.materials.steel_ingot, homedecor.materials.glass_block, homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, "basic_materials:heating_element", homedecor.materials.steel_ingot, }, } }) @@ -527,35 +553,35 @@ minetest.register_craft({ output = "homedecor:oven", recipe = { "homedecor:oven_steel", - "dye:white", - "dye:white", + homedecor.materials.dye_white, + homedecor.materials.dye_white, } }) minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", }, - {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, + {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, "moreblocks:iron_glass", "basic_materials:ic", }, + {homedecor.materials.steel_ingot, homedecor.materials.copper_ingot, "basic_materials:energy_crystal_simple", }, } }) minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "default:glass", "basic_materials:ic", }, - {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, + {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, homedecor.materials.glass_block, "basic_materials:ic", }, + {homedecor.materials.steel_ingot, homedecor.materials.copper_ingot, "basic_materials:energy_crystal_simple", }, } }) minetest.register_craft({ output = "homedecor:refrigerator_steel", recipe = { - {"default:steel_ingot", "homedecor:glowlight_small_cube", "default:steel_ingot", }, - {"default:steel_ingot", "default:copperblock", "default:steel_ingot", }, - {"default:steel_ingot", "default:clay", "default:steel_ingot", }, + {homedecor.materials.steel_ingot, "homedecor:glowlight_small_cube", homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, homedecor.materials.copper_ingot, homedecor.materials.steel_ingot, }, + {homedecor.materials.steel_ingot, homedecor.materials.clay_lump, homedecor.materials.steel_ingot, }, } }) @@ -564,9 +590,9 @@ minetest.register_craft({ output = "homedecor:refrigerator_white", recipe = { "homedecor:refrigerator_steel", - "dye:white", - "dye:white", - "dye:white", + homedecor.materials.dye_white, + homedecor.materials.dye_white, + homedecor.materials.dye_white, } }) @@ -582,7 +608,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:kitchen_cabinet_colorable_steel", recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot}, {"", "homedecor:kitchen_cabinet_colorable", ""}, } }) @@ -628,8 +654,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:kitchen_cabinet_colorable_with_sink", recipe = { - {"group:wood", "default:steel_ingot", "group:wood", }, - {"group:wood", "default:steel_ingot", "group:wood", }, + {"group:wood", homedecor.materials.steel_ingot, "group:wood", }, + {"group:wood", homedecor.materials.steel_ingot, "group:wood", }, {"group:wood", "group:stick", "group:wood", }, } }) @@ -637,18 +663,18 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "basic_materials:ic", "building_blocks:slab_grate_1", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } + { "basic_materials:ic", "building_blocks:slab_grate_1", homedecor.materials.steel_ingot, }, + { homedecor.materials.steel_ingot, "homedecor:shower_head", "basic_materials:motor" }, + { homedecor.materials.steel_ingot, "basic_materials:heating_element", homedecor.materials.water_bucket } }, }) minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } + { "basic_materials:ic", "homedecor:fence_chainlink", homedecor.materials.steel_ingot, }, + { homedecor.materials.steel_ingot, "homedecor:shower_head", "basic_materials:motor" }, + { homedecor.materials.steel_ingot, "basic_materials:heating_element", homedecor.materials.water_bucket } }, }) @@ -679,7 +705,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:dishwasher_steel", recipe = { - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot }, { "", "homedecor:dishwasher", "" }, }, }) @@ -719,8 +745,8 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:kitchen_faucet", recipe = { - { "", "default:steel_ingot" }, - { "default:steel_ingot", "" }, + { "", homedecor.materials.steel_ingot }, + { homedecor.materials.steel_ingot, "" }, { "homedecor:taps", "" } }, }) @@ -728,8 +754,8 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:kitchen_faucet", recipe = { - { "default:steel_ingot","" }, - { "", "default:steel_ingot" }, + { homedecor.materials.steel_ingot,"" }, + { "", homedecor.materials.steel_ingot }, { "", "homedecor:taps" } }, }) @@ -754,8 +780,8 @@ minetest.register_craft({ output = "homedecor:copper_pans", recipe = { { "basic_materials:copper_strip","","basic_materials:copper_strip" }, - { "default:copper_ingot","","default:copper_ingot" }, - { "default:copper_ingot","","default:copper_ingot" } + { homedecor.materials.copper_ingot,"",homedecor.materials.copper_ingot }, + { homedecor.materials.copper_ingot,"",homedecor.materials.copper_ingot } }, }) diff --git a/homedecor_kitchen/mod.conf b/homedecor_kitchen/mod.conf index 8de6943d..8775ca19 100644 --- a/homedecor_kitchen/mod.conf +++ b/homedecor_kitchen/mod.conf @@ -1,4 +1,4 @@ name = homedecor_kitchen description = Homedecor mod: kitchen -depends = homedecor_common, default, basic_materials, dye, unifieddyes -optional_depends = moreblocks, building_blocks, technic, bucket, screwdriver +depends = homedecor_common +optional_depends = moreblocks, building_blocks, technic, bucket, screwdriver, default, basic_materials, dye, unifieddyes