diff --git a/depends.txt b/depends.txt index 54d05845bf769cdff3c43112281ec0ac99ef2fd0..f0e0b987a8c8c92239ea84fd43c33291712f9842 100644 --- a/depends.txt +++ b/depends.txt @@ -9,6 +9,7 @@ building_blocks ? teleport_potion ? scaffolding ? moreores ? +moreblocks ? mobs_animal ? mobs_better_rat ? mobs_slimes ? diff --git a/init.lua b/init.lua index d8d7559048a17c5fc18ef57e455086bfb68a88c4..7e70c2b5855483dd2235f950195eb7fbfe4c2ed2 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,7 @@ illuna = {} dofile(minetest.get_modpath("illuna").."/nodes.lua") +dofile(minetest.get_modpath("illuna").."/moreblocks.lua") dofile(minetest.get_modpath("illuna").."/crafting.lua") dofile(minetest.get_modpath("illuna").."/commands.lua") dofile(minetest.get_modpath("illuna").."/register.lua") @@ -10,9 +11,6 @@ dofile(minetest.get_modpath("illuna").."/shop.lua") dofile(minetest.get_modpath("illuna").."/stairs.lua") dofile(minetest.get_modpath("illuna").."/hotstone.lua") dofile(minetest.get_modpath("illuna").."/replacer.lua") -if minetest.get_modpath("moreblocks") then - dofile(minetest.get_modpath("illuna").."/moreblocks.lua") -end if not minetest.get_modpath("ethereal") then dofile(minetest.get_modpath("illuna").."/water.lua") end diff --git a/moreblocks.lua b/moreblocks.lua index e01de9e5bd9f48d97642e92bb551cfafa1460be5..9a11ed3f29176d65f5d83e0c1ce7bc27b042c914 100644 --- a/moreblocks.lua +++ b/moreblocks.lua @@ -64,10 +64,10 @@ for i = 1, 16 do description = name.." Wool", tiles = {"wool_"..name..".png"}, groups = {oddly_breakabe_by_hand=1}, - sounds = default.node_sound_defaults(), + sounds = illuna.node_sound_wool(), }) - minetest.register_alias(name..":slab_block_1", "moreblocks:slab_wool_"..name) - minetest.register_alias(name..":slab_block_2", "moreblocks:slab_wool_"..name) + minetest.register_alias(name..":slab_block_1", "moreblocks:slab_wool_"..name.."_1") + minetest.register_alias(name..":slab_block_2", "moreblocks:slab_wool_"..name.."_2") end minetest.register_alias("wool:white_microslab", "moreblocks:slab_wool_white")