]> git.lizzy.rs Git - xdecor.git/blobdiff - src/workbench.lua
Workbench: Fix special case of unknown items output (#90)
[xdecor.git] / src / workbench.lua
index 32e0eb858957576e9b403a7eebf7c5224382fc12..ad69361fe27ba4058a932122545017888ee1687c 100644 (file)
@@ -2,28 +2,13 @@ local workbench = {}
 WB = {}
 screwdriver = screwdriver or {}
 local min, ceil = math.min, math.ceil
+local registered_nodes = minetest.registered_nodes
 
 -- Nodes allowed to be cut
 -- 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.not_cuttable == 1) and
-          not def.groups.wool and
-          (def.tiles and type(def.tiles[1]) == "string" and not
-               def.tiles[1]:find("default_mineral")) and
-          not def.mesecons and
-          def.description and
-          def.description ~= "" and
-          def.light_source == 0
-       then
+for node, def in pairs(registered_nodes) do
+       if xdecor.stairs_valid_def(def) then
                nodes[#nodes+1] = node
        end
 end
@@ -70,19 +55,22 @@ workbench.defs = {
 -- Tools allowed to be repaired
 function workbench:repairable(stack)
        local tools = {"pick", "axe", "shovel", "sword", "hoe", "armor", "shield"}
-       for i=1, #tools do
-               return stack:find(tools[i])
+       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)
        local output = {}
-       for _, n in pairs(self.defs) do
-               local count = min(n[2] * input:get_count(), input:get_stack_max())
-               local item = name.."_"..n[1]
-               if not n[3] then item = "stairs:"..n[1].."_"..name:match(":(.*)") end
+       for i=1, #self.defs do
+               local nbox = self.defs[i]
+               local count = min(nbox[2] * input:get_count(), input:get_stack_max())
+               local item = name.."_"..nbox[1]
+               item = nbox[3] and item or "stairs:"..nbox[1].."_"..name:match(":(.*)")
                output[#output+1] = item.." "..count
        end
+
        inv:set_list("forms", output)
 end
 
@@ -101,7 +89,15 @@ local formspecs = {
           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;] ]],
+          list[context;forms;4,0;4,3;]
+          listring[current_player;main]
+          listring[context;tool]
+          listring[current_player;main]
+          listring[context;hammer]
+          listring[current_player;main]
+          listring[context;forms]
+          listring[current_player;main]
+          listring[context;input] ]],
        -- Crafting formspec
        [[ image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
           button[0,0;1.5,1;back;< Back]
@@ -117,7 +113,8 @@ local formspecs = {
 }
 
 function workbench:set_formspec(meta, id)
-       meta:set_string("formspec", "size[8,7;]list[current_player;main;0,3.25;8,4;]"..
+       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
 
@@ -136,10 +133,13 @@ function workbench.construct(pos)
 end
 
 function workbench.fields(pos, _, fields)
+       if fields.quit then return end
        local meta = minetest.get_meta(pos)
-       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
+       local id = fields.back and 1 or
+                  fields.craft and 2 or
+                  fields.storage and 3
+       if not id then return end
+       workbench:set_formspec(meta, id)
 end
 
 function workbench.dig(pos)
@@ -172,7 +172,7 @@ function workbench.put(_, listname, _, stack)
        local stackname = stack:get_name()
        if (listname == "tool" and stack:get_wear() > 0 and
            workbench:repairable(stackname)) or
-          (listname == "input" and minetest.registered_nodes[stackname.."_cube"]) or
+          (listname == "input" and registered_nodes[stackname.."_cube"]) or
           (listname == "hammer" and stackname == "xdecor:hammer") or
            listname == "storage" then
                return stack:get_count()
@@ -202,7 +202,7 @@ function workbench.on_take(pos, listname, index, stack, player)
        local stackname = stack:get_name()
 
        if listname == "input" then
-               if stackname == inputname then
+               if stackname == inputname and registered_nodes[inputname.."_cube"] then
                        workbench:get_output(inv, input, stackname)
                else
                        inv:set_list("forms", {})
@@ -243,7 +243,7 @@ xdecor.register("workbench", {
 for _, d in pairs(workbench.defs) do
 for i=1, #nodes do
        local node = nodes[i]
-       local def = minetest.registered_nodes[node]
+       local def = registered_nodes[node]
 
        if d[3] then
                local groups = {}
@@ -257,7 +257,7 @@ for i=1, #nodes do
                end
 
                if def.tiles then
-                       if #def.tiles > 1 and not (def.drawtype:sub(1,5) == "glass") then
+                       if #def.tiles > 1 and (def.drawtype:sub(1,5) ~= "glass") then
                                tiles = def.tiles
                        else
                                tiles = {def.tiles[1]}
@@ -266,7 +266,7 @@ for i=1, #nodes do
                        tiles = {def.tile_images[1]}
                end
 
-               if not minetest.registered_nodes["stairs:slab_"..node:match(":(.*)")] then
+               if not registered_nodes["stairs:slab_"..node:match(":(.*)")] then
                        stairs.register_stair_and_slab(node:match(":(.*)"), node,
                                groups, tiles, def.description.." Stair",
                                def.description.." Slab", def.sounds)
@@ -289,3 +289,29 @@ for i=1, #nodes do
 end
 end
 
+-- Craft items
+
+minetest.register_tool("xdecor:hammer", {
+       description = "Hammer",
+       inventory_image = "xdecor_hammer.png",
+       wield_image = "xdecor_hammer.png",
+       on_use = function() do return end end
+})
+
+-- Recipes
+
+minetest.register_craft({
+       output = "xdecor:hammer",
+       recipe = {
+               {"default:steel_ingot", "group:stick", "default:steel_ingot"},
+               {"", "group:stick", ""}
+       }
+})
+
+minetest.register_craft({
+       output = "xdecor:workbench",
+       recipe = {
+               {"group:wood", "group:wood"},
+               {"group:wood", "group:wood"}
+       }
+})