]> git.lizzy.rs Git - xdecor.git/blobdiff - src/workbench.lua
Global code style cleaning
[xdecor.git] / src / workbench.lua
index e948c62500accfc6d3c3ef559cab098e651cb4bc..097c5854ab8a7f89ba946d08d7fa7a5ea6779c6c 100644 (file)
@@ -9,7 +9,7 @@ local registered_nodes = minetest.registered_nodes
 local nodes = {}
 for node, def in pairs(registered_nodes) do
        if xdecor.stairs_valid_def(def) then
-               nodes[#nodes+1] = node
+               nodes[#nodes + 1] = node
        end
 end
 
@@ -20,99 +20,117 @@ WB.custom_nodes_register = {
 
 setmetatable(nodes, {
        __concat = function(t1, t2)
-               for i=1, #t2 do
-                       t1[#t1+1] = t2[i]
+               for i = 1, #t2 do
+                       t1[#t1 + 1] = t2[i]
                end
+
                return t1
        end
 })
 
-nodes = nodes..WB.custom_nodes_register
+nodes = nodes .. WB.custom_nodes_register
 
 -- Nodeboxes definitions
 workbench.defs = {
-       -- Name       Yield   X  Y   Z  W   H  L
+       -- Name YieldX  YZ  WH  L
        {"nanoslab",    16, { 0, 0,  0, 8,  1, 8  }},
        {"micropanel",  16, { 0, 0,  0, 16, 1, 8  }},
        {"microslab",   8,  { 0, 0,  0, 16, 1, 16 }},
        {"thinstair",   8,  { 0, 7,  0, 16, 1, 8  },
-                           { 0, 15, 8, 16, 1, 8  }},
+                        { 0, 15, 8, 16, 1, 8  }},
        {"cube",        4,  { 0, 0,  0, 8,  8, 8  }},
        {"panel",       4,  { 0, 0,  0, 16, 8, 8  }},
        {"slab",        2,  nil                   },
        {"doublepanel", 2,  { 0, 0,  0, 16, 8, 8  },
-                           { 0, 8,  8, 16, 8, 8  }},
+                        { 0, 8,  8, 16, 8, 8  }},
        {"halfstair",   2,  { 0, 0,  0, 8,  8, 16 },
-                           { 0, 8,  8, 8,  8, 8  }},
+                        { 0, 8,  8, 8,  8, 8  }},
        {"stair_outer", 1,  nil                   },
        {"stair",       1,  nil                   },
        {"stair_inner", 1,  nil                   }
 }
 
+local repairable_tools = {"pick", "axe", "shovel", "sword", "hoe", "armor", "shield"}
+
 -- Tools allowed to be repaired
 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
+       for _, t in ipairs(repairable_tools) do
+               if stack:find(t) then
+                       return true
+               end
        end
-       return false
 end
 
 function workbench:get_output(inv, input, name)
        local output = {}
-       for i=1, #self.defs do
+       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
+               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
 
+local main_fs = [[
+       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;]
+       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]
+]]
+
+local crafting_fs = [[
+       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]
+]]
+
+local storage_fs = [[
+       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;]
-          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] ]],
+       main_fs,
+
        -- 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] ]],
+       crafting_fs,
+
        -- Storage formspec
-       [[ list[context;storage;0,1;8,2;]
-          button[0,0;1.5,1;back;< Back]
-          listring[context;storage]
-          listring[current_player;main] ]]
+       storage_fs,
 }
 
 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))
+               "size[8,7;]list[current_player;main;0,3.25;8,4;]" ..
+               formspecs[id] .. xbg .. default.get_hotbar_bg(0,3.25))
 end
 
 function workbench.construct(pos)
@@ -131,11 +149,11 @@ end
 
 function workbench.fields(pos, _, fields)
        if fields.quit then return end
+
        local meta = minetest.get_meta(pos)
-       local id = fields.back and 1 or
-                  fields.craft and 2 or
-                  fields.storage and 3
+       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
 
@@ -156,24 +174,26 @@ function workbench.timer(pos)
                return
        end
 
-       -- Tool's wearing range: 0-65535 | 0 = new condition
+       -- Tool's wearing range: 0-65535; 0 = new condition
        tool:add_wear(-500)
        hammer:add_wear(700)
 
        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(stackname)) or
-          (listname == "input" and registered_nodes[stackname.."_cube"]) or
+               workbench:repairable(stackname)) or
+          (listname == "input" and registered_nodes[stackname .. "_cube"]) or
           (listname == "hammer" and stackname == "xdecor:hammer") or
            listname == "storage" then
                return stack:get_count()
        end
+
        return 0
 end
 
@@ -199,7 +219,7 @@ function workbench.on_take(pos, listname, index, stack, player)
        local stackname = stack:get_name()
 
        if listname == "input" then
-               if stackname == inputname and registered_nodes[inputname.."_cube"] then
+               if stackname == inputname and registered_nodes[inputname .. "_cube"] then
                        workbench:get_output(inv, input, stackname)
                else
                        inv:set_list("forms", {})
@@ -221,11 +241,13 @@ end
 
 xdecor.register("workbench", {
        description = "Work Bench",
-       groups = {cracky=2, choppy=2, oddly_breakable_by_hand=1},
+       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,
@@ -237,8 +259,8 @@ xdecor.register("workbench", {
        allow_metadata_inventory_move = workbench.move
 })
 
-for _, d in pairs(workbench.defs) do
-for i=1, #nodes do
+for _, d in ipairs(workbench.defs) do
+for i = 1, #nodes do
        local node = nodes[i]
        local mod_name, item_name = node:match("^(.-):(.*)")
        local def = registered_nodes[node]
@@ -264,14 +286,14 @@ for i=1, #nodes do
                        tiles = {def.tile_images[1]}
                end
 
-               if not registered_nodes["stairs:slab_"..item_name] then
+               if not registered_nodes["stairs:slab_" .. item_name] then
                        stairs.register_stair_and_slab(item_name, node,
-                               groups, tiles, def.description.." Stair",
-                               def.description.." Slab", def.sounds)
+                               groups, tiles, def.description .. " Stair",
+                               def.description .. " Slab", def.sounds)
                end
 
-               minetest.register_node(":"..node.."_"..d[1], {
-                       description = def.description.." "..d[1]:gsub("^%l", string.upper),
+               minetest.register_node(":" .. node .. "_" .. d[1], {
+                       description = def.description .. " " .. d[1]:gsub("^%l", string.upper),
                        paramtype = "light",
                        paramtype2 = "facedir",
                        drawtype = "nodebox",
@@ -283,14 +305,15 @@ for i=1, #nodes do
                        sunlight_propagates = true,
                        on_place = minetest.rotate_node
                })
+
        elseif item_name and mod_name then
                minetest.register_alias_force(
-                       ('%s:%s_innerstair'):format(mod_name, item_name),
-                       ('stairs:stair_inner_%s'):format(item_name)
+                       ("%s:%s_innerstair"):format(mod_name, item_name),
+                       ("stairs:stair_inner_%s"):format(item_name)
                )
                minetest.register_alias_force(
-                       ('%s:%s_outerstair'):format(mod_name, item_name),
-                       ('stairs:stair_outer_%s'):format(item_name)
+                       ("%s:%s_outerstair"):format(mod_name, item_name),
+                       ("stairs:stair_outer_%s"):format(item_name)
                )
        end
 end
@@ -302,7 +325,9 @@ minetest.register_tool("xdecor:hammer", {
        description = "Hammer",
        inventory_image = "xdecor_hammer.png",
        wield_image = "xdecor_hammer.png",
-       on_use = function() do return end end
+       on_use = function() do
+               return end
+       end
 })
 
 -- Recipes