]> git.lizzy.rs Git - xdecor.git/blobdiff - workbench.lua
Don't crash on nil-player in can_dig and check the right players for attachment in...
[xdecor.git] / workbench.lua
index 781498855aa3db783aba80de8916f2a31b6f1b78..ccf1918cb95f7f135174780c1b80501ae5d1f9de 100644 (file)
@@ -2,16 +2,25 @@ local workbench = {}
 screwdriver = screwdriver or {}
 
 -- Nodes allowed to be cut.
--- Only the regular, solid blocks without formspec or explosivity can be cut.
-function workbench:nodes(def)
-       return (def.drawtype == "normal" or def.drawtype:find("glass")) and
-               (def.groups.cracky or def.groups.choppy) and not
-               def.on_construct and not def.after_place_node and not
-               def.after_place_node and not def.on_rightclick and not
-               def.on_blast and not def.allow_metadata_inventory_take and not
-               (def.groups.not_in_creative_inventory == 1) and not
-               def.groups.wool and not def.description:find("Ore") and
-               def.description and def.description ~= "" and def.light_source == 0
+-- Only the regular, solid blocks without metas or explosivity can be cut.
+local nodes = {}
+for node, def in pairs(minetest.registered_nodes) do
+       if (def.drawtype == "normal" or def.drawtype:sub(1,5) == "glass") and
+          (def.groups.cracky or def.groups.choppy) and
+          not def.on_construct and
+          not def.after_place_node and
+          not def.on_rightclick and
+          not def.on_blast and
+          not def.allow_metadata_inventory_take and
+          not (def.groups.not_in_creative_inventory == 1) and
+          not def.groups.wool and
+          not def.description:find("Ore") and
+          def.description and
+          def.description ~= "" and
+          def.light_source == 0
+       then
+               nodes[#nodes+1] = node
+       end
 end
 
 -- Nodeboxes definitions.
@@ -38,9 +47,12 @@ workbench.defs = {
 }
 
 -- Tools allowed to be repaired.
-function workbench:repairable_tools(stack)
-       local tools = [[ pick, axe, shovel, sword, hoe, armor, shield ]]
-       return tools:find(stack:match(":(%w+)"))
+function workbench:repairable(stack)
+       local tools = {"pick", "axe", "shovel", "sword", "hoe", "armor", "shield"}
+       for _, t in pairs(tools) do
+               if stack:find(t) then return true end
+       end
+       return false
 end
 
 function workbench:get_output(inv, input, name)
@@ -58,37 +70,37 @@ function workbench:get_output(inv, input, name)
        inv:set_list("forms", output)
 end
 
-function workbench:formspecs(meta, id)
-       local formspecs = {
-               -- Main formspec.
-               [[ label[0.9,1.23;Cut]
-                  label[0.9,2.23;Repair]
-                  box[-0.05,1;2.05,0.9;#555555]
-                  box[-0.05,2;2.05,0.9;#555555]
-                  button[0,0;2,1;craft;Crafting]
-                  button[2,0;2,1;storage;Storage]
-                  image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
-                  image[0,1;1,1;worktable_saw.png]
-                  image[0,2;1,1;worktable_anvil.png]
-                  image[3,2;1,1;hammer_layout.png]
-                  list[context;input;2,1;1,1;]
-                  list[context;tool;2,2;1,1;]
-                  list[context;hammer;3,2;1,1;]
-                  list[context;forms;4,0;4,3;] ]],
-               -- Crafting formspec.
-               [[ image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
-                  button[0,0;1.5,1;back;< Back]
-                  list[current_player;craft;2,0;3,3;]
-                  list[current_player;craftpreview;6,1;1,1;]
-                  listring[current_player;main]
-                  listring[current_player;craft] ]],
-               -- Storage formspec.
-               [[ list[context;storage;0,1;8,2;]
-                  button[0,0;1.5,1;back;< Back]
-                  listring[context;storage]
-                  listring[current_player;main] ]]
-       }
+local formspecs = {
+       -- Main formspec.
+       [[ label[0.9,1.23;Cut]
+          label[0.9,2.23;Repair]
+          box[-0.05,1;2.05,0.9;#555555]
+          box[-0.05,2;2.05,0.9;#555555]
+          button[0,0;2,1;craft;Crafting]
+          button[2,0;2,1;storage;Storage]
+          image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
+          image[0,1;1,1;worktable_saw.png]
+          image[0,2;1,1;worktable_anvil.png]
+          image[3,2;1,1;hammer_layout.png]
+          list[context;input;2,1;1,1;]
+          list[context;tool;2,2;1,1;]
+          list[context;hammer;3,2;1,1;]
+          list[context;forms;4,0;4,3;] ]],
+       -- Crafting formspec.
+       [[ image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
+          button[0,0;1.5,1;back;< Back]
+          list[current_player;craft;2,0;3,3;]
+          list[current_player;craftpreview;6,1;1,1;]
+          listring[current_player;main]
+          listring[current_player;craft] ]],
+       -- Storage formspec.
+       [[ list[context;storage;0,1;8,2;]
+          button[0,0;1.5,1;back;< Back]
+          listring[context;storage]
+          listring[current_player;main] ]]
+}
 
+function workbench:set_formspec(meta, id)
        meta:set_string("formspec", "size[8,7;]list[current_player;main;0,3.25;8,4;]"..
                        formspecs[id]..xbg..default.get_hotbar_bg(0,3.25))
 end
@@ -104,14 +116,14 @@ function workbench.construct(pos)
        inv:set_size("storage", 8*2)
 
        meta:set_string("infotext", "Work Bench")
-       workbench:formspecs(meta, 1)
+       workbench:set_formspec(meta, 1)
 end
 
 function workbench.fields(pos, _, fields)
        local meta = minetest.get_meta(pos)
-       if     fields.back    then workbench:formspecs(meta, 1)
-       elseif fields.craft   then workbench:formspecs(meta, 2)
-       elseif fields.storage then workbench:formspecs(meta, 3) end
+       if     fields.back    then workbench:set_formspec(meta, 1)
+       elseif fields.craft   then workbench:set_formspec(meta, 2)
+       elseif fields.storage then workbench:set_formspec(meta, 3) end
 end
 
 function workbench.dig(pos)
@@ -136,16 +148,15 @@ function workbench.timer(pos)
 
        inv:set_stack("tool", 1, tool)
        inv:set_stack("hammer", 1, hammer)
-
        return true
 end
 
 function workbench.put(_, listname, _, stack)
        local stackname = stack:get_name()
-       if (listname == "tool" and stack:get_wear() > 0 and workbench:repairable_tools(stackname)) or
-                       (listname == "input" and minetest.registered_nodes[stackname.."_cube"]) or
-                       (listname == "hammer" and stackname == "xdecor:hammer") or
-                       listname == "storage" then
+       if (listname == "tool" and stack:get_wear() > 0 and workbench:repairable(stackname)) or
+          (listname == "input" and minetest.registered_nodes[stackname.."_cube"]) or
+          (listname == "hammer" and stackname == "xdecor:hammer") or
+           listname == "storage" then
                return stack:get_count()
        end
        return 0
@@ -160,8 +171,8 @@ function workbench.take(_, listname, _, stack, player)
        return stack:get_count()
 end
 
-function workbench.move(_, _, _, to_list, _, count)
-       if to_list == "storage" then return count end
+function workbench.move(_, from_list, _, to_list, _, count)
+       if to_list == "storage" and from_list ~= "forms" then return count end
        return 0
 end
 
@@ -183,7 +194,9 @@ function workbench.on_take(pos, listname, index, stack)
        if listname == "input" then
                if stack:get_name() == input:get_name() then
                        workbench:get_output(inv, input, stack:get_name())
-               else inv:set_list("forms", {}) end
+               else
+                       inv:set_list("forms", {})
+               end
        elseif listname == "forms" then
                input:take_item(math.ceil(stack:get_count() / workbench.defs[index][2]))
                inv:set_stack("input", 1, input)
@@ -195,11 +208,9 @@ xdecor.register("workbench", {
        description = "Work Bench",
        groups = {cracky=2, choppy=2, oddly_breakable_by_hand=1},
        sounds = default.node_sound_wood_defaults(),
-       tiles = {
-               "xdecor_workbench_top.png", "xdecor_workbench_top.png",
-               "xdecor_workbench_sides.png", "xdecor_workbench_sides.png",
-               "xdecor_workbench_front.png", "xdecor_workbench_front.png"
-       },
+       tiles = {"xdecor_workbench_top.png",   "xdecor_workbench_top.png",
+                "xdecor_workbench_sides.png", "xdecor_workbench_sides.png",
+                "xdecor_workbench_front.png", "xdecor_workbench_front.png"},
        on_rotate = screwdriver.rotate_simple,
        can_dig = workbench.dig,
        on_timer = workbench.timer,
@@ -213,10 +224,13 @@ xdecor.register("workbench", {
 })
 
 for _, d in pairs(workbench.defs) do
-for node in pairs(minetest.registered_nodes) do
+for i = 1, #nodes do
+       local node = nodes[i]
        local def = minetest.registered_nodes[node]
-       if workbench:nodes(def) and d[3] then
-               local groups, tiles = {}, {}
+
+       if d[3] then
+               local groups = {}
+               local tiles
                groups.not_in_creative_inventory = 1
 
                for k, v in pairs(def.groups) do
@@ -226,9 +240,11 @@ for node in pairs(minetest.registered_nodes) do
                end
 
                if def.tiles then
-                       if #def.tiles > 1 and not def.drawtype:find("glass") then
+                       if #def.tiles > 1 and not (def.drawtype:sub(1,5) == "glass") then
                                tiles = def.tiles
-                       else tiles = {def.tiles[1]} end
+                       else
+                               tiles = {def.tiles[1]}
+                       end
                else
                        tiles = {def.tile_images[1]}
                end
@@ -252,14 +268,6 @@ for node in pairs(minetest.registered_nodes) do
                        on_place = minetest.rotate_node
                })
        end
-       if node:match(":mese") then
-               if d[3] then minetest.register_alias(node.."_"..d[1], "default:glass_"..d[1])
-               else minetest.register_alias("stairs:"..d[1].."_"..node:match(":(.*)"), "stairs:"..d[1].."_glass") end
-       elseif workbench:nodes(def) and not d[3] then
-               minetest.register_alias(node.."_"..d[1], "stairs:"..d[1].."_"..node:match(":(.*)"))
-       end
 end
 end
 
-minetest.register_alias("xdecor:worktable", "xdecor:workbench")
-