New BioVatOilRecipe

+fixed bugged modifier on the BioVat
+added OilRecipe

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: a4f4a2eab37f14377a770ae8e7068e90cc207187

4 files changed, 59 insertions, 11 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java
index 78ff73554f..53b59830eb 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java
@@ -38,12 +38,14 @@ public class BioCultureLoader implements Runnable {
     private static final BioDNA BIO_DNA_WHINE_YEAST = BioDNA.createAndRegisterBioDNA("Saccharomyces cerevisiae var bayanus", EnumRarity.uncommon);
     private static final BioDNA BIO_DNA_BEER_YEAST = BioDNA.createAndRegisterBioDNA("Saccharomyces cerevisiae var cerevisiae", EnumRarity.uncommon);
     private static final BioData eColiData = BioData.createAndRegisterBioData("Escherichia koli", EnumRarity.uncommon, 10000, 0);
+    private static final BioDNA BIO_DNA_ANAEROBIC_OIL = BioDNA.createAndRegisterBioDNA("Pseudomonas Veronii", EnumRarity.uncommon);
+    private static final BioData BIO_DATA_ANAEROBIC_OIL = BioData.createAndRegisterBioData("Pseudomonas Veronii", EnumRarity.uncommon, 5000, 1);
     public static BioCulture CommonYeast;
     public static BioCulture WhineYeast;
     public static BioCulture BeerYeast;
     public static BioCulture rottenFleshBacteria;
     public static BioCulture eColi;
-
+    public static BioCulture anaerobicOil;
     @Override
     public void run() {
         CommonYeast = BioCulture.createAndRegisterBioCulture(new Color(255, 248, 200), "Saccharomyces cerevisiae", BioPlasmid.convertDataToPlasmid(BIO_DATA_YEAST), BioDNA.convertDataToDNA(BIO_DATA_YEAST), true);
@@ -51,7 +53,7 @@ public class BioCultureLoader implements Runnable {
         BeerYeast = BioCulture.createAndRegisterBioCulture(new Color(255, 248, 200), "Saccharomyces cerevisiae var cerevisiae", BioPlasmid.convertDataToPlasmid(BIO_DATA_YEAST), BIO_DNA_BEER_YEAST, true);
         rottenFleshBacteria = BioCulture.createAndRegisterBioCulture(new Color(110, 40, 25), "Escherichia cadaver", BioPlasmid.convertDataToPlasmid(BIO_DATA_BETA_LACMATASE), BioDNA.convertDataToDNA(BIO_DATA_BETA_LACMATASE), false);
         eColi = BioCulture.createAndRegisterBioCulture(new Color(149, 132, 75), "Escherichia koli", BioPlasmid.convertDataToPlasmid(eColiData), BioDNA.convertDataToDNA(eColiData), true);
-
+        anaerobicOil = BioCulture.createAndRegisterBioCulture(new Color(0, 0, 0), "Pseudomonas Veronii", BioPlasmid.convertDataToPlasmid(BIO_DNA_ANAEROBIC_OIL), BioDNA.convertDataToDNA(BIO_DATA_ANAEROBIC_OIL), true);
     }
 
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
index fab53818a7..54d5ecda9f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
@@ -312,6 +312,16 @@ public class BioRecipeLoader extends RecipeLoader {
                     BW_Util.STANDART
             );
 
+            BWRecipes.instance.addBioLabRecipeIncubation(
+                    new ItemStack(Blocks.dirt),
+                    BioCultureLoader.anaerobicOil,
+                    new int[]{100},
+                    new FluidStack[]{fluidStack},
+                    1500,
+                    BW_Util.getMachineVoltageFromTier(4),
+                    BW_Util.STANDART
+            );
+
             BWRecipes.instance.addBacterialVatRecipe(
                     new ItemStack[]{new ItemStack(Items.sugar, 64)},
                     new FluidStack[]{new FluidStack(fluidStack, 100)},
@@ -357,5 +367,17 @@ public class BioRecipeLoader extends RecipeLoader {
                 400,
                 BW_Util.getMachineVoltageFromTier(1)
         );
+
+        BWRecipes.instance.addBacterialVatRecipe(
+                null,
+                new FluidStack[]{Materials.FermentedBiomass.getFluid(10000)},
+                BioCultureLoader.anaerobicOil,
+                new FluidStack[]{new FluidStack(FluidLoader.fulvicAcid,1000)},
+                2748,
+                BW_Util.getMachineVoltageFromTier(3)
+        );
+        GT_Values.RA.addFluidHeaterRecipe(GT_Utility.getIntegratedCircuit(10),new FluidStack(FluidLoader.fulvicAcid,1000),new FluidStack(FluidLoader.heatedfulvicAcid,1000),90,BW_Util.getMachineVoltageFromTier(2));
+        GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(10),null,new FluidStack(FluidLoader.heatedfulvicAcid,1000),new FluidStack(FluidLoader.Kerogen,1000),null,75,BW_Util.getMachineVoltageFromTier(2));
+        GT_Values.RA.addPyrolyseRecipe(Materials.Wood.getDust(10),new FluidStack(FluidLoader.Kerogen,1000),10,null,Materials.Oil.getFluid(1000),105,BW_Util.getMachineVoltageFromTier(3));
     }
-}
+}
\ No newline at end of file
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 8285eb9789..af33363990 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
@@ -27,6 +27,7 @@ import com.github.bartimaeusnek.bartworks.client.renderer.RendererSwitchingColor
 import com.github.bartimaeusnek.bartworks.common.blocks.BioFluidBlock;
 import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BWTileEntityDimIDBridge;
 import com.github.bartimaeusnek.bartworks.util.BioCulture;
+import com.github.bartimaeusnek.bartworks.util.Pair;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
@@ -44,6 +45,7 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.Arrays;
+import java.awt.*;
 
 public class FluidLoader implements Runnable {
 
@@ -54,23 +56,32 @@ public class FluidLoader implements Runnable {
     public static Fluid[] BioLabFluidMaterials;
     public static ItemStack[] BioLabFluidCells;
 
+    //OilProcessing chain
+    public static Fluid fulvicAcid,heatedfulvicAcid,Kerogen;
+
+
+
+
     @Override
     public void run() {
         FluidLoader.renderID = RenderingRegistry.getNextAvailableRenderId();
         short[] rgb = new short[3];
         Arrays.fill(rgb, (short) 255);
         FluidLoader.ff = new GT_Fluid("BWfakeFluid", "molten.autogenerated", rgb);
-        BioLabFluidMaterials = new Fluid[]{
+        FluidLoader.fulvicAcid = FluidLoader.createAndRegisterFluid("Fulvic Acid", new Color(20, 20, 20));
+        FluidLoader.heatedfulvicAcid = FluidLoader.createAndRegisterFluid("Heated Fulvic Acid", new Color(40, 20, 20),720);
+        FluidLoader.Kerogen = FluidLoader.createAndRegisterFluid("Kerogen", new Color(85, 85, 85));
+        FluidLoader.BioLabFluidMaterials = new Fluid[]{
                 new GT_Fluid("FluorecentdDNA", "molten.autogenerated", new short[]{125, 50, 170, 0}),
                 new GT_Fluid("EnzymesSollution", "molten.autogenerated", new short[]{240, 200, 125, 0}),
                 new GT_Fluid("Penicillin", "molten.autogenerated", new short[]{255, 255, 255, 0}),
                 new GT_Fluid("Polymerase", "molten.autogenerated", new short[]{110, 180, 110, 0}),
         };
 
-        BioLabFluidCells = new ItemStack[BioLabFluidMaterials.length];
-        for (int i = 0; i < BioLabFluidMaterials.length; i++) {
-            FluidRegistry.registerFluid(BioLabFluidMaterials[i]);
-            BioLabFluidCells[i] = ItemFluidCell.getUniversalFluidCell(new FluidStack(BioLabFluidMaterials[i], 1000));
+        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));
         }
 
 //        BioCulture.BIO_CULTURE_ARRAY_LIST.get(0).setFluid(new GT_Fluid("_NULL", "molten.autogenerated", BW_Util.splitColorToRBGArray(BioCulture.BIO_CULTURE_ARRAY_LIST.get(0).getColorRGB())));
@@ -83,12 +94,24 @@ public class FluidLoader implements Runnable {
             }
         }
 
-        bioFluidBlock = new BioFluidBlock();
-        GameRegistry.registerBlock(bioFluidBlock, "coloredFluidBlock");
+        FluidLoader.bioFluidBlock = new BioFluidBlock();
+        GameRegistry.registerBlock(FluidLoader.bioFluidBlock, "coloredFluidBlock");
         GameRegistry.registerTileEntity(BWTileEntityDimIDBridge.class, "bwTEDimIDBridge");
         if (FMLCommonHandler.instance().getSide().isClient()) {
             RenderingRegistry.registerBlockHandler(RendererSwitchingColorFluid.instance);
             RenderingRegistry.registerBlockHandler(RendererGlasBlock.instance);
         }
     }
+
+    public static Fluid createAndRegisterFluid(String Name,Color color){
+        Fluid f = new GT_Fluid(Name,"molten.autogenerated",new short[]{(short) color.getRed(),(short) color.getGreen(),(short) color.getBlue(), (short) color.getAlpha()});
+        FluidRegistry.registerFluid(f);
+        return f;
+    }
+    public static Fluid createAndRegisterFluid(String Name, Color color, int temperature){
+        Fluid f = new GT_Fluid(Name,"molten.autogenerated",new short[]{(short) color.getRed(),(short) color.getGreen(),(short) color.getBlue(), (short) color.getAlpha()});
+        f.setTemperature(temperature);
+        FluidRegistry.registerFluid(f);
+        return f;
+    }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java
index b3fce2c4ac..d9a4c77efc 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java
@@ -149,7 +149,8 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_MultiBlockBase {
     }
 
     private int calcMod(double x) {
-        return (int) Math.ceil((-0.00000025D * x * (x - this.getOutputCapacity())));
+        int ret = (int) Math.ceil(100D*(-(2*this.getOutputCapacity()-x)*(2*this.getOutputCapacity()-x)+1D));
+        return ret <= 0 ? 1 : ret > 100 ? 100 : ret;//(int) Math.ceil((-0.00000025D * x * (x - this.getOutputCapacity())));
     }
 
     @Override