From f6d48743ba32940b101af8907e620686ea8bba4a Mon Sep 17 00:00:00 2001
From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:32:17 +1100
Subject: [PATCH] Remove GT Mana Infused & Hide Thermal Stuff

Removes GT Mana Infused, adds conversion recipes for ingot and dust.

Fixes https://github.com/tracer4b/nomi-ceu/issues/233

Hides all Thermal Hardened Glass.

Hides Mana Infused Ore
---
 overrides/scripts/ThermalExpansion.zs | 7 +++++++
 overrides/scripts/_oreDict.zs         | 5 ++++-
 overrides/scripts/materials.zs        | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/overrides/scripts/ThermalExpansion.zs b/overrides/scripts/ThermalExpansion.zs
index bc7a728..7a5ebe4 100644
--- a/overrides/scripts/ThermalExpansion.zs
+++ b/overrides/scripts/ThermalExpansion.zs
@@ -405,6 +405,13 @@ mixer.recipeBuilder()
     .inputs([<thermalfoundation:material:1028>, <metaitem:dustTitanium>])
     .duration(200).EUt(30).buildAndRegister();
 
+// 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>]);
+
+// Hide GT Mana infused
+scripts.common.removeMaterialSolid(32021);
+
 //Remove Unobtainable Satchel and Void Satchel Recipe
 
 //Remove Rockwool smelting recipe
diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs
index 18dcba5..902e1d6 100644
--- a/overrides/scripts/_oreDict.zs
+++ b/overrides/scripts/_oreDict.zs
@@ -2156,6 +2156,9 @@ mods.jei.JEI.removeAndHide(<thermalfoundation:tool.hammer_diamond>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:rockwool:*>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:864>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:865>);
+mods.jei.JEI.removeAndHide(<thermalfoundation:ore:8>);
+mods.jei.JEI.removeAndHide(<thermalfoundation:glass:*>);
+mods.jei.JEI.removeAndHide(<thermalfoundation:glass_alloy:*>);
 
 
 //Custom Materials Removals
@@ -2623,7 +2626,7 @@ recipes.addShapeless(<metaitem:ingotRedAlloy>, [<enderio:item_alloy_ingot:3>]);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:193>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:194>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:195>);
-mods.jei.JEI.removeAndHide(<thermalfoundation:material:200>);
+//mods.jei.JEI.removeAndHide(<thermalfoundation:material:200>);
 mods.jei.JEI.removeAndHide(<thermalfoundation:material:228>);
 mods.jei.JEI.removeAndHide(<extendedcrafting:material:1>);
 mods.jei.JEI.removeAndHide(<libvulpes:productnugget:3>);
diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs
index bcaf217..bb619a9 100644
--- a/overrides/scripts/materials.zs
+++ b/overrides/scripts/materials.zs
@@ -143,7 +143,7 @@ var electrum_flux = MaterialBuilder(32019, "electrum_flux")
 var mithril = MaterialBuilder(32021, "mithril")
     .ingot()
     .color(0x428fdb).iconSet("dull")
-    .flags("generate_plate", "generate_gear")
+    .flags("generate_plate", "generate_gear", "no_unification")
     .components([<material:titanium> * 1, <material:mana> * 1])
     .build();