From e606b93ac633fd95bb2a65aac6acb94b30abcb14 Mon Sep 17 00:00:00 2001
From: Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com>
Date: Sat, 6 Jul 2013 15:19:15 +0700
Subject: [PATCH] Support for multiple-input recipes in extractor.

---
 technic/extractor.lua | 69 ++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/technic/extractor.lua b/technic/extractor.lua
index 92ccdd5..473a7b3 100644
--- a/technic/extractor.lua
+++ b/technic/extractor.lua
@@ -1,27 +1,23 @@
 technic.extractor_recipes ={}
 
-technic.register_extractor_recipe = function(src, dst)
-				   technic.extractor_recipes[src] = dst
+technic.register_extractor_recipe = function(src, src_count, dst, dst_count)
+				   technic.extractor_recipes[src] = {src_count = src_count, dst_name = dst, dst_count = dst_count}
 				   if unified_inventory then
 				      unified_inventory.register_craft(
 					 {
 					    type = "extracting",
-					    output = dst,
-					    items = {src},
+					    output = dst.." "..dst_count,
+					    items = {src.." "..src_count},
 					    width = 0,
 					 })
 				   end
 				end
 
 -- Receive an ItemStack of result by an ItemStack input
-technic.get_extractor_recipe = function(itemstack)
-				local src_item  = itemstack:to_table()
-				if src_item == nil then
-				   return nil
-				end
-				local item_name = src_item["name"]
-				if technic.extractor_recipes[item_name] then
-				   return ItemStack(technic.extractor_recipes[item_name])
+technic.get_extractor_recipe = function(item)
+				if technic.extractor_recipes[item.name]
+				   and item.count >= technic.extractor_recipes[item.name].src_count then
+				   return technic.extractor_recipes[item.name]
 				else
 				   return nil
 				end
@@ -29,18 +25,18 @@ technic.get_extractor_recipe = function(itemstack)
 
 
 
-technic.register_extractor_recipe("technic:coal_dust","dye:black 2")
-technic.register_extractor_recipe("default:cactus","dye:green 2")
-technic.register_extractor_recipe("default:dry_shrub","dye:brown 2")
-technic.register_extractor_recipe("flowers:geranium","dye:blue 2")
-technic.register_extractor_recipe("flowers:dandelion_white","dye:white 2")
-technic.register_extractor_recipe("flowers:dandelion_yellow","dye:yellow 2")
-technic.register_extractor_recipe("flowers:tulip","dye:orange 2")
-technic.register_extractor_recipe("flowers:rose","dye:red 2")
-technic.register_extractor_recipe("flowers:viola","dye:violet 2")
-technic.register_extractor_recipe("technic:raw_latex","technic:rubber 3")
-technic.register_extractor_recipe("moretrees:rubber_tree_trunk_empty","technic:rubber 1")
-technic.register_extractor_recipe("moretrees:rubber_tree_trunk","technic:rubber 1")
+technic.register_extractor_recipe("technic:coal_dust", 1, "dye:black", 2)
+technic.register_extractor_recipe("default:cactus", 1, "dye:green", 2)
+technic.register_extractor_recipe("default:dry_shrub", 1, "dye:brown", 2)
+technic.register_extractor_recipe("flowers:geranium", 1, "dye:blue", 2)
+technic.register_extractor_recipe("flowers:dandelion_white", 1, "dye:white", 2)
+technic.register_extractor_recipe("flowers:dandelion_yellow", 1, "dye:yellow", 2)
+technic.register_extractor_recipe("flowers:tulip", 1, "dye:orange", 2)
+technic.register_extractor_recipe("flowers:rose", 1, "dye:red", 2)
+technic.register_extractor_recipe("flowers:viola", 1, "dye:violet", 2)
+technic.register_extractor_recipe("technic:raw_latex", 1, "technic:rubber", 3)
+technic.register_extractor_recipe("moretrees:rubber_tree_trunk_empty", 1, "technic:rubber", 1)
+technic.register_extractor_recipe("moretrees:rubber_tree_trunk", 1, "technic:rubber", 1)
 
 minetest.register_alias("extractor", "technic:extractor")
 minetest.register_craft({
@@ -160,12 +156,25 @@ minetest.register_abm(
 			    
 		    local inv    = meta:get_inventory()
 		    local empty  = inv:is_empty("src")
-
+		    local srcstack  = inv:get_stack("src", 1)
+		    local src_item = nil
+		    local recipe = nil
+		    local result = nil
+		    
+		    if srcstack then
+		       src_item = srcstack:to_table()
+		    end
+		    if src_item then
+		       recipe = technic.get_extractor_recipe(src_item)
+		    end
+		    if recipe then
+		       result = {name=recipe.dst_name, count=recipe.dst_count}
+		    end 
+		    
 		    if state == 1 then
 		       hacky_swap_node(pos, machine_node)
 		       meta:set_string("infotext", machine_name.." Idle")
 
-		       local result = technic.get_extractor_recipe(inv:get_stack("src", 1))
 		       if not empty and result and inv:room_for_item("dst",result) then
 			  meta:set_int("src_time", 0)
 			  next_state = 2
@@ -181,14 +190,12 @@ minetest.register_abm(
 			  meta:set_int("src_time", meta:get_int("src_time") + 1)
 			  if meta:get_int("src_time") == 4 then -- 4 ticks per output
 			     -- check if there's room for output in "dst" list
-			     local result = technic.get_extractor_recipe(inv:get_stack("src", 1))
 
 			     meta:set_int("src_time", 0)
-			     if inv:room_for_item("dst",result) then
+			     if recipe and inv:room_for_item("dst",result) then
 				-- take stuff from "src" list
-				srcstack = inv:get_stack("src", 1)
-				srcstack:take_item()
-				inv:set_stack("src", 1, srcstack)
+				srcstack:take_item(recipe.src_count)
+			        inv:set_stack("src", 1, srcstack)
 				-- Put result in "dst" list
 				inv:add_item("dst", result)
 			     else