From 76332f51d1e1bd87b319925332c4dae34ea6ef2b Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Wed, 31 Jul 2024 22:08:17 +1000
Subject: [PATCH] Add Alternate and Balance Implosion Recipes for Omnium (#833)

[EXPAND]
[[messages]]
messageTitle = "Rebalance Explosive Amounts for Omnium (#833)"
messageBody = '''
[BUG]
[DETAILS]
details = ["Requires 8 TNT (From 1)", "Requires 4 Dynamite (From 8)"]
[DETAILS]
'''

[[messages]]
messageTitle = "Add Alternate Implosion Recipes for Omnium (#833)"
messageBody = "[FEATURE]\n[QOL]"
[EXPAND]
---
 .../Main/General/Late-Game/lategame.groovy    | 21 +++++++++++++++++++
 overrides/scripts/Earlygame.zs                |  9 --------
 overrides/scripts/extendedcrafting.zs         |  8 -------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy
index 6e1a336..ad2c8a8 100755
--- a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy
+++ b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy
@@ -1,8 +1,29 @@
 import com.nomiceu.nomilabs.util.LabsModeHelper
+import gregtech.api.recipes.builders.ImplosionRecipeBuilder
+import net.minecraft.item.ItemStack
 
 import static com.nomiceu.nomilabs.groovy.GroovyHelpers.RecyclingHelpers.*
 import static gregtech.api.GTValues.*
 
+// Omnium Implosion Compressor Recipes
+ImplosionRecipeBuilder builder = mods.gregtech.implosion_compressor.recipeBuilder()
+	.inputs(item('extendedcrafting:singularity_ultimate'))
+	.outputs(item('extendedcrafting:material:33'))
+	.chancedOutput(item('gregtech:meta_dust', 275), 2500, 0)
+	.duration(20).EUt(VA[LV])
+
+// TNT
+builder.copy()
+	.explosivesAmount(8)
+	.buildAndRegister()
+
+// Other Explosives
+for (ItemStack explosive : [item('gregtech:powderbarrel') * 16, metaitem('dynamite') * 4, item('gregtech:itnt') * 2]) {
+	builder.copy()
+		.explosivesType(explosive)
+		.buildAndRegister()
+}
+
 if (LabsModeHelper.normal) {
 	// Assembly Control Casing (Change from Output 2 to Output 4)
 	replaceRecipeOutput(item('gregtech:multiblock_casing', 3) * 2, item('gregtech:multiblock_casing', 3) * 4)
diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index a04b990..5e3ff3e 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -307,15 +307,6 @@ electrolyzer.recipeBuilder()
 	.fluidOutputs(<liquid:chlorine> * 2000, <liquid:hydrogen> * 4000)
 	.duration(576).EUt(60).buildAndRegister();
 
-
-
-//Omnium
-implosion_compressor.recipeBuilder()
-	.inputs([<extendedcrafting:singularity_ultimate>])
-	.outputs(<extendedcrafting:material:33>)
-	.property("explosives", <metaitem:dynamite> * 8)
-	.duration(20).EUt(30).buildAndRegister();
-
 //Add Decomposition Recipe for Polyphenylene Sulfide
 electrolyzer.recipeBuilder()
 	.fluidInputs(<liquid:polyphenylene_sulfide> * 11000)
diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs
index be82d63..7ccc905 100644
--- a/overrides/scripts/extendedcrafting.zs
+++ b/overrides/scripts/extendedcrafting.zs
@@ -236,14 +236,6 @@ makeExtremeRecipe7(<extendedcrafting:table_ultimate>,
       E : <minecraft:emerald_block>,
       T : <extendedcrafting:table_elite> });
 
-implosion.recipeBuilder()
-    .inputs([<extendedcrafting:singularity_ultimate>])
-    .property("explosives", 1)
-    .outputs(<extendedcrafting:material:33>)
-    .duration(20).EUt(30).buildAndRegister();
-
-
-
 recipes.remove(<minecraft:end_crystal>);
 // End Crystal * 1
 <recipemap:assembler>.findRecipe(16, [<minecraft:ghast_tear:0>, <minecraft:ender_eye:0>], [<liquid:glass> * 1008]).remove();