diff options
author | Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> | 2022-08-06 01:48:08 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-06 00:48:08 +0700 |
commit | 479e3a1db86c810d27c8be0c5ba7d8220b607d31 (patch) | |
tree | c37d759985a7e7d7dd9fb0d1bc50962b10da8adb /src | |
parent | 0b817a389dafaee4baeff1ea70a2ea8c7a59894f (diff) | |
download | GT5-Unofficial-479e3a1db86c810d27c8be0c5ba7d8220b607d31.tar.gz GT5-Unofficial-479e3a1db86c810d27c8be0c5ba7d8220b607d31.tar.bz2 GT5-Unofficial-479e3a1db86c810d27c8be0c5ba7d8220b607d31.zip |
fix sulfur dichloride conflicts (#1212)
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index f4b7a74643..527b3132b8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2270,8 +2270,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)}, new FluidStack[]{Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000)}, new FluidStack[]{MaterialsKevlar.Methylamine.getGas(1000L), Materials.Dimethylamine.getGas(1000L), MaterialsKevlar.Trimethylamine.getGas(1000L), Materials.Water.getFluid(6000L)}, null, 400, 1920); GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(11), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9L)}, new FluidStack[]{Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000)}, new FluidStack[]{MaterialsKevlar.Methylamine.getGas(9000L), Materials.Dimethylamine.getGas(9000L), MaterialsKevlar.Trimethylamine.getGas(9000L), Materials.Water.getFluid(54000L)}, null, 3000, 1920); //S + 2Cl = SCl2 - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16L), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8L), ItemList.Cell_Empty.get(16), 800, 30); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8L), ItemList.Cell_Empty.get(8L), Materials.Chlorine.getGas(16000), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8L), 800, 30); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16L), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8L), ItemList.Cell_Empty.get(16), 800, 30); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8L), ItemList.Cell_Empty.get(8L), Materials.Chlorine.getGas(16000), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8L), GT_Values.NI, 800, 30); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8L), GT_Utility.getIntegratedCircuit(2), Materials.Chlorine.getGas(16000), MaterialsKevlar.SulfurDichloride.getFluid(8000), GT_Values.NI, GT_Values.NI, 800, 30); //SCl2 + SO3 = SO2 + SOCl2 GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfurTrioxide, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 1L), GT_Values.NF, Materials.SulfurDioxide.getGas(1000L), GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.ThionylChloride, 1L), ItemList.Cell_Empty.get(1), 150, 480); |