From 11f2b4f4b317a25972733e3d3fe9f2dc6ce31c6a Mon Sep 17 00:00:00 2001 From: David Leal <halfpacho@gmail.com> Date: Sat, 05 Sep 2020 18:54:37 +0200 Subject: [PATCH] Fix warning reported by LuaCheck (#563) --- technic/machines/register/recipes.lua | 45 ++++++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/technic/machines/register/recipes.lua b/technic/machines/register/recipes.lua index 768c620..921d1c8 100644 --- a/technic/machines/register/recipes.lua +++ b/technic/machines/register/recipes.lua @@ -1,18 +1,24 @@ +local have_ui = minetest.get_modpath("unified_inventory") -technic.recipes = {cooking = {numitems = 1}} -function technic.register_recipe_type(typename, desc, numitems) - numitems = numitems or 1 - if unified_inventory and unified_inventory.register_craft_type then +technic.recipes = { cooking = { input_size = 1, output_size = 1 } } +function technic.register_recipe_type(typename, origdata) + local data = {} + for k, v in pairs(origdata) do data[k] = v end + data.input_size = data.input_size or 1 + data.output_size = data.output_size or 1 + if have_ui and unified_inventory.register_craft_type and data.output_size == 1 then unified_inventory.register_craft_type(typename, { - description = desc, - height = numtiems, - width = 1, + description = data.description, + width = data.input_size, + height = 1, }) end - technic.recipes[typename] = {numitems = numitems, recipes = {}} + data.recipes = {} + technic.recipes[typename] = data end local function get_recipe_index(items) + if not items or type(items) ~= "table" then return false end local l = {} for i, stack in ipairs(items) do l[i] = ItemStack(stack):get_name() @@ -26,16 +32,26 @@ for i, stack in ipairs(data.input) do data.input[i] = ItemStack(stack):to_string() end - data.output = ItemStack(data.output):to_string() - + if type(data.output) == "table" then + for i, v in ipairs(data.output) do + data.output[i] = ItemStack(data.output[i]):to_string() + end + else + data.output = ItemStack(data.output):to_string() + end + local recipe = {time = data.time, input = {}, output = data.output} local index = get_recipe_index(data.input) + if not index then + print("[Technic] ignored registration of garbage recipe!") + return + end for _, stack in ipairs(data.input) do recipe.input[ItemStack(stack):get_name()] = ItemStack(stack):get_count() end - + technic.recipes[typename].recipes[index] = recipe - if unified_inventory then + if have_ui and technic.recipes[typename].output_size == 1 then unified_inventory.register_craft({ type = typename, output = data.output, @@ -65,12 +81,15 @@ end end local index = get_recipe_index(items) + if not index then + print("[Technic] ignored registration of garbage recipe!") + return + end local recipe = technic.recipes[typename].recipes[index] if recipe then local new_input = {} for i, stack in ipairs(items) do if stack:get_count() < recipe.input[stack:get_name()] then - print(stack:get_name()) return nil else new_input[i] = ItemStack(stack) -- Gitblit v1.8.0