From 292840acd56a6fd53ace1c27067c364037ccabd8 Mon Sep 17 00:00:00 2001
From: Exa <11907282+Exaxxion@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:38:36 -0700
Subject: [PATCH] Remove duplicate / conflicting recipes

- Nether Quartz dust fluid extraction (appears twice in same file:
  extractor_solidifier.zs)

- Liquid XP <-> Solidified XP duplicate recipe (already present in
  Microverse.zs)

- Ender Pearl Dust -> Pulsating Dust (conflicts with decomp recipe)
---
 overrides/scripts/Earlygame.zs            |  2 --
 overrides/scripts/expertmode.zs           | 12 ------------
 overrides/scripts/extractor_solidifier.zs |  5 -----
 3 files changed, 19 deletions(-)

diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index 313b533..b69efbc 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -269,8 +269,6 @@ recipes.addShapeless(<metaitem:battery.re.lv.lithium>,[<metaitem:battery.hull.lv
 
 
 centrifuge.findRecipe(30, [<metaitem:dustBlackSteel> * 5], [null]).remove();
-electrolyzer.recipeBuilder().inputs([<ore:dustEnderPearl>]).outputs([<contenttweaker:pulsatingdust>]).duration(200).EUt(1000).buildAndRegister();
-electrolyzer.findRecipe(60, [<metaitem:dustEnderPearl> * 10], [null]).remove();
 
 furnace.setFuel(<metaitem:dustGraphite>, 1200);
 
diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs
index c1bb01a..ab2658c 100644
--- a/overrides/scripts/expertmode.zs
+++ b/overrides/scripts/expertmode.zs
@@ -132,18 +132,6 @@ makeShaped("of_nc_water_source", <nuclearcraft:water_source>,
     { A : <ore:plateDoubleSteel>,
       B : <minecraft:water_bucket:*> });
 
-// Solidified Experience
-solidifier.recipeBuilder()
-    .fluidInputs([<liquid:xpjuice> * 160])
-    .notConsumable(<metaitem:shape.mold.ball>)
-    .outputs(<actuallyadditions:item_solidified_experience>)
-    .duration(500).EUt(16).buildAndRegister();
-
-fluid_extractor.recipeBuilder()
-	.inputs(<actuallyadditions:item_solidified_experience>)
-	.fluidOutputs(<liquid:xpjuice> * 160)
-	.duration(80).EUt(32).buildAndRegister();
-
 // XP Juice
 mixer.recipeBuilder()
 	.inputs(<ore:itemPulsatingPowder>)
diff --git a/overrides/scripts/extractor_solidifier.zs b/overrides/scripts/extractor_solidifier.zs
index 70ed889..8aede1c 100644
--- a/overrides/scripts/extractor_solidifier.zs
+++ b/overrides/scripts/extractor_solidifier.zs
@@ -315,11 +315,6 @@ fluid_extractor.recipeBuilder()
     .fluidOutputs([<liquid:diamond> * 144])
     .duration(180).EUt(16).buildAndRegister();
 
-fluid_extractor.recipeBuilder()
-    .inputs([<metaitem:dustNetherQuartz>])
-    .fluidOutputs([<liquid:quartz> * 144])
-    .duration(180).EUt(16).buildAndRegister();
-
 fluid_extractor.recipeBuilder()
     .inputs([<minecraft:spawn_egg>.withTag({EntityTag: {id: "minecraft:cow"}})])
     .fluidOutputs([<liquid:milk> * 32000])