diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua index 15ed2722..f88638d3 100644 --- a/homedecor_common/materials.lua +++ b/homedecor_common/materials.lua @@ -41,6 +41,7 @@ homedecor.materials = { glass_block = "default_glass", glass_bottle = "vessels:glass_bottle", coal_lump = "default:coal_lump", + stone = "default:stone", cobble = "default:cobble", brick = "default:brick", } @@ -113,6 +114,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then glass_block = "fl_glass:framed_glass", glass_bottle = "fl_bottles:bottle", coal_lump = "fl_ores:coal_ore", + stone = "fl_stone:stone", cobble = "fl_stone:stone_rubble", brick = "", } diff --git a/itemframes/.luacheckrc b/itemframes/.luacheckrc deleted file mode 100644 index 61cf46a2..00000000 --- a/itemframes/.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", - "mesecon", - "screwdriver", -} - -globals = { -} - diff --git a/itemframes/init.lua b/itemframes/init.lua index cfd77e19..a0af87e9 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -137,7 +137,9 @@ minetest.register_node("itemframes:frame",{ sunlight_propagates = true, groups = {choppy = 2, dig_immediate = 2}, legacy_wallmounted = true, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, on_rotate = sd_disallow or nil, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) @@ -213,8 +215,10 @@ minetest.register_node("itemframes:pedestal",{ --}, tiles = {"itemframes_pedestal.png"}, paramtype = "light", - groups = {cracky = 3}, - sounds = default.node_sound_stone_defaults(), + groups = {cracky = 3, dig_stone = 2}, + _sound_def = { + key = "node_sound_stone_defaults", + }, on_rotate = sd_disallow or nil, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) @@ -308,7 +312,7 @@ minetest.register_craft({ output = 'itemframes:frame', recipe = { {'group:stick', 'group:stick', 'group:stick'}, - {'group:stick', 'default:paper', 'default:stick'}, + {'group:stick', homedecor.materials.paper, 'default:stick'}, {'group:stick', 'group:stick', 'group:stick'}, } }) @@ -316,9 +320,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'itemframes:pedestal', recipe = { - {'default:stone', 'default:stone', 'default:stone'}, - {'', 'default:stone', ''}, - {'default:stone', 'default:stone', 'default:stone'}, + {homedecor.materials.stone, homedecor.materials.stone, homedecor.materials.stone}, + {'', homedecor.materials.stone, ''}, + {homedecor.materials.stone, homedecor.materials.stone, homedecor.materials.stone}, } }) diff --git a/itemframes/mod.conf b/itemframes/mod.conf index 32db2200..eb240ac9 100644 --- a/itemframes/mod.conf +++ b/itemframes/mod.conf @@ -1,3 +1,3 @@ name = itemframes -depends = default, homedecor_common -optional_depends = mesecons_mvps, screwdriver +depends = homedecor_common +optional_depends = mesecons_mvps, screwdriver, default