From cc6e0017b3519a100fa3feebc2a83c30ac95b9a1 Mon Sep 17 00:00:00 2001
From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
Date: Thu, 6 Apr 2023 19:47:27 +1000
Subject: [PATCH] Recipe: Cow Soul Vial -> Cow Spawn Egg + cleanup

---
 overrides/scripts/Earlygame.zs        | 13 -------------
 overrides/scripts/Midgame.zs          |  3 +++
 overrides/scripts/ThermalExpansion.zs | 13 +++++++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index abbeeae..7812bea 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -418,19 +418,6 @@ cutter.recipeBuilder()
 	.EUt(30)
 	.buildAndRegister();
 
-// Change drops of pulverised obsidian and niter, add (temporary) conversion recipes
-val basalzEntity = <entity:thermalfoundation:basalz>;
-basalzEntity.removeDrop(<thermalfoundation:material:770>);
-basalzEntity.addPlayerOnlyDrop(<metaitem:dustObsidian> % 80, 0, 2); // 80% is around the rate observed.
-
-recipes.addShapeless(<metaitem:dustObsidian>, [<thermalfoundation:material:770>]);
-
-val blitzEntity = <entity:thermalfoundation:blitz>;
-blitzEntity.removeDrop(<thermalfoundation:material:772>);
-blitzEntity.addPlayerOnlyDrop(<metaitem:dustSaltpeter> % 80, 0, 2); // 80% is around the rate observed.
-
-recipes.addShapeless(<metaitem:dustSaltpeter>, [<thermalfoundation:material:772>]);
-
 // Tooltips
 
 // Not needed because of better tooltips.
diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index 632b71c..3c35708 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -175,3 +175,6 @@ gemPerfect.generateRecipes(function(orePrefix as OrePrefix, material as Material
         .outputs(Utils.item("gemExquisite", material) * 2)
         .duration(100).EUt(1920).buildAndRegister();
 } as IOreRecipeHandler);
+
+// Cow Egg
+recipes.addShapeless(<minecraft:spawn_egg>.withTag({EntityTag: {id: "minecraft:cow"}}), [<enderio:item_soul_vial:1>.withTag({entityId: "minecraft:cow"})]);
diff --git a/overrides/scripts/ThermalExpansion.zs b/overrides/scripts/ThermalExpansion.zs
index 1739db1..8475218 100644
--- a/overrides/scripts/ThermalExpansion.zs
+++ b/overrides/scripts/ThermalExpansion.zs
@@ -391,6 +391,19 @@ mixer.recipeBuilder()
     .inputs([<thermalfoundation:material:1028>, <metaitem:dustTitanium>])
     .duration(200).EUt(30).buildAndRegister();
 
+// Change drops of pulverised obsidian and niter, add (temporary) conversion recipes
+val basalzEntity = <entity:thermalfoundation:basalz>;
+basalzEntity.removeDrop(<thermalfoundation:material:770>);
+basalzEntity.addPlayerOnlyDrop(<metaitem:dustObsidian> % 80, 0, 2); // 80% is around the rate observed.
+
+recipes.addShapeless(<metaitem:dustObsidian>, [<thermalfoundation:material:770>]);
+
+val blitzEntity = <entity:thermalfoundation:blitz>;
+blitzEntity.removeDrop(<thermalfoundation:material:772>);
+blitzEntity.addPlayerOnlyDrop(<metaitem:dustSaltpeter> % 80, 0, 2); // 80% is around the rate observed.
+
+recipes.addShapeless(<metaitem:dustSaltpeter>, [<thermalfoundation:material:772>]);
+
 // Temporary Conversion recipe between gt and thermal mana infused
 recipes.addShapeless(<thermalfoundation:material:136>, [<gregtech:meta_ingot:32021>]);
 recipes.addShapeless(<thermalfoundation:material:72>, [<gregtech:meta_dust:32021>]);