From 01c36556e3e089b80123d677e263885869175d2e Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Sat, 27 Aug 2022 12:33:59 +0800
Subject: [PATCH] swap to avaritia infinity

closes #79
---
 overrides/config/moreplates.cfg         |  2 +-
 overrides/scripts/_oreDict.zs           | 33 +++++++++++++++++++++++--
 overrides/scripts/extendedcrafting.zs   |  2 +-
 overrides/scripts/materials.zs          |  2 ++
 overrides/scripts/multiblocks_expert.zs |  2 +-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/overrides/config/moreplates.cfg b/overrides/config/moreplates.cfg
index 6cb4358..bf0f760 100644
--- a/overrides/config/moreplates.cfg
+++ b/overrides/config/moreplates.cfg
@@ -166,7 +166,7 @@ items {
     B:glowstone_plate=false
     B:gold_stick=false
     B:infinity_gear=false
-    B:infinity_plate=false
+    B:infinity_plate=true
     B:invar_stick=false
     B:iridium_stick=false
     B:iron_alloy_gear=false
diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs
index 50c4b49..442c875 100644
--- a/overrides/scripts/_oreDict.zs
+++ b/overrides/scripts/_oreDict.zs
@@ -127,7 +127,7 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = {
 
 	#blockInfinity
 	<ore:blockInfinity> : [
-		<avaritia:block_resource:1>
+//		<avaritia:block_resource:1>
 	],
 
 	#blockInvar
@@ -656,7 +656,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = {
 
 	#ingotInfinity
 	<ore:ingotInfinity> : [
-		<avaritia:resource:6>
+//		<avaritia:resource:6>
 	],
 
 	#ingotInvar
@@ -1316,6 +1316,35 @@ for oreDictEntry, items in miscDisabled {
 
 <ore:blockCoalCoke>.add(<gregtech:meta_block_compressed_22:5>);
 
+// Infinity conversion
+recipes.addShapeless(<avaritia:resource:6>, [<metaitem:ingotInfinity>]);
+recipes.addShapeless(<moreplates:infinity_plate>, [<metaitem:plateInfinity>]);
+
+mods.jei.JEI.removeAndHide(<metaitem:ingotInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:plateInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:plateDoubleInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:blockInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:nuggetInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:dustInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:dustSmallInfinity>);
+mods.jei.JEI.removeAndHide(<metaitem:dustTinyInfinity>);
+// Infinity Plate * 1
+<recipemap:bender>.findRecipe(24, [<metaitem:ingotInfinity>, <metaitem:circuit.integrated>.withTag({Configuration: 1})], null).remove();
+// Double Infinity Plate * 1
+<recipemap:bender>.findRecipe(96, [<metaitem:ingotInfinity> * 2, <metaitem:circuit.integrated>.withTag({Configuration: 2})], null).remove();
+
+bender.recipeBuilder()
+	.inputs(<avaritia:resource:6>)
+	.circuit(1)
+	.outputs(<moreplates:infinity_plate>)
+	.duration(5000).EUt(24).buildAndRegister();
+
+arc_furnace.recipeBuilder()
+	.inputs(<moreplates:infinity_plate>)
+	.fluidInputs(<liquid:oxygen> * 5000)
+	.outputs(<avaritia:resource:6>)
+	.duration(5000).EUt(30).buildAndRegister();
+
 //Add moreplates neutronium plate to gtce neutronium ore dict
 //<ore:plateNeutronium>.add(<moreplates:neutronium_plate:0>);
 
diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs
index ee1dd00..d594626 100644
--- a/overrides/scripts/extendedcrafting.zs
+++ b/overrides/scripts/extendedcrafting.zs
@@ -483,7 +483,7 @@ makeExtremeRecipe9(<contenttweaker:eternalcatalyst>,
 
 ////////////////////////// Infinity Ingot ///////////////////////
 //mods.avaritia.ExtremeCrafting.remove(<ore:ingotInfinity>);
-makeExtremeRecipe9(<metaitem:ingotInfinity>,
+makeExtremeRecipe9(<avaritia:resource:6>,
     ["         ",
      "     ABBB",
      "  ABBBCDB",
diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs
index d2f6fde..d566cad 100644
--- a/overrides/scripts/materials.zs
+++ b/overrides/scripts/materials.zs
@@ -172,7 +172,9 @@ var infinity = MaterialBuilder(32026, "infinity")
     .ingot()
     .color(0x000000).iconSet("shiny")
     .flags("generate_plate")
+    .components([<material:neutronium> * 5])
     .build();
+<material:infinity>.setFormula("∞");
 
 var microversium = MaterialBuilder(32027, "microversium")
     .ingot()
diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs
index 6256eb2..40599df 100644
--- a/overrides/scripts/multiblocks_expert.zs
+++ b/overrides/scripts/multiblocks_expert.zs
@@ -494,7 +494,7 @@ makeExtremeRecipe5(<metaitem:multiblocktweaker:actualization_chamber>,
       F : <gregtech:fusion_casing:1> });
 
 assembly_line.recipeBuilder()
-    .inputs(<metaitem:gcym:large_autoclave> * 24, <packagedexcrafting:combination_crafter> * 24, <metaitem:emitter.uv> * 24, <metaitem:field.generator.uv> * 24, <ore:circuitUhv> * 64, <gregtech:wire_coil:7> * 64, <draconicevolution:reactor_component> * 24, <draconicevolution:crafting_injector:3> * 8, <metaitem:plateInfinity> * 3, <metaitem:plateInfinity> * 3, <metaitem:plateInfinity> * 3, <metaitem:plateInfinity> * 3)
+    .inputs(<metaitem:gcym:large_autoclave> * 24, <packagedexcrafting:combination_crafter> * 24, <metaitem:emitter.uv> * 24, <metaitem:field.generator.uv> * 24, <ore:circuitUhv> * 64, <gregtech:wire_coil:7> * 64, <draconicevolution:reactor_component> * 24, <draconicevolution:crafting_injector:3> * 8, <moreplates:infinity_plate> * 3, <moreplates:infinity_plate> * 3, <moreplates:infinity_plate> * 3, <moreplates:infinity_plate> * 3)
     .fluidInputs(<liquid:cryotheum> * 36864, <liquid:moltenempowereddiamatine> * 18432, <liquid:naquadria> * 63216, <liquid:taranium> * 4608)
     .outputs(<metaitem:multiblocktweaker:universal_crystallizer>)
     .duration(900).EUt(7864320).buildAndRegister();