mojor fix

3 files changed, 43 insertions, 63 deletions

diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 7c3361eac4..ed2635e0f5 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -64,18 +64,12 @@ public class NaquadahReworkRecipeLoader {
                 2000
         );
 
-        GT_Values.RA.addMultiblockChemicalRecipe(
-                new ItemStack[]{
-                        GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1))
-                },
-                new FluidStack[]{
-                        Materials.Hydrogen.getGas(8000),
-                        FluidRegistry.getFluidStack("seedoil", 3000)
-                },
-                new FluidStack[]{
-                        towEthyl1Hexanol.getFluidOrGas(1000)
-                },
-                null,
+        GT_Values.RA.addChemicalRecipe(
+                GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)),
+                Materials.Hydrogen.getCells(8),
+                FluidRegistry.getFluidStack("seedoil", 3000),
+                towEthyl1Hexanol.getFluidOrGas(1000),
+                ItemList.Cell_Empty.get(8),
                 400,
                 480
         );
@@ -97,34 +91,23 @@ public class NaquadahReworkRecipeLoader {
                 1920
         );
 
-        GT_Values.RA.addMultiblockChemicalRecipe(
-                null,
-                new FluidStack[]{
-                        P507.getFluidOrGas(4000),
-                        lowQualityNaquadahSolution.getFluidOrGas(36000),
-                },
-                new FluidStack[]{
-                        fluorineRichWasteLiquid.getFluidOrGas(6000),
-                        naquadahAdamantiumSolution.getFluidOrGas(30000)
-                },
+        GT_Values.RA.addChemicalRecipe(
+                lowQualityNaquadahSolution.get(OrePrefixes.cell, 36),
+                P507.get(OrePrefixes.cell, 4),
                 null,
+                fluorineRichWasteLiquid.getFluidOrGas(6000),
+                naquadahAdamantiumSolution.get(OrePrefixes.cell, 30),
+                ItemList.Cell_Empty.get(10),
                 4000,
                 1920
         );
 
-        GT_Values.RA.addMultiblockChemicalRecipe(
-                new ItemStack[]{
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 60),
-                },
-                new FluidStack[]{
-                        fluorineRichWasteLiquid.getFluidOrGas(1500)
-                },
-                new FluidStack[]{
-                        wasteLiquid.getFluidOrGas(1000)
-                },
-                new ItemStack[]{
-                        WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60)
-                },
+        GT_Values.RA.addChemicalRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 60),
+                null,
+                fluorineRichWasteLiquid.getFluidOrGas(1500),
+                wasteLiquid.getFluidOrGas(1000),
+                WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60),
                 1000,
                 120
         );
@@ -304,19 +287,13 @@ public class NaquadahReworkRecipeLoader {
                 30
         );
 
-        GT_Values.RA.addMultiblockChemicalRecipe(
-                new ItemStack[]{
-                        lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10),
-                },
-                new FluidStack[]{
-                        Materials.SulfuricAcid.getFluid(30000)
-                },
-                new FluidStack[]{
-                        naquadriaRichSolution.getFluidOrGas(9000)
-                },
-                new ItemStack[]{
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1),
-                },
+        GT_Values.RA.addChemicalRecipe(
+                lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10),
+                Materials.SulfuricAcid.getCells(30),
+                null,
+                naquadriaRichSolution.getFluidOrGas(9000),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1),
+                ItemList.Cell_Empty.get(30),
                 1000,
                 7680
         );
@@ -336,18 +313,12 @@ public class NaquadahReworkRecipeLoader {
                 1050
         );
 
-        GT_Values.RA.addMultiblockChemicalRecipe(
-                new ItemStack[]{
-                        lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3),
-                },
-                new FluidStack[]{
-                        Materials.Water.getFluid(3000),
-                        P507.getFluidOrGas(500)
-                },
-                new FluidStack[]{
-                        lowQualityNaquadriaSolution.getFluidOrGas(3500)
-                },
-                null,
+        GT_Values.RA.addChemicalRecipe(
+                lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3),
+                Materials.Water.getCells(3),
+                P507.getFluidOrGas(500),
+                lowQualityNaquadriaSolution.getFluidOrGas(3500),
+                ItemList.Cell_Empty.get(3),
                 500,
                 1920
         );
diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java
index 176976d77b..b68d62edb2 100644
--- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java
+++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java
@@ -16,7 +16,7 @@ public class NeutronActivatorLoader {
                         thoriumBasedLiquidFuelDepleted.getFluidOrGas(200)
                 },
                 null,
-                20000,
+                10000,
                 700,
                 500
         );
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index 297f43c3d2..f98a44a6b9 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -679,8 +679,17 @@ public class RecipeLoader {
                 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.addChemicalRecipe(
+                Materials.GasolineRaw.getCells(9),
+                Materials.Ethanol.getCells(1),
+                MyMaterial.ethanolGasoline.get(OrePrefixes.cell, 10),
+                15,
+                120
+        );
+
+        GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 0);
+        GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 1);
+        GT_Values.RA.addFuel(MyMaterial.ethanolGasoline.get(OrePrefixes.cell), null, 750, 0);
 
         GT_Values.RA.addMultiblockChemicalRecipe(
                 new ItemStack[]{