few naqline recipe change (#19)

4 files changed, 69 insertions, 208 deletions

diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index ef29aebeff..0da646cc55 100644
--- a/src/main/java/goodgenerator/items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -1268,6 +1268,17 @@ public class MyMaterial implements Runnable {
             new Pair<>(BlackPlutonium, 1)
     );
 
+    public static final Werkstoff antimonyPentafluorideSolution = new Werkstoff(
+        new short[]{0x16,0xd5,0xe2},
+        "Antimony Pentafluoride Solution",
+        subscriptNumbers("SbF5"),
+        new Werkstoff.Stats(),
+        Werkstoff.Types.MIXTURE,
+        new Werkstoff.GenerationFeatures().disable().addCells(),
+        OffsetID + 106,
+        TextureSet.SET_FLUID
+    );
+
     @Override
     public void run() { }
 }
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 93cedc94e8..3f3e4dff6d 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -128,7 +128,7 @@ public class NaquadahReworkRecipeLoader {
         );
 
         GT_Values.RA.addChemicalRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 60),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40),
                 null,
                 fluorineRichWasteLiquid.getFluidOrGas(1500),
                 wasteLiquid.getFluidOrGas(1000),
@@ -480,7 +480,7 @@ public class NaquadahReworkRecipeLoader {
                 GT_Utility.getIntegratedCircuit(2),
                 Materials.Nitrogen.getGas(1000),
                 null,
-                Materials.Naquadah.getNuggets(3),
+                Materials.Naquadah.getNuggets(1),
                 null,
                 2400,
                 7680,
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index 392e5be138..61d69652f9 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -360,213 +360,34 @@ public class RecipeLoader {
         );
 
         //Atomic Separation Catalyst
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(9),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(9),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(27),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(27),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(9),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(9),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(27),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(27),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(18),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(18),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(54),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(54),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(18),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(18),
-                300,
-                480
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(54),
-                300,
-                480
-        );
 
-        GT_Values.RA.addMixerRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
-                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
-                GT_Utility.getIntegratedCircuit(4),null,
-                Materials.Naquadah.getMolten(288),
-                null,
-                ItemRefer.Raw_Atomic_Separation_Catalyst.get(54),
-                300,
-                480
-        );
+        ItemStack[] mat1 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9)};
+        ItemStack[] mat2 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4)};
+        ItemStack[] mat3 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Europium,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4)};
+        ItemStack[] mat4 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4)};
+
+        for (int i = 0; i < mat1.length; i ++) {
+            for (ItemStack itemStack : mat2) {
+                for (int k = 0; k < mat3.length; k++) {
+                    for (ItemStack itemStack2 : mat4) {
+                        int c1 = i == 1 ? 2 : 1;
+                        int c2 = k == 2 ? 3 : 1;
+                        GT_Values.RA.addMixerRecipe(
+                            mat1[i],
+                            itemStack,
+                            mat3[k],
+                            itemStack2,
+                            GT_Utility.getIntegratedCircuit(4), null,
+                            Materials.Naquadah.getMolten(288),
+                            null,
+                            ItemRefer.Raw_Atomic_Separation_Catalyst.get(9 * c1 * c2),
+                            300,
+                            480
+                        );
+                    }
+                }
+            }
+        }
 
         GT_Values.RA.addFormingPressRecipe(
                 WerkstoffLoader.Tiberium.get(OrePrefixes.plate,4),
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 04387407b7..d6f48f3641 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -1385,6 +1385,35 @@ public class RecipeLoader_02 {
             );
         }
 
+        GT_Values.RA.addMultiblockChemicalRecipe(
+            new ItemStack[]{
+                Materials.Antimony.getDust(8),
+                GT_Utility.getIntegratedCircuit(24)
+            },
+            new FluidStack[]{
+                MyMaterial.ether.getFluidOrGas(1000),
+                Materials.Fluorine.getGas(40000),
+                Materials.Ice.getSolid(8000)
+            },
+            new FluidStack[]{
+                MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(8000)
+            },
+            null,
+            800,
+            7680
+        );
+
+        GT_Values.RA.addUniversalDistillationRecipe(
+            MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(4000),
+            new FluidStack[]{
+                MyMaterial.antimonyPentafluoride.getFluidOrGas(4000),
+                MyMaterial.ether.getFluidOrGas(500)
+            },
+            null,
+            100,
+            120
+        );
+
     }
 
     public static void InitLoadRecipe() {