From 5e19514c60bd46a939beeeddde1125f137c486fb Mon Sep 17 00:00:00 2001
From: Carter Kolwey <cheapiephp@gmail.com>
Date: Tue, 28 Feb 2017 00:58:43 +0100
Subject: [PATCH] Add dirt recipe to centrifuge 4 dirt -> 2 clay lumps, 1 sand, 1 gravel
---
technic/machines/register/recipes.lua | 108 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/technic/machines/register/recipes.lua b/technic/machines/register/recipes.lua
index fb5c09e..d30fd4f 100644
--- a/technic/machines/register/recipes.lua
+++ b/technic/machines/register/recipes.lua
@@ -1,63 +1,107 @@
+local have_ui = minetest.get_modpath("unified_inventory")
-technic.recipes = {}
-function technic.register_recipe_type(typename, desc)
- 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,
+ description = data.description,
+ width = data.input_size,
height = 1,
- width = 1,
})
end
- technic.recipes[typename] = {}
+ data.recipes = {}
+ technic.recipes[typename] = data
end
-function technic.register_recipe(typename, data)
- local src = ItemStack(data.input):get_name()
- technic.recipes[typename][src] = data
- if unified_inventory then
+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()
+ end
+ table.sort(l)
+ return table.concat(l, "/")
+end
+
+local function register_recipe(typename, data)
+ -- Handle aliases
+ for i, stack in ipairs(data.input) do
+ data.input[i] = ItemStack(stack):to_string()
+ end
+ 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 and technic.recipes[typename].output_size == 1 then
unified_inventory.register_craft({
type = typename,
output = data.output,
- items = {data.input},
+ items = data.input,
width = 0,
})
end
end
-function technic.get_recipe(typename, item)
+function technic.register_recipe(typename, data)
+ minetest.after(0.01, register_recipe, typename, data) -- Handle aliases
+end
+
+function technic.get_recipe(typename, items)
if typename == "cooking" then -- Already builtin in Minetest, so use that
- local result = minetest.get_craft_result({
+ local result, new_input = minetest.get_craft_result({
method = "cooking",
width = 1,
- items = {item}})
+ items = items})
-- Compatibility layer
if not result or result.time == 0 then
return nil
else
return {time = result.time,
- input = item:get_name(),
- output = result.item:to_string()}
+ new_input = new_input.items,
+ output = result.item}
end
end
- local recipe = technic.recipes[typename][item:get_name()]
- if recipe and item:get_count() >= ItemStack(recipe.input):get_count() then
- return recipe
+ 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
+ return nil
+ else
+ new_input[i] = ItemStack(stack)
+ new_input[i]:take_item(recipe.input[stack:get_name()])
+ end
+ end
+ return {time = recipe.time,
+ new_input = new_input,
+ output = recipe.output}
else
return nil
end
end
-
--- Handle aliases
-minetest.after(0.01, function ()
- for _, recipes_list in pairs(technic.recipes) do
- for ingredient, recipe in pairs(recipes_list) do
- ingredient = minetest.registered_aliases[ingredient]
- while ingredient do
- recipes_list[ingredient] = recipe
- ingredient = minetest.registered_aliases[ingredient]
- end
- end
- end
-end)
--
Gitblit v1.8.0