From fcda60cc2eecfabe0bf2d4b075832073779870b4 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 11 Feb 2017 18:46:23 +0100 Subject: [PATCH] Move core sounds from mcl_core to mcl_sounds --- mods/beds/depends.txt | 1 + mods/beds/init.lua | 4 +- mods/craftingpack/crafting/depends.txt | 1 + mods/craftingpack/crafting/init.lua | 2 +- mods/doors/depends.txt | 1 + mods/doors/init.lua | 22 +-- mods/hardened_clay/depends.txt | 1 + mods/hardened_clay/init.lua | 4 +- mods/itemframes/depends.txt | 1 + mods/itemframes/init.lua | 2 +- mods/mcl_books/depends.txt | 1 + mods/mcl_books/init.lua | 2 +- mods/mcl_cake/depends.txt | 1 + mods/mcl_cake/init.lua | 12 +- mods/mcl_chests/depends.txt | 1 + mods/mcl_chests/init.lua | 10 +- mods/mcl_core/depends.txt | 1 + mods/mcl_core/functions.lua | 87 +-------- mods/mcl_core/nodes.lua | 182 +++++++++--------- mods/mcl_end/depends.txt | 2 +- mods/mcl_end/init.lua | 18 +- mods/mcl_farming/beetroot.lua | 8 +- mods/mcl_farming/carrots.lua | 8 +- mods/mcl_farming/depends.txt | 1 + mods/mcl_farming/melon.lua | 14 +- mods/mcl_farming/mushrooms.lua | 4 +- mods/mcl_farming/potatoes.lua | 6 +- mods/mcl_farming/pumpkin.lua | 18 +- mods/mcl_farming/soil.lua | 4 +- mods/mcl_farming/wheat.lua | 8 +- mods/mcl_fences/depends.txt | 1 + mods/mcl_fences/init.lua | 4 +- mods/mcl_flowerpots/depends.txt | 1 + mods/mcl_flowerpots/nodes.lua | 6 +- mods/mcl_flowers/depends.txt | 1 + mods/mcl_flowers/init.lua | 24 +-- mods/mcl_furnaces/depends.txt | 1 + mods/mcl_furnaces/init.lua | 4 +- mods/mcl_heads/depends.txt | 2 +- mods/mcl_heads/init.lua | 2 +- mods/mcl_hoppers/depends.txt | 1 + mods/mcl_hoppers/init.lua | 6 +- mods/mcl_jukebox/depends.txt | 1 + mods/mcl_jukebox/init.lua | 2 +- mods/mcl_minecarts/depends.txt | 1 + mods/mcl_minecarts/rails.lua | 2 +- mods/mcl_nether/depends.txt | 2 +- mods/mcl_nether/init.lua | 22 +-- mods/mcl_nether/nether_wart.lua | 8 +- mods/mcl_sounds/description.txt | 1 + mods/mcl_sounds/init.lua | 87 +++++++++ mods/mcl_sounds/mod.conf | 1 + .../sounds/default_break_glass.1.ogg | Bin .../sounds/default_break_glass.2.ogg | Bin .../sounds/default_break_glass.3.ogg | Bin .../sounds/default_cool_lava.1.ogg | Bin .../sounds/default_cool_lava.2.ogg | Bin .../sounds/default_cool_lava.3.ogg | Bin .../sounds/default_dig_choppy.ogg | Bin .../sounds/default_dig_cracky.ogg | Bin .../sounds/default_dig_crumbly.ogg | Bin .../sounds/default_dig_dig_immediate.ogg | Bin .../default_dig_oddly_breakable_by_hand.ogg | Bin .../sounds/default_dirt_footstep.1.ogg | Bin .../sounds/default_dirt_footstep.2.ogg | Bin .../sounds/default_dug_node.1.ogg | Bin .../sounds/default_dug_node.2.ogg | Bin .../sounds/default_glass_footstep.ogg | Bin .../sounds/default_grass_footstep.1.ogg | Bin .../sounds/default_grass_footstep.2.ogg | Bin .../sounds/default_grass_footstep.3.ogg | Bin .../sounds/default_gravel_footstep.1.ogg | Bin .../sounds/default_gravel_footstep.2.ogg | Bin .../sounds/default_gravel_footstep.3.ogg | Bin .../sounds/default_gravel_footstep.4.ogg | Bin .../sounds/default_hard_footstep.1.ogg | Bin .../sounds/default_hard_footstep.2.ogg | Bin .../sounds/default_hard_footstep.3.ogg | Bin .../sounds/default_place_node.1.ogg | Bin .../sounds/default_place_node.2.ogg | Bin .../sounds/default_place_node.3.ogg | Bin .../sounds/default_place_node_hard.1.ogg | Bin .../sounds/default_place_node_hard.2.ogg | Bin .../sounds/default_sand_footstep.1.ogg | Bin .../sounds/default_sand_footstep.2.ogg | Bin .../sounds/default_snow_footstep.1.ogg | Bin .../sounds/default_snow_footstep.2.ogg | Bin .../sounds/default_snow_footstep.3.ogg | Bin .../sounds/default_tool_break.ogg | Bin .../sounds/default_wood_footstep.1.ogg | Bin .../sounds/default_wood_footstep.2.ogg | Bin mods/mcl_tnt/depends.txt | 1 + mods/mcl_tnt/init.lua | 2 +- mods/mcl_torches/depends.txt | 1 + mods/mcl_torches/init.lua | 2 +- mods/mcl_walls/depends.txt | 1 + mods/mcl_walls/init.lua | 8 +- mods/mcl_wool/depends.txt | 2 +- mods/mcl_wool/init.lua | 4 +- .../3d_armor_stand/depends.txt | 1 + .../minetest-3d_armor/3d_armor_stand/init.lua | 2 +- mods/mobs/depends.txt | 1 + mods/mobs/spawner.lua | 2 +- mods/redstone/mesecons/depends.txt | 1 + mods/redstone/mesecons/wires.lua | 4 +- mods/redstone/mesecons_button/init.lua | 8 +- mods/redstone/mesecons_commandblock/init.lua | 4 +- mods/redstone/mesecons_delayer/init.lua | 2 +- mods/redstone/mesecons_lightstone/init.lua | 4 +- mods/redstone/mesecons_noteblock/init.lua | 2 +- mods/redstone/mesecons_pistons/init.lua | 22 +-- .../redstone/mesecons_pressureplates/init.lua | 4 +- mods/redstone/mesecons_solarpanel/init.lua | 8 +- mods/redstone/mesecons_torch/init.lua | 6 +- mods/redstone/mesecons_walllever/init.lua | 4 +- mods/signs/depends.txt | 1 + mods/signs/init.lua | 4 +- mods/stairs/depends.txt | 1 + mods/stairs/init.lua | 42 ++-- mods/xpanes/depends.txt | 1 + mods/xpanes/init.lua | 4 +- 121 files changed, 393 insertions(+), 363 deletions(-) create mode 100644 mods/mcl_sounds/description.txt create mode 100644 mods/mcl_sounds/init.lua create mode 100644 mods/mcl_sounds/mod.conf rename mods/{mcl_core => mcl_sounds}/sounds/default_break_glass.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_break_glass.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_break_glass.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_cool_lava.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_cool_lava.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_cool_lava.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dig_choppy.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dig_cracky.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dig_crumbly.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dig_dig_immediate.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dig_oddly_breakable_by_hand.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dirt_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dirt_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dug_node.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_dug_node.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_glass_footstep.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_grass_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_grass_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_grass_footstep.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_gravel_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_gravel_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_gravel_footstep.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_gravel_footstep.4.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_hard_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_hard_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_hard_footstep.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_place_node.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_place_node.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_place_node.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_place_node_hard.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_place_node_hard.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_sand_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_sand_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_snow_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_snow_footstep.2.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_snow_footstep.3.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_tool_break.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_wood_footstep.1.ogg (100%) rename mods/{mcl_core => mcl_sounds}/sounds/default_wood_footstep.2.ogg (100%) diff --git a/mods/beds/depends.txt b/mods/beds/depends.txt index 6f4744dccd..9cf0e87f76 100644 --- a/mods/beds/depends.txt +++ b/mods/beds/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_wool diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 9f10b87b17..ce1732c23a 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -55,7 +55,7 @@ minetest.register_node("beds:bed_bottom", { paramtype2 = "facedir", stack_max = 1, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,bed=1,deco_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, @@ -152,7 +152,7 @@ minetest.register_node("beds:bed_top", { paramtype2 = "facedir", is_ground_content = false, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,not_in_creative_inventory=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, diff --git a/mods/craftingpack/crafting/depends.txt b/mods/craftingpack/crafting/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/craftingpack/crafting/depends.txt +++ b/mods/craftingpack/crafting/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/craftingpack/crafting/init.lua b/mods/craftingpack/crafting/init.lua index ddf6dd64bc..f87a5aa340 100644 --- a/mods/craftingpack/crafting/init.lua +++ b/mods/craftingpack/crafting/init.lua @@ -175,7 +175,7 @@ minetest.register_node("crafting:workbench", { on_rightclick = function(pos, node, clicker, itemstack) set_workbench(clicker) end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ diff --git a/mods/doors/depends.txt b/mods/doors/depends.txt index 7642bee0a9..b666116891 100644 --- a/mods/doors/depends.txt +++ b/mods/doors/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/doors/init.lua b/mods/doors/init.lua index fa3616a28d..74b46d3937 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -301,7 +301,7 @@ doors:register_door("doors:door_wood", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_wood_b.png", "door_brown.png"}, tiles_top = {"door_wood_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -320,7 +320,7 @@ doors:register_door("doors:door_acacia", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_acacia_b.png", "door_brown.png"}, tiles_top = {"door_acacia_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -339,7 +339,7 @@ doors:register_door("doors:door_birch", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_birch_b.png", "door_brown.png"}, tiles_top = {"door_birch_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -358,7 +358,7 @@ doors:register_door("doors:door_dark_oak", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_dark_oak_b.png", "door_brown.png"}, tiles_top = {"door_dark_oak_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -377,7 +377,7 @@ doors:register_door("doors:door_jungle", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_jungle_b.png", "door_brown.png"}, tiles_top = {"door_jungle_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -396,7 +396,7 @@ doors:register_door("doors:door_spruce", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=1}, tiles_bottom = {"door_spruce_b.png", "door_brown.png"}, tiles_top = {"door_spruce_a.png", "door_brown.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ @@ -446,7 +446,7 @@ doors:register_door("doors:door_steel", { groups = {snappy=1,cracky=1,level=2,door=1,mesecon_effector_on=1}, tiles_bottom = {"door_steel_b.png", "door_grey.png"}, tiles_top = {"door_steel_a.png", "door_grey.png"}, - sounds = mcl_core.node_sound_metal_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), }) minetest.register_craft({ @@ -504,7 +504,7 @@ minetest.register_node("doors:trapdoor", { stack_max = 64, paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,door=2}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), drop = "doors:trapdoor", node_box = { type = "fixed", @@ -550,7 +550,7 @@ minetest.register_node("doors:trapdoor_open", { paramtype2 = "facedir", pointable = true, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,door=2}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), drop = "doors:trapdoor", node_box = { type = "fixed", @@ -627,7 +627,7 @@ minetest.register_node("doors:iron_trapdoor", { stack_max = 64, paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,door=2}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), drop = "doors:iron_trapdoor", node_box = { type = "fixed", @@ -673,7 +673,7 @@ minetest.register_node("doors:iron_trapdoor_open", { is_ground_content = false, pointable = true, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,door=2,mesecon_effector_on=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), drop = "doors:iron_trapdoor", node_box = { type = "fixed", diff --git a/mods/hardened_clay/depends.txt b/mods/hardened_clay/depends.txt index 12e5d60062..e9446535ec 100644 --- a/mods/hardened_clay/depends.txt +++ b/mods/hardened_clay/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_dye diff --git a/mods/hardened_clay/init.lua b/mods/hardened_clay/init.lua index 9d37add483..0602c6e7a7 100644 --- a/mods/hardened_clay/init.lua +++ b/mods/hardened_clay/init.lua @@ -25,7 +25,7 @@ minetest.register_node("hardened_clay:hardened_clay", { tiles = {"hardened_clay.png"}, stack_max = 64, groups = {cracky=3,hardened_clay=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_craft({ @@ -46,7 +46,7 @@ for _, row in ipairs(clay.dyes) do tiles = {"hardened_clay_stained_"..name..".png"}, groups = {cracky=3,hardened_clay=1,building_block=1}, stack_max = 64, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) if craft_color_group then minetest.register_craft({ diff --git a/mods/itemframes/depends.txt b/mods/itemframes/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/itemframes/depends.txt +++ b/mods/itemframes/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/itemframes/init.lua b/mods/itemframes/init.lua index 55b28af14e..984c206aec 100644 --- a/mods/itemframes/init.lua +++ b/mods/itemframes/init.lua @@ -100,7 +100,7 @@ minetest.register_node("itemframes:frame",{ paramtype2 = "facedir", sunlight_propagates = true, groups = { dig_immediate=3,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) diff --git a/mods/mcl_books/depends.txt b/mods/mcl_books/depends.txt index c115aa1ef0..a7311fe00d 100644 --- a/mods/mcl_books/depends.txt +++ b/mods/mcl_books/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_mobitems diff --git a/mods/mcl_books/init.lua b/mods/mcl_books/init.lua index 39bf6d0b8f..20b9a03d67 100644 --- a/mods/mcl_books/init.lua +++ b/mods/mcl_books/init.lua @@ -156,7 +156,7 @@ minetest.register_node("mcl_books:bookshelf", { is_ground_content = false, groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3,building_block=1}, drop = "mcl_books:book 3", - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ diff --git a/mods/mcl_cake/depends.txt b/mods/mcl_cake/depends.txt index e8ac16a9f2..2d7ed44c5b 100644 --- a/mods/mcl_cake/depends.txt +++ b/mods/mcl_cake/depends.txt @@ -1,4 +1,5 @@ mcl_core +mcl_sounds bucket mcl_farming mcl_mobitems diff --git a/mods/mcl_cake/init.lua b/mods/mcl_cake/init.lua index 94f3ef8806..41b91d454d 100644 --- a/mods/mcl_cake/init.lua +++ b/mods/mcl_cake/init.lua @@ -48,7 +48,7 @@ minetest.register_node("mcl_cake:cake", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_5"), ItemStack("mcl_cake:cake"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_5",param2=0}) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_5", { description = "Cake (5 Slices Left)", @@ -70,7 +70,7 @@ minetest.register_node("mcl_cake:cake_5", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_4"), ItemStack("mcl_cake:cake_5"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_4",param2=0}) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_4", { description = "Cake (4 Slices Left)", @@ -92,7 +92,7 @@ minetest.register_node("mcl_cake:cake_4", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_3"), ItemStack("mcl_cake:cake_4"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_3",param2=0}) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_3", { description = "Cake (3 Slices Left)", @@ -114,7 +114,7 @@ minetest.register_node("mcl_cake:cake_3", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_2"), ItemStack("mcl_cake:cake_3"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_2",param2=0}) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_2", { description = "Cake (2 Slices Left)", @@ -136,7 +136,7 @@ minetest.register_node("mcl_cake:cake_2", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_1"), ItemStack("mcl_cake:cake_2"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_1",param2=0}) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_1", { description = "Cake (1 Slice Left)", @@ -158,5 +158,5 @@ minetest.register_node("mcl_cake:cake_1", { minetest.do_item_eat(2, ItemStack("mcl:cake:cake 0"), ItemStack("mcl_cake:cake_1"), clicker, {type="nothing"}) minetest.remove_node(pos) end, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) diff --git a/mods/mcl_chests/depends.txt b/mods/mcl_chests/depends.txt index cf343b242e..02419c23e6 100644 --- a/mods/mcl_chests/depends.txt +++ b/mods/mcl_chests/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_end diff --git a/mods/mcl_chests/init.lua b/mods/mcl_chests/init.lua index 4b264fe5e4..7ed0d14b3b 100644 --- a/mods/mcl_chests/init.lua +++ b/mods/mcl_chests/init.lua @@ -30,7 +30,7 @@ minetest.register_node("mcl_chests:chest", { stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=2, deco_block=1}, is_ground_content = false, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) local param2 = minetest.get_node(pos).param2 local meta = minetest.get_meta(pos) @@ -142,7 +142,7 @@ minetest.register_node("mcl_chests:chest_left", { groups = {choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, drop = "mcl_chests:chest", is_ground_content = false, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_destruct = function(pos) local n = minetest.get_node(pos) if n.name == "mcl_chests:chest" then @@ -201,7 +201,7 @@ minetest.register_node("mcl_chests:chest_right", { groups = {choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, drop = "mcl_chests:chest", is_ground_content = false, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_destruct = function(pos) local n = minetest.get_node(pos) if n.name == "mcl_chests:chest" then @@ -272,7 +272,7 @@ minetest.register_node("mcl_chests:ender_chest", { paramtype = "light", light_source = 7, paramtype2 = "facedir", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), drop = "mcl_core:obsidian 8", on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -331,7 +331,7 @@ for color, desc in pairs(boxtypes) do "mcl_chests_"..color.."_shulker_box_side.png", "mcl_chests_"..color.."_shulker_box_side.png"}, groups = {cracky=2, deco_block=1, shulker_box=1}, is_ground_content = false, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), stack_max = 1, drop = "", on_construct = function(pos) diff --git a/mods/mcl_core/depends.txt b/mods/mcl_core/depends.txt index a501f11db4..673d7e4259 100644 --- a/mods/mcl_core/depends.txt +++ b/mods/mcl_core/depends.txt @@ -1 +1,2 @@ +mcl_sounds mcl_util diff --git a/mods/mcl_core/functions.lua b/mods/mcl_core/functions.lua index 29bb1358df..218d01df53 100644 --- a/mods/mcl_core/functions.lua +++ b/mods/mcl_core/functions.lua @@ -613,91 +613,6 @@ minetest.register_abm({ }) --- --- Sounds --- - -function mcl_core.node_sound_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="", gain=1.0} - table.dug = table.dug or - {name="default_dug_node", gain=0.25} - table.place = table.place or - {name="default_place_node_hard", gain=1.0} - return table -end - -function mcl_core.node_sound_stone_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_hard_footstep", gain=0.5} - table.dug = table.dug or - {name="default_hard_footstep", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end - --- TODO: Maybe add custom metal sounds -mcl_core.node_sound_metal_defaults = mcl_core.node_sound_stone_defaults - -function mcl_core.node_sound_dirt_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_dirt_footstep", gain=1.0} - table.dug = table.dug or - {name="default_dirt_footstep", gain=1.5} - table.place = table.place or - {name="default_place_node", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end - -function mcl_core.node_sound_sand_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_sand_footstep", gain=0.5} - table.dug = table.dug or - {name="default_sand_footstep", gain=1.0} - table.place = table.place or - {name="default_place_node", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end - -function mcl_core.node_sound_wood_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_wood_footstep", gain=0.5} - table.dug = table.dug or - {name="default_wood_footstep", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end - -function mcl_core.node_sound_leaves_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_grass_footstep", gain=0.35} - table.dug = table.dug or - {name="default_grass_footstep", gain=0.85} - table.dig = table.dig or - {name="default_dig_crumbly", gain=0.4} - table.place = table.place or - {name="default_place_node", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end - -function mcl_core.node_sound_glass_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name="default_glass_footstep", gain=0.5} - table.dug = table.dug or - {name="default_break_glass", gain=1.0} - mcl_core.node_sound_defaults(table) - return table -end -- Leaf Decay @@ -811,7 +726,7 @@ function mcl_core.add_glass(desc, recipeitem, color) use_texture_alpha = true, stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=3, building_block=1}, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), drop = "", }) diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua index 3d2be0c34c..8e1c7ae9f4 100644 --- a/mods/mcl_core/nodes.lua +++ b/mods/mcl_core/nodes.lua @@ -28,7 +28,7 @@ minetest.register_node("mcl_core:stone", { stack_max = 64, groups = {cracky=3, stone=1, building_block=1, deco_block=1}, drop = 'mcl_core:cobble', - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stone_with_coal", { @@ -38,7 +38,7 @@ minetest.register_node("mcl_core:stone_with_coal", { stack_max = 64, groups = {cracky=3, building_block=1}, drop = 'mcl_core:coal_lump', - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stone_with_iron", { @@ -48,7 +48,7 @@ minetest.register_node("mcl_core:stone_with_iron", { stack_max = 64, groups = {cracky=2, building_block=1}, drop = 'mcl_core:stone_with_iron', - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) @@ -59,7 +59,7 @@ minetest.register_node("mcl_core:stone_with_gold", { stack_max = 64, groups = {cracky=2, building_block=1}, drop = "mcl_core:stone_with_gold", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) local redstone_timer = 68.28 @@ -86,7 +86,7 @@ minetest.register_node("mcl_core:stone_with_redstone", { }, } }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_punch = redstone_ore_activate, on_walk_over = redstone_ore_activate, -- Uses walkover mod }) @@ -116,7 +116,7 @@ minetest.register_node("mcl_core:stone_with_redstone_lit", { }, } }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), -- Reset timer after re-punching or stepping on on_punch = redstone_ore_reactivate, on_walk_over = redstone_ore_reactivate, -- Uses walkover mod @@ -142,7 +142,7 @@ minetest.register_node("mcl_core:stone_with_lapis", { {items = {'mcl_dye:blue 4'}}, } }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stone_with_emerald", { @@ -152,7 +152,7 @@ minetest.register_node("mcl_core:stone_with_emerald", { stack_max = 64, groups = {cracky=2, building_block=1}, drop = "mcl_core:emerald", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stone_with_diamond", { @@ -162,7 +162,7 @@ minetest.register_node("mcl_core:stone_with_diamond", { stack_max = 64, groups = {cracky=1, building_block=1}, drop = "mcl_core:diamond", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stonebrick", { @@ -170,7 +170,7 @@ minetest.register_node("mcl_core:stonebrick", { tiles = {"default_stone_brick.png"}, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stonebrickcarved", { @@ -179,7 +179,7 @@ minetest.register_node("mcl_core:stonebrickcarved", { is_ground_content = false, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stonebrickcracked", { @@ -188,7 +188,7 @@ minetest.register_node("mcl_core:stonebrickcracked", { is_ground_content = false, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:stonebrickmossy", { @@ -196,7 +196,7 @@ minetest.register_node("mcl_core:stonebrickmossy", { tiles = {"default_stonebrick_mossy.png"}, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:granite", { @@ -205,7 +205,7 @@ minetest.register_node("mcl_core:granite", { is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:granite_smooth", { @@ -213,7 +213,7 @@ minetest.register_node("mcl_core:granite_smooth", { tiles = {"default_granite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:andesite", { @@ -222,7 +222,7 @@ minetest.register_node("mcl_core:andesite", { is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:andesite_smooth", { @@ -230,7 +230,7 @@ minetest.register_node("mcl_core:andesite_smooth", { tiles = {"default_andesite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:diorite", { @@ -239,7 +239,7 @@ minetest.register_node("mcl_core:diorite", { is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:diorite_smooth", { @@ -247,7 +247,7 @@ minetest.register_node("mcl_core:diorite_smooth", { tiles = {"default_diorite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:dirt_with_grass", { @@ -257,7 +257,7 @@ minetest.register_node("mcl_core:dirt_with_grass", { stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, cultivatable=2, building_block=1}, drop = 'mcl_core:dirt', - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) @@ -277,7 +277,7 @@ minetest.register_node("mcl_core:grass_path", { } }, groups = { crumbly=3, not_in_creative_inventory=1, }, - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) @@ -290,7 +290,7 @@ minetest.register_node("mcl_core:mycelium", { stack_max = 64, groups = {crumbly=3, building_block=1}, drop = 'mcl_core:dirt', - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) @@ -302,7 +302,7 @@ minetest.register_node("mcl_core:podzol", { stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, building_block=1}, drop = 'mcl_core:dirt', - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), }) minetest.register_node("mcl_core:dirt", { @@ -311,7 +311,7 @@ minetest.register_node("mcl_core:dirt", { is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, cultivatable=2, building_block=1}, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), }) minetest.register_node("mcl_core:coarse_dirt", { @@ -320,7 +320,7 @@ minetest.register_node("mcl_core:coarse_dirt", { is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sugarcane=1, cultivatable=1, building_block=1}, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), }) minetest.register_node("mcl_core:gravel", { @@ -336,7 +336,7 @@ minetest.register_node("mcl_core:gravel", { {items = {'mcl_core:gravel'}} } }, - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_gravel_footstep", gain=0.45}, }), }) @@ -348,7 +348,7 @@ minetest.register_node("mcl_core:sand", { is_ground_content = true, stack_max = 64, groups = {crumbly=3, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, - sounds = mcl_core.node_sound_sand_defaults(), + sounds = mcl_sounds.node_sound_sand_defaults(), }) minetest.register_node("mcl_core:sandstone", { @@ -357,7 +357,7 @@ minetest.register_node("mcl_core:sandstone", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:sandstonesmooth", { @@ -366,7 +366,7 @@ minetest.register_node("mcl_core:sandstonesmooth", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:sandstonecarved", { @@ -375,7 +375,7 @@ minetest.register_node("mcl_core:sandstonecarved", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) -- red sandstone -- @@ -386,7 +386,7 @@ minetest.register_node("mcl_core:redsand", { is_ground_content = true, stack_max = 64, groups = {crumbly=3, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, - sounds = mcl_core.node_sound_sand_defaults(), + sounds = mcl_sounds.node_sound_sand_defaults(), }) minetest.register_node("mcl_core:redsandstone", { @@ -395,7 +395,7 @@ minetest.register_node("mcl_core:redsandstone", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:redsandstonesmooth", { @@ -404,7 +404,7 @@ minetest.register_node("mcl_core:redsandstonesmooth", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:redsandstonecarved", { @@ -413,7 +413,7 @@ minetest.register_node("mcl_core:redsandstonecarved", { is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) --- @@ -426,7 +426,7 @@ minetest.register_node("mcl_core:clay", { stack_max = 64, groups = {crumbly=3, building_block=1}, drop = 'mcl_core:clay_lump 4', - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = "", }), }) @@ -438,7 +438,7 @@ minetest.register_node("mcl_core:brick_block", { is_ground_content = false, stack_max = 64, groups = {cracky=3, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:haybale", { @@ -450,7 +450,7 @@ minetest.register_node("mcl_core:haybale", { is_ground_content = false, on_place = mcl_util.rotate_axis, groups = {oddly_breakable_by_hand=3,flammable=2, building_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_core:bone_block", { @@ -460,7 +460,7 @@ minetest.register_node("mcl_core:bone_block", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {cracky=2, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:sea_lantern", { @@ -479,7 +479,7 @@ minetest.register_node("mcl_core:sea_lantern", { }, tiles = {{name="default_sea_lantern.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.25}}}, groups = {oddly_breakable_by_hand=3, building_block=1}, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), }) minetest.register_node("mcl_core:prismarine", { @@ -488,7 +488,7 @@ minetest.register_node("mcl_core:prismarine", { is_ground_content = false, tiles = {{name="default_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}}, groups = {cracky=3, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:prismarine_brick", { @@ -497,7 +497,7 @@ minetest.register_node("mcl_core:prismarine_brick", { is_ground_content = false, tiles = {"default_prismarine_bricks.png"}, groups = {cracky=2, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:prismarine_dark", { @@ -506,7 +506,7 @@ minetest.register_node("mcl_core:prismarine_dark", { is_ground_content = false, tiles = {"default_prismarine_dark.png"}, groups = {cracky=2, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) @@ -520,7 +520,7 @@ minetest.register_node("mcl_core:tree", { on_place = mcl_util.rotate_axis, stack_max = 64, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2, building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:sapling", { @@ -538,7 +538,7 @@ minetest.register_node("mcl_core:sapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_core:leaves", { @@ -564,7 +564,7 @@ minetest.register_node("mcl_core:leaves", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) -- Dark oak tree -- @@ -575,7 +575,7 @@ minetest.register_node("mcl_core:darktree", { on_place = mcl_util.rotate_axis, stack_max = 64, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:darksapling", { @@ -593,7 +593,7 @@ minetest.register_node("mcl_core:darksapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_core:darkleaves", { @@ -619,7 +619,7 @@ minetest.register_node("mcl_core:darkleaves", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) -- Jungle Tree -- @@ -631,7 +631,7 @@ minetest.register_node("mcl_core:jungletree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:junglewood", { @@ -640,7 +640,7 @@ minetest.register_node("mcl_core:junglewood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:jungleleaves", { @@ -660,7 +660,7 @@ minetest.register_node("mcl_core:jungleleaves", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_core:junglesapling", { @@ -678,7 +678,7 @@ minetest.register_node("mcl_core:junglesapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) @@ -691,7 +691,7 @@ minetest.register_node("mcl_core:acaciatree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:acaciawood", { @@ -700,7 +700,7 @@ minetest.register_node("mcl_core:acaciawood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:acacialeaves", { @@ -720,7 +720,7 @@ minetest.register_node("mcl_core:acacialeaves", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_core:acaciasapling", { @@ -738,7 +738,7 @@ minetest.register_node("mcl_core:acaciasapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) -- Spruce Tree -- @@ -750,7 +750,7 @@ minetest.register_node("mcl_core:sprucetree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:sprucewood", { @@ -759,7 +759,7 @@ minetest.register_node("mcl_core:sprucewood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:spruceleaves", { @@ -785,7 +785,7 @@ minetest.register_node("mcl_core:spruceleaves", { } } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_core:sprucesapling", { @@ -803,7 +803,7 @@ minetest.register_node("mcl_core:sprucesapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_core:birchtree", { @@ -813,7 +813,7 @@ minetest.register_node("mcl_core:birchtree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:birchwood", { @@ -822,7 +822,7 @@ minetest.register_node("mcl_core:birchwood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:birchleaves", { @@ -843,7 +843,7 @@ minetest.register_node("mcl_core:birchleaves", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_core:birchsapling", { @@ -861,7 +861,7 @@ minetest.register_node("mcl_core:birchsapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_core:cactus", { @@ -871,7 +871,7 @@ minetest.register_node("mcl_core:cactus", { is_ground_content = true, stack_max = 64, groups = {oddly_breakable_by_hand=2,deco_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), paramtype = "light", node_box = { type = "fixed", @@ -920,7 +920,7 @@ minetest.register_node("mcl_core:reeds", { }, stack_max = 64, groups = {dig_immediate=3,craftitem=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) @@ -929,7 +929,7 @@ minetest.register_node("mcl_core:bedrock", { tiles = {"default_bedrock.png"}, stack_max = 64, groups = {oddly_breakable_by_hand=5,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), is_ground_content = false, on_blast = function() end, drop = '', @@ -966,7 +966,7 @@ minetest.register_node("mcl_core:glass", { sunlight_propagates = true, stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=3,building_block=1}, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), drop = "", }) @@ -1004,7 +1004,7 @@ minetest.register_node("mcl_core:rail", { }, stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=3,attached_node=1,rail=1,connect_to_raillike=1,dig_by_water=1,transport=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_core:ladder", { @@ -1026,7 +1026,7 @@ minetest.register_node("mcl_core:ladder", { }, stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=3,deco_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -1047,7 +1047,7 @@ minetest.register_node("mcl_core:vine", { }, stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=3,flammable=2,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), drop = "", after_dig_node = function(pos, oldnode, oldmetadata, user) local item = user:get_wielded_item() @@ -1078,7 +1078,7 @@ minetest.register_node("mcl_core:wood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:darkwood", { @@ -1087,7 +1087,7 @@ minetest.register_node("mcl_core:darkwood", { stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_core:water_flowing", { @@ -1243,7 +1243,7 @@ minetest.register_node("mcl_core:cobble", { is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=2, building_block=1, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:mossycobble", { @@ -1252,7 +1252,7 @@ minetest.register_node("mcl_core:mossycobble", { is_ground_content = true, stack_max = 64, groups = {cracky=3, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:coalblock", { @@ -1261,7 +1261,7 @@ minetest.register_node("mcl_core:coalblock", { is_ground_content = false, stack_max = 64, groups = {cracky=2, flammable=1, building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:steelblock", { @@ -1270,7 +1270,7 @@ minetest.register_node("mcl_core:steelblock", { is_ground_content = false, stack_max = 64, groups = {cracky=1,level=2,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:goldblock", { @@ -1279,7 +1279,7 @@ minetest.register_node("mcl_core:goldblock", { is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:diamondblock", { @@ -1288,7 +1288,7 @@ minetest.register_node("mcl_core:diamondblock", { is_ground_content = false, stack_max = 64, groups = {cracky=1,level=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:lapisblock", { @@ -1297,7 +1297,7 @@ minetest.register_node("mcl_core:lapisblock", { is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:emeraldblock", { @@ -1306,14 +1306,14 @@ minetest.register_node("mcl_core:emeraldblock", { is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_core:obsidian", { description = "Obsidian", tiles = {"default_obsidian.png"}, is_ground_content = true, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), stack_max = 64, groups = {cracky=4,level=2,oddly_breakable_by_hand=4,building_block=1}, }) @@ -1342,7 +1342,7 @@ minetest.register_node("mcl_core:dry_shrub", { }, } }, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = {-1/3, -1/2, -1/3, 1/3, 1/6, 1/3}, @@ -1369,7 +1369,7 @@ minetest.register_node("mcl_core:grass", { buildable_to = true, is_ground_content = true, groups = {snappy=3,flammable=3,attached_node=1,dig_immediate=3,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), after_dig_node = function(pos, oldnode, oldmetadata, user) local item = user:get_wielded_item() if item:get_name() == "mcl_core:shears" then @@ -1389,7 +1389,7 @@ minetest.register_node("mcl_core:sponge", { diggable = true, buildable_to = false, stack_max = 64, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,building_block=1}, on_place = function(itemstack, placer, pointed_thing) local pn = placer:get_player_name() @@ -1470,7 +1470,7 @@ minetest.register_node("mcl_core:sponge_wet", { diggable = true, buildable_to = false, stack_max = 64, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,building_block=1}, }) @@ -1485,7 +1485,7 @@ minetest.register_node("mcl_core:ice", { stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=2,building_block=1}, drop = "", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), }) minetest.register_node("mcl_core:packed_ice", { @@ -1498,7 +1498,7 @@ minetest.register_node("mcl_core:packed_ice", { stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=2,building_block=1}, drop = "", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), }) -- Frosted Ice (4 nodes) @@ -1533,7 +1533,7 @@ for i=0,3 do stack_max = 64, groups = {cracky=2, frosted_ice=1, not_in_creative_inventory=1}, drop = "", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), on_construct = function(pos) local timer = minetest.get_node_timer(pos) timer:start(1.5) @@ -1569,7 +1569,7 @@ minetest.register_node("mcl_core:snow", { }, }, groups = {crumbly=3,falling_node=1,deco_block=1}, - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), drop = "mcl_throwing:snowball 2", @@ -1581,7 +1581,7 @@ minetest.register_node("mcl_core:snowblock", { is_ground_content = true, stack_max = 64, groups = {crumbly=3,building_block=1}, - sounds = mcl_core.node_sound_dirt_defaults({ + sounds = mcl_sounds.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), drop = "mcl_throwing:snowball 4", diff --git a/mods/mcl_end/depends.txt b/mods/mcl_end/depends.txt index 0fa73873d3..bba0414ecc 100644 --- a/mods/mcl_end/depends.txt +++ b/mods/mcl_end/depends.txt @@ -1,3 +1,3 @@ -mcl_core +mcl_sounds mcl_throwing mcl_util diff --git a/mods/mcl_end/init.lua b/mods/mcl_end/init.lua index 6cdb470c9b..cdf95aaeb8 100644 --- a/mods/mcl_end/init.lua +++ b/mods/mcl_end/init.lua @@ -4,7 +4,7 @@ minetest.register_node("mcl_end:end_stone", { tiles = {"mcl_end_end_stone.png"}, stack_max = 64, groups = {cracky=2,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:end_bricks", { @@ -13,7 +13,7 @@ minetest.register_node("mcl_end:end_bricks", { is_ground_content = false, stack_max = 64, groups = {cracky=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:purpur_block", { @@ -22,7 +22,7 @@ minetest.register_node("mcl_end:purpur_block", { is_ground_content = false, stack_max = 64, groups = {cracky=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:purpur_pillar", { @@ -33,7 +33,7 @@ minetest.register_node("mcl_end:purpur_pillar", { on_place = mcl_util.rotate_axis, tiles = {"mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar.png"}, groups = {cracky=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) local rod_box = { @@ -69,7 +69,7 @@ minetest.register_node("mcl_end:end_rod", { selection_box = rod_box, -- FIXME: Collision box does not seem to rotate correctly collision_box = rod_box, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), }) minetest.register_node("mcl_end:dragon_egg", { @@ -104,7 +104,7 @@ minetest.register_node("mcl_end:dragon_egg", { type = "regular", }, groups = { oddly_breakable_by_hand = 3, falling_node = 1, deco_block = 1, not_in_creative_inventory = 1 }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), -- TODO: Make dragon egg teleport on punching }) @@ -133,7 +133,7 @@ minetest.register_node("mcl_end:chorus_flower", { paramtype = "light", node_box = chorus_flower_box, selection_box = { type = "regular" }, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), groups = { oddly_breakable_by_hand = 3, choppy = 3, deco_block = 1 }, }) @@ -151,7 +151,7 @@ minetest.register_node("mcl_end:chorus_flower_dead", { paramtype = "light", node_box = chorus_flower_box, selection_box = { type = "regular" }, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), drop = "mcl_end:chorus_flower", groups = { oddly_breakable_by_hand = 3, choppy = 3, deco_block = 1}, }) @@ -181,7 +181,7 @@ minetest.register_node("mcl_end:chorus_plant", { }, connect_sides = { "top", "bottom", "front", "back", "left", "right" }, connects_to = {"mcl_end:chorus_plant", "mcl_end:chorus_flower", "mcl_end:chorus_flower_dead", "mcl_end:end_stone"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), -- TODO: Check drop probability drop = { items = { {items = { "mcl_end:chorus_fruit", rarity = 4 } } } }, groups = { oddly_breakable_by_hand = 3, choppy = 3, not_in_creative_inventory = 1,}, diff --git a/mods/mcl_farming/beetroot.lua b/mods/mcl_farming/beetroot.lua index c0eb3db9aa..06702bad27 100644 --- a/mods/mcl_farming/beetroot.lua +++ b/mods/mcl_farming/beetroot.lua @@ -21,7 +21,7 @@ minetest.register_node("mcl_farming:beetroot_0", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:beetroot_1", { @@ -41,7 +41,7 @@ minetest.register_node("mcl_farming:beetroot_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:beetroot_2", { @@ -61,7 +61,7 @@ minetest.register_node("mcl_farming:beetroot_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:beetroot", { @@ -85,7 +85,7 @@ minetest.register_node("mcl_farming:beetroot", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:beetroot_item", { diff --git a/mods/mcl_farming/carrots.lua b/mods/mcl_farming/carrots.lua index f8e233b5d5..91dd902043 100644 --- a/mods/mcl_farming/carrots.lua +++ b/mods/mcl_farming/carrots.lua @@ -11,7 +11,7 @@ minetest.register_node("mcl_farming:carrot_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot_2", { @@ -27,7 +27,7 @@ minetest.register_node("mcl_farming:carrot_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot_3", { @@ -43,7 +43,7 @@ minetest.register_node("mcl_farming:carrot_3", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot", { @@ -61,7 +61,7 @@ minetest.register_node("mcl_farming:carrot", { } }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:carrot_item", { diff --git a/mods/mcl_farming/depends.txt b/mods/mcl_farming/depends.txt index bba645a334..2627142958 100644 --- a/mods/mcl_farming/depends.txt +++ b/mods/mcl_farming/depends.txt @@ -1,4 +1,5 @@ mcl_core +mcl_sounds bucket mcl_wool mcl_torches diff --git a/mods/mcl_farming/melon.lua b/mods/mcl_farming/melon.lua index e2a71cca0e..265bb18afa 100644 --- a/mods/mcl_farming/melon.lua +++ b/mods/mcl_farming/melon.lua @@ -51,7 +51,7 @@ minetest.register_node("mcl_farming:melontige_1", { }, }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_2", { @@ -68,7 +68,7 @@ minetest.register_node("mcl_farming:melontige_2", { }, }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_unconnect", { @@ -79,7 +79,7 @@ minetest.register_node("mcl_farming:melontige_unconnect", { drawtype = "plantlike", tiles = {"farming_tige_end.png"}, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_r", { @@ -109,7 +109,7 @@ minetest.register_node("mcl_farming:melontige_linked_r", { "farming_tige_connnect.png^[transformFX90" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_l", { @@ -139,7 +139,7 @@ minetest.register_node("mcl_farming:melontige_linked_l", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_t", { @@ -169,7 +169,7 @@ minetest.register_node("mcl_farming:melontige_linked_t", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_b", { @@ -199,7 +199,7 @@ minetest.register_node("mcl_farming:melontige_linked_b", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:melon_seeds", { diff --git a/mods/mcl_farming/mushrooms.lua b/mods/mcl_farming/mushrooms.lua index 63dbc67044..8cb120446a 100644 --- a/mods/mcl_farming/mushrooms.lua +++ b/mods/mcl_farming/mushrooms.lua @@ -8,7 +8,7 @@ minetest.register_node("mcl_farming:mushroom_brown", { paramtype = "light", walkable = false, groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), light_source = 1, selection_box = { type = "fixed", @@ -26,7 +26,7 @@ minetest.register_node("mcl_farming:mushroom_red", { paramtype = "light", walkable = false, groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.015, 0.15 }, diff --git a/mods/mcl_farming/potatoes.lua b/mods/mcl_farming/potatoes.lua index 351de76dc7..af9c979bc4 100644 --- a/mods/mcl_farming/potatoes.lua +++ b/mods/mcl_farming/potatoes.lua @@ -11,7 +11,7 @@ minetest.register_node("mcl_farming:potato_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:potato_2", { @@ -27,7 +27,7 @@ minetest.register_node("mcl_farming:potato_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:potato", { @@ -44,7 +44,7 @@ minetest.register_node("mcl_farming:potato", { } }, groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:potato_item", { diff --git a/mods/mcl_farming/pumpkin.lua b/mods/mcl_farming/pumpkin.lua index 291ef9c4cb..acd6a4940f 100644 --- a/mods/mcl_farming/pumpkin.lua +++ b/mods/mcl_farming/pumpkin.lua @@ -22,7 +22,7 @@ minetest.register_node("mcl_farming:pumpkin_1", { }, }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkin_2", { @@ -39,7 +39,7 @@ minetest.register_node("mcl_farming:pumpkin_2", { }, }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) @@ -70,7 +70,7 @@ minetest.register_node("mcl_farming:pumpkin_face", { end end end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_unconnect", { @@ -81,7 +81,7 @@ minetest.register_node("mcl_farming:pumpkintige_unconnect", { drawtype = "plantlike", tiles = {"farming_tige_end.png"}, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) @@ -112,7 +112,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_r", { "farming_tige_connnect.png^[transformFX90" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_l", { @@ -142,7 +142,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_l", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_t", { @@ -172,7 +172,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_t", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_b", { @@ -202,7 +202,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_b", { "farming_tige_connnect.png" --front }, groups = {snappy=3, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) mcl_farming:add_plant("mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2"}, 80, 20) @@ -268,7 +268,7 @@ minetest.register_node("mcl_farming:pumpkin_face_light", { light_source = 14, tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face_light.png"}, groups = {choppy=2, oddly_breakable_by_hand=2, building_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) minetest.register_craft({ diff --git a/mods/mcl_farming/soil.lua b/mods/mcl_farming/soil.lua index 1e1377b5b5..c400f74d72 100644 --- a/mods/mcl_farming/soil.lua +++ b/mods/mcl_farming/soil.lua @@ -12,7 +12,7 @@ minetest.register_node("mcl_farming:soil", { } }, groups = { crumbly=3, not_in_creative_inventory=1, soil=2, soil_sapling=1 }, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), }) minetest.register_node("mcl_farming:soil_wet", { @@ -28,7 +28,7 @@ minetest.register_node("mcl_farming:soil_wet", { } }, groups = { crumbly=3, not_in_creative_inventory=1, soil=3, soil_sapling=1 }, - sounds = mcl_core.node_sound_dirt_defaults(), + sounds = mcl_sounds.node_sound_dirt_defaults(), }) minetest.register_abm({ diff --git a/mods/mcl_farming/wheat.lua b/mods/mcl_farming/wheat.lua index 152d7ffb62..9d390c4ba8 100644 --- a/mods/mcl_farming/wheat.lua +++ b/mods/mcl_farming/wheat.lua @@ -22,7 +22,7 @@ minetest.register_node("mcl_farming:wheat_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -49,7 +49,7 @@ minetest.register_node("mcl_farming:wheat_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -76,7 +76,7 @@ minetest.register_node("mcl_farming:wheat_3", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -111,7 +111,7 @@ minetest.register_node("mcl_farming:wheat", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { diff --git a/mods/mcl_fences/depends.txt b/mods/mcl_fences/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_fences/depends.txt +++ b/mods/mcl_fences/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_fences/init.lua b/mods/mcl_fences/init.lua index 326d68f2e4..cf454fac62 100644 --- a/mods/mcl_fences/init.lua +++ b/mods/mcl_fences/init.lua @@ -194,7 +194,7 @@ end local wood_groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,fence_wood=1} local wood_connect = {"group:fence_wood"} -local wood_sounds = mcl_core.node_sound_wood_defaults() +local wood_sounds = mcl_sounds.node_sound_wood_defaults() local woods = { {"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:wood"}, @@ -234,7 +234,7 @@ for w=1, #woods do end -- Nether Brick Fence (without fence gate!) -mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", nil, "mcl_nether_nether_brick.png", "default_fence.png", nil, {cracky=2, deco_block=1, fence_nether_brick=1}, {"group:fence_nether_brick"}, mcl_core.node_sound_stone_defaults()) +mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", nil, "mcl_nether_nether_brick.png", "default_fence.png", nil, {cracky=2, deco_block=1, fence_nether_brick=1}, {"group:fence_nether_brick"}, mcl_sounds.node_sound_stone_defaults()) minetest.register_craft({ output = 'mcl_fences:nether_brick_fence 6', diff --git a/mods/mcl_flowerpots/depends.txt b/mods/mcl_flowerpots/depends.txt index 442501faa1..f8a6e9bfd9 100644 --- a/mods/mcl_flowerpots/depends.txt +++ b/mods/mcl_flowerpots/depends.txt @@ -1,3 +1,4 @@ mcl_core +mcl_sounds mcl_farming mcl_flowers diff --git a/mods/mcl_flowerpots/nodes.lua b/mods/mcl_flowerpots/nodes.lua index 1d29855063..a46f899fdf 100644 --- a/mods/mcl_flowerpots/nodes.lua +++ b/mods/mcl_flowerpots/nodes.lua @@ -48,7 +48,7 @@ minetest.register_node("mcl_flowerpots:flower_pot", { }, inventory_image = "mcl_flowerpots_flowerpot_inventory.png", groups = {dig_immediate=3, deco_block=1, attached_node=1, flower_pot=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_rightclick = function(pos, node, clicker, itemstack) local item = clicker:get_wielded_item():get_name() for _, row in ipairs(flowers) do @@ -107,7 +107,7 @@ minetest.register_node("mcl_flowerpots:flower_pot_"..flower, { fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2} }, groups = {dig_immediate=3, attached_node=1, not_in_creative_inventory=1, flower_pot=2}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_rightclick = function(pos, item, clicker) minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, flower_node) minetest.set_node(pos, {name="mcl_flowerpots:flower_pot"}) @@ -143,7 +143,7 @@ minetest.register_node("mcl_flowerpots:flower_pot_"..flower, { fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2} }, groups = {dig_immediate=3, attached_node=1, not_in_creative_inventory=1, flower_pot=2}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_rightclick = function(pos, item, clicker) minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, flower_node) minetest.set_node(pos, {name="mcl_flowerpots:flower_pot"}) diff --git a/mods/mcl_flowers/depends.txt b/mods/mcl_flowers/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_flowers/depends.txt +++ b/mods/mcl_flowers/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_flowers/init.lua b/mods/mcl_flowers/init.lua index ed168661ae..3b0ccc4c98 100644 --- a/mods/mcl_flowers/init.lua +++ b/mods/mcl_flowers/init.lua @@ -26,7 +26,7 @@ local function add_simple_flower(name, desc, image, color) walkable = false, stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,dig_by_water=1,color=1,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), buildable_to = true, selection_box = { type = "fixed", @@ -52,7 +52,7 @@ minetest.register_node("mcl_flowers:tulip_pink", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -71,7 +71,7 @@ minetest.register_node("mcl_flowers:tulip_red", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_red=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -91,7 +91,7 @@ minetest.register_node("mcl_flowers:tulip_white", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_white=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -113,7 +113,7 @@ minetest.register_node("mcl_flowers:allium", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -134,7 +134,7 @@ minetest.register_node("mcl_flowers:peony", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -156,7 +156,7 @@ minetest.register_node("mcl_flowers:azure_bluet", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_white=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -177,7 +177,7 @@ minetest.register_node("mcl_flowers:blue_orchid", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_blue=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -198,7 +198,7 @@ minetest.register_node("mcl_flowers:fern", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -246,7 +246,7 @@ function register_large(name, desc, inv_img, bot_img, colr) --change in function ]] drop = "mcl_flowers:"..name, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,colr=1, dig_by_water=1, double_bottom =1,deco_block=1,deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 }, @@ -266,7 +266,7 @@ function register_large(name, desc, inv_img, bot_img, colr) --change in function buildable_to = true, drop = "mcl_flowers:"..name, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,colr=1, dig_by_water=1, not_in_creative_inventory = 1, double_top =1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 }, @@ -288,7 +288,7 @@ minetest.register_node("mcl_flowers:waterlily", { walkable = true, sunlight_propagates = true, groups = {dig_immediate = 3, dig_by_water = 1, deco_block=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), node_placement_prediction = "", node_box = { type = "fixed", diff --git a/mods/mcl_furnaces/depends.txt b/mods/mcl_furnaces/depends.txt index fbe5852b9c..8cee84368f 100644 --- a/mods/mcl_furnaces/depends.txt +++ b/mods/mcl_furnaces/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_craftguide diff --git a/mods/mcl_furnaces/init.lua b/mods/mcl_furnaces/init.lua index 77e6235fd8..c2d384c7ce 100644 --- a/mods/mcl_furnaces/init.lua +++ b/mods/mcl_furnaces/init.lua @@ -31,7 +31,7 @@ minetest.register_node("mcl_furnaces:furnace", { is_ground_content = false, stack_max = 64, groups = {cracky=2, deco_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", furnace_inactive_formspec) @@ -97,7 +97,7 @@ minetest.register_node("mcl_furnaces:furnace_active", { light_source = 13, drop = "mcl_furnaces:furnace", groups = {cracky=2, not_in_creative_inventory=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", furnace_inactive_formspec) diff --git a/mods/mcl_heads/depends.txt b/mods/mcl_heads/depends.txt index 315237e07b..3d96266de1 100644 --- a/mods/mcl_heads/depends.txt +++ b/mods/mcl_heads/depends.txt @@ -1 +1 @@ -mcl_core +mcl_sounds diff --git a/mods/mcl_heads/init.lua b/mods/mcl_heads/init.lua index 805958b2e2..9dc7fb6c10 100644 --- a/mods/mcl_heads/init.lua +++ b/mods/mcl_heads/init.lua @@ -29,7 +29,7 @@ local function addhead(node, desc) type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, }, }, - sounds = mcl_core.node_sound_defaults({ + sounds = mcl_sounds.node_sound_defaults({ footstep = {name="default_hard_footstep", gain=0.3} }), }) diff --git a/mods/mcl_hoppers/depends.txt b/mods/mcl_hoppers/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_hoppers/depends.txt +++ b/mods/mcl_hoppers/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_hoppers/init.lua b/mods/mcl_hoppers/init.lua index 910ee893c9..850d265461 100644 --- a/mods/mcl_hoppers/init.lua +++ b/mods/mcl_hoppers/init.lua @@ -68,7 +68,7 @@ minetest.register_node("mcl_hoppers:hopper", { minetest.log("action", player:get_player_name().. " takes stuff from mcl_hoppers at "..minetest.pos_to_string(pos)) end, - sounds = mcl_core.node_sound_metal_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), }) minetest.register_node("mcl_hoppers:hopper_side", { @@ -128,7 +128,7 @@ minetest.register_node("mcl_hoppers:hopper_side", { minetest.log("action", player:get_player_name().. " takes stuff from mcl_hoppers at "..minetest.pos_to_string(pos)) end, - sounds = mcl_core.node_sound_metal_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), }) --make mcl_hopperss suck in blocks minetest.register_abm({ @@ -516,7 +516,7 @@ minetest.register_craftitem("mcl_hoppers:hopper_item", { placed = true end if placed == true then - minetest.sound_play(mcl_core.node_sound_metal_defaults().place, { pos = pos2 }) + minetest.sound_play(mcl_sounds.node_sound_metal_defaults().place, { pos = pos2 }) if not minetest.setting_getbool("creative_mode") then itemstack:take_item() end diff --git a/mods/mcl_jukebox/depends.txt b/mods/mcl_jukebox/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_jukebox/depends.txt +++ b/mods/mcl_jukebox/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_jukebox/init.lua b/mods/mcl_jukebox/init.lua index 736e9be209..bc27d1dbdc 100644 --- a/mods/mcl_jukebox/init.lua +++ b/mods/mcl_jukebox/init.lua @@ -76,7 +76,7 @@ minetest.register_craft({ minetest.register_node("mcl_jukebox:jukebox", { description = "Jukebox", tiles = {"mcl_jukebox_top.png", "mcl_jukebox_side.png", "mcl_jukebox_side.png"}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), groups = {oddly_breakable_by_hand=1, choppy=3, deco_block=1}, on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/mods/mcl_minecarts/depends.txt b/mods/mcl_minecarts/depends.txt index 485278d763..c77c4d8db6 100644 --- a/mods/mcl_minecarts/depends.txt +++ b/mods/mcl_minecarts/depends.txt @@ -1,3 +1,4 @@ mcl_core +mcl_sounds mcl_player mesecons? diff --git a/mods/mcl_minecarts/rails.lua b/mods/mcl_minecarts/rails.lua index 532016ccff..f3975b1cdc 100644 --- a/mods/mcl_minecarts/rails.lua +++ b/mods/mcl_minecarts/rails.lua @@ -21,7 +21,7 @@ minetest.register_node("mcl_minecarts:golden_rail", { minetest.get_meta(pos):set_string("cart_acceleration", "0.5") end end, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), mesecons = { effector = { action_on = function(pos, node) diff --git a/mods/mcl_nether/depends.txt b/mods/mcl_nether/depends.txt index 9c189b0725..0e641cef1a 100644 --- a/mods/mcl_nether/depends.txt +++ b/mods/mcl_nether/depends.txt @@ -1,3 +1,3 @@ -mcl_core +mcl_sounds mcl_util walkover diff --git a/mods/mcl_nether/init.lua b/mods/mcl_nether/init.lua index f405a61e67..a7e0e57b30 100644 --- a/mods/mcl_nether/init.lua +++ b/mods/mcl_nether/init.lua @@ -14,7 +14,7 @@ minetest.register_node("mcl_nether:glowstone", { }, -- Real light level: 15 (but Minetest caps at 14) light_source = 14, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), }) minetest.register_node("mcl_nether:quartz_ore", { @@ -24,7 +24,7 @@ minetest.register_node("mcl_nether:quartz_ore", { is_ground_content = true, groups = {cracky=2,building_block=1}, drop = 'mcl_nether:quartz', - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_nether:netherrack", { @@ -33,7 +33,7 @@ minetest.register_node("mcl_nether:netherrack", { tiles = {"mcl_nether_netherrack.png"}, is_ground_content = true, groups = {cracky=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_nether:magma", { @@ -44,7 +44,7 @@ minetest.register_node("mcl_nether:magma", { light_source = 3, sunlight_propagates = false, groups = {cracky=3,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), -- From walkover mod on_walk_over = function(loc, nodeiamon, player) -- Hurt players standing on top of this block @@ -62,7 +62,7 @@ minetest.register_node("mcl_nether:soul_sand", { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.5 - 2/16, 0.5 }, }, - sounds = mcl_core.node_sound_sand_defaults(), + sounds = mcl_sounds.node_sound_sand_defaults(), -- Movement handling is done in playerplus mod }) @@ -73,7 +73,7 @@ minetest.register_node("mcl_nether:nether_brick", { tiles = {"mcl_nether_nether_brick.png"}, is_ground_content = false, groups = {cracky=2,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_nether:red_nether_brick", { @@ -83,7 +83,7 @@ minetest.register_node("mcl_nether:red_nether_brick", { tiles = {"mcl_nether_red_nether_brick.png"}, is_ground_content = false, groups = {cracky=2,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) @@ -93,7 +93,7 @@ minetest.register_node("mcl_nether:nether_wart_block", { tiles = {"mcl_nether_nether_wart_block.png"}, is_ground_content = false, groups = {oddly_breakable_by_hand=3,building_block=1}, - sounds = mcl_core.node_sound_leaves_defaults( + sounds = mcl_sounds.node_sound_leaves_defaults( { footstep={name="default_dirt_footstep", gain=0.7}, dug={name="default_dirt_footstep", gain=1.5}, @@ -107,7 +107,7 @@ minetest.register_node("mcl_nether:quartz_block", { is_ground_content = false, tiles = {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, groups = {cracky=3,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_nether:quartz_chiseled", { @@ -116,7 +116,7 @@ minetest.register_node("mcl_nether:quartz_chiseled", { is_ground_content = false, tiles = {"mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_side.png"}, groups = {cracky=3,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node("mcl_nether:quartz_pillar", { @@ -127,7 +127,7 @@ minetest.register_node("mcl_nether:quartz_pillar", { on_place = mcl_util.rotate_axis, tiles = {"mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_side.png"}, groups = {cracky=3,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) diff --git a/mods/mcl_nether/nether_wart.lua b/mods/mcl_nether/nether_wart.lua index 7dcd3e5707..b600f54b87 100644 --- a/mods/mcl_nether/nether_wart.lua +++ b/mods/mcl_nether/nether_wart.lua @@ -12,7 +12,7 @@ minetest.register_node("mcl_nether:nether_wart_0", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,attached_node=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_nether:nether_wart_1", { @@ -29,7 +29,7 @@ minetest.register_node("mcl_nether:nether_wart_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,attached_node=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_nether:nether_wart_2", { @@ -46,7 +46,7 @@ minetest.register_node("mcl_nether:nether_wart_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,attached_node=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_node("mcl_nether:nether_wart", { @@ -70,7 +70,7 @@ minetest.register_node("mcl_nether:nether_wart", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1,attached_node=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), + sounds = mcl_sounds.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_nether:nether_wart_item", { diff --git a/mods/mcl_sounds/description.txt b/mods/mcl_sounds/description.txt new file mode 100644 index 0000000000..26c21e3b1c --- /dev/null +++ b/mods/mcl_sounds/description.txt @@ -0,0 +1 @@ +This mod contains the core sounds of MineClone 2 as well as helper function for mods to access them. diff --git a/mods/mcl_sounds/init.lua b/mods/mcl_sounds/init.lua new file mode 100644 index 0000000000..1fe07dd98b --- /dev/null +++ b/mods/mcl_sounds/init.lua @@ -0,0 +1,87 @@ +-- +-- Sounds +-- + +mcl_sounds = {} + +function mcl_sounds.node_sound_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="", gain=1.0} + table.dug = table.dug or + {name="default_dug_node", gain=0.25} + table.place = table.place or + {name="default_place_node_hard", gain=1.0} + return table +end + +function mcl_sounds.node_sound_stone_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_hard_footstep", gain=0.5} + table.dug = table.dug or + {name="default_hard_footstep", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end + +-- TODO: Maybe add custom metal sounds +mcl_sounds.node_sound_metal_defaults = mcl_sounds.node_sound_stone_defaults + +function mcl_sounds.node_sound_dirt_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_dirt_footstep", gain=1.0} + table.dug = table.dug or + {name="default_dirt_footstep", gain=1.5} + table.place = table.place or + {name="default_place_node", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end + +function mcl_sounds.node_sound_sand_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_sand_footstep", gain=0.5} + table.dug = table.dug or + {name="default_sand_footstep", gain=1.0} + table.place = table.place or + {name="default_place_node", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end + +function mcl_sounds.node_sound_wood_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_wood_footstep", gain=0.5} + table.dug = table.dug or + {name="default_wood_footstep", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end + +function mcl_sounds.node_sound_leaves_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_grass_footstep", gain=0.35} + table.dug = table.dug or + {name="default_grass_footstep", gain=0.85} + table.dig = table.dig or + {name="default_dig_crumbly", gain=0.4} + table.place = table.place or + {name="default_place_node", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end + +function mcl_sounds.node_sound_glass_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_glass_footstep", gain=0.5} + table.dug = table.dug or + {name="default_break_glass", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end diff --git a/mods/mcl_sounds/mod.conf b/mods/mcl_sounds/mod.conf new file mode 100644 index 0000000000..3227e61263 --- /dev/null +++ b/mods/mcl_sounds/mod.conf @@ -0,0 +1 @@ +name = mcl_sounds diff --git a/mods/mcl_core/sounds/default_break_glass.1.ogg b/mods/mcl_sounds/sounds/default_break_glass.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_break_glass.1.ogg rename to mods/mcl_sounds/sounds/default_break_glass.1.ogg diff --git a/mods/mcl_core/sounds/default_break_glass.2.ogg b/mods/mcl_sounds/sounds/default_break_glass.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_break_glass.2.ogg rename to mods/mcl_sounds/sounds/default_break_glass.2.ogg diff --git a/mods/mcl_core/sounds/default_break_glass.3.ogg b/mods/mcl_sounds/sounds/default_break_glass.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_break_glass.3.ogg rename to mods/mcl_sounds/sounds/default_break_glass.3.ogg diff --git a/mods/mcl_core/sounds/default_cool_lava.1.ogg b/mods/mcl_sounds/sounds/default_cool_lava.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_cool_lava.1.ogg rename to mods/mcl_sounds/sounds/default_cool_lava.1.ogg diff --git a/mods/mcl_core/sounds/default_cool_lava.2.ogg b/mods/mcl_sounds/sounds/default_cool_lava.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_cool_lava.2.ogg rename to mods/mcl_sounds/sounds/default_cool_lava.2.ogg diff --git a/mods/mcl_core/sounds/default_cool_lava.3.ogg b/mods/mcl_sounds/sounds/default_cool_lava.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_cool_lava.3.ogg rename to mods/mcl_sounds/sounds/default_cool_lava.3.ogg diff --git a/mods/mcl_core/sounds/default_dig_choppy.ogg b/mods/mcl_sounds/sounds/default_dig_choppy.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dig_choppy.ogg rename to mods/mcl_sounds/sounds/default_dig_choppy.ogg diff --git a/mods/mcl_core/sounds/default_dig_cracky.ogg b/mods/mcl_sounds/sounds/default_dig_cracky.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dig_cracky.ogg rename to mods/mcl_sounds/sounds/default_dig_cracky.ogg diff --git a/mods/mcl_core/sounds/default_dig_crumbly.ogg b/mods/mcl_sounds/sounds/default_dig_crumbly.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dig_crumbly.ogg rename to mods/mcl_sounds/sounds/default_dig_crumbly.ogg diff --git a/mods/mcl_core/sounds/default_dig_dig_immediate.ogg b/mods/mcl_sounds/sounds/default_dig_dig_immediate.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dig_dig_immediate.ogg rename to mods/mcl_sounds/sounds/default_dig_dig_immediate.ogg diff --git a/mods/mcl_core/sounds/default_dig_oddly_breakable_by_hand.ogg b/mods/mcl_sounds/sounds/default_dig_oddly_breakable_by_hand.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dig_oddly_breakable_by_hand.ogg rename to mods/mcl_sounds/sounds/default_dig_oddly_breakable_by_hand.ogg diff --git a/mods/mcl_core/sounds/default_dirt_footstep.1.ogg b/mods/mcl_sounds/sounds/default_dirt_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dirt_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_dirt_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_dirt_footstep.2.ogg b/mods/mcl_sounds/sounds/default_dirt_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dirt_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_dirt_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_dug_node.1.ogg b/mods/mcl_sounds/sounds/default_dug_node.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dug_node.1.ogg rename to mods/mcl_sounds/sounds/default_dug_node.1.ogg diff --git a/mods/mcl_core/sounds/default_dug_node.2.ogg b/mods/mcl_sounds/sounds/default_dug_node.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_dug_node.2.ogg rename to mods/mcl_sounds/sounds/default_dug_node.2.ogg diff --git a/mods/mcl_core/sounds/default_glass_footstep.ogg b/mods/mcl_sounds/sounds/default_glass_footstep.ogg similarity index 100% rename from mods/mcl_core/sounds/default_glass_footstep.ogg rename to mods/mcl_sounds/sounds/default_glass_footstep.ogg diff --git a/mods/mcl_core/sounds/default_grass_footstep.1.ogg b/mods/mcl_sounds/sounds/default_grass_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_grass_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_grass_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_grass_footstep.2.ogg b/mods/mcl_sounds/sounds/default_grass_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_grass_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_grass_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_grass_footstep.3.ogg b/mods/mcl_sounds/sounds/default_grass_footstep.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_grass_footstep.3.ogg rename to mods/mcl_sounds/sounds/default_grass_footstep.3.ogg diff --git a/mods/mcl_core/sounds/default_gravel_footstep.1.ogg b/mods/mcl_sounds/sounds/default_gravel_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_gravel_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_gravel_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_gravel_footstep.2.ogg b/mods/mcl_sounds/sounds/default_gravel_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_gravel_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_gravel_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_gravel_footstep.3.ogg b/mods/mcl_sounds/sounds/default_gravel_footstep.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_gravel_footstep.3.ogg rename to mods/mcl_sounds/sounds/default_gravel_footstep.3.ogg diff --git a/mods/mcl_core/sounds/default_gravel_footstep.4.ogg b/mods/mcl_sounds/sounds/default_gravel_footstep.4.ogg similarity index 100% rename from mods/mcl_core/sounds/default_gravel_footstep.4.ogg rename to mods/mcl_sounds/sounds/default_gravel_footstep.4.ogg diff --git a/mods/mcl_core/sounds/default_hard_footstep.1.ogg b/mods/mcl_sounds/sounds/default_hard_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_hard_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_hard_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_hard_footstep.2.ogg b/mods/mcl_sounds/sounds/default_hard_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_hard_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_hard_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_hard_footstep.3.ogg b/mods/mcl_sounds/sounds/default_hard_footstep.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_hard_footstep.3.ogg rename to mods/mcl_sounds/sounds/default_hard_footstep.3.ogg diff --git a/mods/mcl_core/sounds/default_place_node.1.ogg b/mods/mcl_sounds/sounds/default_place_node.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_place_node.1.ogg rename to mods/mcl_sounds/sounds/default_place_node.1.ogg diff --git a/mods/mcl_core/sounds/default_place_node.2.ogg b/mods/mcl_sounds/sounds/default_place_node.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_place_node.2.ogg rename to mods/mcl_sounds/sounds/default_place_node.2.ogg diff --git a/mods/mcl_core/sounds/default_place_node.3.ogg b/mods/mcl_sounds/sounds/default_place_node.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_place_node.3.ogg rename to mods/mcl_sounds/sounds/default_place_node.3.ogg diff --git a/mods/mcl_core/sounds/default_place_node_hard.1.ogg b/mods/mcl_sounds/sounds/default_place_node_hard.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_place_node_hard.1.ogg rename to mods/mcl_sounds/sounds/default_place_node_hard.1.ogg diff --git a/mods/mcl_core/sounds/default_place_node_hard.2.ogg b/mods/mcl_sounds/sounds/default_place_node_hard.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_place_node_hard.2.ogg rename to mods/mcl_sounds/sounds/default_place_node_hard.2.ogg diff --git a/mods/mcl_core/sounds/default_sand_footstep.1.ogg b/mods/mcl_sounds/sounds/default_sand_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_sand_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_sand_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_sand_footstep.2.ogg b/mods/mcl_sounds/sounds/default_sand_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_sand_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_sand_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_snow_footstep.1.ogg b/mods/mcl_sounds/sounds/default_snow_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_snow_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_snow_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_snow_footstep.2.ogg b/mods/mcl_sounds/sounds/default_snow_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_snow_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_snow_footstep.2.ogg diff --git a/mods/mcl_core/sounds/default_snow_footstep.3.ogg b/mods/mcl_sounds/sounds/default_snow_footstep.3.ogg similarity index 100% rename from mods/mcl_core/sounds/default_snow_footstep.3.ogg rename to mods/mcl_sounds/sounds/default_snow_footstep.3.ogg diff --git a/mods/mcl_core/sounds/default_tool_break.ogg b/mods/mcl_sounds/sounds/default_tool_break.ogg similarity index 100% rename from mods/mcl_core/sounds/default_tool_break.ogg rename to mods/mcl_sounds/sounds/default_tool_break.ogg diff --git a/mods/mcl_core/sounds/default_wood_footstep.1.ogg b/mods/mcl_sounds/sounds/default_wood_footstep.1.ogg similarity index 100% rename from mods/mcl_core/sounds/default_wood_footstep.1.ogg rename to mods/mcl_sounds/sounds/default_wood_footstep.1.ogg diff --git a/mods/mcl_core/sounds/default_wood_footstep.2.ogg b/mods/mcl_sounds/sounds/default_wood_footstep.2.ogg similarity index 100% rename from mods/mcl_core/sounds/default_wood_footstep.2.ogg rename to mods/mcl_sounds/sounds/default_wood_footstep.2.ogg diff --git a/mods/mcl_tnt/depends.txt b/mods/mcl_tnt/depends.txt index e2279f65bf..a135c3ff71 100644 --- a/mods/mcl_tnt/depends.txt +++ b/mods/mcl_tnt/depends.txt @@ -1,2 +1,3 @@ mcl_core +mcl_sounds mcl_fire diff --git a/mods/mcl_tnt/init.lua b/mods/mcl_tnt/init.lua index 83c0a28f7f..723b01876d 100644 --- a/mods/mcl_tnt/init.lua +++ b/mods/mcl_tnt/init.lua @@ -49,7 +49,7 @@ minetest.register_node("mcl_tnt:tnt", { mesecons = {effector = { action_on = tnt.ignite }}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), }) local TNT_RANGE = 3 diff --git a/mods/mcl_torches/depends.txt b/mods/mcl_torches/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_torches/depends.txt +++ b/mods/mcl_torches/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_torches/init.lua b/mods/mcl_torches/init.lua index c7595c3ab8..7a372a15eb 100644 --- a/mods/mcl_torches/init.lua +++ b/mods/mcl_torches/init.lua @@ -122,7 +122,7 @@ mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png", }}, 14, {dig_immediate=3, torch=1, dig_by_water=1, deco_block=1}, - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) minetest.register_craft({ diff --git a/mods/mcl_walls/depends.txt b/mods/mcl_walls/depends.txt index 315237e07b..97bf510696 100644 --- a/mods/mcl_walls/depends.txt +++ b/mods/mcl_walls/depends.txt @@ -1 +1,2 @@ mcl_core +mcl_sounds diff --git a/mods/mcl_walls/init.lua b/mods/mcl_walls/init.lua index 8d952b7ab5..46601c57ac 100644 --- a/mods/mcl_walls/init.lua +++ b/mods/mcl_walls/init.lua @@ -126,7 +126,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = take }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) end @@ -145,7 +145,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = {pillar, full_blocks[1]} }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) minetest.register_node(nodename.."_21", { @@ -163,7 +163,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = {pillar, full_blocks[2]} }, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) -- Inventory item @@ -186,7 +186,7 @@ local function register_wall(nodename, name, texture, invtex) }, collisionbox = {-0.2, 0, -0.2, 0.2, 1.4, 0.2}, on_construct = update_wall, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), }) end diff --git a/mods/mcl_wool/depends.txt b/mods/mcl_wool/depends.txt index 315237e07b..3d96266de1 100644 --- a/mods/mcl_wool/depends.txt +++ b/mods/mcl_wool/depends.txt @@ -1 +1 @@ -mcl_core +mcl_sounds diff --git a/mods/mcl_wool/init.lua b/mods/mcl_wool/init.lua index 5c7916d8d6..4d7f1528d4 100644 --- a/mods/mcl_wool/init.lua +++ b/mods/mcl_wool/init.lua @@ -39,7 +39,7 @@ for _, row in ipairs(wool.dyes) do is_ground_content = false, tiles = {"wool_"..texture..".png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,wool=1,building_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mcl_wool:"..name.."_carpet", { description = desc.." Carpet", @@ -48,7 +48,7 @@ for _, row in ipairs(wool.dyes) do tiles = {"wool_"..texture..".png"}, wield_image = "wool_"..name..".png", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,carpet=1,deco_block=1}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), paramtype = "light", stack_max = 64, drawtype = "nodebox", diff --git a/mods/minetest-3d_armor/3d_armor_stand/depends.txt b/mods/minetest-3d_armor/3d_armor_stand/depends.txt index 0dd0e62156..88d41c1adf 100644 --- a/mods/minetest-3d_armor/3d_armor_stand/depends.txt +++ b/mods/minetest-3d_armor/3d_armor_stand/depends.txt @@ -1,3 +1,4 @@ 3d_armor mcl_core +mcl_sounds stairs diff --git a/mods/minetest-3d_armor/3d_armor_stand/init.lua b/mods/minetest-3d_armor/3d_armor_stand/init.lua index 92b5c07797..e9b7fd861d 100644 --- a/mods/minetest-3d_armor/3d_armor_stand/init.lua +++ b/mods/minetest-3d_armor/3d_armor_stand/init.lua @@ -95,7 +95,7 @@ minetest.register_node("3d_armor_stand:armor_stand", { fixed = {-0.5,-0.5,-0.5, 0.5,1.4,0.5} }, groups = {choppy=2, oddly_breakable_by_hand=2, deco_block=1}, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", armor_stand_formspec) diff --git a/mods/mobs/depends.txt b/mods/mobs/depends.txt index e8924953bc..6077b78d68 100644 --- a/mods/mobs/depends.txt +++ b/mods/mobs/depends.txt @@ -1,4 +1,5 @@ mcl_core +mcl_sounds invisibility? intllib? lucky_block? diff --git a/mods/mobs/spawner.lua b/mods/mobs/spawner.lua index 782f78e306..0e7a331388 100644 --- a/mods/mobs/spawner.lua +++ b/mods/mobs/spawner.lua @@ -70,7 +70,7 @@ minetest.register_node("mobs:spawner", { S("> name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] distance[1-20] y_offset[-10 to 10]")) end end, - sounds = mcl_core.node_sound_metal_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), }) -- spawner abm diff --git a/mods/redstone/mesecons/depends.txt b/mods/redstone/mesecons/depends.txt index 315237e07b..115fd33401 100644 --- a/mods/redstone/mesecons/depends.txt +++ b/mods/redstone/mesecons/depends.txt @@ -1 +1,2 @@ +mcl_sounds mcl_core diff --git a/mods/redstone/mesecons/wires.lua b/mods/redstone/mesecons/wires.lua index bc94cc64aa..82ee4e6e7e 100644 --- a/mods/redstone/mesecons/wires.lua +++ b/mods/redstone/mesecons/wires.lua @@ -123,7 +123,7 @@ for zmy=0, 1 do state = mesecon.state.off, onstate = "mesecons:wire_"..nodeid.."_on" }}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) minetest.register_node("mesecons:wire_"..nodeid.."_on", { @@ -154,7 +154,7 @@ for zmy=0, 1 do state = mesecon.state.on, offstate = "mesecons:wire_"..nodeid.."_off" }}, - sounds = mcl_core.node_sound_defaults(), + sounds = mcl_sounds.node_sound_defaults(), }) end end diff --git a/mods/redstone/mesecons_button/init.lua b/mods/redstone/mesecons_button/init.lua index 053ddb7f04..68dea8cb52 100644 --- a/mods/redstone/mesecons_button/init.lua +++ b/mods/redstone/mesecons_button/init.lua @@ -44,7 +44,7 @@ minetest.register_node("mesecons_button:button_stone_off", { minetest.sound_play("mesecons_button_push", {pos=pos}) minetest.after(1, mesecon.button_turnoff, pos) end, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.buttonlike_get @@ -70,7 +70,7 @@ minetest.register_node("mesecons_button:button_stone_on", { groups = {cracky=3, not_in_creative_inventory=1, attached_node=1, dig_by_water=1}, drop = 'mesecons_button:button_stone_off', description = "Stone Button", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.buttonlike_get @@ -101,7 +101,7 @@ minetest.register_node("mesecons_button:button_wood_off", { minetest.sound_play("mesecons_button_push", {pos=pos}) minetest.after(1, mesecon.button_turnoff, pos) end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.buttonlike_get @@ -127,7 +127,7 @@ minetest.register_node("mesecons_button:button_wood_on", { groups = {choppy=3, not_in_creative_inventory=1, attached_node=1, dig_by_water=1}, drop = 'mesecons_button:button_wood_off', description = "Wooden Button", - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.buttonlike_get diff --git a/mods/redstone/mesecons_commandblock/init.lua b/mods/redstone/mesecons_commandblock/init.lua index 95c5ca3fa0..828061b595 100644 --- a/mods/redstone/mesecons_commandblock/init.lua +++ b/mods/redstone/mesecons_commandblock/init.lua @@ -185,7 +185,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {effector = { action_on = commandblock_action_on }}, @@ -201,7 +201,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {effector = { action_off = commandblock_action_off }} diff --git a/mods/redstone/mesecons_delayer/init.lua b/mods/redstone/mesecons_delayer/init.lua index 5fae64393e..4a7a8fa110 100644 --- a/mods/redstone/mesecons_delayer/init.lua +++ b/mods/redstone/mesecons_delayer/init.lua @@ -125,7 +125,7 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), { end, delayer_time = delaytime, delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i), - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = { receptor = { diff --git a/mods/redstone/mesecons_lightstone/init.lua b/mods/redstone/mesecons_lightstone/init.lua index 74ce271a04..e6636d84a9 100644 --- a/mods/redstone/mesecons_lightstone/init.lua +++ b/mods/redstone/mesecons_lightstone/init.lua @@ -4,7 +4,7 @@ minetest.register_node("mesecons_lightstone:lightstone_off", { groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2}, is_ground_content = false, description= "Redstone Lamp", - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {effector = { action_on = function (pos, node) mesecon:swap_node(pos, "mesecons_lightstone:lightstone_on") @@ -20,7 +20,7 @@ minetest.register_node("mesecons_lightstone:lightstone_on", { is_ground_content = false, -- Real light level: 15 (Minetest caps at 14) light_source = 14, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), mesecons = {effector = { action_off = function (pos, node) mesecon:swap_node(pos, "mesecons_lightstone:lightstone_off") diff --git a/mods/redstone/mesecons_noteblock/init.lua b/mods/redstone/mesecons_noteblock/init.lua index 1ed128ab3e..1bef265b34 100644 --- a/mods/redstone/mesecons_noteblock/init.lua +++ b/mods/redstone/mesecons_noteblock/init.lua @@ -15,7 +15,7 @@ minetest.register_node("mesecons_noteblock:noteblock", { minetest.add_node(pos, {name = node.name, param2 = param2}) mesecon.noteblock_play(pos, param2) end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector = { -- play sound when activated action_on = function (pos, node) mesecon.noteblock_play(pos, node.param2) diff --git a/mods/redstone/mesecons_pistons/init.lua b/mods/redstone/mesecons_pistons/init.lua index b22dee18b3..b13b2e8565 100644 --- a/mods/redstone/mesecons_pistons/init.lua +++ b/mods/redstone/mesecons_pistons/init.lua @@ -157,7 +157,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { is_ground_content = false, after_place_node = piston_orientate, mesecons_piston = pistonspec_normal, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_get_rules @@ -186,7 +186,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { node_box = piston_on_box, selection_box = piston_on_box, mesecons_piston = pistonspec_normal, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_get_rules @@ -241,7 +241,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { is_ground_content = false, after_place_node = piston_orientate, mesecons_piston = pistonspec_sticky, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_get_rules @@ -270,7 +270,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { node_box = piston_on_box, selection_box = piston_on_box, mesecons_piston = pistonspec_sticky, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_get_rules @@ -372,7 +372,7 @@ minetest.register_node("mesecons_pistons:piston_up_normal_on", { node_box = piston_up_on_box, selection_box = piston_up_on_box, mesecons_piston = pistonspec_normal_up, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_up_rules, @@ -430,7 +430,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_off", { is_ground_content = false, drop = "mesecons_pistons:piston_sticky_off", mesecons_piston = pistonspec_sticky_up, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_up_rules, @@ -459,7 +459,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_on", { node_box = piston_up_on_box, selection_box = piston_up_on_box, mesecons_piston = pistonspec_sticky_up, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_up_rules, @@ -535,7 +535,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_off", { is_ground_content = false, drop = "mesecons_pistons:piston_normal_off", mesecons_piston = pistonspec_normal_down, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_down_rules, @@ -564,7 +564,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_on", { node_box = piston_down_on_box, selection_box = piston_down_on_box, mesecons_piston = pistonspec_normal_down, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_down_rules, @@ -618,7 +618,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_off", { is_ground_content = false, drop = "mesecons_pistons:piston_sticky_off", mesecons_piston = pistonspec_sticky_down, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_down_rules, @@ -647,7 +647,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_on", { node_box = piston_down_on_box, selection_box = piston_down_on_box, mesecons_piston = pistonspec_sticky_down, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_down_rules, diff --git a/mods/redstone/mesecons_pressureplates/init.lua b/mods/redstone/mesecons_pressureplates/init.lua index 7fcf184817..759e867f18 100644 --- a/mods/redstone/mesecons_pressureplates/init.lua +++ b/mods/redstone/mesecons_pressureplates/init.lua @@ -115,7 +115,7 @@ mesecon:register_pressure_plate( "default_wood.png", "default_wood.png", {{"group:wood", "group:wood"}}, - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) mesecon:register_pressure_plate( "mesecons_pressureplates:pressure_plate_stone_off", @@ -124,7 +124,7 @@ mesecon:register_pressure_plate( "default_stone.png", "default_stone.png", {{"mcl_core:stone", "mcl_core:stone"}}, - mcl_core.node_sound_stone_defaults()) + mcl_sounds.node_sound_stone_defaults()) minetest.register_craft({ type = "fuel", diff --git a/mods/redstone/mesecons_solarpanel/init.lua b/mods/redstone/mesecons_solarpanel/init.lua index 03ed743feb..c4643a443d 100644 --- a/mods/redstone/mesecons_solarpanel/init.lua +++ b/mods/redstone/mesecons_solarpanel/init.lua @@ -20,7 +20,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_on", { drop = "mesecons_solarpanel:solar_panel_off", description="Daylight Sensor", groups = {dig_immediate=3, not_in_creative_inventory = 1}, - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.on }}, @@ -49,7 +49,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", { }, groups = {dig_immediate=3}, description="Daylight Sensor", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.off }}, @@ -118,7 +118,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_on", { drop = "mesecons_solarpanel:solar_panel_off", groups = {dig_immediate=3, not_in_creative_inventory = 1}, description="Inverted Daylight Sensor", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.on }}, @@ -148,7 +148,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", { drop = "mesecons_solarpanel:solar_panel_off", groups = {dig_immediate=3, not_in_creative_inventory=1}, description="Inverted Daylight Sensor", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.off }}, diff --git a/mods/redstone/mesecons_torch/init.lua b/mods/redstone/mesecons_torch/init.lua index efb22aed8e..a1c2b10ba5 100644 --- a/mods/redstone/mesecons_torch/init.lua +++ b/mods/redstone/mesecons_torch/init.lua @@ -46,7 +46,7 @@ mcl_torches.register_torch("mesecon_torch_off", "Mesecon Torch (off)", "jeija_to {"jeija_torches_off.png"}, 0, {dig_immediate=3, dig_by_water=1, not_in_creative_inventory=1}, - mcl_core.node_sound_wood_defaults(), + mcl_sounds.node_sound_wood_defaults(), { mesecons = {receptor = { state = mesecon.state.off, @@ -61,7 +61,7 @@ mcl_torches.register_torch("mesecon_torch_on", "Mesecon Torch", "jeija_torches_o {"jeija_torches_on.png"}, 7, {dig_immediate=3, dig_by_water=1}, - mcl_core.node_sound_wood_defaults(), + mcl_sounds.node_sound_wood_defaults(), { mesecons = {receptor = { state = mesecon.state.on, @@ -75,7 +75,7 @@ minetest.register_node("mesecons_torch:redstoneblock", { tiles = {"default_redstone_block.png"}, stack_max = 64, groups = {cracky=1}, - sounds = mcl_core.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_stone_defaults(), is_ground_content = false, mesecons = {receptor = { state = mesecon.state.on, diff --git a/mods/redstone/mesecons_walllever/init.lua b/mods/redstone/mesecons_walllever/init.lua index 9f8c979db4..1eae7eafb2 100644 --- a/mods/redstone/mesecons_walllever/init.lua +++ b/mods/redstone/mesecons_walllever/init.lua @@ -35,7 +35,7 @@ minetest.register_node("mesecons_walllever:wall_lever_off", { mesecon:receptor_on(pos, mesecon.rules.buttonlike_get(node)) minetest.sound_play("mesecons_lever", {pos=pos}) end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {receptor = { rules = mesecon.rules.buttonlike_get, state = mesecon.state.off @@ -75,7 +75,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", { mesecon:receptor_off(pos, mesecon.rules.buttonlike_get(node)) minetest.sound_play("mesecons_lever", {pos=pos}) end, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), mesecons = {receptor = { rules = mesecon.rules.buttonlike_get, state = mesecon.state.on diff --git a/mods/signs/depends.txt b/mods/signs/depends.txt index 315237e07b..115fd33401 100644 --- a/mods/signs/depends.txt +++ b/mods/signs/depends.txt @@ -1 +1,2 @@ +mcl_sounds mcl_core diff --git a/mods/signs/init.lua b/mods/signs/init.lua index 66be9543ae..65ca403de8 100644 --- a/mods/signs/init.lua +++ b/mods/signs/init.lua @@ -202,7 +202,7 @@ minetest.register_node("signs:sign_wall", { tiles = {"signs_top.png", "signs_bottom.png", "signs_side.png", "signs_side.png", "signs_back.png", "signs_front.png"}, groups = sign_groups, stack_max = 16, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_place = function(itemstack, placer, pointed_thing) local above = pointed_thing.above @@ -277,7 +277,7 @@ minetest.register_node("signs:sign_yard", { groups = sign_groups, drop = "signs:sign_wall", stack_max = 16, - sounds = mcl_core.node_sound_wood_defaults(), + sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) construct_sign(pos) diff --git a/mods/stairs/depends.txt b/mods/stairs/depends.txt index 3dd42799b5..e49f5a7a0c 100644 --- a/mods/stairs/depends.txt +++ b/mods/stairs/depends.txt @@ -1,3 +1,4 @@ mcl_core +mcl_sounds mcl_nether mcl_end diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index b9692b6ede..447ac85981 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -229,109 +229,109 @@ stairs.register_stair("wood", "mcl_core:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_wood.png"}, "Oak Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("wood", "mcl_core:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_wood.png"}, "Oak Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_stair("junglewood", "mcl_core:junglewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_junglewood.png"}, "Jungle Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("junglewood", "mcl_core:junglewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_junglewood.png"}, "Jungle Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_stair("acaciawood", "mcl_core:acaciawood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_acaciawood.png"}, "Acacia Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("acaciawood", "mcl_core:acaciawood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_acaciawood.png"}, "Acacia Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_stair("sprucewood", "mcl_core:sprucewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_sprucewood.png"}, "Spruce Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("sprucewood", "mcl_core:sprucewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_sprucewood.png"}, "Spruce Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_stair("birchwood", "mcl_core:birchwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_planks_birch.png"}, "Birch Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("birchwood", "mcl_core:birchwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_planks_birch.png"}, "Birch Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_stair("darkwood", "mcl_core:darkwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Stairs", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("oakwood", "mcl_core:darkwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Slab", - mcl_core.node_sound_wood_defaults()) + mcl_sounds.node_sound_wood_defaults()) stairs.register_slab("stone", "mcl_core:stone", {cracky=3}, {"stairs_stone_slab_top.png", "stairs_stone_slab_top.png", "stairs_stone_slab_side.png"}, "Stone Slab", - mcl_core.node_sound_stone_defaults(), "Double Stone Slab") + mcl_sounds.node_sound_stone_defaults(), "Double Stone Slab") stairs.register_stair_and_slab("cobble", "mcl_core:cobble", {cracky=3}, {"default_cobble.png"}, "Cobblestone Stairs", "Cobblestone Slab", - mcl_core.node_sound_stone_defaults()) + mcl_sounds.node_sound_stone_defaults()) stairs.register_stair_and_slab("brick_block", "mcl_core:brick_block", {cracky=3}, {"default_brick.png"}, "Brick Stairs", "Brick Slab", - mcl_core.node_sound_stone_defaults()) + mcl_sounds.node_sound_stone_defaults()) stairs.register_stair_and_slab("sandstone", "group:sandstone", {crumbly=2,cracky=2}, {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, "Sandstone Stairs", "Sandstone Slab", - mcl_core.node_sound_stone_defaults(), "mcl_core:sandstone") + mcl_sounds.node_sound_stone_defaults(), "mcl_core:sandstone") stairs.register_stair_and_slab("redsandstone", "group:redsandstone", {crumbly=2,cracky=2}, {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, "Red Sandstone Stairs", "Red Sandstone Slab", - mcl_core.node_sound_stone_defaults(), nil, "mcl_core:redsandstone") + mcl_sounds.node_sound_stone_defaults(), nil, "mcl_core:redsandstone") stairs.register_stair_and_slab("stonebrick", "group:stonebrick", {cracky=3}, {"default_stone_brick.png"}, "Stone Bricks Stairs", "Stone Bricks Slab", - mcl_core.node_sound_stone_defaults(), nil, "mcl_core:stonebrick" + mcl_sounds.node_sound_stone_defaults(), nil, "mcl_core:stonebrick" ) stairs.register_stair_and_slab("quartzblock", "group:quartz_block", @@ -339,7 +339,7 @@ stairs.register_stair_and_slab("quartzblock", "group:quartz_block", {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, "Quartz Stairs", "Quartz Slab", - mcl_core.node_sound_stone_defaults(), nil, "mcl_nether:quartz_block" + mcl_sounds.node_sound_stone_defaults(), nil, "mcl_nether:quartz_block" ) stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick", @@ -347,7 +347,7 @@ stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick", {"mcl_nether_nether_brick.png"}, "Nether Brick Stairs", "Nether Brick Slab", - mcl_core.node_sound_stone_defaults() + mcl_sounds.node_sound_stone_defaults() ) stairs.register_stair_and_slab("purpur_block", "mcl_end:purpur_block", @@ -355,7 +355,7 @@ stairs.register_stair_and_slab("purpur_block", "mcl_end:purpur_block", {"mcl_end_purpur_block.png"}, "Purpur Stairs", "Purpur Slab", - mcl_core.node_sound_stone_defaults() + mcl_sounds.node_sound_stone_defaults() ) minetest.register_craft({ diff --git a/mods/xpanes/depends.txt b/mods/xpanes/depends.txt index 315237e07b..115fd33401 100644 --- a/mods/xpanes/depends.txt +++ b/mods/xpanes/depends.txt @@ -1 +1,2 @@ +mcl_sounds mcl_core diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index c6581e74e7..ffbd1bb643 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -152,7 +152,7 @@ local pane = function(description, node, append) textures = {"xpanes_pane_glass"..append..".png","xpanes_pane_half_glass"..append..".png","xpanes_top_glass"..append..".png"}, inventory_image = "xpanes_pane_glass"..append..".png", wield_image = "xpanes_pane_glass"..append..".png", - sounds = mcl_core.node_sound_glass_defaults(), + sounds = mcl_sounds.node_sound_glass_defaults(), groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3}, recipe = { {node, node, node}, @@ -168,7 +168,7 @@ xpanes.register_pane("bar", { inventory_image = "xpanes_pane_iron.png", wield_image = "xpanes_pane_iron.png", groups = {cracky=2}, - sounds = mcl_core.node_sound_metal_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), recipe = { {"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"}, {"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"}