diff options
author | Martin Robertz <dream-master@gmx.net> | 2022-12-29 19:18:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-29 19:18:48 +0100 |
commit | f923d383ae702abb62990a49bec2faeddd58809b (patch) | |
tree | 0d3682429741e541bdc3f4add47f131aee3b3b3d /src/main/java/gregtech/loaders/postload | |
parent | d50ae9faa2fd16e6cc8d242ef63a555902271ec1 (diff) | |
download | GT5-Unofficial-f923d383ae702abb62990a49bec2faeddd58809b.tar.gz GT5-Unofficial-f923d383ae702abb62990a49bec2faeddd58809b.tar.bz2 GT5-Unofficial-f923d383ae702abb62990a49bec2faeddd58809b.zip |
Naphthenic acid (#1589)
* add burn value for NaphthenicAcid 60k in Semi Fluid generator
(cherry picked from commit 3fa145932b64025067e807f4ff900f51029d07bd)
* add Naphthenic acid recipes and change a few
(cherry picked from commit 8b6b6d72dd79b4549dccd3732ccca6e219dd8ce7)
* spotless
* fix error
(cherry picked from commit db7b322cece6cf151f92ab6aa467bc8e4c84bda8)
* Chemical balance fixes
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 67 |
1 files changed, 54 insertions, 13 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 962ad39ecf..0dbccc6ba7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -12127,7 +12127,7 @@ public class GT_MachineRecipeLoader implements Runnable { // C8H10 + 6O =CoC22H14O4= C8H6O4 + 2H2O GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41L), Materials.Oxygen.getGas(6000L), Materials.Water.getFluid(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1L), @@ -12283,13 +12283,13 @@ public class GT_MachineRecipeLoader implements Runnable { 4000, 120); - GT_Values.RA.addChemicalRecipe( + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( MaterialsKevlar.CobaltIIHydroxide.getDust(5), MaterialsKevlar.NaphthenicAcid.getCells(1), GT_Values.NF, GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + ItemList.Cell_Empty.get(1L), 100, 480); GT_Values.RA.addChemicalRecipe( @@ -12297,27 +12297,68 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.NaphthenicAcid.getFluid(1000L), GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - 100, + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + 200, 480); - GT_Values.RA.addChemicalRecipe( + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1), GT_Values.NF, - GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + Materials.AceticAcid.getFluid(1500L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + ItemList.Cell_Empty.get(1L), 100, 480); GT_Values.RA.addChemicalRecipe( MaterialsKevlar.CobaltIIAcetate.getDust(15), GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.NaphthenicAcid.getFluid(1000L), - GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), + Materials.AceticAcid.getFluid(1500L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), 100, 480); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45L) + }, + new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, + new FluidStack[] { + GT_Values.NF, + }, + new ItemStack[] { + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), + }, + 200, + 1920); + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7L) + }, + new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, + new FluidStack[] { + Materials.AceticAcid.getFluid(15000L), + }, + new ItemStack[] { + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), + }, + 200, + 1920); // Co + 2HNO3 = Co(NO3)2 + 2H GT_Values.RA.addChemicalRecipe( Materials.Cobalt.getDust(1), @@ -12343,7 +12384,7 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.CobaltOxide.getDust(2), Materials.AceticAcid.getCells(2), GT_Values.NF, - Materials.Hydrogen.getGas(2000L), + Materials.Water.getFluid(2000L), MaterialsKevlar.CobaltIIAcetate.getDust(15), ItemList.Cell_Empty.get(2L), 100, |