add recipes for Nq fuel line

3 files changed, 275 insertions, 11 deletions

diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index f5fa273c91..2d8ec04361 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -316,7 +316,7 @@ public class MyMaterial implements Runnable {
             new short[]{93,219,0},
             "Naquadah Gas",
             "Who need it?",
-            new Werkstoff.Stats().setToxic(true).setRadioactive(true),
+            new Werkstoff.Stats().setToxic(true).setRadioactive(true).setGas(true),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             31026,
@@ -350,7 +350,7 @@ public class MyMaterial implements Runnable {
 
     public static final Werkstoff antimonyTrichloride = new Werkstoff(
             new short[]{0x0f,0xdc,0x34},
-            "Antimony Trichloride",
+            "Antimony Trichloride Solution",
             subscriptNumbers("SbCl3"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
@@ -359,6 +359,17 @@ public class MyMaterial implements Runnable {
             TextureSet.SET_FLUID
     );
 
+    public static final Werkstoff antimonyPentachlorideSolution = new Werkstoff(
+            new short[]{0x15,0x93,0x2c},
+            "Antimony Pentachloride Solution",
+            subscriptNumbers("SbCl5"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31030,
+            TextureSet.SET_FLUID
+    );
+
     public static final Werkstoff antimonyPentachloride = new Werkstoff(
             new short[]{0x15,0x93,0x2c},
             "Antimony Pentachloride",
@@ -366,7 +377,7 @@ public class MyMaterial implements Runnable {
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
-            31030,
+            31037,
             TextureSet.SET_FLUID
     );
 
@@ -414,7 +425,7 @@ public class MyMaterial implements Runnable {
             TextureSet.SET_FLUID
     );
 
-    public static final Werkstoff NaquadahEmulsion = new Werkstoff(
+    public static final Werkstoff naquadahEmulsion = new Werkstoff(
             new short[]{0x4a,0x46,0x45},
             "Naquadah Emulsion",
             "??Nq??",
@@ -425,7 +436,7 @@ public class MyMaterial implements Runnable {
             TextureSet.SET_FLUID
     );
 
-    public static final Werkstoff NaquadahSolution = new Werkstoff(
+    public static final Werkstoff naquadahSolution = new Werkstoff(
             new short[]{0x84,0x81,0x80},
             "Naquadah Solution",
             "~Nq~",
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index a2f5092761..03561db74b 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -1,6 +1,7 @@
 package GoodGenerator.Loader;
 
 import GoodGenerator.Items.MyMaterial;
+import GoodGenerator.util.CrackRecipeAdder;
 import GoodGenerator.util.MaterialFix;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import gregtech.api.enums.*;
@@ -551,9 +552,228 @@ public class RecipeLoader {
                 114514,
                 7000
         );
+
+        CrackRecipeAdder.crackerAdder(
+                MyMaterial.naquadahGas.getFluidOrGas(1000),
+                MyMaterial.atomicSeparationCatalyst.getMolten(4),
+                new FluidStack[]{
+                        Materials.Helium.getGas(300),
+                        WerkstoffLoader.Xenon.getFluidOrGas(40),
+                        WerkstoffLoader.Krypton.getFluidOrGas(20),
+                        Materials.Radon.getGas(14000)
+                },
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadah,1),
+                4
+        );
+
+        CrackRecipeAdder.crackerAdder(
+                MyMaterial.lightNaquadahFuel.getFluidOrGas(1000),
+                MyMaterial.atomicSeparationCatalyst.getMolten(4),
+                new FluidStack[]{
+                        Materials.Radon.getGas(1400),
+                        MyMaterial.naquadahGas.getFluidOrGas(400),
+                        Materials.Uranium.getMolten(648),
+                        MyMaterial.heavyNaquadahFuel.getFluidOrGas(280),
+                        Materials.Plutonium.getMolten(576),
+                        MyMaterial.naquadahAsphalt.getFluidOrGas(140)
+                },
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Uranium235,1),
+                6
+        );
+
+        CrackRecipeAdder.crackerAdder(
+                MyMaterial.heavyNaquadahFuel.getFluidOrGas(1000),
+                MyMaterial.atomicSeparationCatalyst.getMolten(6),
+                new FluidStack[]{
+                        Materials.Radon.getGas(1000),
+                        MyMaterial.naquadahGas.getFluidOrGas(450),
+                        MyMaterial.lightNaquadahFuel.getFluidOrGas(560),
+                        Materials.Uranium.getMolten(720),
+                        Materials.Lutetium.getMolten(648),
+                        MyMaterial.naquadahAsphalt.getFluidOrGas(240)
+                },
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Plutonium,1),
+                6
+        );
+
+        CrackRecipeAdder.crackerAdder(
+                MyMaterial.naquadahAsphalt.getFluidOrGas(1000),
+                MyMaterial.atomicSeparationCatalyst.getMolten(12),
+                new FluidStack[]{
+                        MyMaterial.lightNaquadahFuel.getFluidOrGas(600),
+                        Materials.Uranium.getMolten(1152),
+                        Materials.Promethium.getMolten(864),
+                        Materials.Plutonium.getMolten(792),
+                        Materials.Thulium.getMolten(216),
+                        MyMaterial.heavyNaquadahFuel.getFluidOrGas(350)
+                },
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadria,1),
+                6
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(2)
+                },
+                new FluidStack[]{
+                        Materials.Ethanol.getFluid(1000),
+                        Materials.SulfuricAcid.getFluid(1000)
+                },
+                new FluidStack[]{
+                        MyMaterial.ether.getFluidOrGas(500),
+                        Materials.DilutedSulfuricAcid.getFluid(1500)
+                },
+                null,
+                510,
+                120
+        );
+
+        GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell),GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Empty,1),537,0);
+        GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell),null,537,1);
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1),
+                        GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Antimony,1),
+                },
+                new FluidStack[]{
+                        MyMaterial.ether.getFluidOrGas(1000),
+                        Materials.Chlorine.getGas(3000)
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyTrichloride.getFluidOrGas(1000)
+                },
+                null,
+                60,
+                30
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1),
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyTrichloride.getFluidOrGas(1000),
+                        Materials.Chlorine.getGas(2000)
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000)
+                },
+                null,
+                180,
+                480
+        );
+
+        GT_Values.RA.addUniversalDistillationRecipe(
+                MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000),
+                new  FluidStack[]{
+                        MyMaterial.ether.getFluidOrGas(1000),
+                        MyMaterial.antimonyPentachloride.getFluidOrGas(1000)
+                },
+                null,
+                600,
+                120
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1),
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyPentachloride.getFluidOrGas(1000),
+                        Materials.HydrofluoricAcid.getFluid(5000)
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyPentafluoride.getFluidOrGas(1000),
+                        Materials.HydrochloricAcid.getFluid(5000)
+                },
+                null,
+                420,
+                30
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1),
+                },
+                new FluidStack[]{
+                        MyMaterial.antimonyPentafluoride.getFluidOrGas(1000),
+                        Materials.HydrofluoricAcid.getFluid(1000)
+                },
+                new FluidStack[]{
+                        MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000),
+                },
+                null,
+                840,
+                2040
+        );
+
+        GT_Values.RA.addBlastRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.NaquadahEnriched,32),
+                GT_Utility.getIntegratedCircuit(16),
+                MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000),
+                MyMaterial.acidNaquadahEmulsion.getFluidOrGas(2000),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,3),
+                null,
+                3600,
+                2040,
+                3400
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(3),
+                        GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Quicklime,32)
+                },
+                new FluidStack[]{
+                        MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000),
+                },
+                new FluidStack[]{
+                        MyMaterial.naquadahEmulsion.getFluidOrGas(1000),
+                },
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.dust,Materials.AntimonyTrioxide,1),
+                        WerkstoffLoader.Fluorspar.get(OrePrefixes.dust,6)
+                },
+                240,
+                30
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                GT_Utility.getIntegratedCircuit(1),
+                null,
+                MyMaterial.naquadahEmulsion.getFluidOrGas(1000),
+                MyMaterial.naquadahSolution.getFluidOrGas(500),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,4),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,2),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1),
+                MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1),
+                new int[]{8000,7500,5000,2000,500,100},
+                800,
+                120
+        );
+
+        GT_Values.RA.addUniversalDistillationRecipe(
+                MyMaterial.naquadahSolution.getFluidOrGas(20),
+                new  FluidStack[]{
+                        MyMaterial.naquadahAsphalt.getFluidOrGas(2),
+                        MyMaterial.heavyNaquadahFuel.getFluidOrGas(5),
+                        MyMaterial.lightNaquadahFuel.getFluidOrGas(10),
+                        FluidRegistry.getFluidStack("water",10),
+                        MyMaterial.naquadahGas.getFluidOrGas(60)
+                },
+                null,
+                20,
+                2040
+        );
+
+
     }
 
     public static void Fixer(){
         MaterialFix.MaterialFluidExtractionFix(MyMaterial.atomicSeparationCatalyst);
+        MaterialFix.MaterialFluidExtractionFix(MyMaterial.extremelyUnstableNaquadah);
     }
 }
diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
index 7cec9e893a..3d3e3a356c 100644
--- a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
@@ -1,14 +1,47 @@
 package GoodGenerator.util;
 
+import gregtech.api.enums.GT_Values;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 public class CrackRecipeAdder {
-    float coe1[] = {1.25f,1.2f,1.1f,0.9f,0.85f,0.8f};
-    float coe2[] = {1.4f,1.25f,1.2f,0.8f,0.75f,0.7f};
-    float coe3[] = {1.6f,1.5f,1.45f,0.7f,0.6f,0.55f};
-    public static void crackerAdder(FluidStack inputFluid,FluidStack[] outputFluids){
+    static float[] coe1 = {1.25f,1.2f,1.1f,0.9f,0.85f,0.8f,0.75f};
+    static float[] coe2 = {1.4f,1.25f,1.2f,0.8f,0.75f,0.7f,0.65f};
+    static float[] coe3 = {1.6f,1.5f,1.45f,0.7f,0.6f,0.55f,0.45f};
+    public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids, ItemStack outputItem, int num){
+
         String name;
-        name = inputFluid.getFluid().getName();
-        //WIP
+        FluidStack[] actOutput = new FluidStack[num];
+        name = inputFluid.getFluid().getName().replaceAll(" ","");
+
+        GT_Values.RA.addCrackingRecipe(1,inputFluid,cracker, FluidRegistry.getFluidStack("lightlycracked"+name,1000),320,7680);
+        GT_Values.RA.addCrackingRecipe(2,inputFluid,cracker, FluidRegistry.getFluidStack("moderatelycracked"+name,1000),480,7680);
+        GT_Values.RA.addCrackingRecipe(3,inputFluid,cracker, FluidRegistry.getFluidStack("heavilycracked"+name,1000),560,7680);
+
+        for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
+            Fluid tmp1 = outputFluids[i].getFluid();
+            int tmp2 = (int)(outputFluids[i].amount * coe1[i]);
+            actOutput[j] = new FluidStack(tmp1, tmp2);
+        }
+
+        GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("lightlycracked"+name,1000),actOutput,outputItem,2400,7680);
+
+        for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
+            Fluid tmp1 = outputFluids[i].getFluid();
+            int tmp2 = (int)(outputFluids[i].amount * coe2[i]);
+            actOutput[j] = new FluidStack(tmp1, tmp2);
+        }
+
+        GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("moderatelycracked"+name,1000),actOutput,outputItem,2400,7680);
+
+        for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
+            Fluid tmp1 = outputFluids[i].getFluid();
+            int tmp2 = (int)(outputFluids[i].amount * coe3[i]);
+            actOutput[j] = new FluidStack(tmp1, tmp2);
+        }
+
+        GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("heavilycracked"+name,1000),actOutput,outputItem,2400,7680);
     }
 }