Add QFT Water Line Skips (#693)

* New catalyst definitions

* New catalyst english name and images

* 2 new recipes for waterline skips

4 files changed, 60 insertions, 2 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index eb623fd248..f975026fee 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -126,11 +126,13 @@ public class GenericChem extends ItemPackage {
     public static ItemStack mTitaTungstenIndiumCatalyst;
     public static ItemStack mRadioactivityCatalyst;
     public static ItemStack mRareEarthGroupCatalyst;
+    public static ItemStack mLimpidWaterCatalyst;
     public static ItemStack mSimpleNaquadahCatalyst;
     public static ItemStack mAdvancedNaquadahCatalyst;
     public static ItemStack mRawIntelligenceCatalyst;
     public static ItemStack mUltimatePlasticCatalyst;
     public static ItemStack mBiologicalIntelligenceCatalyst;
+    public static ItemStack mFlawlessWaterCatalyst;
     public static ItemStack TemporalHarmonyCatalyst;
 
     public static ItemStack mMillingBallAlumina;
@@ -198,6 +200,8 @@ public class GenericChem extends ItemPackage {
         mUltimatePlasticCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 26, 1);
         mBiologicalIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 27, 1);
         TemporalHarmonyCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 28, 1);
+        mLimpidWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 29, 1);
+        mFlawlessWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 30, 1);
     }
 
     public void registerOreDict() {
@@ -231,6 +235,8 @@ public class GenericChem extends ItemPackage {
         ItemUtils.addItemToOreDictionary(mUltimatePlasticCatalyst, "catalystUltimatePlastic");
         ItemUtils.addItemToOreDictionary(mBiologicalIntelligenceCatalyst, "catalystBiologicalIntelligence");
         ItemUtils.addItemToOreDictionary(TemporalHarmonyCatalyst, "catalystTemporalHarmony");
+        ItemUtils.addItemToOreDictionary(mLimpidWaterCatalyst, "catalystLimpidWater");
+        ItemUtils.addItemToOreDictionary(mFlawlessWaterCatalyst, "catalystFlawlessWater");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 004ae5f3e2..7a39820d12 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -25,7 +25,7 @@ public class ItemGenericChemBase extends Item {
 
     protected final IIcon base[];
 
-    private final int aMetaSize = 29;
+    private final int aMetaSize = 31;
 
     /*
      * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal
@@ -40,7 +40,8 @@ public class ItemGenericChemBase extends Item {
      * thorium/uranium/plutonium skip) 22 - Rare-Earth Group Catalyst (for monaline skip) 23 - Simple Naquadah Catalyst
      * (for early naqline skip) 24 - Advanced Naquadah Catalyst (for late naqline skip) 25 - Raw Intelligence Catalyst
      * (for stem cells skip) 26 - Ultimate Plasticizer Catalyst (for late plastics skip) 27 - Biological Intelligence
-     * Catalyst (for bio cells skip) 28 - Temporal Harmonizer Catalyst (for Eternity processing)
+     * Catalyst (for bio cells skip) 28 - Temporal Harmonizer Catalyst (for Eternity processing) 29 - Limpid Water
+     * Catalyst (for early waterline skip) 30 - Flawless Water Catalyst (for advanced waterline skip)
      */
 
     public ItemGenericChemBase() {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 0cfa4e7646..0fa6e7dbec 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1412,6 +1412,12 @@ public class ItemUtils {
         if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) {
             return true;
         }
+        if (GT_Utility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) {
+            return true;
+        }
+        if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) {
+            return true;
+        }
         return false;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
index be2d0f38d4..a3296cc4a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
@@ -169,6 +169,19 @@ public class RecipeLoader_ChemicalSkips {
                 (int) TierEU.RECIPE_UHV,
                 2);
 
+        // Early Waterline skip (first 4 tiers)
+        CORE.RA.addQuantumTransformerRecipe(
+                new ItemStack[] { ItemUtils.getSimpleStack(GenericChem.mLimpidWaterCatalyst, 0) },
+                new FluidStack[] { Materials.Water.getFluid(40000L) },
+                new FluidStack[] { Materials.Grade1PurifiedWater.getFluid(20000L),
+                        Materials.Grade2PurifiedWater.getFluid(10000L), Materials.Grade3PurifiedWater.getFluid(5000L),
+                        Materials.Grade4PurifiedWater.getFluid(1000L) },
+                new ItemStack[] {},
+                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                20 * 20,
+                (int) TierEU.RECIPE_UHV,
+                2);
+
         // Stem Cells
         CORE.RA.addQuantumTransformerRecipe(
                 new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32),
@@ -239,6 +252,18 @@ public class RecipeLoader_ChemicalSkips {
                 (int) TierEU.RECIPE_UIV,
                 4);
 
+        // Advanced Waterline skip (last 4 tiers)
+        CORE.RA.addQuantumTransformerRecipe(
+                new ItemStack[] { ItemUtils.getSimpleStack(GenericChem.mFlawlessWaterCatalyst, 0) },
+                new FluidStack[] { Materials.Water.getFluid(40000L) },
+                new FluidStack[] { Materials.Grade5PurifiedWater.getFluid(20000L),
+                        Materials.Grade6PurifiedWater.getFluid(10000L), Materials.Grade7PurifiedWater.getFluid(5000L),
+                        Materials.Grade8PurifiedWater.getFluid(1000L) },
+                new ItemStack[] {},
+                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                20 * 20,
+                (int) TierEU.RECIPE_UIV,
+                4);
     }
 
     private static void fusionReactorRecipes() {
@@ -319,6 +344,16 @@ public class RecipeLoader_ChemicalSkips {
                 (int) TierEU.RECIPE_UEV);
 
         CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+                        WerkstoffLoader.Hedenbergit.get(OrePrefixes.lens, 1),
+                        GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Silver, 1, false),
+                        ItemList.Circuit_Silicon_Wafer6.get(64) },
+                ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216),
+                ItemUtils.getSimpleStack(GenericChem.mLimpidWaterCatalyst, 1),
+                60 * 20,
+                (int) TierEU.RECIPE_UEV);
+
+        CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadah.getDust(64),
                         Materials.Adamantium.getDust(64), Materials.Silver.getNanite(1) },
                 ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216),
@@ -360,6 +395,16 @@ public class RecipeLoader_ChemicalSkips {
 
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+                        WerkstoffLoader.Hedenbergit.get(OrePrefixes.lens, 64),
+                        GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Silver, 64, false),
+                        ItemList.Circuit_Silicon_Wafer6.get(64) },
+                FluidUtils.getFluidStack("molten.shirabon", 92160),
+                ItemUtils.getSimpleStack(GenericChem.mFlawlessWaterCatalyst, 1),
+                60 * 20,
+                (int) TierEU.RECIPE_UMV);
+
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
                         GT_OreDictUnificator.get("blockShirabon", 16), MaterialsUEVplus.Universium.getNanite(1),
                         ItemList.Timepiece.get(1) },
                 Materials.DarkIron.getMolten(92160),