From 63bf6332b62042a2d95fcad55c6052510149cf63 Mon Sep 17 00:00:00 2001
From: Nihilistzsche <nihilistzsche@gmail.com>
Date: Fri, 10 Feb 2023 17:21:35 -0800
Subject: [PATCH] Everything efficiency.

---
 compatibility/crafting-efficiency.lua | 17 +++++++++++++----
 data-util.lua                         | 13 +++++++++++++
 me.lua                                |  2 +-
 tin-enriched.lua                      |  1 +
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/compatibility/crafting-efficiency.lua b/compatibility/crafting-efficiency.lua
index 282f6e5..1dd28c2 100644
--- a/compatibility/crafting-efficiency.lua
+++ b/compatibility/crafting-efficiency.lua
@@ -8,13 +8,22 @@ if mods["crafting-efficiency-2"] then
   for i, recipe in pairs(util.me.recipes) do
     -- add remaining recipes with direct items to find the icons
     if data.raw.recipe[recipe] and (data.raw.item[recipe] or data.raw.fluid[recipe])
-    and not eff_data[recipe] and 
-    (data.raw.recipe[recipe].main_product or util.get_result_count(recipe) == 1) then
+    and not eff_data[recipe] then
+      local research_level = 1
+	  if not data.raw.recipe[recipe].enabled then
+		  for tech, tbl in pairs(data.raw.technology) do
+			  for _, effect in pairs(tbl.effects or {}) do
+				  if effect.type == "unlock-recipe" and effect.recipe == recipe then
+					  research_level = math.min(#tbl.unit.ingredients, 6)
+				  end
+			  end
+		  end
+	  end
       eff_data[recipe] = {
         max = 15,
-        icon = data.raw.item[recipe] and data.raw.item[recipe].icon or data.raw.fluid[recipe].icon,
+        icon = util.get_item_or_fluid_icon(recipe),
         crafting = { efficiency = 10 },
-        research = { level = 6 },
+        research = { level = research_level },
       }
     end
   end
diff --git a/data-util.lua b/data-util.lua
index 4c4cd1e..eef178f 100644
--- a/data-util.lua
+++ b/data-util.lua
@@ -963,6 +963,19 @@ function util.set_item_icons(item_name, icons)
   end
 end
 
+-- Gets an item or fluid icon
+function util.get_item_or_fluid_icon(name)
+  icon = ""
+  if data.raw.item[name] then 
+    icon = data.raw.item[name].icon 
+    if not icon then icon = data.raw.item[name].icons[1].icon end
+  elseif data.raw.fluid[name] then
+    icon = data.raw.fluid[name].icon 
+    if not icon then icon = data.raw.fluid[name].icons[1].icon end
+  end
+  return icon
+end
+
 function util.set_to_founding(recipe, options)
   util.set_category(recipe, "founding", options)
   util.set_subgroup(recipe, "foundry-intermediate", options)
diff --git a/me.lua b/me.lua
index 95352a8..35b9702 100644
--- a/me.lua
+++ b/me.lua
@@ -7,7 +7,7 @@ me.recipes = {"tin-plate", "solder", "organotins",
               "enriched-tin-plate",
               "tin-smelting-vulcanite",
               "molten-tin",
-              "enriched-tin-smelting-vulcanite",}
+              "enriched-tin-smelting-vulcanite", "bronze-plate", "tinned-cable"}
 
 
 function me.use_cable()
diff --git a/tin-enriched.lua b/tin-enriched.lua
index 078055c..80e1407 100644
--- a/tin-enriched.lua
+++ b/tin-enriched.lua
@@ -31,6 +31,7 @@ data:extend(
     always_show_made_in = true,
     always_show_products = true,
     allow_productivity = true,
+	subgroup = "raw-material",
     ingredients =
     {
       mods.bzcarbon and {type = "item", name = "graphite", amount = 1}