From 42626eb07a4c78b7b894fe4f9b261cda738fe51b Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Fri, 19 Aug 2022 09:11:19 -0700
Subject: [PATCH] recipe updates, modded

---
 changelog.txt          |  8 ++++++++
 data-final-fixes.lua   | 11 +++++++++++
 info.json              |  6 ++++--
 tin-recipe-updates.lua |  6 ++++++
 tin-recipe.lua         |  8 ++------
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index fcc23c5..801c2c9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.1.5
+Date: 2022-08-17
+  Fixes:
+    - SE: Disable matter recipes at start
+  Changes:
+    - Compatibility with bob's assembling machines 
+    - Compatibility with Renai Transportation inserters
+---------------------------------------------------------------------------------------------------
 Version: 0.1.4
 Date: 2022-08-16
   Changes:
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 7007253..2ceda36 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -19,5 +19,16 @@ util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "sol
 util.multiply_recipe("electronic-circuit", 2)
 util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1)
 
+if mods.RenaiTransportation then
+  for i, recipe in pairs(data.raw.recipe) do
+    if recipe.result and data.raw.item[recipe.result] and
+    data.raw.item[recipe.result].subgroup == "throwers" and
+    recipe.result ~= "RTThrower-burner-inserter"
+    then
+      util.add_ingredient(recipe.name, "bronze-plate", 1)
+    end
+  end
+end
+
 -- Must be last
 util.create_list()
diff --git a/info.json b/info.json
index e50805c..95c2af2 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bztin",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "factorio_version": "1.1",
     "title": "Tin",
     "author": "Brevven",
@@ -14,12 +14,14 @@
       "? bzzirconium >= 0.6.0",
       "? bztungsten >= 0.6.0",
       "? bzcarbon >= 0.3.0",
+      "? bzaluminum >= 0.4.9",
       "? space-exploration >= 0.5.100",
       "? aai-industry",
       "? Krastorio2",
       "? sand-and-glass",
       "? deadlock-beltboxes-loaders",
-      "? DeadlockCrating"
+      "? DeadlockCrating",
+      "(?) RenaiTransportation"
     ],
     "description": "Adds tin, solder and more to the base game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods."
 }
diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua
index 62ccfaa..cfbeecc 100644
--- a/tin-recipe-updates.lua
+++ b/tin-recipe-updates.lua
@@ -165,3 +165,9 @@ if mods.bztungsten and not mods.bzaluminum then
   util.replace_ingredient("small-lamp", "copper-cable", "tinned-cable")
   util.add_prerequisite("optics", "tinned-cable")
 end
+
+if mods.bobassembly then
+  util.add_ingredient("steam-assembling-machine", "solder", 1)
+  util.add_ingredient("fluid-furnace", "solder", 1)
+  util.add_ingredient("chemical-plant-2", "solder", 1)
+end
diff --git a/tin-recipe.lua b/tin-recipe.lua
index aabb96a..83d51f4 100644
--- a/tin-recipe.lua
+++ b/tin-recipe.lua
@@ -177,10 +177,6 @@ if util.me.use_bronze() then
 local bronze_i = {}
 bronze_i["copper-plate"] = 17
 bronze_i["tin-plate"] = 3
-if mods.bzaluminum then
-  bronze_i["copper-plate"] = bronze_i["copper-plate"] - 1
-  bronze_i["aluminum-plate"] = 1
-end
  
 data:extend({
   {
@@ -204,12 +200,12 @@ data:extend({
   },
 })
 for item, count in pairs(bronze_i) do
-  util.add_ingredient("bronze-plate", item, count)
+  util.add_ingredient("bronze-plate", item, count, {force=true})
 end
 if mods.bzfoundry and data.raw.item["foundry"] then
   util.add_effect("foundry", { type = "unlock-recipe", recipe = "bronze-plate" })
   util.add_prerequisite("fast-inserter", "foundry")
-  util.set_to_founding("bronze-plate")
+  util.set_to_founding("bronze-plate", {force=true})
 else
   util.add_effect("automation", { type = "unlock-recipe", recipe = "bronze-plate" })
 end