From a52835dd7731a2a28fb742cb2aef3ba625bdbbf2 Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Mon, 13 Oct 2025 16:00:31 +0200
Subject: [PATCH] Add missing ingredient types + compatibility fixes

---
 ChemistryForYou2/prototypes/recipes.lua | 16 ++++++++--------
 ChemistryForYou2/recipe-modify.lua      | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ChemistryForYou2/prototypes/recipes.lua b/ChemistryForYou2/prototypes/recipes.lua
index a113d75..17cc86b 100644
--- a/ChemistryForYou2/prototypes/recipes.lua
+++ b/ChemistryForYou2/prototypes/recipes.lua
@@ -68,7 +68,7 @@ if mods["bzaluminum"] then
 end
 local sodaLimeGlassCategory = "crafting"
 
-if not data.raw.item["glass"] then
+if not data.raw.item["glass"] and not data.raw.item["kr-glass"] then
   data:extend({
     {
       type = "item",
@@ -521,11 +521,11 @@ data:extend({
         } or {
           { icon = "__ChemistryForYou2__/graphics/icons/glass.png", icon_size = 64},
         }),
-    main_product = "glass",
+    main_product = mods["Krastorio2"] and "kr-glass" or "glass",
     enabled = false,
     energy_required = 16,
     ingredients = {{type="item", name="sodium-carbonate", amount=10}, (data.raw.item["quicklime"] and {type = "item", name = "quicklime", amount=10}) or {type = "item", name = "stone", amount=5}, (data.raw.item["alumina"] and {type = "item", name = "alumina", amount=1}) or {type = "item", name = "iron-plate", amount=1}},
-    results = {{type="item", name = "glass", amount=10}}
+    results = {{type="item", name = mods["Krastorio2"] and "kr-glass" or "glass", amount=10}}
   }
 })
 
@@ -536,16 +536,16 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
   if mods["248k-Redux"] then
     local rich_water_filtration_results = {data.raw.item["lithium"] and {type = "item", name="lithium", amount=5} or {type = "item", name="el_lithium_item", amount=5}, {type="fluid", name="water", amount=100}}
     if data.raw.item["cobaltite-ore"] then
-      table.insert(rich_water_filtration_results, {name="cobaltite-ore", amount=1, probability=0.2})
+      table.insert(rich_water_filtration_results, { type = "item", name = "cobaltite-ore", amount=1, probability=0.2})
     end
     if data.raw.item["gold-ore"] then
-      table.insert(rich_water_filtration_results, {name="gold-ore", amount=1, probability=0.1})
+      table.insert(rich_water_filtration_results, { type = "item", name = "gold-ore", amount=1, probability=0.1})
     end
     if data.raw.item["platinum-powder"] then
-      table.insert(rich_water_filtration_results, {name="platinum-powder", amount=1, probability=0.1})
+      table.insert(rich_water_filtration_results, { type = "item", name = "platinum-powder", amount=1, probability=0.1})
     end
     if data.raw.item["palladium-powder"] then
-      table.insert(rich_water_filtration_results, {name="palladium-powder", amount=1, probability=0.1})
+      table.insert(rich_water_filtration_results, { type = "item", name = "palladium-powder", amount=1, probability=0.1})
     end
     data:extend({
       {
@@ -1149,7 +1149,7 @@ if mods["space-exploration"] then
     util.add_productivity("deep-space-ore-enrichment")
   end
   if mods["bztungsten"] then
-    local smart_glass_ingredients = {{type="item", name="tungsten-trioxide", amount=10}, {type="item", name="glass", amount=10}}
+    local smart_glass_ingredients = {{type="item", name="tungsten-trioxide", amount=10}, {type="item", name=mods["Krastorio2"] and "kr-glass" or "glass", amount=10}}
     if data.raw.item["graphene"] then
       table.insert(smart_glass_ingredients, {type="item", name="graphene", amount=4})
     end
diff --git a/ChemistryForYou2/recipe-modify.lua b/ChemistryForYou2/recipe-modify.lua
index c803813..faffbc1 100644
--- a/ChemistryForYou2/recipe-modify.lua
+++ b/ChemistryForYou2/recipe-modify.lua
@@ -2,6 +2,7 @@ local util = require("data-util")
 
 -- Main vanilla changes
 
+local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
 
 -- Mod changes
 if mods["248k-Redux"] then
@@ -91,7 +92,7 @@ if mods["ShockTurret"] then
 end
 
 if mods["bzgold"] and mods["ThemTharHills-Updated"] then
-    util.add_product("trace-gold-from-copper", {name="platinum-powder", amount=1, probability=0.1})
+    util.add_product("trace-gold-from-copper", { type = "item", name = "platinum-powder", amount=1, probability=0.1})
     util.add_unlock("gold-processing", "platinum-ingot")
 end
 
@@ -132,16 +133,16 @@ if mods["space-exploration"] then
 
     if mods["bztungsten"] then
         util.remove_ingredient("se-space-biochemical-laboratory", "graphene")
-        util.replace_ingredient("se-space-biochemical-laboratory", "glass", "smart-glass", 80)
+        util.replace_ingredient("se-space-biochemical-laboratory", glass_name, "smart-glass", 80)
 
         util.remove_ingredient("se-space-growth-facility", "graphene")
-        util.replace_ingredient("se-space-growth-facility", "glass", "smart-glass", 300)
+        util.replace_ingredient("se-space-growth-facility", glass_name, "smart-glass", 300)
 
         util.remove_ingredient("se-space-mirror", "silver-plate")
-        util.replace_ingredient("se-space-mirror", "glass", "smart-glass", 8)
+        util.replace_ingredient("se-space-mirror", glass_name, "smart-glass", 8)
 
         util.remove_ingredient("se-space-mirror-alternate", "silver-plate")
-        util.replace_ingredient("se-space-mirror-alternate", "glass", "smart-glass", 2)
+        util.replace_ingredient("se-space-mirror-alternate", glass_name, "smart-glass", 2)
 
         util.add_prerequisite("se-space-biochemical-laboratory","tungsten-chemistry")
     end