Remove Universal Fluid Cells from recipes (#263)

Former-commit-id: 6f82e9b3964288213fc21f3dd84267bf980af352

5 files changed, 24 insertions, 20 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index c2a0702cfc..37ef834fde 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.207:dev")
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.211:dev")
     compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
     compile("com.github.GTNewHorizons:TecTech:5.0.67:dev")
     compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev")
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
index c1d149c29c..ba11127fe5 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
@@ -36,7 +36,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.objects.GT_Fluid;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
-import ic2.core.item.ItemFluidCell;
+import gregtech.common.items.GT_MetaGenerated_Item_98;
 import java.awt.*;
 import java.util.Arrays;
 import net.minecraft.block.Block;
@@ -77,8 +77,16 @@ public class FluidLoader {
         FluidLoader.BioLabFluidCells = new ItemStack[FluidLoader.BioLabFluidMaterials.length];
         for (int i = 0; i < FluidLoader.BioLabFluidMaterials.length; i++) {
             FluidRegistry.registerFluid(FluidLoader.BioLabFluidMaterials[i]);
-            FluidLoader.BioLabFluidCells[i] =
-                    ItemFluidCell.getUniversalFluidCell(new FluidStack(FluidLoader.BioLabFluidMaterials[i], 1000));
+        }
+
+        GT_MetaGenerated_Item_98.FluidCell[] fluidCells = new GT_MetaGenerated_Item_98.FluidCell[] {
+            GT_MetaGenerated_Item_98.FluidCell.FLUORESCENT_DNA,
+            GT_MetaGenerated_Item_98.FluidCell.ENZYME_SOLUTION,
+            GT_MetaGenerated_Item_98.FluidCell.PENICILLIN,
+            GT_MetaGenerated_Item_98.FluidCell.POLYMERASE,
+        };
+        for (int i = 0; i < fluidCells.length; i++) {
+            FluidLoader.BioLabFluidCells[i] = fluidCells[i].get();
         }
 
         //        BioCulture.BIO_CULTURE_ARRAY_LIST.get(0).setFluid(new GT_Fluid("_NULL", "molten.autogenerated",
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
index 2bba0d833e..f8fa74dce3 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
@@ -258,7 +258,7 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
                             if (cultureDNABioData.getChance() > new XSTR().nextInt(10000)) {
                                 this.mOutputItems[0] = Outp;
                             } else this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L);
-                            this.mOutputItems[1] = ItemList.Cell_Universal_Fluid.get(2L);
+                            this.mOutputItems[1] = ItemList.Cell_Empty.get(2L);
 
                             this.calculateOverclockedNess(
                                     BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), 500);
@@ -305,7 +305,7 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
                                 this.mOutputItems[0] =
                                         BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(cultureDNABioData));
                             }
-                            this.mOutputItems[1] = ItemList.Cell_Universal_Fluid.get(1L);
+                            this.mOutputItems[1] = ItemList.Cell_Empty.get(1L);
                             this.calculateOverclockedNess(
                                     BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), 500);
                             return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE;
@@ -344,7 +344,7 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
                             if (cultureDNABioData.getChance() > new XSTR().nextInt(10000)) {
                                 this.mOutputItems[0] = BioItemList.getPetriDish(bioCulture);
                             }
-                            this.mOutputItems[1] = ItemList.Cell_Universal_Fluid.get(1L);
+                            this.mOutputItems[1] = ItemList.Cell_Empty.get(1L);
                             this.calculateOverclockedNess(
                                     BW_Util.getMachineVoltageFromTier(3 + rTier + cultureDNABioData.getTier()), 500);
                             return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
index 6df9b03f4a..9774620098 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
@@ -39,11 +39,11 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.util.*;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
-import ic2.core.item.ItemFluidCell;
 import java.lang.reflect.Field;
 import java.util.Map;
 import net.minecraft.init.Items;
@@ -109,7 +109,7 @@ public class AdditionalRecipes {
                                 FluidLoader.BioLabFluidCells[3],
                                 ItemList.Tool_DataOrb.get(1L)
                             },
-                            new ItemStack[] {Outp, ItemList.Cell_Universal_Fluid.get(2L)},
+                            new ItemStack[] {Outp, ItemList.Cell_Empty.get(2L)},
                             BioItemList.mBioLabParts[1],
                             new int[] {DNA.getChance(), 10000},
                             dnaFluid,
@@ -136,7 +136,7 @@ public class AdditionalRecipes {
                             new ItemStack[] {
                                 FluidLoader.BioLabFluidCells[1], BioItemList.getPlasmidCell(null), inp, inp2
                             },
-                            new ItemStack[] {stack, ItemList.Cell_Universal_Fluid.get(1L)},
+                            new ItemStack[] {stack, ItemList.Cell_Empty.get(1L)},
                             BioItemList.mBioLabParts[2],
                             new int[] {DNA.getChance(), 10000},
                             dnaFluid,
@@ -160,7 +160,7 @@ public class AdditionalRecipes {
                                 BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(Plasmid)),
                                 FluidLoader.BioLabFluidCells[2],
                             },
-                            new ItemStack[] {stack, ItemList.Cell_Universal_Fluid.get(1L)},
+                            new ItemStack[] {stack, ItemList.Cell_Empty.get(1L)},
                             BioItemList.mBioLabParts[3],
                             new int[] {10000, 10000},
                             new FluidStack[] {FluidRegistry.getFluidStack("ic2distilledwater", 1000)},
@@ -226,15 +226,10 @@ public class AdditionalRecipes {
                                     BioItemList.getPetriDish(null),
                                     fluidStack.equals(Materials.Water.getFluid(1000L))
                                             ? Materials.Water.getCells(1)
-                                            : ItemFluidCell.getUniversalFluidCell(
-                                                    FluidRegistry.getFluidStack("ic2distilledwater", 1000))
-                                },
-                                new ItemStack[] {
-                                    BioItemList.getPetriDish(bioCulture),
-                                    fluidStack.equals(Materials.Water.getFluid(1000L))
-                                            ? Materials.Empty.getCells(1)
-                                            : ItemList.Cell_Universal_Fluid.get(1L)
+                                            : GT_Utility.getContainersFromFluid(GT_ModHandler.getDistilledWater(1000))
+                                                    .get(0)
                                 },
+                                new ItemStack[] {BioItemList.getPetriDish(bioCulture), Materials.Empty.getCells(1)},
                                 null,
                                 new int[] {bioCulture.getChance(), 10000},
                                 new FluidStack[] {new FluidStack(bioCulture.getFluid(), 1000)},
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java
index 25f4a0e523..6c597ced06 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java
@@ -36,6 +36,7 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.objects.GT_ItemStack;
@@ -811,7 +812,7 @@ public class BWRecipes {
 
         public GT_Recipe addMoltenFuel(Materials M, int burn) {
             return super.addFuel(
-                    ItemFluidCell.getUniversalFluidCell(M.getMolten(144L)), Ic2Items.FluidCell.copy(), burn);
+                    GT_OreDictUnificator.get(OrePrefixes.cellMolten, M, 1), Materials.Empty.getCells(1), burn);
         }
 
         public GT_Recipe addLiquidFuel(FluidStack fluidStack, int burn) {