Junglegrass: Prevent seeding of dirt_with_grass
[oweals/minetest_game.git] / mods / default / nodes.lua
index b37f11320c9db5c139729a618c2e990f30c1bad4..c20a3a887061e2cc48ea9bf73e69d3fa0e4d2ffc 100644 (file)
@@ -30,6 +30,12 @@ default:desert_stone_block
 default:sandstone
 default:sandstonebrick
 default:sandstone_block
+default:desert_sandstone
+default:desert_sandstone_brick
+default:desert_sandstone_block
+default:silver_sandstone
+default:silver_sandstone_brick
+default:silver_sandstone_block
 
 default:obsidian
 default:obsidianbrick
@@ -44,6 +50,7 @@ default:dirt_with_grass
 default:dirt_with_grass_footsteps
 default:dirt_with_dry_grass
 default:dirt_with_snow
+default:dirt_with_rainforest_litter
 
 default:sand
 default:desert_sand
@@ -159,8 +166,6 @@ default:lava_flowing
 Tools / "Advanced" crafting / Non-"natural"
 -------------------------------------------
 
-default:torch
-
 default:chest
 default:chest_locked
 
@@ -181,11 +186,10 @@ default:fence_aspen_wood
 default:glass
 default:obsidian_glass
 
-default:rail
-
 default:brick
 
 default:meselamp
+default:mese_post_light
 
 Misc
 ----
@@ -277,7 +281,6 @@ minetest.register_node("default:desert_stone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:sandstone", {
        description = "Sandstone",
        tiles = {"default_sandstone.png"},
@@ -303,6 +306,55 @@ minetest.register_node("default:sandstone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_sandstone", {
+       description = "Desert Sandstone",
+       tiles = {"default_desert_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_brick", {
+       description = "Desert Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_desert_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_block", {
+       description = "Desert Sandstone Block",
+       tiles = {"default_desert_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone", {
+       description = "Silver Sandstone",
+       tiles = {"default_silver_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_brick", {
+       description = "Silver Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_silver_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_block", {
+       description = "Silver Sandstone Block",
+       tiles = {"default_silver_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
 
 minetest.register_node("default:obsidian", {
        description = "Obsidian",
@@ -382,13 +434,28 @@ minetest.register_node("default:dirt_with_snow", {
        tiles = {"default_snow.png", "default_dirt.png",
                {name = "default_dirt.png^default_snow_side.png",
                        tileable_vertical = false}},
-       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1, snowy = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
        }),
 })
 
+minetest.register_node("default:dirt_with_rainforest_litter", {
+       description = "Dirt with Rainforest Litter",
+       tiles = {
+               "default_rainforest_litter.png",
+               "default_dirt.png",
+               {name = "default_dirt.png^default_rainforest_litter_side.png",
+                       tileable_vertical = false}
+       },
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+       drop = "default:dirt",
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_grass_footstep", gain = 0.4},
+       }),
+})
+
 minetest.register_node("default:sand", {
        description = "Sand",
        tiles = {"default_sand.png"},
@@ -442,7 +509,6 @@ minetest.register_node("default:snow", {
        paramtype = "light",
        buildable_to = true,
        floodable = true,
-       walkable = false,
        drawtype = "nodebox",
        node_box = {
                type = "fixed",
@@ -450,7 +516,7 @@ minetest.register_node("default:snow", {
                        {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
                },
        },
-       groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
+       groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1, snowy = 1},
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
                dug = {name = "default_snow_footstep", gain = 0.2},
@@ -468,12 +534,19 @@ minetest.register_node("default:snow", {
 minetest.register_node("default:snowblock", {
        description = "Snow Block",
        tiles = {"default_snow.png"},
-       groups = {crumbly = 3, puts_out_fire = 1},
+       groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1},
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
                dug = {name = "default_snow_footstep", gain = 0.2},
                dig = {name = "default_snow_footstep", gain = 0.2}
        }),
+
+       on_construct = function(pos)
+               pos.y = pos.y - 1
+               if minetest.get_node(pos).name == "default:dirt_with_grass" then
+                       minetest.set_node(pos, {name = "default:dirt_with_snow"})
+               end
+       end,
 })
 
 minetest.register_node("default:ice", {
@@ -481,7 +554,7 @@ minetest.register_node("default:ice", {
        tiles = {"default_ice.png"},
        is_ground_content = false,
        paramtype = "light",
-       groups = {cracky = 3, puts_out_fire = 1},
+       groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1},
        sounds = default.node_sound_glass_defaults(),
 })
 
@@ -513,7 +586,6 @@ minetest.register_node("default:wood", {
 minetest.register_node("default:sapling", {
        description = "Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_sapling.png"},
        inventory_image = "default_sapling.png",
        wield_image = "default_sapling.png",
@@ -579,7 +651,6 @@ minetest.register_node("default:leaves", {
 minetest.register_node("default:apple", {
        description = "Apple",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_apple.png"},
        inventory_image = "default_apple.png",
        paramtype = "light",
@@ -649,7 +720,6 @@ minetest.register_node("default:jungleleaves", {
 minetest.register_node("default:junglesapling", {
        description = "Jungle Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_junglesapling.png"},
        inventory_image = "default_junglesapling.png",
        wield_image = "default_junglesapling.png",
@@ -729,7 +799,6 @@ minetest.register_node("default:pine_needles",{
 minetest.register_node("default:pine_sapling", {
        description = "Pine Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_pine_sapling.png"},
        inventory_image = "default_pine_sapling.png",
        wield_image = "default_pine_sapling.png",
@@ -790,6 +859,7 @@ minetest.register_node("default:acacia_leaves", {
        description = "Acacia Leaves",
        drawtype = "allfaces_optional",
        tiles = {"default_acacia_leaves.png"},
+       special_tiles = {"default_acacia_leaves_simple.png"},
        waving = 1,
        paramtype = "light",
        is_ground_content = false,
@@ -809,7 +879,6 @@ minetest.register_node("default:acacia_leaves", {
 minetest.register_node("default:acacia_sapling", {
        description = "Acacia Tree Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_acacia_sapling.png"},
        inventory_image = "default_acacia_sapling.png",
        wield_image = "default_acacia_sapling.png",
@@ -888,7 +957,6 @@ minetest.register_node("default:aspen_leaves", {
 minetest.register_node("default:aspen_sapling", {
        description = "Aspen Tree Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_aspen_sapling.png"},
        inventory_image = "default_aspen_sapling.png",
        wield_image = "default_aspen_sapling.png",
@@ -1045,7 +1113,7 @@ minetest.register_node("default:cactus", {
        tiles = {"default_cactus_top.png", "default_cactus_top.png",
                "default_cactus_side.png"},
        paramtype2 = "facedir",
-       groups = {snappy = 1, choppy = 3},
+       groups = {choppy = 3},
        sounds = default.node_sound_wood_defaults(),
        on_place = minetest.rotate_node,
 })
@@ -1075,7 +1143,6 @@ minetest.register_node("default:dry_shrub", {
        description = "Dry Shrub",
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.0,
        tiles = {"default_dry_shrub.png"},
        inventory_image = "default_dry_shrub.png",
        wield_image = "default_dry_shrub.png",
@@ -1095,7 +1162,7 @@ minetest.register_node("default:junglegrass", {
        description = "Jungle Grass",
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.3,
+       visual_scale = 1.69,
        tiles = {"default_junglegrass.png"},
        inventory_image = "default_junglegrass.png",
        wield_image = "default_junglegrass.png",
@@ -1103,7 +1170,7 @@ minetest.register_node("default:junglegrass", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1},
+       groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -1219,7 +1286,7 @@ end
 minetest.register_node("default:bush_stem", {
        description = "Bush Stem",
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_bush_stem.png"},
        inventory_image = "default_bush_stem.png",
        wield_image = "default_bush_stem.png",
@@ -1241,12 +1308,14 @@ minetest.register_node("default:bush_leaves", {
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:acacia_bush_stem", {
        description = "Acacia Bush Stem",
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_acacia_bush_stem.png"},
        inventory_image = "default_acacia_bush_stem.png",
        wield_image = "default_acacia_bush_stem.png",
@@ -1264,10 +1333,12 @@ minetest.register_node("default:acacia_bush_leaves", {
        description = "Acacia Bush Leaves",
        drawtype = "allfaces_optional",
        waving = 1,
-       tiles = {"default_acacia_leaves.png"},
+       tiles = {"default_acacia_leaves_simple.png"},
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = default.after_place_leaves,
 })
 
 
@@ -1344,7 +1415,8 @@ minetest.register_node("default:water_source", {
        liquid_alternative_source = "default:water_source",
        liquid_viscosity = 1,
        post_effect_color = {a = 103, r = 30, g = 60, b = 90},
-       groups = {water = 3, liquid = 3, puts_out_fire = 1},
+       groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1},
+       sounds = default.node_sound_water_defaults(),
 })
 
 minetest.register_node("default:water_flowing", {
@@ -1389,7 +1461,8 @@ minetest.register_node("default:water_flowing", {
        liquid_viscosity = 1,
        post_effect_color = {a = 103, r = 30, g = 60, b = 90},
        groups = {water = 3, liquid = 3, puts_out_fire = 1,
-               not_in_creative_inventory = 1},
+               not_in_creative_inventory = 1, cools_lava = 1},
+       sounds = default.node_sound_water_defaults(),
 })
 
 
@@ -1435,7 +1508,8 @@ minetest.register_node("default:river_water_source", {
        liquid_renewable = false,
        liquid_range = 2,
        post_effect_color = {a = 103, r = 30, g = 76, b = 90},
-       groups = {water = 3, liquid = 3, puts_out_fire = 1},
+       groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1},
+       sounds = default.node_sound_water_defaults(),
 })
 
 minetest.register_node("default:river_water_flowing", {
@@ -1482,7 +1556,8 @@ minetest.register_node("default:river_water_flowing", {
        liquid_range = 2,
        post_effect_color = {a = 103, r = 30, g = 76, b = 90},
        groups = {water = 3, liquid = 3, puts_out_fire = 1,
-               not_in_creative_inventory = 1},
+               not_in_creative_inventory = 1, cools_lava = 1},
+       sounds = default.node_sound_water_defaults(),
 })
 
 
@@ -1583,58 +1658,6 @@ minetest.register_node("default:lava_flowing", {
 -- Tools / "Advanced" crafting / Non-"natural"
 --
 
-minetest.register_node("default:torch", {
-       description = "Torch",
-       drawtype = "torchlike",
-       tiles = {
-               {
-                       name = "default_torch_on_floor_animated.png",
-                       animation = {
-                               type = "vertical_frames",
-                               aspect_w = 16,
-                               aspect_h = 16,
-                               length = 3.0
-                       },
-               },
-               {
-                       name="default_torch_on_ceiling_animated.png",
-                       animation = {
-                               type = "vertical_frames",
-                               aspect_w = 16,
-                               aspect_h = 16,
-                               length = 3.0
-                       },
-               },
-               {
-                       name="default_torch_animated.png",
-                       animation = {
-                               type = "vertical_frames",
-                               aspect_w = 16,
-                               aspect_h = 16,
-                               length = 3.0
-                       },
-               },
-       },
-       inventory_image = "default_torch_on_floor.png",
-       wield_image = "default_torch_on_floor.png",
-       paramtype = "light",
-       paramtype2 = "wallmounted",
-       sunlight_propagates = true,
-       is_ground_content = false,
-       walkable = false,
-       light_source = default.LIGHT_MAX - 1,
-       selection_box = {
-               type = "wallmounted",
-               wall_top = {-0.1, 0.5 - 0.6, -0.1, 0.1, 0.5, 0.1},
-               wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5 + 0.6, 0.1},
-               wall_side = {-0.5, -0.3, -0.1, -0.5 + 0.3, 0.3, 0.1},
-       },
-       groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1},
-       legacy_wallmounted = true,
-       sounds = default.node_sound_defaults(),
-})
-
-
 local chest_formspec =
        "size[8,9]" ..
        default.gui_bg ..
@@ -1663,20 +1686,6 @@ local function get_locked_chest_formspec(pos)
  return formspec
 end
 
-local function has_locked_chest_privilege(meta, player)
-       local name = ""
-       if player then
-               if minetest.check_player_privs(player, "protection_bypass") then
-                       return true
-               end
-               name = player:get_player_name()
-       end
-       if name ~= meta:get_string("owner") then
-               return false
-       end
-       return true
-end
-
 minetest.register_node("default:chest", {
        description = "Chest",
        tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
@@ -1747,26 +1756,23 @@ minetest.register_node("default:chest_locked", {
        can_dig = function(pos,player)
                local meta = minetest.get_meta(pos);
                local inv = meta:get_inventory()
-               return inv:is_empty("main") and has_locked_chest_privilege(meta, player)
+               return inv:is_empty("main") and default.can_interact_with_node(player, pos)
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index,
                        to_list, to_index, count, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return count
        end,
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return stack:get_count()
        end,
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return stack:get_count()
@@ -1782,8 +1788,7 @@ minetest.register_node("default:chest_locked", {
                        " from locked chest at " .. minetest.pos_to_string(pos))
        end,
        on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               local meta = minetest.get_meta(pos)
-               if has_locked_chest_privilege(meta, clicker) then
+               if default.can_interact_with_node(clicker, pos) then
                        minetest.show_formspec(
                                clicker:get_player_name(),
                                "default:chest_locked",
@@ -1793,6 +1798,46 @@ minetest.register_node("default:chest_locked", {
                return itemstack
        end,
        on_blast = function() end,
+       on_key_use = function(pos, player)
+               local secret = minetest.get_meta(pos):get_string("key_lock_secret")
+               local itemstack = player:get_wielded_item()
+               local key_meta = itemstack:get_meta()
+
+               if key_meta:get_string("secret") == "" then
+                       key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret)
+                       itemstack:set_metadata("")
+               end
+
+               if secret ~= key_meta:get_string("secret") then
+                       return
+               end
+
+               minetest.show_formspec(
+                       player:get_player_name(),
+                       "default:chest_locked",
+                       get_locked_chest_formspec(pos)
+               )
+       end,
+       on_skeleton_key_use = function(pos, player, newsecret)
+               local meta = minetest.get_meta(pos)
+               local owner = meta:get_string("owner")
+               local name = player:get_player_name()
+
+               -- verify placer is owner of lockable chest
+               if owner ~= name then
+                       minetest.record_protection_violation(pos, name)
+                       minetest.chat_send_player(name, "You do not own this chest.")
+                       return nil
+               end
+
+               local secret = meta:get_string("key_lock_secret")
+               if secret == "" then
+                       secret = newsecret
+                       meta:set_string("key_lock_secret", secret)
+               end
+
+               return secret, "a locked chest", owner
+       end,
 })
 
 
@@ -1808,16 +1853,23 @@ local bookshelf_formspec =
        "listring[current_player;main]" ..
        default.get_hotbar_bg(0,2.85)
 
--- Inventory slots overlay
-local bx, by = 0, 0.3
-for i = 1, 16 do
-       if i == 9 then
-               bx = 0
-               by = by + 1
+local function get_bookshelf_formspec(inv)
+       local formspec = bookshelf_formspec
+       local invlist = inv and inv:get_list("books")
+       -- Inventory slots overlay
+       local bx, by = 0, 0.3
+       for i = 1, 16 do
+               if i == 9 then
+                       bx = 0
+                       by = by + 1
+               end
+               if not invlist or invlist[i]:is_empty() then
+                       formspec = formspec ..
+                               "image[" .. bx .. "," .. by .. ";1,1;default_bookshelf_slot.png]"
+               end
+               bx = bx + 1
        end
-       bookshelf_formspec = bookshelf_formspec ..
-               "image["..bx..","..by..";1,1;default_book_slot.png]"
-       bx = bx + 1
+       return formspec
 end
 
 minetest.register_node("default:bookshelf", {
@@ -1831,7 +1883,7 @@ minetest.register_node("default:bookshelf", {
 
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", bookshelf_formspec)
+               meta:set_string("formspec", get_bookshelf_formspec(nil))
                local inv = meta:get_inventory()
                inv:set_size("books", 8 * 2)
        end,
@@ -1848,14 +1900,20 @@ minetest.register_node("default:bookshelf", {
        on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
                minetest.log("action", player:get_player_name() ..
                        " moves stuff in bookshelf at " .. minetest.pos_to_string(pos))
+               local meta = minetest.get_meta(pos)
+               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
        end,
        on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
                        " moves stuff to bookshelf at " .. minetest.pos_to_string(pos))
+               local meta = minetest.get_meta(pos)
+               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
        end,
        on_metadata_inventory_take = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
                        " takes stuff from bookshelf at " .. minetest.pos_to_string(pos))
+               local meta = minetest.get_meta(pos)
+               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
        end,
        on_blast = function(pos)
                local drops = {}
@@ -2038,27 +2096,6 @@ minetest.register_node("default:obsidian_glass", {
 })
 
 
-minetest.register_node("default:rail", {
-       description = "Rail",
-       drawtype = "raillike",
-       tiles = {"default_rail.png", "default_rail_curved.png",
-               "default_rail_t_junction.png", "default_rail_crossing.png"},
-       inventory_image = "default_rail.png",
-       wield_image = "default_rail.png",
-       paramtype = "light",
-       sunlight_propagates = true,
-       walkable = false,
-       is_ground_content = false,
-       selection_box = {
-               type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-       },
-       groups = {dig_immediate = 2, attached_node = 1,
-               connect_to_raillike = minetest.raillike_group("rail")},
-})
-
-
 minetest.register_node("default:brick", {
        description = "Brick Block",
        paramtype2 = "facedir",
@@ -2082,6 +2119,27 @@ minetest.register_node("default:meselamp", {
        light_source = default.LIGHT_MAX,
 })
 
+minetest.register_node("default:mese_post_light", {
+       description = "Mese Post Light",
+       tiles = {"default_mese_post_light_top.png", "default_mese_post_light_top.png",
+               "default_mese_post_light_side_dark.png", "default_mese_post_light_side_dark.png",
+               "default_mese_post_light_side.png", "default_mese_post_light_side.png"},
+       wield_image = "default_mese_post_light_side.png",
+       drawtype = "nodebox",
+       node_box = {
+               type = "fixed",
+               fixed = {
+                       {-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16},
+               },
+       },
+       paramtype = "light",
+       light_source = default.LIGHT_MAX,
+       sunlight_propagates = true,
+       is_ground_content = false,
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults(),
+})
+
 --
 -- Misc
 --
@@ -2093,3 +2151,69 @@ minetest.register_node("default:cloud", {
        sounds = default.node_sound_defaults(),
        groups = {not_in_creative_inventory = 1},
 })
+
+--
+-- register trees for leafdecay
+--
+
+if minetest.get_mapgen_setting("mg_name") == "v6" then
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 2,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 3,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:pine_tree"},
+               leaves = {"default:pine_needles"},
+               radius = 3,
+       })
+else
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 3,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 2,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:pine_tree"},
+               leaves = {"default:pine_needles"},
+               radius = 2,
+       })
+end
+
+default.register_leafdecay({
+       trunks = {"default:acacia_tree"},
+       leaves = {"default:acacia_leaves"},
+       radius = 2,
+})
+
+default.register_leafdecay({
+       trunks = {"default:aspen_tree"},
+       leaves = {"default:aspen_leaves"},
+       radius = 2,
+})
+
+default.register_leafdecay({
+       trunks = {"default:bush_stem"},
+       leaves = {"default:bush_leaves"},
+       radius = 1,
+})
+
+default.register_leafdecay({
+       trunks = {"default:acacia_bush_stem"},
+       leaves = {"default:acacia_bush_leaves"},
+       radius = 1,
+})