Saplings: Reduce grow time to ABM equivalent
[oweals/minetest_game.git] / mods / default / nodes.lua
index 1eb2f30524adc0e1c8456afdddc39d29e70aa9d7..701e70b644fef46f1b8c98c9972a0036cbe0aff6 100644 (file)
@@ -107,6 +107,10 @@ default:steelblock
 
 default:stone_with_copper
 default:copperblock
+
+default:stone_with_tin
+default:tinblock
+
 default:bronzeblock
 
 default:stone_with_gold
@@ -140,8 +144,10 @@ default:dry_grass_5
 
 default:bush_stem
 default:bush_leaves
+default:bush_sapling
 default:acacia_bush_stem
 default:acacia_bush_leaves
+default:acacia_bush_sapling
 
 Corals
 ------
@@ -434,7 +440,7 @@ 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, snowy = 1},
+       groups = {crumbly = 3, spreading_dirt_type = 1, snowy = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
@@ -602,7 +608,7 @@ minetest.register_node("default:sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -687,7 +693,7 @@ minetest.register_node("default:jungletree", {
 })
 
 minetest.register_node("default:junglewood", {
-       description = "Junglewood Planks",
+       description = "Jungle Wood Planks",
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_junglewood.png"},
@@ -736,7 +742,7 @@ minetest.register_node("default:junglesapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -815,7 +821,7 @@ minetest.register_node("default:pine_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -895,7 +901,7 @@ minetest.register_node("default:acacia_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -973,7 +979,7 @@ minetest.register_node("default:aspen_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -1044,6 +1050,24 @@ minetest.register_node("default:copperblock", {
        sounds = default.node_sound_metal_defaults(),
 })
 
+
+minetest.register_node("default:stone_with_tin", {
+       description = "Tin Ore",
+       tiles = {"default_stone.png^default_mineral_tin.png"},
+       groups = {cracky = 2},
+       drop = "default:tin_lump",
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:tinblock", {
+       description = "Tin Block",
+       tiles = {"default_tin_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 1, level = 2},
+       sounds = default.node_sound_metal_defaults(),
+})
+
+
 minetest.register_node("default:bronzeblock", {
        description = "Bronze Block",
        tiles = {"default_bronze_block.png"},
@@ -1170,7 +1194,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",
@@ -1296,7 +1320,7 @@ minetest.register_node("default:bush_stem", {
        sounds = default.node_sound_wood_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.54, 7 / 16},
+               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16},
        },
 })
 
@@ -1307,11 +1331,53 @@ minetest.register_node("default:bush_leaves", {
        tiles = {"default_leaves_simple.png"},
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:bush_sapling"}, rarity = 5},
+                       {items = {"default:bush_leaves"}}
+               }
+       },
        sounds = default.node_sound_leaves_defaults(),
 
        after_place_node = default.after_place_leaves,
 })
 
+minetest.register_node("default:bush_sapling", {
+       description = "Bush Sapling",
+       drawtype = "plantlike",
+       tiles = {"default_bush_sapling.png"},
+       inventory_image = "default_bush_sapling.png",
+       wield_image = "default_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = default.grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
+})
+
 minetest.register_node("default:acacia_bush_stem", {
        description = "Acacia Bush Stem",
        drawtype = "plantlike",
@@ -1325,7 +1391,7 @@ minetest.register_node("default:acacia_bush_stem", {
        sounds = default.node_sound_wood_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.54, 7 / 16},
+               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16},
        },
 })
 
@@ -1336,11 +1402,53 @@ minetest.register_node("default:acacia_bush_leaves", {
        tiles = {"default_acacia_leaves_simple.png"},
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:acacia_bush_sapling"}, rarity = 5},
+                       {items = {"default:acacia_bush_leaves"}}
+               }
+       },
        sounds = default.node_sound_leaves_defaults(),
 
        after_place_node = default.after_place_leaves,
 })
 
+minetest.register_node("default:acacia_bush_sapling", {
+       description = "Acacia Bush Sapling",
+       drawtype = "plantlike",
+       tiles = {"default_acacia_bush_sapling.png"},
+       inventory_image = "default_acacia_bush_sapling.png",
+       wield_image = "default_acacia_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = default.grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, 2 / 16, 3 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:acacia_bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
+})
+
 
 --
 -- Corals
@@ -1658,19 +1766,7 @@ minetest.register_node("default:lava_flowing", {
 -- Tools / "Advanced" crafting / Non-"natural"
 --
 
-local chest_formspec =
-       "size[8,9]" ..
-       default.gui_bg ..
-       default.gui_bg_img ..
-       default.gui_slots ..
-       "list[current_name;main;0,0.3;8,4;]" ..
-       "list[current_player;main;0,4.85;8,1;]" ..
-       "list[current_player;main;0,6.08;8,3;8]" ..
-       "listring[current_name;main]" ..
-       "listring[current_player;main]" ..
-       default.get_hotbar_bg(0,4.85)
-
-local function get_locked_chest_formspec(pos)
+local function get_chest_formspec(pos)
        local spos = pos.x .. "," .. pos.y .. "," .. pos.z
        local formspec =
                "size[8,9]" ..
@@ -1683,162 +1779,295 @@ local function get_locked_chest_formspec(pos)
                "listring[nodemeta:" .. spos .. ";main]" ..
                "listring[current_player;main]" ..
                default.get_hotbar_bg(0,4.85)
- return formspec
      return formspec
 end
 
-minetest.register_node("default:chest", {
-       description = "Chest",
-       tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-               "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
-       paramtype2 = "facedir",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2},
-       legacy_facedir_simple = true,
-       is_ground_content = false,
-       sounds = default.node_sound_wood_defaults(),
+local function chest_lid_obstructed(pos)
+       local above = {x = pos.x, y = pos.y + 1, z = pos.z}
+       local def = minetest.registered_nodes[minetest.get_node(above).name]
+       -- allow ladders, signs, wallmounted things and torches to not obstruct
+       if def and
+                       (def.drawtype == "airlike" or
+                       def.drawtype == "signlike" or
+                       def.drawtype == "torchlike" or
+                       (def.drawtype == "nodebox" and def.paramtype2 == "wallmounted")) then
+               return false
+       end
+       return true
+end
 
-       on_construct = function(pos)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", chest_formspec)
-               local inv = meta:get_inventory()
-               inv:set_size("main", 8*4)
-       end,
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos);
-               local inv = meta:get_inventory()
-               return inv:is_empty("main")
-       end,
-       on_metadata_inventory_move = function(pos, from_list, from_index,
+local open_chests = {}
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+       if formname ~= "default:chest" then
+               return
+       end
+       if not player or not fields.quit then
+               return
+       end
+       local pn = player:get_player_name()
+
+       if not open_chests[pn] then
+               return
+       end
+
+       local pos = open_chests[pn].pos
+       local sound = open_chests[pn].sound
+       local swap = open_chests[pn].swap
+       local node = minetest.get_node(pos)
+
+       open_chests[pn] = nil
+       for k, v in pairs(open_chests) do
+               if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then
+                       return true
+               end
+       end
+       minetest.after(0.2, minetest.swap_node, pos, { name = "default:" .. swap,
+                       param2 = node.param2 })
+       minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
+       return true
+end)
+
+function default.register_chest(name, d)
+       local def = table.copy(d)
+       def.drawtype = "mesh"
+       def.visual = "mesh"
+       def.paramtype = "light"
+       def.paramtype2 = "facedir"
+       def.legacy_facedir_simple = true
+       def.is_ground_content = false
+
+       if def.protected then
+               def.on_construct = function(pos)
+                       local meta = minetest.get_meta(pos)
+                       meta:set_string("infotext", "Locked Chest")
+                       meta:set_string("owner", "")
+                       local inv = meta:get_inventory()
+                       inv:set_size("main", 8*4)
+               end
+               def.after_place_node = function(pos, placer)
+                       local meta = minetest.get_meta(pos)
+                       meta:set_string("owner", placer:get_player_name() or "")
+                       meta:set_string("infotext", "Locked Chest (owned by " ..
+                                       meta:get_string("owner") .. ")")
+               end
+               def.can_dig = function(pos,player)
+                       local meta = minetest.get_meta(pos);
+                       local inv = meta:get_inventory()
+                       return inv:is_empty("main") and
+                                       default.can_interact_with_node(player, pos)
+               end
+               def.allow_metadata_inventory_move = function(pos, from_list, from_index,
+                               to_list, to_index, count, player)
+                       if not default.can_interact_with_node(player, pos) then
+                               return 0
+                       end
+                       return count
+               end
+               def.allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+                       if not default.can_interact_with_node(player, pos) then
+                               return 0
+                       end
+                       return stack:get_count()
+               end
+               def.allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+                       if not default.can_interact_with_node(player, pos) then
+                               return 0
+                       end
+                       return stack:get_count()
+               end
+               def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+                       if not default.can_interact_with_node(clicker, pos) then
+                               return itemstack
+                       end
+
+                       minetest.sound_play(def.sound_open, {gain = 0.3,
+                                       pos = pos, max_hear_distance = 10})
+                       if not chest_lid_obstructed(pos) then
+                               minetest.swap_node(pos,
+                                               { name = "default:" .. name .. "_open",
+                                               param2 = node.param2 })
+                       end
+                       minetest.after(0.2, minetest.show_formspec,
+                                       clicker:get_player_name(),
+                                       "default:chest", get_chest_formspec(pos))
+                       open_chests[clicker:get_player_name()] = { pos = pos,
+                                       sound = def.sound_close, swap = name }
+               end
+               def.on_blast = function() end
+               def.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_chest_formspec(pos)
+                       )
+               end
+               def.on_skeleton_key_use = function(pos, player, newsecret)
+                       local meta = minetest.get_meta(pos)
+                       local owner = meta:get_string("owner")
+                       local pn = player:get_player_name()
+
+                       -- verify placer is owner of lockable chest
+                       if owner ~= pn then
+                               minetest.record_protection_violation(pos, pn)
+                               minetest.chat_send_player(pn, "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
+       else
+               def.on_construct = function(pos)
+                       local meta = minetest.get_meta(pos)
+                       meta:set_string("infotext", "Chest")
+                       local inv = meta:get_inventory()
+                       inv:set_size("main", 8*4)
+               end
+               def.can_dig = function(pos,player)
+                       local meta = minetest.get_meta(pos);
+                       local inv = meta:get_inventory()
+                       return inv:is_empty("main")
+               end
+               def.on_rightclick = function(pos, node, clicker)
+                       minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos,
+                                       max_hear_distance = 10})
+                       if not chest_lid_obstructed(pos) then
+                               minetest.swap_node(pos, {
+                                               name = "default:" .. name .. "_open",
+                                               param2 = node.param2 })
+                       end
+                       minetest.after(0.2, minetest.show_formspec,
+                                       clicker:get_player_name(),
+                                       "default:chest", get_chest_formspec(pos))
+                       open_chests[clicker:get_player_name()] = { pos = pos,
+                                       sound = def.sound_close, swap = name }
+               end
+       end
+
+       def.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 chest at " .. minetest.pos_to_string(pos))
-       end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+       end
+       def.on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
                        " moves " .. stack:get_name() ..
                        " to chest at " .. minetest.pos_to_string(pos))
-       end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+       end
+       def.on_metadata_inventory_take = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
                        " takes " .. stack:get_name() ..
                        " from chest at " .. minetest.pos_to_string(pos))
-       end,
-       on_blast = function(pos)
+       end
+       def.on_blast = function(pos)
                local drops = {}
                default.get_inventory_drops(pos, "main", drops)
                drops[#drops+1] = "default:chest"
                minetest.remove_node(pos)
                return drops
-       end,
-})
-
-minetest.register_node("default:chest_locked", {
-       description = "Locked Chest",
-       tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-               "default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
-       paramtype2 = "facedir",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2},
-       legacy_facedir_simple = true,
-       is_ground_content = false,
-       sounds = default.node_sound_wood_defaults(),
+       end
 
-       after_place_node = function(pos, placer)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("owner", placer:get_player_name() or "")
-               meta:set_string("infotext", "Locked Chest (owned by " ..
-                               meta:get_string("owner") .. ")")
-       end,
-       on_construct = function(pos)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("owner", "")
-               local inv = meta:get_inventory()
-               inv:set_size("main", 8 * 4)
-       end,
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos);
-               local inv = meta:get_inventory()
-               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)
-               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)
-               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)
-               if not default.can_interact_with_node(player, pos) then
-                       return 0
-               end
-               return stack:get_count()
-       end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
-               minetest.log("action", player:get_player_name() ..
-                       " moves " .. stack:get_name() ..
-                       " to locked chest at " .. minetest.pos_to_string(pos))
-       end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
-               minetest.log("action", player:get_player_name() ..
-                       " takes " .. stack:get_name()  ..
-                       " from locked chest at " .. minetest.pos_to_string(pos))
-       end,
-       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               if default.can_interact_with_node(clicker, pos) then
-                       minetest.show_formspec(
-                               clicker:get_player_name(),
-                               "default:chest_locked",
-                               get_locked_chest_formspec(pos)
-                       )
-               end
-               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)
-               end
+       local def_opened = table.copy(def)
+       local def_closed = table.copy(def)
 
-               if secret ~= key_meta:get_string("secret") then
-                       return
+       def_opened.mesh = "chest_open.obj"
+       for i = 1, #def_opened.tiles do
+               if type(def_opened.tiles[i]) == "string" then
+                       def_opened.tiles[i] = {name = def_opened.tiles[i], backface_culling = true}
+               elseif def_opened.tiles[i].backface_culling == nil then
+                       def_opened.tiles[i].backface_culling = true
                end
+       end
+       def_opened.drop = "default:" .. name
+       def_opened.groups.not_in_creative_inventory = 1
+       def_opened.selection_box = {
+               type = "fixed",
+               fixed = { -1/2, -1/2, -1/2, 1/2, 3/16, 1/2 },
+       }
+       def_opened.can_dig = function()
+               return false
+       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
+       def_closed.mesh = nil
+       def_closed.drawtype = nil
+       def_closed.tiles[6] = def.tiles[5] -- swap textures around for "normal"
+       def_closed.tiles[5] = def.tiles[3] -- drawtype to make them match the mesh
+       def_closed.tiles[3] = def.tiles[3].."^[transformFX"
+
+       minetest.register_node("default:" .. name, def_closed)
+       minetest.register_node("default:" .. name .. "_open", def_opened)
+
+       -- convert old chests to this new variant
+       minetest.register_lbm({
+               label = "update chests to opening chests",
+               name = "default:upgrade_" .. name .. "_v2",
+               nodenames = {"default:" .. name},
+               action = function(pos, node)
+                       local meta = minetest.get_meta(pos)
+                       meta:set_string("formspec", nil)
+                       local inv = meta:get_inventory()
+                       local list = inv:get_list("default:chest")
+                       if list then
+                               inv:set_size("main", 8*4)
+                               inv:set_list("main", list)
+                               inv:set_list("default:chest", nil)
+                       end
                end
+       })
+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,
+default.register_chest("chest", {
+       description = "Chest",
+       tiles = {
+               "default_chest_top.png",
+               "default_chest_top.png",
+               "default_chest_side.png",
+               "default_chest_side.png",
+               "default_chest_front.png",
+               "default_chest_inside.png"
+       },
+       sounds = default.node_sound_wood_defaults(),
+       sound_open = "default_chest_open",
+       sound_close = "default_chest_close",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2},
 })
 
+default.register_chest("chest_locked", {
+       description = "Locked Chest",
+       tiles = {
+               "default_chest_top.png",
+               "default_chest_top.png",
+               "default_chest_side.png",
+               "default_chest_side.png",
+               "default_chest_lock.png",
+               "default_chest_inside.png"
+       },
+       sounds = default.node_sound_wood_defaults(),
+       sound_open = "default_chest_open",
+       sound_close = "default_chest_close",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2},
+       protected = true,
+})
 
 local bookshelf_formspec =
        "size[8,7;]" ..
@@ -2043,7 +2272,7 @@ default.register_fence("default:fence_acacia_wood", {
 })
 
 default.register_fence("default:fence_junglewood", {
-       description = "Junglewood Fence",
+       description = "Jungle Wood Fence",
        texture = "default_fence_junglewood.png",
        inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
        wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
@@ -2077,6 +2306,7 @@ minetest.register_node("default:glass", {
        drawtype = "glasslike_framed_optional",
        tiles = {"default_glass.png", "default_glass_detail.png"},
        paramtype = "light",
+       paramtype2 = "glasslikeliquidlevel",
        sunlight_propagates = true,
        is_ground_content = false,
        groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -2088,6 +2318,7 @@ minetest.register_node("default:obsidian_glass", {
        drawtype = "glasslike_framed_optional",
        tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
        paramtype = "light",
+       paramtype2 = "glasslikeliquidlevel",
        is_ground_content = false,
        sunlight_propagates = true,
        sounds = default.node_sound_glass_defaults(),
@@ -2202,7 +2433,7 @@ default.register_leafdecay({
 default.register_leafdecay({
        trunks = {"default:aspen_tree"},
        leaves = {"default:aspen_leaves"},
-       radius = 2,
+       radius = 3,
 })
 
 default.register_leafdecay({