From fc2d2e585c464fe1892cb778c0bd83b04deae2dd Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Sun, 10 Feb 2019 23:07:28 +0100
Subject: [PATCH] Fix issue #60

---
 init.lua | 145 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 69 deletions(-)

diff --git a/init.lua b/init.lua
index 26577f0..56351ef 100644
--- a/init.lua
+++ b/init.lua
@@ -49,6 +49,8 @@ local group_stereotypes = {
 }
 
 local function table_merge(t, t2)
+	t, t2 = t or {}, t2 or {}
+
 	for i = 1, #t2 do
 		t[#t + 1] = t2[i]
 	end
@@ -132,6 +134,55 @@ local function apply_recipe_filters(recipes, player)
 	return recipes
 end
 
+local function item_has_groups(item_groups, groups)
+	for i = 1, #groups do
+		local group = groups[i]
+		if not item_groups[group] then
+			return
+		end
+	end
+
+	return true
+end
+
+local function extract_groups(str)
+	return str:sub(7):split(",")
+end
+
+local function item_in_recipe(item, recipe)
+	local item_groups = reg_items[item].groups
+	for _, recipe_item in pairs(recipe.items) do
+		if recipe_item == item then
+			return true
+		elseif recipe_item:sub(1,6) == "group:" then
+			local groups = extract_groups(recipe_item)
+			if item_has_groups(item_groups, groups) then
+				return true
+			end
+		end
+	end
+end
+
+local function get_item_usages(item)
+	local usages, c = {}, 0
+
+	for _, recipes in pairs(recipes_cache) do
+	for i = 1, #recipes do
+		local recipe = recipes[i]
+		if item_in_recipe(item, recipe) then
+			c = c + 1
+			usages[c] = recipe
+		end
+	end
+	end
+
+	if fuel_cache[item] then
+		usages[#usages + 1] = {type = "fuel", width = 1, items = {item}}
+	end
+
+	return usages
+end
+
 local function get_filtered_items(player)
 	local items, c = {}, 0
 
@@ -139,6 +190,10 @@ local function get_filtered_items(player)
 		local item = init_items[i]
 		local recipes = recipes_cache[item]
 
+		if fuel_cache[item] then
+			recipes = table_merge(get_item_usages(item), recipes)
+		end
+
 		if recipes then
 			recipes = apply_recipe_filters(recipes, player)
 			if #recipes > 0 then
@@ -181,21 +236,6 @@ local function cache_fuel(item)
 	end
 end
 
-local function extract_groups(str)
-	return str:sub(7):split(",")
-end
-
-local function item_has_groups(item_groups, groups)
-	for i = 1, #groups do
-		local group = groups[i]
-		if not item_groups[group] then
-			return
-		end
-	end
-
-	return true
-end
-
 local function groups_to_item(groups)
 	if #groups == 1 then
 		local group = groups[1]
@@ -522,40 +562,6 @@ local function search(data)
 	data.items = filtered_list
 end
 
-local function item_in_recipe(item, recipe)
-	local item_groups = reg_items[item].groups
-	for _, recipe_item in pairs(recipe.items) do
-		if recipe_item == item then
-			return true
-		elseif recipe_item:sub(1,6) == "group:" then
-			local groups = extract_groups(recipe_item)
-			if item_has_groups(item_groups, groups) then
-				return true
-			end
-		end
-	end
-end
-
-local function get_item_usages(item)
-	local usages, c = {}, 0
-
-	for _, recipes in pairs(recipes_cache) do
-	for i = 1, #recipes do
-		local recipe = recipes[i]
-		if item_in_recipe(item, recipe) then
-			c = c + 1
-			usages[c] = recipe
-		end
-	end
-	end
-
-	if fuel_cache[item] then
-		usages[#usages + 1] = {type = "fuel", width = 1, items = {item}}
-	end
-
-	return usages
-end
-
 local function get_inv_items(player)
 	local inv = player:get_inventory()
 	local main, craft = inv:get_list("main"), inv:get_list("craft")
@@ -576,25 +582,6 @@ local function get_inv_items(player)
 	return inv_items
 end
 
-local function item_in_inv(item, inv_items)
-	local inv_items_size = #inv_items
-	if item:sub(1,6) == "group:" then
-		local groups = extract_groups(item)
-		for i = 1, inv_items_size do
-			local item_groups = reg_items[inv_items[i]].groups
-			if item_has_groups(item_groups, groups) then
-				return true
-			end
-		end
-	else
-		for i = 1, inv_items_size do
-			if inv_items[i] == item then
-				return true
-			end
-		end
-	end
-end
-
 local function init_data(name)
 	player_data[name] = {
 		filter  = "",
@@ -865,6 +852,26 @@ else
 end
 
 if progressive_mode then
+	local function item_in_inv(item, inv_items)
+		local inv_items_size = #inv_items
+
+		if item:sub(1,6) == "group:" then
+			local groups = extract_groups(item)
+			for i = 1, inv_items_size do
+				local item_groups = reg_items[inv_items[i]].groups
+				if item_has_groups(item_groups, groups) then
+					return true
+				end
+			end
+		else
+			for i = 1, inv_items_size do
+				if inv_items[i] == item then
+					return true
+				end
+			end
+		end
+	end
+
 	local function recipe_in_inv(recipe, inv_items)
 		for _, item in pairs(recipe.items) do
 			if not item_in_inv(item, inv_items) then
@@ -969,7 +976,7 @@ mt.register_chatcommand("craft", {
 			elseif recipes_cache[node_name] then
 				return false, fmt(msg, S("You don't know a recipe for this node"))
 			else
-				return false, fmt(msg, S("No recipe for this node"))	
+				return false, fmt(msg, S("No recipe for this node"))
 			end
 		end