From ab65faccfb809fd74a6df233c31ea99eb69e4c25 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sat, 3 May 2025 03:48:35 -0700
Subject: [PATCH] k2 updates

---
 carbon-recipe-k2.lua | 12 ++++++------
 changelog.txt        |  5 +++++
 data-util.lua        | 29 ++++++++++++++---------------
 info.json            |  2 +-
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/carbon-recipe-k2.lua b/carbon-recipe-k2.lua
index 7965b4d..cc686d0 100644
--- a/carbon-recipe-k2.lua
+++ b/carbon-recipe-k2.lua
@@ -37,23 +37,23 @@ data:extend({
     },
     results = {
       {type="item", name="graphite", amount=18},
-      {type="fluid", name="dirty-water", amount=25, catalyst_amount=25},
+      {type="fluid", name="kr-dirty-water", amount=25, catalyst_amount=25},
     },
   },
 	{
 		type = "recipe",
-		name = "dirty-water-filtration-graphite",
+		name = "kr-dirty-water-filtration-graphite",
 		category = "fluid-filtration",
 		icons =
 		{
 			{
-				icon = data.raw.fluid["dirty-water"].icon,
-				icon_size = data.raw.fluid["dirty-water"].icon_size
+				icon = data.raw.fluid["kr-dirty-water"].icon,
+				icon_size = data.raw.fluid["kr-dirty-water"].icon_size
 			},
 			{
 				icon = data.raw.item["flake-graphite"].icon,
 				icon_size =	data.raw.item["flake-graphite"].icon_size,
-				scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["flake-graphite"].icon_size),
+				scale = 0.20 * 64 / (data.raw.item["flake-graphite"].icon_size or 64),
 				shift = {0, 4}
 			}
 		},
@@ -64,7 +64,7 @@ data:extend({
 		always_show_products = true,
 		ingredients =
 		{
-			{type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100},
+			{type = "fluid", name = "kr-dirty-water", amount = 100, catalyst_amount = 100},
 		},
 		results =
 		{
diff --git a/changelog.txt b/changelog.txt
index f9c6ead..f64343e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.0.17
+Date: 2025-05-03
+  Changes:
+    - K2: Compatbility updates
+---------------------------------------------------------------------------------------------------
 Version: 2.0.16
 Date: 2025-04-20
   Changes:
diff --git a/data-util.lua b/data-util.lua
index 0e48dbf..29ebf26 100644
--- a/data-util.lua
+++ b/data-util.lua
@@ -115,12 +115,9 @@ function util.fe_plus(sub)
   end
 end
 
-function util.get_stack_size(default) 
-  if mods.Krastorio2 then
-    local size = get_setting("kr-stack-size")
-    if size and tonumber(size) then
-      return tonumber(size)
-    end
+function util.get_stack_size(default)
+  if mods.Krastorio2 and kr_adjust_stack_sizes then
+    return tonumber(200)
   end
   return default
 end
@@ -515,14 +512,11 @@ end
 -- k2 matter 
 -- params: {k2matter}, k2baseicon , {icon}
 function util.k2matter(params)
-  local matter = require("__Krastorio2__/lib/public/data-stages/matter-util")
+  local matter = require("__Krastorio2__/prototypes/libraries/matter")
   if mods["space-exploration"] then 
-    params.k2matter.need_stabilizer = true
+    params.k2matter.needs_stabilizer = true
   end
-  if not params.k2matter.minimum_conversion_quantity then
-    params.k2matter.minimum_conversion_quantity = 10
-  end
-  if not data.raw.technology[params.k2matter.unlocked_by_technology] then
+  if not data.raw.technology[params.k2matter.unlocked_by] then
     local icon = ""
     if params.k2baseicon then
       icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
@@ -534,7 +528,7 @@ function util.k2matter(params)
         {
           {
             type = "technology",
-            name = params.k2matter.unlocked_by_technology,
+            name = params.k2matter.unlocked_by,
             icons =
             {
               {
@@ -561,15 +555,20 @@ function util.k2matter(params)
               {
                 {"production-science-pack", 1},
                 {"utility-science-pack", 1},
-                {"matter-tech-card", 1}
+                {"kr-matter-tech-card", 1}
               },
               time = 45,
             },
+            effects = {}
             -- (ignore for now) localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
           },
         })
   end
-  matter.createMatterRecipe(params.k2matter)
+  if params.k2matter.only_deconversion then
+    matter.make_deconversion_recipe(params.k2matter)
+  else
+    matter.make_recipes(params.k2matter)
+  end
 end
 
 
diff --git a/info.json b/info.json
index d79aaf7..a3b6448 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bzcarbon",
-    "version": "2.0.16",
+    "version": "2.0.17",
     "factorio_version": "2.0",
     "title": "Graphite & Diamonds",
     "author": "Brevven",