Fix door model UV for open and close (#2372)
[oweals/minetest_game.git] / mods / doors / init.lua
index 7e587dcf7188f6987320312a0c624d4efce5fa3a..08b650f336d88a182ca727a1e2fbd5683cfc4ba9 100644 (file)
@@ -1,23 +1,28 @@
---[[
-
-Copyright (C) 2012 PilzAdam
-  modified by BlockMen (added sounds, glassdoors[glass, obsidian glass], trapdoor)
-Copyright (C) 2015 - Auke Kok <sofar@foo-projects.org>
-
---]]
+-- doors/init.lua
 
 -- our API object
 doors = {}
 
--- private data
-local _doors = {}
-_doors.registered_doors = {}
-_doors.registered_trapdoors = {}
+doors.registered_doors = {}
+doors.registered_trapdoors = {}
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("doors")
+
+
+local function replace_old_owner_information(pos)
+       local meta = minetest.get_meta(pos)
+       local owner = meta:get_string("doors_owner")
+       if owner and owner ~= "" then
+               meta:set_string("owner", owner)
+               meta:set_string("doors_owner", "")
+       end
+end
 
 -- returns an object to a door object or nil
 function doors.get(pos)
        local node_name = minetest.get_node(pos).name
-       if _doors.registered_doors[node_name] then
+       if doors.registered_doors[node_name] then
                -- A normal upright door
                return {
                        pos = pos,
@@ -25,23 +30,23 @@ function doors.get(pos)
                                if self:state() then
                                        return false
                                end
-                               return _doors.door_toggle(self.pos, nil, player)
+                               return doors.door_toggle(self.pos, nil, player)
                        end,
                        close = function(self, player)
                                if not self:state() then
                                        return false
                                end
-                               return _doors.door_toggle(self.pos, nil, player)
+                               return doors.door_toggle(self.pos, nil, player)
                        end,
                        toggle = function(self, player)
-                               return _doors.door_toggle(self.pos, nil, player)
+                               return doors.door_toggle(self.pos, nil, player)
                        end,
                        state = function(self)
                                local state = minetest.get_meta(self.pos):get_int("state")
                                return state %2 == 1
                        end
                }
-       elseif _doors.registered_trapdoors[node_name] then
+       elseif doors.registered_trapdoors[node_name] then
                -- A trapdoor
                return {
                        pos = pos,
@@ -49,16 +54,16 @@ function doors.get(pos)
                                if self:state() then
                                        return false
                                end
-                               return _doors.trapdoor_toggle(self.pos, nil, player)
+                               return doors.trapdoor_toggle(self.pos, nil, player)
                        end,
                        close = function(self, player)
                                if not self:state() then
                                        return false
                                end
-                               return _doors.trapdoor_toggle(self.pos, nil, player)
+                               return doors.trapdoor_toggle(self.pos, nil, player)
                        end,
                        toggle = function(self, player)
-                               return _doors.trapdoor_toggle(self.pos, nil, player)
+                               return doors.trapdoor_toggle(self.pos, nil, player)
                        end,
                        state = function(self)
                                return minetest.get_node(self.pos).name:sub(-5) == "_open"
@@ -72,7 +77,7 @@ end
 -- this hidden node is placed on top of the bottom, and prevents
 -- nodes from being placed in the top half of the door.
 minetest.register_node("doors:hidden", {
-       description = "Hidden Door Segment",
+       description = S("Hidden Door Segment"),
        -- can't use airlike otherwise falling nodes will turn to entities
        -- and will be forever stuck until door is removed.
        drawtype = "nodebox",
@@ -90,7 +95,7 @@ minetest.register_node("doors:hidden", {
        on_blast = function() end,
        tiles = {"doors_blank.png"},
        -- 1px transparent block inside door hinge near node top.
-       nodebox = {
+       node_box = {
                type = "fixed",
                fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32},
        },
@@ -110,10 +115,10 @@ local transform = {
                {v = "_a", param2 = 2},
        },
        {
-               {v = "_b", param2 = 1},
-               {v = "_b", param2 = 2},
-               {v = "_b", param2 = 3},
-               {v = "_b", param2 = 0},
+               {v = "_c", param2 = 1},
+               {v = "_c", param2 = 2},
+               {v = "_c", param2 = 3},
+               {v = "_c", param2 = 0},
        },
        {
                {v = "_b", param2 = 1},
@@ -122,14 +127,14 @@ local transform = {
                {v = "_b", param2 = 0},
        },
        {
-               {v = "_a", param2 = 3},
-               {v = "_a", param2 = 0},
-               {v = "_a", param2 = 1},
-               {v = "_a", param2 = 2},
+               {v = "_d", param2 = 3},
+               {v = "_d", param2 = 0},
+               {v = "_d", param2 = 1},
+               {v = "_d", param2 = 2},
        },
 }
 
-function _doors.door_toggle(pos, node, clicker)
+function doors.door_toggle(pos, node, clicker)
        local meta = minetest.get_meta(pos)
        node = node or minetest.get_node(pos)
        local def = minetest.registered_nodes[node.name]
@@ -147,13 +152,10 @@ function _doors.door_toggle(pos, node, clicker)
                state = tonumber(state)
        end
 
-       if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then
-               local owner = meta:get_string("doors_owner")
-               if owner ~= "" then
-                       if clicker:get_player_name() ~= owner then
-                               return false
-                       end
-               end
+       replace_old_owner_information(pos)
+
+       if clicker and not default.can_interact_with_node(clicker, pos) then
+               return false
        end
 
        -- until Lua-5.2 we have no bitwise operators :(
@@ -164,12 +166,20 @@ function _doors.door_toggle(pos, node, clicker)
        end
 
        local dir = node.param2
+
+       -- It's possible param2 is messed up, so, validate before using
+       -- the input data. This indicates something may have rotated
+       -- the door, even though that is not supported.
+       if not transform[state + 1] or not transform[state + 1][dir + 1] then
+               return false
+       end
+
        if state % 2 == 0 then
                minetest.sound_play(def.door.sounds[1],
-                       {pos = pos, gain = 0.3, max_hear_distance = 10})
+                       {pos = pos, gain = 0.3, max_hear_distance = 10}, true)
        else
                minetest.sound_play(def.door.sounds[2],
-                       {pos = pos, gain = 0.3, max_hear_distance = 10})
+                       {pos = pos, gain = 0.3, max_hear_distance = 10}, true)
        end
 
        minetest.swap_node(pos, {
@@ -185,7 +195,7 @@ end
 local function on_place_node(place_to, newnode,
        placer, oldnode, itemstack, pointed_thing)
        -- Run script hook
-       for _, callback in ipairs(core.registered_on_placenodes) do
+       for _, callback in ipairs(minetest.registered_on_placenodes) do
                -- Deepcopy pos, node and pointed_thing because callback can modify them
                local place_to_copy = {x = place_to.x, y = place_to.y, z = place_to.z}
                local newnode_copy =
@@ -203,6 +213,11 @@ local function on_place_node(place_to, newnode,
        end
 end
 
+local function can_dig_door(pos, digger)
+       replace_old_owner_information(pos)
+       return default.can_interact_with_node(digger, pos)
+end
+
 function doors.register(name, def)
        if not name:find(":") then
                name = "doors:" .. name
@@ -246,6 +261,7 @@ function doors.register(name, def)
        minetest.register_craftitem(":" .. name, {
                description = def.description,
                inventory_image = def.inventory_image,
+               groups = table.copy(def.groups),
 
                on_place = function(itemstack, placer, pointed_thing)
                        local pos
@@ -256,7 +272,9 @@ function doors.register(name, def)
 
                        local node = minetest.get_node(pointed_thing.under)
                        local pdef = minetest.registered_nodes[node.name]
-                       if pdef and pdef.on_rightclick then
+                       if pdef and pdef.on_rightclick and
+                                       not (placer and placer:is_player() and
+                                       placer:get_player_control().sneak) then
                                return pdef.on_rightclick(pointed_thing.under,
                                                node, placer, itemstack, pointed_thing)
                        end
@@ -273,17 +291,19 @@ function doors.register(name, def)
                        end
 
                        local above = {x = pos.x, y = pos.y + 1, z = pos.z}
-                       if not minetest.registered_nodes[
-                               minetest.get_node(above).name].buildable_to then
+                       local top_node = minetest.get_node_or_nil(above)
+                       local topdef = top_node and minetest.registered_nodes[top_node.name]
+
+                       if not topdef or not topdef.buildable_to then
                                return itemstack
                        end
 
-                       local pn = placer:get_player_name()
+                       local pn = placer and placer:get_player_name() or ""
                        if minetest.is_protected(pos, pn) or minetest.is_protected(above, pn) then
                                return itemstack
                        end
 
-                       local dir = minetest.dir_to_facedir(placer:get_look_dir())
+                       local dir = placer and minetest.dir_to_facedir(placer:get_look_dir()) or 0
 
                        local ref = {
                                {x = -1, y = 0, z = 0},
@@ -312,14 +332,16 @@ function doors.register(name, def)
                        meta:set_int("state", state)
 
                        if def.protected then
-                               meta:set_string("doors_owner", pn)
-                               meta:set_string("infotext", "Owned by " .. pn)
+                               meta:set_string("owner", pn)
+                               meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
                        end
 
-                       if not minetest.setting_getbool("creative_mode") then
+                       if not (creative and creative.is_enabled_for and creative.is_enabled_for(pn)) then
                                itemstack:take_item()
                        end
 
+                       minetest.sound_play(def.sounds.place, {pos = pos}, true)
+
                        on_place_node(pos, minetest.get_node(pos),
                                placer, node, itemstack, pointed_thing)
 
@@ -336,21 +358,6 @@ function doors.register(name, def)
        end
        def.recipe = nil
 
-       local can_dig = function(pos, digger)
-               if not def.protected then
-                       return true
-               end
-               if minetest.check_player_privs(digger, "protection_bypass") then
-                       return true
-               end
-               local meta = minetest.get_meta(pos)
-               local owner_name
-               if digger then
-                       owner_name = digger:get_player_name()
-               end
-               return meta:get_string("doors_owner") == owner_name
-       end
-
        if not def.sounds then
                def.sounds = default.node_sound_wood_defaults()
        end
@@ -370,24 +377,49 @@ function doors.register(name, def)
                name = name,
                sounds = { def.sound_close, def.sound_open },
        }
-
-       def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               _doors.door_toggle(pos, node, clicker)
-               return itemstack
+       if not def.on_rightclick then
+               def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+                       doors.door_toggle(pos, node, clicker)
+                       return itemstack
+               end
        end
        def.after_dig_node = function(pos, node, meta, digger)
                minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z})
-               nodeupdate({x = pos.x, y = pos.y + 1, z = pos.z})
-       end
-       def.can_dig = function(pos, player)
-               return can_dig(pos, player)
+               minetest.check_for_falling({x = pos.x, y = pos.y + 1, z = pos.z})
        end
        def.on_rotate = function(pos, node, user, mode, new_param2)
                return false
        end
 
        if def.protected then
+               def.can_dig = can_dig_door
                def.on_blast = function() end
+               def.on_key_use = function(pos, player)
+                       local door = doors.get(pos)
+                       door:toggle(player)
+               end
+               def.on_skeleton_key_use = function(pos, player, newsecret)
+                       replace_old_owner_information(pos)
+                       local meta = minetest.get_meta(pos)
+                       local owner = meta:get_string("owner")
+                       local pname = player:get_player_name()
+
+                       -- verify placer is owner of lockable door
+                       if owner ~= pname then
+                               minetest.record_protection_violation(pos, pname)
+                               minetest.chat_send_player(pname, S("You do not own this locked door."))
+                               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, S("a locked door"), owner
+               end
+               def.node_dig_prediction = ""
        else
                def.on_blast = function(pos, intensity)
                        minetest.remove_node(pos)
@@ -417,15 +449,23 @@ function doors.register(name, def)
        def.mesh = "door_b.obj"
        minetest.register_node(":" .. name .. "_b", def)
 
-       _doors.registered_doors[name .. "_a"] = true
-       _doors.registered_doors[name .. "_b"] = true
+       def.mesh = "door_a2.obj"
+       minetest.register_node(":" .. name .. "_c", def)
+
+       def.mesh = "door_b2.obj"
+       minetest.register_node(":" .. name .. "_d", def)
+
+       doors.registered_doors[name .. "_a"] = true
+       doors.registered_doors[name .. "_b"] = true
+       doors.registered_doors[name .. "_c"] = true
+       doors.registered_doors[name .. "_d"] = true
 end
 
 doors.register("door_wood", {
                tiles = {{ name = "doors_door_wood.png", backface_culling = true }},
-               description = "Wooden Door",
+               description = S("Wooden Door"),
                inventory_image = "doors_item_wood.png",
-               groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+               groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
                recipe = {
                        {"group:wood", "group:wood"},
                        {"group:wood", "group:wood"},
@@ -435,11 +475,11 @@ doors.register("door_wood", {
 
 doors.register("door_steel", {
                tiles = {{name = "doors_door_steel.png", backface_culling = true}},
-               description = "Steel Door",
+               description = S("Steel Door"),
                inventory_image = "doors_item_steel.png",
                protected = true,
-               groups = {snappy = 1, cracky = 1, level = 2},
-               sounds = default.node_sound_stone_defaults(),
+               groups = {node = 1, cracky = 1, level = 2},
+               sounds = default.node_sound_metal_defaults(),
                sound_open = "doors_steel_door_open",
                sound_close = "doors_steel_door_close",
                recipe = {
@@ -451,9 +491,9 @@ doors.register("door_steel", {
 
 doors.register("door_glass", {
                tiles = {"doors_door_glass.png"},
-               description = "Glass Door",
+               description = S("Glass Door"),
                inventory_image = "doors_item_glass.png",
-               groups = {snappy=1, cracky=1, oddly_breakable_by_hand=3},
+               groups = {node = 1, cracky=3, oddly_breakable_by_hand=3},
                sounds = default.node_sound_glass_defaults(),
                sound_open = "doors_glass_door_open",
                sound_close = "doors_glass_door_close",
@@ -466,9 +506,9 @@ doors.register("door_glass", {
 
 doors.register("door_obsidian_glass", {
                tiles = {"doors_door_obsidian_glass.png"},
-               description = "Obsidian Glass Door",
+               description = S("Obsidian Glass Door"),
                inventory_image = "doors_item_obsidian_glass.png",
-               groups = {snappy=1, cracky=1, oddly_breakable_by_hand=3},
+               groups = {node = 1, cracky=3},
                sounds = default.node_sound_glass_defaults(),
                sound_open = "doors_glass_door_open",
                sound_close = "doors_glass_door_close",
@@ -505,49 +545,40 @@ end
 
 ----trapdoor----
 
-function _doors.trapdoor_toggle(pos, node, clicker)
+function doors.trapdoor_toggle(pos, node, clicker)
        node = node or minetest.get_node(pos)
-       if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then
-               local meta = minetest.get_meta(pos)
-               local owner = meta:get_string("doors_owner")
-               if owner ~= "" then
-                       if clicker:get_player_name() ~= owner then
-                               return false
-                       end
-               end
+
+       replace_old_owner_information(pos)
+
+       if clicker and not default.can_interact_with_node(clicker, pos) then
+               return false
        end
 
        local def = minetest.registered_nodes[node.name]
 
        if string.sub(node.name, -5) == "_open" then
                minetest.sound_play(def.sound_close,
-                       {pos = pos, gain = 0.3, max_hear_distance = 10})
+                       {pos = pos, gain = 0.3, max_hear_distance = 10}, true)
                minetest.swap_node(pos, {name = string.sub(node.name, 1,
                        string.len(node.name) - 5), param1 = node.param1, param2 = node.param2})
        else
                minetest.sound_play(def.sound_open,
-                       {pos = pos, gain = 0.3, max_hear_distance = 10})
+                       {pos = pos, gain = 0.3, max_hear_distance = 10}, true)
                minetest.swap_node(pos, {name = node.name .. "_open",
                        param1 = node.param1, param2 = node.param2})
        end
 end
 
 function doors.register_trapdoor(name, def)
+       if not name:find(":") then
+               name = "doors:" .. name
+       end
+
        local name_closed = name
        local name_opened = name.."_open"
 
-       local function check_player_priv(pos, player)
-               if not def.protected or
-                               minetest.check_player_privs(player, "protection_bypass") then
-                       return true
-               end
-               local meta = minetest.get_meta(pos)
-               local player_name = player and player:get_player_name()
-               return meta:get_string("doors_owner") == player_name
-       end
-
        def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               _doors.trapdoor_toggle(pos, node, clicker)
+               doors.trapdoor_toggle(pos, node, clicker)
                return itemstack
        end
 
@@ -556,23 +587,48 @@ function doors.register_trapdoor(name, def)
        def.paramtype = "light"
        def.paramtype2 = "facedir"
        def.is_ground_content = false
-       def.can_dig = check_player_priv
 
        if def.protected then
+               def.can_dig = can_dig_door
                def.after_place_node = function(pos, placer, itemstack, pointed_thing)
                        local pn = placer:get_player_name()
                        local meta = minetest.get_meta(pos)
-                       meta:set_string("doors_owner", pn)
-                       meta:set_string("infotext", "Owned by "..pn)
+                       meta:set_string("owner", pn)
+                       meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
 
-                       return minetest.setting_getbool("creative_mode")
+                       return (creative and creative.is_enabled_for and creative.is_enabled_for(pn))
                end
 
                def.on_blast = function() end
+               def.on_key_use = function(pos, player)
+                       local door = doors.get(pos)
+                       door:toggle(player)
+               end
+               def.on_skeleton_key_use = function(pos, player, newsecret)
+                       replace_old_owner_information(pos)
+                       local meta = minetest.get_meta(pos)
+                       local owner = meta:get_string("owner")
+                       local pname = player:get_player_name()
+
+                       -- verify placer is owner of lockable door
+                       if owner ~= pname then
+                               minetest.record_protection_violation(pos, pname)
+                               minetest.chat_send_player(pname, S("You do not own this trapdoor."))
+                               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, S("a locked trapdoor"), owner
+               end
+               def.node_dig_prediction = ""
        else
                def.on_blast = function(pos, intensity)
                        minetest.remove_node(pos)
-                       minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z})
                        return {name}
                end
        end
@@ -600,8 +656,14 @@ function doors.register_trapdoor(name, def)
                type = "fixed",
                fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
        }
-       def_closed.tiles = {def.tile_front, def.tile_front, def.tile_side, def.tile_side,
-               def.tile_side, def.tile_side}
+       def_closed.tiles = {
+               def.tile_front,
+               def.tile_front .. '^[transformFY',
+               def.tile_side,
+               def.tile_side,
+               def.tile_side,
+               def.tile_side
+       }
 
        def_opened.node_box = {
                type = "fixed",
@@ -611,10 +673,14 @@ function doors.register_trapdoor(name, def)
                type = "fixed",
                fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
        }
-       def_opened.tiles = {def.tile_side, def.tile_side,
-                       def.tile_side .. '^[transform3',
-                       def.tile_side .. '^[transform1',
-                       def.tile_front, def.tile_front}
+       def_opened.tiles = {
+               def.tile_side,
+               def.tile_side .. '^[transform2',
+               def.tile_side .. '^[transform3',
+               def.tile_side .. '^[transform1',
+               def.tile_front .. '^[transform46',
+               def.tile_front .. '^[transform6'
+       }
 
        def_opened.drop = name_closed
        def_opened.groups.not_in_creative_inventory = 1
@@ -622,57 +688,58 @@ function doors.register_trapdoor(name, def)
        minetest.register_node(name_opened, def_opened)
        minetest.register_node(name_closed, def_closed)
 
-       _doors.registered_trapdoors[name_opened] = true
-       _doors.registered_trapdoors[name_closed] = true
+       doors.registered_trapdoors[name_opened] = true
+       doors.registered_trapdoors[name_closed] = true
 end
 
 doors.register_trapdoor("doors:trapdoor", {
-       description = "Trapdoor",
+       description = S("Wooden Trapdoor"),
        inventory_image = "doors_trapdoor.png",
        wield_image = "doors_trapdoor.png",
        tile_front = "doors_trapdoor.png",
        tile_side = "doors_trapdoor_side.png",
-       groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=2, door=1},
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1},
 })
 
 doors.register_trapdoor("doors:trapdoor_steel", {
-       description = "Steel Trapdoor",
+       description = S("Steel Trapdoor"),
        inventory_image = "doors_trapdoor_steel.png",
        wield_image = "doors_trapdoor_steel.png",
        tile_front = "doors_trapdoor_steel.png",
        tile_side = "doors_trapdoor_steel_side.png",
        protected = true,
-       sounds = default.node_sound_stone_defaults(),
+       sounds = default.node_sound_metal_defaults(),
        sound_open = "doors_steel_door_open",
        sound_close = "doors_steel_door_close",
-       groups = {snappy=1, cracky=1, level=2, door=1},
+       groups = {cracky = 1, level = 2, door = 1},
 })
 
 minetest.register_craft({
-       output = 'doors:trapdoor 2',
+       output = "doors:trapdoor 2",
        recipe = {
-               {'group:wood', 'group:wood', 'group:wood'},
-               {'group:wood', 'group:wood', 'group:wood'},
-               {'', '', ''},
+               {"group:wood", "group:wood", "group:wood"},
+               {"group:wood", "group:wood", "group:wood"},
+               {"", "", ""},
        }
 })
 
 minetest.register_craft({
-       output = 'doors:trapdoor_steel',
+       output = "doors:trapdoor_steel",
        recipe = {
-               {'default:steel_ingot', 'default:steel_ingot'},
-               {'default:steel_ingot', 'default:steel_ingot'},
+               {"default:steel_ingot", "default:steel_ingot"},
+               {"default:steel_ingot", "default:steel_ingot"},
        }
 })
 
 
 ----fence gate----
+local fence_collision_extra = minetest.settings:get_bool("enable_fence_tall") and 3/8 or 0
 
 function doors.register_fencegate(name, def)
        local fence = {
                description = def.description,
                drawtype = "mesh",
-               tiles = {def.texture},
+               tiles = {},
                paramtype = "light",
                paramtype2 = "facedir",
                sunlight_propagates = true,
@@ -685,15 +752,25 @@ function doors.register_fencegate(name, def)
                        local node_def = minetest.registered_nodes[node.name]
                        minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2})
                        minetest.sound_play(node_def.sound, {pos = pos, gain = 0.3,
-                               max_hear_distance = 8})
+                               max_hear_distance = 8}, true)
                        return itemstack
                end,
                selection_box = {
                        type = "fixed",
-                       fixed = {-1/2, -1/2, -1/4, 1/2, 1/2, 1/4},
+                       fixed = {-1/2, -1/2, -1/4, 1/2, 1/2, 1/4}
                },
        }
 
+
+       if type(def.texture) == "string" then
+               fence.tiles[1] = {name = def.texture, backface_culling = true}
+       elseif def.texture.backface_culling == nil then
+               fence.tiles[1] = table.copy(def.texture)
+               fence.tiles[1].backface_culling = true
+       else
+               fence.tiles[1] = def.texture
+       end
+
        if not fence.sounds then
                fence.sounds = default.node_sound_wood_defaults()
        end
@@ -706,7 +783,7 @@ function doors.register_fencegate(name, def)
        fence_closed.sound = "doors_fencegate_open"
        fence_closed.collision_box = {
                type = "fixed",
-               fixed = {-1/2, -1/2, -1/4, 1/2, 1/2, 1/4},
+               fixed = {-1/2, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8}
        }
 
        local fence_open = table.copy(fence)
@@ -716,8 +793,8 @@ function doors.register_fencegate(name, def)
        fence_open.groups.not_in_creative_inventory = 1
        fence_open.collision_box = {
                type = "fixed",
-               fixed = {{-1/2, -1/2, -1/4, -3/8, 1/2, 1/4},
-                       {-5/8, -3/8, -14/16, -3/8, 3/8, 0}},
+               fixed = {{-1/2, -1/2, -1/8, -3/8, 1/2 + fence_collision_extra, 1/8},
+                        {-1/2, -3/8, -1/2, -3/8, 3/8,                         0  }}
        }
 
        minetest.register_node(":" .. name .. "_closed", fence_closed)
@@ -726,43 +803,88 @@ function doors.register_fencegate(name, def)
        minetest.register_craft({
                output = name .. "_closed",
                recipe = {
-                       {"default:stick", def.material, "default:stick"},
-                       {"default:stick", def.material, "default:stick"}
+                       {"group:stick", def.material, "group:stick"},
+                       {"group:stick", def.material, "group:stick"}
                }
        })
 end
 
 doors.register_fencegate("doors:gate_wood", {
-       description = "Wooden Fence Gate",
+       description = S("Apple Wood Fence Gate"),
        texture = "default_wood.png",
        material = "default:wood",
        groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_acacia_wood", {
-       description = "Acacia Fence Gate",
+       description = S("Acacia Wood Fence Gate"),
        texture = "default_acacia_wood.png",
        material = "default:acacia_wood",
        groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_junglewood", {
-       description = "Junglewood Fence Gate",
+       description = S("Jungle Wood Fence Gate"),
        texture = "default_junglewood.png",
        material = "default:junglewood",
        groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_pine_wood", {
-       description = "Pine Fence Gate",
+       description = S("Pine Wood Fence Gate"),
        texture = "default_pine_wood.png",
        material = "default:pine_wood",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}
 })
 
 doors.register_fencegate("doors:gate_aspen_wood", {
-       description = "Aspen Fence Gate",
+       description = S("Aspen Wood Fence Gate"),
        texture = "default_aspen_wood.png",
        material = "default:aspen_wood",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}
+})
+
+
+----fuels----
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:trapdoor",
+       burntime = 7,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:door_wood",
+       burntime = 14,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:gate_wood_closed",
+       burntime = 7,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:gate_acacia_wood_closed",
+       burntime = 8,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:gate_junglewood_closed",
+       burntime = 9,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:gate_pine_wood_closed",
+       burntime = 6,
+})
+
+minetest.register_craft({
+       type = "fuel",
+       recipe = "doors:gate_aspen_wood_closed",
+       burntime = 5,
 })