properly detect and use sounds from default/mcl

crops/artichoke.lua

@@ -33,7 +33,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/asparagus.lua

@@ -35,7 +35,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/barley.lua

@@ -65,7 +65,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/beans.lua

@@ -102,7 +102,7 @@ minetest.register_node("farming:beanpole", {
 	selection_box = farming.select,
 	groups = {handy = 1, snappy = 3, flammable = 2, attached_node = 1},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 
 	on_place = function(itemstack, placer, pointed_thing)
 
@@ -195,7 +195,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1
@@ -259,7 +259,7 @@ minetest.register_node("farming:beanbush", {
 		compostability = 35, not_in_creative_inventory = 1
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 })
 
 -- mapgen

crops/beetroot.lua

@@ -56,7 +56,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/blackberry.lua

@@ -32,7 +32,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/blueberry.lua

@@ -76,7 +76,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/cabbage.lua

@@ -32,7 +32,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/carrot.lua

@@ -75,7 +75,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 

crops/chili.lua

@@ -75,7 +75,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/cocoa.lua

@@ -130,7 +130,7 @@ minetest.register_node("farming:chocolate_block", {
 	tiles = {"farming_chocolate_block.png"},
 	is_ground_content = false,
 	groups = {cracky = 2, oddly_breakable_by_hand = 2},
-	sounds = farming.sounds.node_sound_stone_defaults()
+	sounds = farming.node_sound_stone_defaults()
 })
 
 minetest.register_craft({
@@ -164,7 +164,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 
 	-- custom function to check for growing conditions, returning True when found
 	growth_check = function(pos, node_name)

crops/coffee.lua

@@ -28,7 +28,7 @@ minetest.register_node("farming:coffee_cup", {
 	groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1},
 	is_ground_content = false,
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 farming.add_eatable("farming:coffee_cup", 2)
@@ -64,7 +64,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/corn.lua

@@ -94,7 +94,7 @@ minetest.register_node("farming:bottle_ethanol", {
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
 	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 minetest.register_craft( {
@@ -130,7 +130,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/cotton.lua

@@ -25,7 +25,7 @@ minetest.register_node("farming:cotton_wild", {
 			{items = {"farming:seed_cotton"}, rarity = 1}
 		}
 	},
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16}
@@ -124,7 +124,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/cucumber.lua

@@ -36,7 +36,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/eggplant.lua

@@ -34,7 +34,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/garlic.lua

@@ -54,7 +54,7 @@ minetest.register_node("farming:garlic_braid", {
 	},
 	groups = {vessel = 1, dig_immediate = 3, flammable = 3, compostability = 65},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -97,7 +97,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/ginger.lua

@@ -33,7 +33,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/grapes.lua

@@ -99,7 +99,7 @@ minetest.register_node("farming:trellis", {
 	selection_box = farming.select,
 	groups = {handy = 1, snappy = 3, flammable = 2, attached_node = 1},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 
 	on_place = function(itemstack, placer, pointed_thing)
 
@@ -192,7 +192,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1
@@ -268,7 +268,7 @@ minetest.register_node("farming:grapebush", {
 		not_in_creative_inventory = 1, compostability = 35
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 })
 
 -- mapgen

crops/hemp.lua

@@ -54,7 +54,7 @@ minetest.register_node("farming:hemp_oil", {
 		food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
 		compostability = 45
 	},
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 minetest.register_craft( {
@@ -121,7 +121,7 @@ minetest.register_node("farming:hemp_block", {
 		compostability = 85
 	},
 	is_ground_content = false,
-	sounds =  farming.sounds.node_sound_leaves_defaults(),
+	sounds =  farming.node_sound_leaves_defaults(),
 	_mcl_hardness = 0.8,
 	_mcl_blast_resistance = 1
 })
@@ -144,7 +144,7 @@ if minetest.global_exists("stairs") then
 			{snappy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 			{"farming_hemp_block.png"},
 			"Hemp Block",
-			farming.sounds.node_sound_leaves_defaults())
+			farming.node_sound_leaves_defaults())
 	else
 
 		stairs.register_stair_and_slab("hemp_block", "farming:hemp_block",
@@ -152,7 +152,7 @@ if minetest.global_exists("stairs") then
 			{"farming_hemp_block.png"},
 			"Hemp Block Stair",
 			"Hemp Block Slab",
-			farming.sounds.node_sound_leaves_defaults())
+			farming.node_sound_leaves_defaults())
 	end
 end
 
@@ -190,7 +190,7 @@ minetest.register_node("farming:hemp_rope", {
 		oddly_breakable_by_hand = 3, compostability = 55
 	},
 	is_ground_content = false,
-	sounds =  farming.sounds.node_sound_leaves_defaults(),
+	sounds =  farming.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
@@ -226,7 +226,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/lettuce.lua

@@ -31,7 +31,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/melon.lua

@@ -47,7 +47,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1
@@ -91,7 +91,7 @@ minetest.register_node("farming:melon_8", {
 	},
 	is_ground_content = false,
 	drop = "farming:melon_8",
-	sounds = farming.sounds.node_sound_wood_defaults(),
+	sounds = farming.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
 	on_place = minetest.rotate_node,
 	_mcl_hardness = 0.8,

crops/mint.lua

@@ -73,7 +73,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/onion.lua

@@ -69,7 +69,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/parsley.lua

@@ -33,7 +33,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/peas.lua

@@ -59,7 +59,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/pepper.lua

@@ -67,7 +67,7 @@ minetest.register_node("farming:pepper_ground", {
 		dig_immediate = 3, attached_node = 1, compostability = 30
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_defaults(),
+	sounds = farming.node_sound_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
@@ -103,7 +103,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/pineapple.lua

@@ -102,7 +102,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/potato.lua

@@ -79,7 +79,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/pumpkin.lua

@@ -48,7 +48,7 @@ minetest.register_node("farming:jackolantern", {
 		handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_wood_defaults(),
+	sounds = farming.node_sound_wood_defaults(),
 	on_punch = function(pos, node, puncher)
 		local name = puncher:get_player_name() or ""
 		if minetest.is_protected(pos, name) then return end
@@ -75,7 +75,7 @@ minetest.register_node("farming:jackolantern_on", {
 		not_in_creative_inventory = 1
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_wood_defaults(),
+	sounds = farming.node_sound_wood_defaults(),
 	drop = "farming:jackolantern",
 	on_punch = function(pos, node, puncher)
 		local name = puncher:get_player_name() or ""
@@ -171,7 +171,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1
@@ -215,7 +215,7 @@ minetest.register_node("farming:pumpkin_8", {
 	},
 	is_ground_content = false,
 	drop = "farming:pumpkin_8",
-	sounds = farming.sounds.node_sound_wood_defaults(),
+	sounds = farming.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
 	on_place = minetest.rotate_node,
 	_mcl_hardness = 0.8,

crops/raspberry.lua

@@ -53,7 +53,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/rhubarb.lua

@@ -54,7 +54,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 	minlight = 10,
 	maxlight = 12
 }

crops/rice.lua

@@ -95,7 +95,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/soy.lua

@@ -33,7 +33,7 @@ minetest.register_node("farming:soy_sauce", {
 		compostability = 65
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 -- soy sauce recipe
@@ -68,7 +68,7 @@ minetest.register_node("farming:soy_milk", {
 		attached_node = 1, drink = 1, compostability = 65
 	},
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 farming.add_eatable("farming:soy_milk", 2)
@@ -143,7 +143,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/spinach.lua

@@ -33,7 +33,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/strawberry.lua

@@ -36,7 +36,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 --stage 1

crops/sunflower.lua

@@ -80,7 +80,7 @@ minetest.register_node("farming:sunflower_oil", {
 		food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
 		flammable = 2, compostability = 65
 	},
-	sounds = farming.sounds.node_sound_glass_defaults()
+	sounds = farming.node_sound_glass_defaults()
 })
 
 minetest.register_craft( {
@@ -137,7 +137,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/tomato.lua

@@ -55,7 +55,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1

crops/vanilla.lua

@@ -34,7 +34,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- vanilla extract
@@ -52,7 +52,7 @@ minetest.register_node("farming:vanilla_extract", {
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
 	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
-	sounds = farming.sounds.node_sound_glass_defaults(),
+	sounds = farming.node_sound_glass_defaults(),
 })
 
 minetest.register_craft( {

crops/wheat.lua

@@ -41,7 +41,7 @@ minetest.register_node("farming:straw", {
 	tiles = {"farming_straw.png"},
 	is_ground_content = false,
 	groups = {handy = 1, snappy = 3, flammable = 4, fall_damage_add_percent = -30},
-	sounds = farming.sounds.node_sound_leaves_defaults(),
+	sounds = farming.node_sound_leaves_defaults(),
 	_mcl_hardness = 0.8,
 	_mcl_blast_resistance = 1
 })
@@ -69,7 +69,7 @@ if minetest.global_exists("stairs") then
 			{snappy = 3, flammable = 4},
 			{"farming_straw.png"},
 			"Straw",
-			farming.sounds.node_sound_leaves_defaults())
+			farming.node_sound_leaves_defaults())
 	else
 
 		stairs.register_stair_and_slab("straw", "farming:straw",
@@ -77,7 +77,7 @@ if minetest.global_exists("stairs") then
 			{"farming_straw.png"},
 			"Straw Stair",
 			"Straw Slab",
-			farming.sounds.node_sound_leaves_defaults())
+			farming.node_sound_leaves_defaults())
 	end
 end
 
@@ -133,7 +133,7 @@ local def = {
 	},
 	_mcl_hardness = farming.mcl_hardness,
 	is_ground_content = false,
-	sounds = farming.sounds.node_sound_leaves_defaults()
+	sounds = farming.node_sound_leaves_defaults()
 }
 
 -- stage 1