Remove waterline QFT skip (#3460)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 0 insertions, 38 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 4ba835d57d..9150bf53a3 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -119,14 +119,12 @@ 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 mParticleAccelerationCatalyst;
     public static ItemStack mUltimatePlasticCatalyst;
     public static ItemStack mBiologicalIntelligenceCatalyst;
-    public static ItemStack mFlawlessWaterCatalyst;
     public static ItemStack TemporalHarmonyCatalyst;
     public static ItemStack mSynchrotronCapableCatalyst;
     public static ItemStack mAlgagenicGrowthPromoterCatalyst;
@@ -190,8 +188,6 @@ 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);
         mParticleAccelerationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 31, 1);
         mSynchrotronCapableCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 32, 1);
         mAlgagenicGrowthPromoterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 33, 1);
@@ -228,8 +224,6 @@ 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");
         ItemUtils.addItemToOreDictionary(mParticleAccelerationCatalyst, "catalystParticleAcceleration");
         ItemUtils.addItemToOreDictionary(mSynchrotronCapableCatalyst, "catalystSynchrotronCapable");
         ItemUtils.addItemToOreDictionary(mAlgagenicGrowthPromoterCatalyst, "catalystAlgagenicGrowthPromoter");
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 83e3b991a0..117e386e69 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -939,12 +939,6 @@ public class ItemUtils {
         if (GTUtility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) {
             return true;
         }
-        if (GTUtility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) {
-            return true;
-        }
-        if (GTUtility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) {
-            return true;
-        }
         if (GTUtility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) {
             return true;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java
index e0f97f018d..b59ce51239 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java
@@ -275,19 +275,6 @@ public class RecipeLoaderChemicalSkips {
             .eut(TierEU.RECIPE_UHV)
             .metadata(QFT_FOCUS_TIER, 2)
             .addTo(quantumForceTransformerRecipes);
-        // Early Waterline skip (first 4 tiers)
-        GTValues.RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(GenericChem.mLimpidWaterCatalyst, 0))
-            .fluidInputs(Materials.Water.getFluid(40000L))
-            .fluidOutputs(
-                Materials.Grade1PurifiedWater.getFluid(20000L),
-                Materials.Grade2PurifiedWater.getFluid(10000L),
-                Materials.Grade3PurifiedWater.getFluid(5000L),
-                Materials.Grade4PurifiedWater.getFluid(1000L))
-            .duration(20 * SECONDS)
-            .eut(TierEU.RECIPE_UHV)
-            .metadata(QFT_FOCUS_TIER, 2)
-            .addTo(quantumForceTransformerRecipes);
         // Stem Cells
         GTValues.RA.stdBuilder()
             .itemInputs(
@@ -382,19 +369,6 @@ public class RecipeLoaderChemicalSkips {
             .eut(TierEU.RECIPE_UIV)
             .metadata(QFT_FOCUS_TIER, 4)
             .addTo(quantumForceTransformerRecipes);
-        // Advanced Waterline skip (last 4 tiers)
-        GTValues.RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(GenericChem.mFlawlessWaterCatalyst, 0))
-            .fluidInputs(Materials.Water.getFluid(40000L))
-            .fluidOutputs(
-                Materials.Grade5PurifiedWater.getFluid(20000L),
-                Materials.Grade6PurifiedWater.getFluid(10000L),
-                Materials.Grade7PurifiedWater.getFluid(5000L),
-                Materials.Grade8PurifiedWater.getFluid(1000L))
-            .duration(20 * SECONDS)
-            .eut(TierEU.RECIPE_UIV)
-            .metadata(QFT_FOCUS_TIER, 4)
-            .addTo(quantumForceTransformerRecipes);
         // Rare Particles
         GTValues.RA.stdBuilder()
             .itemInputs(