From cad773f1ccc00ef01bb522dbd863a900c986197a Mon Sep 17 00:00:00 2001
From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com>
Date: Thu, 31 Mar 2022 21:46:54 +0800
Subject: [PATCH] more hard recipes

---
 overrides/scripts/BlastFurnace.zs       | 13 -------------
 overrides/scripts/Midgame.zs            |  6 ------
 overrides/scripts/expertmode.zs         | 11 ++++++++++-
 overrides/scripts/multiblocks_expert.zs | 10 ++++------
 overrides/scripts/normalmode.zs         | 21 +++++++++++++++++++++
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/overrides/scripts/BlastFurnace.zs b/overrides/scripts/BlastFurnace.zs
index 24dee3b..5112e5b 100644
--- a/overrides/scripts/BlastFurnace.zs
+++ b/overrides/scripts/BlastFurnace.zs
@@ -178,19 +178,6 @@ alloy_blast_smelter.recipeBuilder()
 	.EUt(120)
 	.buildAndRegister();
 
-//Draconium [tier 14]
-// Hot Draconium Ingot * 1
-<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 2})], [<liquid:neon> * 25]).remove();
-// Hot Draconium Ingot * 1
-<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 1})], null).remove();
-
-blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:nitro_fuel>*2000]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
-blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:nitro_fuel>*8000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
-blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:gasoline>*2000]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
-blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:gasoline>*8000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
-blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:gasoline_premium>*500]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
-blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:gasoline_premium>*2000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
-
 //Dark Soularium [tier 18]
 blast_furnace.recipeBuilder().inputs([<ore:ingotSoularium>,<ore:ingotDarkSteel>]).fluidInputs([<liquid:tritium>*1000]).outputs([<simplyjetpacks:metaitemmods:3>]).property("temperature", 8600).duration(1200).EUt(32000).buildAndRegister();
 
diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index 14c810e..5b1c231 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -21,12 +21,6 @@ recipes.addShaped("test", <thermalexpansion:satchel:2>, [
 recipes.remove(<actuallyadditions:item_misc:19>);	
 reactor.recipeBuilder().inputs([<minecraft:nether_star>]).fluidInputs([<liquid:ender_distillation> * 8000]).outputs(<actuallyadditions:item_misc:19>).EUt(400).duration(2000).buildAndRegister();
 
-//Distillation Tower
-recipes.removeByRecipeName("gregtech:distillation_tower");
-recipes.addShaped(<meta_tile_entity:distillation_tower>, [
-	[<ore:pipeLargeFluidStainlessSteel>, <metaitem:electric.pump.hv>, <ore:pipeLargeFluidStainlessSteel>], 
-	[<ore:circuitAdvanced>, <meta_tile_entity:hull.mv>, <ore:circuitAdvanced>], 
-	[<ore:pipeLargeFluidStainlessSteel>, <metaitem:electric.pump.hv>, <ore:pipeLargeFluidStainlessSteel>]]);
 
 //Fermenter
 fermenter.recipeBuilder().fluidInputs([<liquid:canolaoil> * 100]).fluidOutputs([<liquid:refinedcanolaoil> * 100]).duration(400).EUt(2).buildAndRegister();
diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs
index c0facf4..7f718be 100644
--- a/overrides/scripts/expertmode.zs
+++ b/overrides/scripts/expertmode.zs
@@ -498,7 +498,7 @@ assembler.recipeBuilder()
     .duration(400).EUt(7680).buildAndRegister();
 
 assembly_line.recipeBuilder()
-    .inputs(<metaitem:hull.zpm>, <thermalinnovation:drill:4>, <thermalinnovation:drill:4>, <thermalinnovation:drill:4>, <contenttweaker:t3laser> * 12, <metaitem:frameNaquadahAlloy> * 12, <metaitem:sensor.zpm> * 6, <metaitem:conveyor.module.zpm> * 12, <metaitem:fluid.regulator.zpm> * 12, <metaitem:cableGtSingleVanadiumGallium> * 12, <metaitem:gearOsmiridium> * 12)
+    .inputs(<metaitem:hull.zpm>, <thermalinnovation:drill:4>, <thermalinnovation:drill:4>, <thermalinnovation:drill:4>, <contenttweaker:t3laser> * 12, <metaitem:frameNaquadahAlloy> * 12, <metaitem:sensor.zpm> * 6, <metaitem:conveyor.module.zpm> * 12, <metaitem:fluid.regulator.zpm> * 12, <metaitem:cableGtSingleVanadiumGallium> * 12, <moreplates:empowered_void_gear> * 12)
     .fluidInputs(<liquid:concrete> * 2304)
     .outputs(<metaitem:large_miner.iv>)
     .duration(800).EUt(122880).buildAndRegister();
@@ -509,6 +509,15 @@ assembly_line.recipeBuilder()
     .outputs(<metaitem:large_miner.luv>)
     .duration(800).EUt(1966080).buildAndRegister();
 
+//Draconium [tier 14]
+// Hot Draconium Ingot * 1
+<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 2})], [<liquid:neon> * 25]).remove();
+// Hot Draconium Ingot * 1
+<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 1})], null).remove();
+
+blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:gasoline_premium> * 1000]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:gasoline_premium> * 4000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
+
 // Remove shortcut recipes
 recipes.remove(<minecraft:stick> * 16);
 recipes.removeByRecipeName("appliedenergistics2:misc/vanilla_comparator");
diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs
index f512a8e..da6b5b2 100644
--- a/overrides/scripts/multiblocks_expert.zs
+++ b/overrides/scripts/multiblocks_expert.zs
@@ -630,9 +630,8 @@ microverse_projector_advanced.recipeMap
              <gregtech:ore_pentlandite_0:1> * 64,
              <gregtech:ore_chalcocite_0:1> * 64,
              <gregtech:ore_chalcocite_0:1> * 64,
-             <gregtech:ore_cooperite_0:1> * 64,
-             <gregtech:ore_osmiridium_8020_0> * 20,
-             <gregtech:ore_iridosmine_8020_0> * 8)
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_cooperite_0:1> * 64)
     .buildAndRegister();
 
 
@@ -1174,9 +1173,8 @@ actualization_chamber.recipeMap
              <gregtech:ore_pentlandite_0:1> * 64,
              <gregtech:ore_chalcocite_0:1> * 64,
              <gregtech:ore_chalcocite_0:1> * 64,
-             <gregtech:ore_cooperite_0:1> * 64,
-             <gregtech:ore_osmiridium_8020_0> * 20,
-             <gregtech:ore_iridosmine_8020_0> * 8)
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_cooperite_0:1> * 64)
     .buildAndRegister();
 
 
diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs
index 279bb17..9ee4186 100644
--- a/overrides/scripts/normalmode.zs
+++ b/overrides/scripts/normalmode.zs
@@ -538,6 +538,27 @@ recipes.addShaped(<ae2stuff:grower>, [
 	[<appliedenergistics2:material:1>, <meta_tile_entity:hull.lv>, <appliedenergistics2:material:1>], 
 	[<ore:frameGtDarkSteel>, <appliedenergistics2:material:1>, <ore:frameGtDarkSteel>]]);	
 
+//Distillation Tower
+recipes.removeByRecipeName("gregtech:distillation_tower");
+recipes.addShaped(<meta_tile_entity:distillation_tower>, [
+	[<ore:pipeLargeFluidStainlessSteel>, <metaitem:electric.pump.hv>, <ore:pipeLargeFluidStainlessSteel>], 
+	[<ore:circuitAdvanced>, <meta_tile_entity:hull.mv>, <ore:circuitAdvanced>], 
+	[<ore:pipeLargeFluidStainlessSteel>, <metaitem:electric.pump.hv>, <ore:pipeLargeFluidStainlessSteel>]]);
+
+//Draconium [tier 14]
+// Hot Draconium Ingot * 1
+<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 2})], [<liquid:neon> * 25]).remove();
+// Hot Draconium Ingot * 1
+<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustDraconium>, <metaitem:circuit.integrated>.withTag({Configuration: 1})], null).remove();
+
+blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:nitro_fuel>*2000]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:nitro_fuel>*8000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:gasoline>*2000]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:gasoline>*8000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<metaitem:dustDraconium>]).fluidInputs([<liquid:gasoline_premium>*500]).outputs(<metaitem:ingotHotDraconium>).property("temperature", 6800).duration(10000).EUt(120).buildAndRegister();
+blast_furnace.recipeBuilder().inputs([<armorplus:material:3> * 4]).fluidInputs([<liquid:gasoline_premium>*2000]).outputs([<metaitem:ingotHotDraconium> * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister();
+
+
 // Removals
 // GT
 mods.jei.JEI.removeAndHide(<meta_tile_entity:steam_extractor_bronze>);