From 9e186bd4dcbfe9590a42c0eb2ace9b2306322fe5 Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Fri, 15 Apr 2022 15:34:29 +0800
Subject: [PATCH] fix recipe conflicts and adjust hard chains

---
 overrides/scripts/Endgame.zs           |  4 ++++
 overrides/scripts/Midgame.zs           | 11 ++++++++++-
 overrides/scripts/expert_processing.zs | 15 ++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs
index 592193d..4f99b17 100644
--- a/overrides/scripts/Endgame.zs
+++ b/overrides/scripts/Endgame.zs
@@ -194,6 +194,10 @@ makeShaped("of_processing_array", <metaitem:processing_array>,
        S : <advsolars:sunnarium>, //Sunnarium
        B : <metaitem:tool.dataorb>}); //dataorb
 
+// Titanium Ingot * 26
+<recipemap:arc_furnace>.findRecipe(30, [<metaitem:processing_array>], [<liquid:oxygen> * 381]).remove();
+// Titanium Dust * 26
+<recipemap:macerator>.findRecipe(8, [<metaitem:processing_array>], null).remove();
 
 
 
diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index 2f9dd59..0a1f17c 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -124,4 +124,13 @@ canner.recipeBuilder()
 	.inputs(<minecraft:glass_bottle>)
 	.fluidInputs(<liquid:xpjuice> * 500)
 	.outputs(<minecraft:experience_bottle>)
-	.duration(1500).EUt(4).buildAndRegister();
\ No newline at end of file
+	.duration(1500).EUt(4).buildAndRegister();
+
+// DE Info Tablet
+recipes.removeByRecipeName("draconicevolution:info_tablet");
+recipes.addShaped(<draconicevolution:info_tablet>, [
+	[<ore:stone>, <ore:stone>, <ore:stone>],
+	[<ore:stone>, <ore:dustDraconium>, <ore:stone>],
+	[<ore:stone>, <ore:stone>, <ore:stone>]
+]);
+
diff --git a/overrides/scripts/expert_processing.zs b/overrides/scripts/expert_processing.zs
index b17cac9..5c22752 100644
--- a/overrides/scripts/expert_processing.zs
+++ b/overrides/scripts/expert_processing.zs
@@ -85,6 +85,15 @@ chemical_reactor.recipeBuilder()
     .fluidOutputs(<liquid:polyvinyl_acetate> * 4320)
     .duration(800).EUt(30).buildAndRegister();
 
+// Recipe conflict
+// Styrene * 1000
+<recipemap:chemical_reactor>.findRecipe(30, null, [<liquid:ethylbenzene> * 1000]).remove();
+chemical_reactor.recipeBuilder()
+    .fluidInputs(<liquid:ethylbenzene> * 1000)
+    .circuit(1)
+    .fluidOutputs(<liquid:styrene> * 1000, <liquid:hydrogen> * 2000)
+    .duration(30).EUt(30).buildAndRegister();
+
 // Hydrazine Rocket Fuel
 chemical_reactor.recipeBuilder()
     .fluidInputs(<liquid:hydrazine> * 1000, <liquid:dimethylhydrazine> * 1000, <liquid:dinitrogen_tetroxide> * 2000)
@@ -405,13 +414,13 @@ chemical_reactor.recipeBuilder()
 
 chemical_reactor.recipeBuilder()
     .fluidInputs(<liquid:methanol> * 1000, <liquid:carbon_dioxide> * 1000)
-    .notConsumable(<metaitem:dustSodiumMethoxide>)
+    .inputs(<metaitem:dustTinySodiumMethoxide>)
     .fluidOutputs(<liquid:methyl_formate> * 1000)
     .duration(16).EUt(30).buildAndRegister();
 
 chemical_reactor.recipeBuilder()
-    .fluidInputs(<liquid:methyl_formate> * 1000, <liquid:water> * 1000)
-    .fluidOutputs(<liquid:formic_acid> * 1000, <liquid:water> * 1000)
+    .fluidInputs(<liquid:methyl_formate> * 1000, <liquid:water> * 3000)
+    .fluidOutputs(<liquid:formic_acid> * 1000, <liquid:methanol> * 1000)
     .duration(16).EUt(30).buildAndRegister();
 
 // Potassium Pyrosulfate