From ec73a8508fc8458e10be6a93bbc3be2eba26595f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Mon, 19 Jan 2015 19:37:46 +0100 Subject: [PATCH] add custom collision and selection box handling to CNC machine also clean up formatting of surrounding code --- technic/machines/register/extractor_recipes.lua | 51 +++------------------------------------------------ 1 files changed, 3 insertions(+), 48 deletions(-) diff --git a/technic/machines/register/extractor_recipes.lua b/technic/machines/register/extractor_recipes.lua index 2d19130..f752144 100644 --- a/technic/machines/register/extractor_recipes.lua +++ b/technic/machines/register/extractor_recipes.lua @@ -1,53 +1,11 @@ local S = technic.getter -if unified_inventory and unified_inventory.register_craft_type then - unified_inventory.register_craft_type("extracting", { - description = S("Extracting"), - height = 1, - width = 1, - }) -end - -technic.extractor_recipes = {} +technic.register_recipe_type("extracting", { description = S("Extracting") }) function technic.register_extractor_recipe(data) data.time = data.time or 4 - local src = ItemStack(data.input):get_name() - technic.extractor_recipes[src] = data - if unified_inventory then - unified_inventory.register_craft({ - type = "extracting", - output = data.output, - items = {data.input}, - width = 0, - }) - end -end - --- Receive an ItemStack of result by an ItemStack input -function technic.get_extractor_recipe(item) - if technic.extractor_recipes[item:get_name()] and - item:get_count() >= ItemStack(technic.extractor_recipes[item:get_name()].input):get_count() then - return technic.extractor_recipes[item:get_name()] - else - return nil - end -end - -minetest.after(0.01, function () - for ingredient, recipe in pairs(technic.extractor_recipes) do - ingredient = minetest.registered_aliases[ingredient] - while ingredient do - technic.grinder_recipes[ingredient] = recipe - ingredient = minetest.registered_aliases[ingredient] - end - end -end) - --- Receive an ItemStack of result by an ItemStack input -function technic.get_grinder_recipe(itemstack) - return technic.grinder_recipes[itemstack:get_name()] + technic.register_recipe("extracting", data) end local recipes = { @@ -66,12 +24,9 @@ {"technic:raw_latex", "technic:rubber 3"}, {"moretrees:rubber_tree_trunk_empty", "technic:rubber"}, {"moretrees:rubber_tree_trunk", "technic:rubber"}, - - -- Other - {"technic:uranium 5", "technic:enriched_uranium"}, } for _, data in pairs(recipes) do - technic.register_extractor_recipe({input = data[1], output = data[2]}) + technic.register_extractor_recipe({input = {data[1]}, output = data[2]}) end -- Gitblit v1.8.0