From a91ba235314ea6b56adf4d8cca574eebb88b1b62 Mon Sep 17 00:00:00 2001
From: Steelux <70096037+Steelux8@users.noreply.github.com>
Date: Tue, 29 Mar 2022 15:48:03 +0100
Subject: Duplicate Calcium Chloride Changes (#163)

- Changed Sodium Carbonite recipe to use the Bartworks Calcium Chloride instead, if loaded. If it isn't loaded, the GT++ dust is used instead (at Alkalus's request of having this dust defined in GT++ as well);
- Removed duplicate electrolyzer recipe if BW is loaded. If it isn't, the recipe does load. Also adjusted the amount of inputs, 3 dusts instead of 1.
---
 .../loaders/recipe/RecipeLoader_GlueLine.java      | 59 ++++++++++++++--------
 1 file changed, 37 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
index 95c91b85a5..185b3b85d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
@@ -204,14 +204,27 @@ public class RecipeLoader_GlueLine {
                 MISC_MATERIALS.SODIUM_CYANIDE.getDust(1),
                 10 * 20);
 
-        GT_Values.RA.addChemicalRecipe(
-                CI.getNumberedCircuit(18),
-                ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 1),
-                Materials.SaltWater.getFluid(1000L),
-                FluidUtils.getWater(1000),
-                Materials.SodiumCarbonate.getDust(1),
-                MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(1),
-                5 * 20);
+        if (LoadedMods.BartWorks) {
+            GT_Values.RA.addChemicalRecipe(
+                    CI.getNumberedCircuit(18),
+                    ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 1),
+                    Materials.SaltWater.getFluid(1000L),
+                    FluidUtils.getWater(1000),
+                    Materials.SodiumCarbonate.getDust(1),
+                    ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 1),
+                    5 * 20);
+        }
+
+        else {
+            GT_Values.RA.addChemicalRecipe(
+                    CI.getNumberedCircuit(18),
+                    ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 1),
+                    Materials.SaltWater.getFluid(1000L),
+                    FluidUtils.getWater(1000),
+                    Materials.SodiumCarbonate.getDust(1),
+                    MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(1),
+                    5 * 20);
+        }
 
         GT_Values.RA.addChemicalRecipe(
                 CI.getNumberedCircuit(19),
@@ -253,20 +266,22 @@ public class RecipeLoader_GlueLine {
     }
 
     private static void electrolyzerRecipes() {
-        GT_Values.RA.addElectrolyzerRecipe(
-                CI.getNumberedCircuit(1),
-                MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(1),
-                null,
-                Materials.Chlorine.getFluid(2000), // Out
-                Materials.Calcium.getDust(1),
-                null,
-                null,
-                null,
-                null,
-                null,
-                new int[] {10000, 10000, 10000},
-                20 * 30,
-                120);
+        if (!LoadedMods.BartWorks) {
+            GT_Values.RA.addElectrolyzerRecipe(
+                    CI.getNumberedCircuit(1),
+                    MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(3),
+                    null,
+                    Materials.Chlorine.getFluid(2000), // Out
+                    Materials.Calcium.getDust(1),
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    new int[]{10000, 10000, 10000},
+                    20 * 30,
+                    120);
+        }
     }
 
     private static void fluidHeaterRecipes() {
-- 
cgit