Localize player_attached

[oweals/minetest_game.git] / mods / default / nodes.lua

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index c098159082bc2c40c80a4bd53d028129dfe5704b..354096e04701c64db1ecf1545207f147a36512f9 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -378,9 +378,9 @@ minetest.register_node("default:papyrus", {
 
 default.bookshelf_formspec =
        "size[8,7;]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[context;books;0,0.3;8,2;]"..
        "list[current_player;main;0,2.85;8,1;]"..
        "list[current_player;main;0,4.08;8,3;8]"..
@@ -456,12 +456,13 @@ minetest.register_node("default:glass", {
        sounds = default.node_sound_glass_defaults(),
 })
 
+local fence_texture = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126"
 minetest.register_node("default:fence_wood", {
        description = "Wooden Fence",
        drawtype = "fencelike",
        tiles = {"default_wood.png"},
-       inventory_image = "default_fence.png",
-       wield_image = "default_fence.png",
+       inventory_image = fence_texture,
+       wield_image = fence_texture,
        paramtype = "light",
        is_ground_content = false,
        selection_box = {
@@ -722,7 +723,7 @@ minetest.register_node("default:sign_wall", {
                        return
                end
                local meta = minetest.get_meta(pos)
-               fields.text = fields.text or ""
+               if not fields.text then return end
                minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text..
                                "\" to sign at "..minetest.pos_to_string(pos))
                meta:set_string("text", fields.text)
@@ -732,9 +733,9 @@ minetest.register_node("default:sign_wall", {
 
 default.chest_formspec = 
        "size[8,9]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       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]"..
@@ -744,9 +745,9 @@ function default.get_locked_chest_formspec(pos)
        local spos = pos.x .. "," .. pos.y .. "," ..pos.z
        local formspec =
                "size[8,9]"..
-               gui_bg..
-               gui_bg_img..
-               gui_slots..
+               default.gui_bg..
+               default.gui_bg_img..
+               default.gui_slots..
                "list[nodemeta:".. spos .. ";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]"..
@@ -868,9 +869,9 @@ minetest.register_node("default:chest_locked", {
 function default.furnace_active(pos, percent, item_percent)
     local formspec = 
        "size[8,8.5]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[current_name;src;2.75,0.5;1,1;]"..
        "list[current_name;fuel;2.75,2.5;1,1;]"..
        "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
@@ -902,9 +903,9 @@ end
 
 default.furnace_inactive_formspec =
        "size[8,8.5]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[current_name;src;2.75,0.5;1,1;]"..
        "list[current_name;fuel;2.75,2.5;1,1;]"..
        "image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..