From 2a8d676176cee0407d9fa4a32034f68a0e0026d0 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sun, 28 Mar 2021 20:48:58 -0700
Subject: [PATCH] fix fe+ compat

---
 changelog.txt                      | 5 +++++
 data-util.lua                      | 6 +++---
 info.json                          | 2 +-
 titanium-recipe-final-stacking.lua | 7 +++++--
 titanium-recipe-modules.lua        | 5 ++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 48047b4..9f486ba 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.10.6
+Date: 2021-03-18
+  Fixes:
+    - Fix and improve FE+ compatiblity broken in 0.10.3
+---------------------------------------------------------------------------------------------------
 Version: 0.10.5
 Date: 2021-03-18
   Features:
diff --git a/data-util.lua b/data-util.lua
index ce9deb3..d7a75a1 100644
--- a/data-util.lua
+++ b/data-util.lua
@@ -25,15 +25,15 @@ function data_util.get_stack_size(default)
 end
 
 function data_util.steel_to_titanium(name) 
-  data_util.replace_ingredient(name, "steel-plate", "titanium-plate")
+  data_util.replace_ingredient(name, "steel-plate", data_util.titanium_plate)
 end
 
 function data_util.add_titanium_ingredient(amount, name) 
-  data_util.add_ingredient(name, "titanium-plate", amount)
+  data_util.add_ingredient(name, data_util.titanium_plate, amount)
 end
 
 function data_util.rare_to_titanium(name) 
-  data_util.replace_ingredient(name, "rare-metals", "titanium-plate")
+  data_util.replace_ingredient(name, "rare-metals", data_util.titanium_plate)
 end
 
 function data_util.add_titanium_prerequisite(name)
diff --git a/info.json b/info.json
index 3c35cd1..0fca5af 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bztitanium",
-    "version": "0.10.5",
+    "version": "0.10.6",
     "factorio_version": "1.1",
     "title": "Titanium",
     "author": "Brevven",
diff --git a/titanium-recipe-final-stacking.lua b/titanium-recipe-final-stacking.lua
index 03afdfc..f9d7bf1 100644
--- a/titanium-recipe-final-stacking.lua
+++ b/titanium-recipe-final-stacking.lua
@@ -1,7 +1,10 @@
 -- Deadlock stacking recipes
+
+local util = require("__bztitanium__.data-util");
+
 if deadlock then
   deadlock.add_stack("titanium-ore",  "__bztitanium__/graphics/icons/stacked/titanium-ore-stacked.png", "deadlock-stacking-2", 64)
-  deadlock.add_stack("titanium-plate", "__bztitanium__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64)
+  deadlock.add_stack(util.titanium_plate, "__bztitanium__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64)
   if mods["Krastorio2"] then
     deadlock.add_stack("enriched-titanium", "__bztitanium__/graphics/icons/stacked/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64)
   end
@@ -10,7 +13,7 @@ end
 -- Deadlock crating recipes
 if deadlock_crating then
   deadlock_crating.add_crate("titanium-ore", "deadlock-crating-2")
-  deadlock_crating.add_crate("titanium-plate", "deadlock-crating-2")
+  deadlock_crating.add_crate(util.titanium_plate, "deadlock-crating-2")
   if mods["Krastorio2"] then
     deadlock_crating.add_crate("enriched-titanium", "deadlock-crating-2")
   end
diff --git a/titanium-recipe-modules.lua b/titanium-recipe-modules.lua
index f239bfb..6744db5 100644
--- a/titanium-recipe-modules.lua
+++ b/titanium-recipe-modules.lua
@@ -1,6 +1,9 @@
 -- Enable prod modules for all titanium plate and ore recipes
 
-recipes = {"titanium-plate"}
+local util = require("__bztitanium__.data-util");
+
+local recipes = {util.titanium_plate}
+
 if mods["Krastorio2"] then
   table.insert(recipes, "enriched-titanium-plate")
   table.insert(recipes, "enriched-titanium")