From eb002efda14dd307e8875dfc09c7e333fe6fabce Mon Sep 17 00:00:00 2001
From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
Date: Thu, 2 Feb 2023 21:27:44 +1100
Subject: [PATCH] Polished Stone & Black Quartz

Adds Distilled Water recipe for black quartz and polished stone
Changes Black Quartz and polished stone to be like their counterparts
Relocates certain lines to their correct locations

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

There is so much weird stuff in JetpacksAndEnergyStorage.zs!
---
 overrides/scripts/AE2.zs                      |  3 ++
 overrides/scripts/Earlygame.zs                |  9 -----
 overrides/scripts/Endgame.zs                  |  6 ---
 overrides/scripts/JetpacksAndEnergyStorage.zs |  9 -----
 overrides/scripts/aa xu2.zs                   | 39 +++++++++++++++++--
 overrides/scripts/dml.zs                      |  3 ++
 overrides/scripts/normalmode.zs               |  2 +-
 7 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs
index 807261e..6e993c5 100644
--- a/overrides/scripts/AE2.zs
+++ b/overrides/scripts/AE2.zs
@@ -409,3 +409,6 @@ recipes.addShapeless(<metaitem:gemCertusQuartz> * 4, [<appliedenergistics2:quart
 recipes.addShapeless(<metaitem:gemCertusQuartz> * 4, [<appliedenergistics2:chiseled_quartz_block>]);
 
 mods.jei.JEI.removeAndHide(<appliedenergistics2:material:0>);
+
+<appliedenergistics2:material:1>.addTooltip(format.aqua(format.italic(
+    "Obtained by charging with RF power in the AE2 Charger.")));
diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index 75f14e4..27dc0f8 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -62,11 +62,6 @@ recipes.addShaped(<storagedrawers:controllerslave>, [
 	[<ore:circuitLv>, <storagedrawers:customdrawers>, <ore:circuitLv>],
 	[<ore:plateIron>, <minecraft:gold_block>, <ore:plateIron>]]);
 
-
-//Black Quartz
-electrolyzer.recipeBuilder().inputs([<metaitem:dustQuartzite> * 4]).outputs([<actuallyadditions:item_dust:7>]).duration(400).EUt(90).buildAndRegister();
-autoclave.recipeBuilder().inputs([<actuallyadditions:item_dust:7>]).fluidInputs(<liquid:water> * 1000).outputs([<actuallyadditions:item_misc:5>]).duration(150).EUt(16).buildAndRegister();
-
 //Mechanical Crafter
 recipes.remove(<extrautils2:crafter>);
 recipes.addShaped(<extrautils2:crafter>, [[<extrautils2:ingredients>, <metaitem:gearSmallSteel>, <extrautils2:ingredients>],[<metaitem:gearSmallSteel>, <metaitem:workbench>, <metaitem:gearSmallSteel>], [<extrautils2:ingredients>, <metaitem:gearSmallSteel>, <extrautils2:ingredients>]]);
@@ -341,10 +336,6 @@ electrolyzer.recipeBuilder()
 	.fluidOutputs(<liquid:hydrogen> * 4000)
 	.duration(288).EUt(128).buildAndRegister();
 
-
-// remove xu2 shortcut hopper
-recipes.removeByRecipeName("extrautils2:shortcut_hopper");
-
 // Crafting Station
 assembler.recipeBuilder()
 	.inputs([<minecraft:chest> * 2, <ore:plankWood> * 4, <minecraft:crafting_table>])
diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs
index 297e566..f677232 100644
--- a/overrides/scripts/Endgame.zs
+++ b/overrides/scripts/Endgame.zs
@@ -2,12 +2,6 @@ import crafttweaker.item.IIngredient;
 import mods.gregtech.recipe.RecipeMap;
 import scripts.common.makeShaped as makeShaped;
 
-<deepmoblearning:glitch_fragment>.addTooltip(format.aqua(format.italic(
-    "Obtained by crushing Glitch Hearts against Obsidian.")));
-
-<appliedenergistics2:material:1>.addTooltip(format.aqua(format.italic(
-    "Obtained by charging with RF power in the AE2 Charger.")));
-
 //Gravistar
 // Gravi Star * 1
 <recipemap:autoclave>.findRecipe(7680, [<metaitem:quantumstar>], [<liquid:neutronium> * 288]).remove();
diff --git a/overrides/scripts/JetpacksAndEnergyStorage.zs b/overrides/scripts/JetpacksAndEnergyStorage.zs
index cb5168d..6417dba 100644
--- a/overrides/scripts/JetpacksAndEnergyStorage.zs
+++ b/overrides/scripts/JetpacksAndEnergyStorage.zs
@@ -455,13 +455,10 @@ recipes.remove(<enderio:item_material:13>); // vibrant bimetal gear
 recipes.remove(<enderio:item_material:14>); // pulsating crystal
 recipes.remove(<enderio:item_material:15>); // vibrant crystal
 recipes.remove(<enderio:item_material:73>); // dark bimetal gear
-
 recipes.remove(<minecraft:stone:2>);
 recipes.remove(<minecraft:stone:4>);
 recipes.remove(<minecraft:stone:6>);
 
-recipes.remove(<extrautils2:decorativesolid:2>); // polished stone
-
 // pulsating crystal
 autoclave.recipeBuilder()
     .inputs([<minecraft:diamond>])
@@ -475,12 +472,6 @@ autoclave.recipeBuilder()
     .outputs([<enderio:item_material:15>])
     .duration(200).EUt(30).buildAndRegister();
 
-// polished stone
-autoclave.recipeBuilder()
-    .inputs([<minecraft:stone>]).fluidInputs([<liquid:water> * 250])
-    .outputs([<extrautils2:decorativesolid:2>])
-    .duration(100).EUt(4).buildAndRegister();
-
 recipes.remove(<appliedenergistics2:quartz_vibrant_glass>);
 
 alloy.recipeBuilder()
diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs
index 3436154..2898e26 100644
--- a/overrides/scripts/aa xu2.zs	
+++ b/overrides/scripts/aa xu2.zs	
@@ -1,3 +1,5 @@
+import mods.gregtech.recipe.RecipeMap;
+
 print("--- loading aa xu2.zs ---");
 	
 # *======= Empowerer =======*
@@ -59,7 +61,23 @@ recipes.remove(<snad:snad>);
 recipes.remove(<snad:snad:1>);
 recipes.addShaped(<snad:snad>, [[<extrautils2:compressedsand:1>],[<extrautils2:compressedsand:1>]]);
 
-	
+//Black Quartz
+electrolyzer.recipeBuilder()
+	.inputs([<metaitem:dustQuartzite> * 4])
+	.outputs([<actuallyadditions:item_dust:7>])
+	.duration(400).EUt(90).buildAndRegister();
+
+autoclave.recipeBuilder()
+	.inputs([<actuallyadditions:item_dust:7>])
+	.fluidInputs(<liquid:water> * 250)
+	.chancedOutput(<actuallyadditions:item_misc:5>, 7000, 1000)
+	.duration(1200).EUt(24).buildAndRegister();
+
+autoclave.recipeBuilder()
+	.inputs([<actuallyadditions:item_dust:7>])
+	.fluidInputs(<liquid:distilled_water> * 50)
+	.outputs(<actuallyadditions:item_misc:5>)
+	.duration(600).EUt(24).buildAndRegister();		
 	
 //Long Range Breaker
 recipes.remove(<actuallyadditions:block_directional_breaker>);
@@ -129,6 +147,23 @@ recipes.addShaped(<extrautils2:machine>, [
 var furnGen = <extrautils2:machine>.withTag({Type: "extrautils2:generator"});
 var redPlate = <metaitem:plateRedAlloy>;
 
+// Polished Stone
+recipes.remove(<extrautils2:decorativesolid:2>);
+autoclave.recipeBuilder()
+    .inputs([<minecraft:stone>])
+    .fluidInputs([<liquid:water> * 200])
+    .outputs([<extrautils2:decorativesolid:2>])
+    .duration(100).EUt(7).buildAndRegister();
+
+autoclave.recipeBuilder()
+    .inputs([<minecraft:stone>])
+    .fluidInputs([<liquid:distilled_water> * 36])
+    .outputs([<extrautils2:decorativesolid:2>])
+    .duration(100).EUt(7).buildAndRegister();
+
+// remove xu2 shortcut hopper
+recipes.removeByRecipeName("extrautils2:shortcut_hopper");
+
 //XU2 Generators
 recipes.remove(furnGen);
 recipes.remove(<extrautils2:machine>.withTag({Type: "extrautils2:generator_survival"}));	
@@ -382,8 +417,6 @@ recipes.addShaped(<actuallyadditions:block_furnace_solar>, [
 	[<extrautils2:ingredients>, <solarflux:solar_panel_1>, <extrautils2:ingredients>],
 	[null,<extrautils2:decorativesolid:3>,null]]);
 	
-	
-	
 <actuallyadditions:item_misc:13>.addTooltip(format.green("Canola can be turned into Canola Oil via a Canola Press. This is a somewhat slow machine and requres RF to function."));
 
 <actuallyadditions:item_knife>.addTooltip(format.red("When making Hamburgers, make sure to place this in the Crafting Table last! Otherwise, Bio Mash will be created."));
diff --git a/overrides/scripts/dml.zs b/overrides/scripts/dml.zs
index 32715d4..8532870 100644
--- a/overrides/scripts/dml.zs
+++ b/overrides/scripts/dml.zs
@@ -71,3 +71,6 @@ recipes.addShaped(<deepmoblearning:deep_learner>, [
     [<metaitem:sensor.lv>,<metaitem:tricorder_scanner>,<metaitem:sensor.lv>],
     [null,null,null]]);
 
+<deepmoblearning:glitch_fragment>.addTooltip(format.aqua(format.italic(
+    "Obtained by crushing Glitch Hearts against Obsidian.")));
+
diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs
index 7d9c704..57e651d 100644
--- a/overrides/scripts/normalmode.zs
+++ b/overrides/scripts/normalmode.zs
@@ -361,7 +361,7 @@ recipes.removeByRecipeName("gregtech:basic_circuit_board");
 recipes.addShaped("basic_circuit_board", <metaitem:circuit_board.basic>, [[<ore:wireFineCopper>, <ore:wireFineCopper>, <ore:wireFineCopper>], [<ore:wireFineCopper>, <gregtech:meta_item_1:381>, <ore:wireFineCopper>], [<ore:wireFineCopper>, <ore:wireFineCopper>, <ore:wireFineCopper>]]);
 
 
-////////////////////////// Creative Vending Upgrade ///////////////////////
+////////////////////////// Creative Chest ///////////////////////
 val creativecell = <thermalexpansion:cell>.withTag({Recv: 250000, RSControl: 0 as byte, Facing: 3 as byte, Energy: 500000000, Creative: 1 as byte, SideCache: [2, 2, 2, 2, 2, 2] as byte[] as byte[], Level: 4 as byte, Send: 250000}, false);
 val creativetank = <thermalexpansion:tank>.withTag({RSControl: 0 as byte, Creative: 1 as byte, Level: 4 as byte}, false);
 val creativejetpack = <simplyjetpacks:itemjetpack>.withTag({JetpackParticleType: 3}, false);