diff --git a/homedecor_roofing/.luacheckrc b/homedecor_roofing/.luacheckrc deleted file mode 100644 index 4f0848c8..00000000 --- a/homedecor_roofing/.luacheckrc +++ /dev/null @@ -1,20 +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", -} - -globals = { -} - diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index d5bbcdb2..5ff6ecbc 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -5,12 +5,14 @@ homedecor_roofing = {} minetest.register_node(":homedecor:skylight", { description = S("Glass Skylight"), drawtype = "raillike", - tiles = { "default_glass.png" }, - wield_image = "default_glass.png", + tiles = { homedecor.glass }, + wield_image = homedecor.glass, inventory_image = "homedecor_skylight_inv.png", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree = 2 }, paramtype = "light", - sounds = default.node_sound_glass_defaults(), + _sound_def = { + key = "node_sound_glass_defaults", + }, selection_box = homedecor.nodebox.slab_y(0.1), }) @@ -21,9 +23,11 @@ minetest.register_node(":homedecor:skylight_frosted", { wield_image = "homedecor_skylight_frosted.png", inventory_image = "homedecor_skylight_frosted_inv.png", use_texture_alpha = "blend", - groups = { snappy = 3 }, + groups = { snappy = 3, dig_tree = 2 }, paramtype = "light", - sounds = default.node_sound_glass_defaults(), + _sound_def = { + key = "node_sound_glass_defaults", + }, selection_box = homedecor.nodebox.slab_y(0.1), }) @@ -36,8 +40,10 @@ for s, s_loc in pairs({ ["asphalt"] = S("asphalt"), ["terracotta"] = S("terracot inventory_image = "homedecor_shingles_"..s.."_inv.png", paramtype = "light", walkable = false, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), + groups = { snappy = 3, dig_tree = 2 }, + _sound_def = { + key = "node_sound_wood_defaults", + }, selection_box = homedecor.nodebox.slab_y(0.1), }) end @@ -93,7 +99,9 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo collision_box = ocorner_cbox, groups = groups, on_place = minetest.rotate_node, - sounds = default.node_sound_wood_defaults() + _sound_def = { + key = "node_sound_wood_defaults", + }, }) end @@ -114,7 +122,9 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo collision_box = icorner_cbox, groups = groups, on_place = minetest.rotate_node, - sounds = default.node_sound_wood_defaults() + _sound_def = { + key = "node_sound_wood_defaults", + }, }) end @@ -137,7 +147,9 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups use_texture_alpha = "blend", groups = groups, on_place = minetest.rotate_node, - sounds = default.node_sound_wood_defaults() + _sound_def = { + key = "node_sound_wood_defaults", + }, }) -- convert between flat shingles and slopes @@ -260,19 +272,19 @@ end -- corners homedecor_roofing.register_roof("homedecor", "wood", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_wood.png" }, S("Wood Shingles") ) homedecor_roofing.register_roof("homedecor", "asphalt", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_asphalt.png" }, S("Asphalt Shingles") ) homedecor_roofing.register_roof("homedecor", "terracotta", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_terracotta.png" }, S("Terracotta Shingles") ) @@ -281,43 +293,47 @@ homedecor_roofing.register_roof("homedecor", "terracotta", homedecor_roofing.register_slope("homedecor", "wood", "homedecor:shingles_wood", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_wood.png" }, S("Wood Shingles") ) homedecor_roofing.register_slope("homedecor", "asphalt", "homedecor:shingles_asphalt", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_asphalt.png" }, S("Asphalt Shingles") ) homedecor_roofing.register_slope("homedecor", "terracotta", "homedecor:shingles_terracotta", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_terracotta.png" }, S("Terracotta Shingles") ) homedecor_roofing.register_slope("homedecor", "glass", "homedecor:shingles_glass", - { snappy = 3 }, + { snappy = 3, dig_tree = 2 }, { "homedecor_shingles_glass.png", "homedecor_shingles_wood.png" }, S("Glass Shingles") ) +local brick_tex = "default_brick.png" +if not minetest.get_modpath("default") then brick_tex = "[combine:16x16^[noalpha^[colorize:#AA4A44" end homedecor.register("chimney", { description = S("Chimney"), mesh = "homedecor_chimney.obj", tiles = { "homedecor_chimney_tb.png", - "default_brick.png" + brick_tex }, selection_box = homedecor.nodebox.bar_y(0.25), - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults() + groups = {cracky=3, dig_tree = 2}, + _sound_def = { + key = "node_sound_stone_defaults", + }, }) -- crafting diff --git a/homedecor_roofing/mod.conf b/homedecor_roofing/mod.conf index 2457e4cf..7bca6cb6 100644 --- a/homedecor_roofing/mod.conf +++ b/homedecor_roofing/mod.conf @@ -1,3 +1,3 @@ name = homedecor_roofing description = Homedecor mod: roofing -depends = homedecor_common, default, dye +depends = homedecor_common