Mailbox's code cleaning

diff --git a/enchanting.lua b/enchanting.lua
index e1a0c813d6e5ed1581dac672d1b87ce808884183..3cef5b318027b1c959ec828223d687085fec3201 100644 (file)
--- a/enchanting.lua
+++ b/enchanting.lua
@@ -86,7 +86,7 @@ xdecor.register("enchantment_table", {
                "xdecor_enchantment_side.png", "xdecor_enchantment_side.png",
                "xdecor_enchantment_side.png", "xdecor_enchantment_side.png"
        },
-       groups = {cracky=1, oddly_breakable_by_hand=1, level=2},
+       groups = {cracky=1, oddly_breakable_by_hand=1, level=1},
        sounds = default.node_sound_stone_defaults(),
        on_rotate = screwdriver.rotate_simple,
        can_dig = enchanting.dig,

diff --git a/mailbox.lua b/mailbox.lua
index fafd724c9864654e74ffc2e65cf874358d0f941e..3dc83a570b430345480ff2482a4e682be7c635da 100644 (file)
--- a/mailbox.lua
+++ b/mailbox.lua
@@ -1,6 +1,5 @@
 local mailbox = {}
 screwdriver = screwdriver or {}
-local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
 
 xdecor.register("mailbox", {
        description = "Mailbox",
@@ -13,13 +12,13 @@ xdecor.register("mailbox", {
        on_rotate = screwdriver.rotate_simple,
        after_place_node = function(pos, placer, _)
                local meta = minetest.get_meta(pos)
-               local owner = placer:get_player_name()
+               local player_name = placer:get_player_name()
 
-               meta:set_string("owner", owner)
-               meta:set_string("infotext", owner.."'s Mailbox")
+               meta:set_string("owner", player_name)
+               meta:set_string("infotext", player_name.."'s Mailbox")
 
                local inv = meta:get_inventory()
-               inv:set_size("main", 8*4)
+               inv:set_size("mailbox", 8*4)
                inv:set_size("drop", 1)
        end,
        on_rightclick = function(pos, _, clicker, _)
@@ -27,44 +26,47 @@ xdecor.register("mailbox", {
                local player = clicker:get_player_name()
                local owner = meta:get_string("owner")
 
-               if owner == player then
-                       minetest.show_formspec(player, "", mailbox.get_formspec(pos))
-               else minetest.show_formspec(player, "",
-                               mailbox.get_insert_formspec(pos, owner))
+               if player == owner then
+                       minetest.show_formspec(player, "", mailbox.get_formspec(pos, owner, 1))
+               else
+                       minetest.show_formspec(player, "", mailbox.get_formspec(pos, owner, 0))
                end
        end,
        can_dig = function(pos, player)
                local meta = minetest.get_meta(pos)
                local owner = meta:get_string("owner")
+               local player_name = player:get_player_name()
                local inv = meta:get_inventory()
 
-               return inv:is_empty("main") and player and player:get_player_name() == owner
+               return inv:is_empty("mailbox") and player and player_name == owner
        end,
        on_metadata_inventory_put = function(pos, listname, _, stack, _)
                local inv = minetest.get_meta(pos):get_inventory()
-               if listname == "drop" and inv:room_for_item("main", stack) then
+               if listname == "drop" and inv:room_for_item("mailbox", stack) then
                        inv:remove_item("drop", stack)
-                       inv:add_item("main", stack)
+                       inv:add_item("mailbox", stack)
                end
        end,
        allow_metadata_inventory_put = function(pos, listname, _, stack, _)
                if listname == "drop" then
                        local meta = minetest.get_meta(pos)
                        local inv = meta:get_inventory()
-                       if inv:room_for_item("main", stack) then return -1 end
+                       if inv:room_for_item("mailbox", stack) then return -1 end
                end
                return 0
        end
 })
 
-function mailbox.get_formspec(pos)
+function mailbox.get_formspec(pos, owner, fs_type)
+       local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
        local spos = pos.x..","..pos.y..","..pos.z
-       return "size[8,9]"..xbg..default.get_hotbar_bg(0,5.25)..
-               "label[0,0;You received...]list[nodemeta:"..spos..";main;0,0.75;8,4;]list[current_player;main;0,5.25;8,4;]"
-end
 
-function mailbox.get_insert_formspec(pos, owner)
-       local spos = pos.x..","..pos.y..","..pos.z
-       return "size[8,5]"..xbg..default.get_hotbar_bg(0,1.25)..
-               "label[0.5,0;Send your goods\nto "..owner.." :]list[nodemeta:"..spos..";drop;3.5,0;1,1;]list[current_player;main;0,1.25;8,4;]"
+       if fs_type == 1 then
+               return "size[8,9]"..xbg..default.get_hotbar_bg(0,5.25)..
+                       "label[0,0;You received...]list[nodemeta:"..spos..";mailbox;0,0.75;8,4;]list[current_player;main;0,5.25;8,4;]"
+       else
+               return "size[8,5]"..xbg..default.get_hotbar_bg(0,1.25)..
+                       "label[0.5,0;Send your goods\nto "..owner.." :]list[nodemeta:"..spos..";drop;3.5,0;1,1;]list[current_player;main;0,1.25;8,4;]"
+       end
 end
+