diff options
8 files changed, 342 insertions, 480 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index ca9053dacb..6059ad2a1e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -254,10 +254,10 @@ public class CoalTar extends ItemPackage { new ItemStack[] { CI.getNumberedBioCircuit(15) }, - FluidUtils.getFluidStack("fluid.phthalicacid", 144), + FluidUtils.getFluidStack("fluid.phthalicacid", 1000), null, new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 1) + ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15) }, new int[] {10000}, 60 * 20, diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index cbaaf43bcf..4da38eb41e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -52,12 +52,10 @@ public class GenericChem extends ItemPackage { false, null, 0, - new MaterialStack[] { - new MaterialStack(NONMATERIAL.PTFE, 75), - new MaterialStack(NONMATERIAL.PLASTIC, 15), - new MaterialStack(ELEMENT.getInstance().CARBON, 5), - new MaterialStack(ELEMENT.getInstance().SODIUM, 5) - }); + new MaterialStack(NONMATERIAL.PTFE, 75), + new MaterialStack(NONMATERIAL.PLASTIC, 15), + new MaterialStack(ELEMENT.getInstance().CARBON, 5), + new MaterialStack(ELEMENT.getInstance().SODIUM, 5)); /** * Fluids @@ -317,6 +315,7 @@ public class GenericChem extends ItemPackage { recipeHydrogenPeroxide(); recipeLithiumHydroperoxide(); recipeLithiumPeroxide(); + //The follow is using alk science, ignore them if (!usingGregtechNitricOxide) { recipeNitricOxide(); } @@ -346,21 +345,21 @@ public class GenericChem extends ItemPackage { private void recipeSodiumEthoxide() { - //2 C2H5OH + 2 Na → 2 C2H5ONa + H2 + //C2H5OH + Na → C2H5ONa + H CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(16), - ELEMENT.getInstance().SODIUM.getDust(2) + ELEMENT.getInstance().SODIUM.getDust(1) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000), }, new ItemStack[] { - ItemUtils.getSimpleStack(mSodiumEthoxide, 2) + ItemUtils.getSimpleStack(mSodiumEthoxide, 9) }, new FluidStack[] { - ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) + ELEMENT.getInstance().HYDROGEN.getFluidStack(1000) }, 20 *20, 120, @@ -369,20 +368,19 @@ public class GenericChem extends ItemPackage { private void recipePotassiumHydroxide() { - //Ca(OH)2 + K2CO3 → CaCO3 + 2 KOH + //Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(18), - ELEMENT.getInstance().POTASSIUM.getDust(4), - ELEMENT.getInstance().CARBON.getDust(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 2), - }, + Materials.Potash.getDust(3), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), + }, new FluidStack[] { - FluidUtils.getFluidStack("oxygen", 6000), + Materials.CarbonDioxide.getGas(1000) }, new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 2), - ItemUtils.getSimpleStack(mPotassiumHydroxide, 4) + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 5), + ItemUtils.getSimpleStack(mPotassiumHydroxide, 6) }, new FluidStack[] { @@ -397,18 +395,18 @@ public class GenericChem extends ItemPackage { private void recipeEthylXanthates() { - //Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O + //Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(17), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 2), + CI.getNumberedCircuit(17), + ItemUtils.getSimpleStack(mPotassiumHydroxide, 3), }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000), }, new ItemStack[] { - ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 1) + ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12) }, new FluidStack[] { FluidUtils.getWater(1000) @@ -421,13 +419,13 @@ public class GenericChem extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(17), - ItemUtils.getSimpleStack(mSodiumEthoxide, 1) + ItemUtils.getSimpleStack(mSodiumEthoxide, 9) }, new FluidStack[] { FluidUtils.getFluidStack(Carbon_Disulfide, 1000), }, new ItemStack[] { - ItemUtils.getSimpleStack(mSodiumEthylXanthate, 1) + ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12) }, new FluidStack[] { @@ -438,7 +436,7 @@ public class GenericChem extends ItemPackage { } - + //The follow is using alk science, ignore them private void recipeHydricSulfur() { ItemStack aCellHydricSulfide = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenSulfide", 1); @@ -472,7 +470,7 @@ public class GenericChem extends ItemPackage { new ItemStack[] { CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(mBrownCatalyst, 0), - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4) + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4) }, new FluidStack[] { FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000), @@ -481,14 +479,11 @@ public class GenericChem extends ItemPackage { }, new FluidStack[] { - FluidUtils.getFluidStack(Carbon_Disulfide, 2000), - FluidUtils.getFluidStack(Hydrogen_Sulfide, 4000) + FluidUtils.getFluidStack(Carbon_Disulfide, 2000) }, 20 *60 * 5, 30, 2); - - } private void recipeMutatedLivingSolder() { @@ -550,6 +545,7 @@ public class GenericChem extends ItemPackage { 480); } + //The follow is using alk science, ignore them private void recipeNitrogenDioxide() { ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); ItemStack aNitrogenDioxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1); @@ -560,7 +556,7 @@ public class GenericChem extends ItemPackage { GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), ELEMENT.getInstance().OXYGEN.getCell(1), GT_Values.NF, GT_Values.NF, ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30); } - + //The follow is using alk science, ignore them private void recipeNitricOxide() { ItemStack aWaterCell = ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1); ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); @@ -576,7 +572,7 @@ public class GenericChem extends ItemPackage { GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluidStack(8000), ELEMENT.getInstance().OXYGEN.getFluidStack(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30); } - + //The follow is using alk science, ignore them private void recipeHydrochloricAcid() { ItemStack aAcidCell = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrochloricAcid", 1); @@ -647,14 +643,15 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexane() { + //C6H6 + 6H = C6H12 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0) }, new FluidStack[] { - FluidUtils.getFluidStack(Benzene, 2000), - FluidUtils.getFluidStack("hydrogen", 10000) + FluidUtils.getFluidStack(Benzene, 1000), + FluidUtils.getFluidStack("hydrogen", 6000) }, new ItemStack[] { @@ -670,20 +667,21 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexanone() { + //C6H12 + 2O(Air) = C6H10O + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0) }, new FluidStack[] { - FluidUtils.getFluidStack(Cyclohexane, 2000), - FluidUtils.getFluidStack("air", 10000) + FluidUtils.getFluidStack(Cyclohexane, 1000), + FluidUtils.getFluidStack("air", 4000) }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Cyclohexanone, 2000), + FluidUtils.getFluidStack(Cyclohexanone, 1000), }, 20 * 120, 120, @@ -694,22 +692,19 @@ public class GenericChem extends ItemPackage { getTierTwoChip(), }, new FluidStack[] { - FluidUtils.getFluidStack(Phenol, 2000), - FluidUtils.getFluidStack("oxygen", 5000) + FluidUtils.getFluidStack(Cyclohexane, 1000), + FluidUtils.getFluidStack("oxygen", 2000) }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Cyclohexanone, 2000), + FluidUtils.getFluidStack(Cyclohexanone, 1000), }, 20 * 120, 120, 2); - - - } private void recipeCatalystRed() { @@ -907,20 +902,21 @@ public class GenericChem extends ItemPackage { private void recipeAniline() { + //C6H5NO2 + 6H = C6H7N + 2H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0) }, new FluidStack[] { - FluidUtils.getFluidStack(NitroBenzene, 2000), - FluidUtils.getFluidStack("hydrogen", 10000) + FluidUtils.getFluidStack(NitroBenzene, 1000), + FluidUtils.getFluidStack("hydrogen", 6000) }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Aniline, 2000), + FluidUtils.getFluidStack(Aniline, 1000), }, 20 * 30, 500, @@ -930,6 +926,7 @@ public class GenericChem extends ItemPackage { private void recipeNitroBenzene() { + //C6H6 + HNO3 =H2SO4= C6H5NO2 +H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getTierThreeChip(), @@ -937,7 +934,7 @@ public class GenericChem extends ItemPackage { new FluidStack[] { FluidUtils.getFluidStack(Benzene, 5000), FluidUtils.getFluidStack("sulfuricacid", 3000), - FluidUtils.getFluidStack("nitricacid", 3000), + FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getDistilledWater(10000) }, new ItemStack[] { @@ -955,96 +952,81 @@ public class GenericChem extends ItemPackage { private void recipe2Ethylanthraquinone() { + //C6H4(CO)2O + C6H5CH2CH3 = C6H4(CO)2C6H3CH2CH3 + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(4), - ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4), - }, + ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15), + }, new FluidStack[] { - FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 2000), - }, + FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000), + }, new ItemStack[] { - }, + }, new FluidStack[] { - FluidUtils.getFluidStack(Ethylanthraquinone2, 2000+(144*4)), + FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), }, 20 * 15, 120, - 2); - - /*GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), - null, - FluidUtils.getFluidStack("fluid.2ethylanthraquinone", 2000+(144*4)), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - 20*16);*/ - + 2); } private void recipe2Ethylanthrahydroquinone() { + //C6H4(CO)2C6H3CH2CH3 + 2H = C6H4(COH)2C6H3CH2CH3 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0), }, new FluidStack[] { - FluidUtils.getFluidStack(Ethylanthraquinone2, 4000), + FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), FluidUtils.getFluidStack("hydrogen", 2000), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), + FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 1000), }, 20 * 40, 120, - 2); - - /*GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0), - ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthraquinone", 1), - FluidUtils.getFluidStack("hydrogen", 500), - FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 1200), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - 20*40);*/ - + 2); } private void recipeLithiumPeroxide() { + //2HLiO2 = Li2O2 + H2O2 CORE.RA.addDehydratorRecipe( new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3) + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) }, null, null, new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2) }, - new int[]{10000, 10000, 10000}, + new int[]{10000, 10000}, 20*100, 120); } private void recipeLithiumHydroperoxide() { + //LiOH + H2O2 = HLiO2 + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(4), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3), }, new FluidStack[] { - FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000), + FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), }, new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14), - }, + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4), + }, new FluidStack[] { }, @@ -1068,25 +1050,45 @@ public class GenericChem extends ItemPackage { private void recipeHydrogenPeroxide() { + //C6H4(COH)2C6H3CH2CH3 + 2O =(C6H4CH)2= H2O2 + C6H4(CO)2C6H3CH2CH3 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(4), }, new FluidStack[] { - FluidUtils.getFluidStack("air", 15000), + FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), FluidUtils.getFluidStack("fluid.anthracene", 50), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Ethylanthraquinone2, 4000), - FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000), + FluidUtils.getFluidStack(Ethylanthraquinone2, 5000), + FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000), }, 20 * 30, 240, 1); + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { + CI.getNumberedCircuit(4), + }, + new FluidStack[] { + Materials.Oxygen.getGas(10000), + FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), + FluidUtils.getFluidStack("fluid.anthracene", 50), + }, + new ItemStack[] { + }, + new FluidStack[] { + FluidUtils.getFluidStack(Ethylanthraquinone2, 5000), + FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000), + }, + 20 * 5, + 240, + 1); + /* CORE.RA.addChemicalRecipe( GT_ModHandler.getAirCell(15), ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5), @@ -1100,35 +1102,6 @@ public class GenericChem extends ItemPackage { } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - private static final ItemStack getTierOneChip() { return CI.getNumberedAdvancedCircuit(4); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index c9c5ca98f6..d0c815829a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -6,6 +6,7 @@ import java.util.LinkedHashMap; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; @@ -97,54 +98,51 @@ public class RocketFuels extends ItemPackage { new int[]{100, 50}, 20*16, 500);*/ - + + //2HNO3 + Cu = N2O4 + H2O + CuO CORE.RA.addChemicalPlantRecipe( new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 12), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0), }, new FluidStack[] { - FluidUtils.getFluidStack("nitricacid", 4000) + FluidUtils.getFluidStack("nitricacid", 2000) }, new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 1) + Materials.CupricOxide.getDust(2), }, new FluidStack[] { - FluidUtils.getFluidStack(Nitrogen_Tetroxide, 3000), + FluidUtils.getFluidStack(Nitrogen_Tetroxide, 1000), }, new int[]{100, 100, 50, 50}, 20 * 30, MaterialUtils.getVoltageForTier(3), 3); - } public static void createHydrazine(){ + //H2O2 + 2NH3 = N2H4 + 2H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(21) }, new FluidStack[] { - FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000), + FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), FluidUtils.getFluidStack("ammonia", 2000), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Hydrazine, 4000), - + FluidUtils.getFluidStack(Hydrazine, 1000), }, 20 * 30, MaterialUtils.getVoltageForTier(2), 1); - FluidStack aBartWorksHydrogenPeroxide = FluidUtils.getWildcardFluidStack("Hydrogen Peroxide", 2000); + FluidStack aBartWorksHydrogenPeroxide = FluidUtils.getWildcardFluidStack("Hydrogen Peroxide", 1000); if (aBartWorksHydrogenPeroxide != null) { Logger.INFO("Found BW Hydrogen Peroxide, adding compat recipe."); CORE.RA.addChemicalPlantRecipe( @@ -159,7 +157,7 @@ public class RocketFuels extends ItemPackage { }, new FluidStack[] { - FluidUtils.getFluidStack(Hydrazine, 4000), + FluidUtils.getFluidStack(Hydrazine, 1000), }, 20 * 30, @@ -172,20 +170,21 @@ public class RocketFuels extends ItemPackage { public static void createMonomethylhydrazine(){ + //C + 2H + N2H4 = CH6N2 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(21), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 2) + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) }, new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 2000), - FluidUtils.getFluidStack(Hydrazine, 2000), + FluidUtils.getFluidStack(Hydrazine, 1000), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Monomethylhydrazine, 4000), + FluidUtils.getFluidStack(Monomethylhydrazine, 1000), }, 20 * 48, @@ -206,6 +205,7 @@ public class RocketFuels extends ItemPackage { private static void createHydratedAmmoniumNitrateSlurry() { + //NH3 + HNO3 = NH4NO3 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(21), @@ -218,7 +218,7 @@ public class RocketFuels extends ItemPackage { }, new FluidStack[] { - FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8000), + FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184), }, 20 * 60, @@ -230,7 +230,7 @@ public class RocketFuels extends ItemPackage { private static void createAmmoniumNitrateDust() { CORE.RA.addDehydratorRecipe( new ItemStack[] {CI.getNumberedCircuit(8)}, - FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8*144), + FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8 * 144), FluidUtils.getWater(2000), new ItemStack[] { ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8) @@ -243,21 +243,21 @@ public class RocketFuels extends ItemPackage { private static void createFormaldehyde() { + //O + CH4O = CH2O + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0), }, new FluidStack[] { - FluidUtils.getFluidStack("oxygen", 16000), + FluidUtils.getFluidStack("oxygen", 32000), FluidUtils.getFluidStack("methanol", 32000), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(Formaldehyde, 8000), - + FluidUtils.getFluidStack(Formaldehyde, 32000), }, 20 * 90, 120, diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index 534b876478..1b681cd9fa 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -40,11 +40,9 @@ public final class MISC_MATERIALS { "KNO3", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) - }); + new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); public static final Material SODIUM_NITRATE = new Material( "Sodium Nitrate", MaterialState.SOLID, //State @@ -58,11 +56,9 @@ public final class MISC_MATERIALS { "NaNO3", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) - }); + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); public static final Material SOLAR_SALT_COLD = new Material( "Solar Salt (Cold)", @@ -74,10 +70,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(POTASSIUM_NITRATE, 4), - new MaterialStack(SODIUM_NITRATE, 6) - }); + new MaterialStack(POTASSIUM_NITRATE, 4), + new MaterialStack(SODIUM_NITRATE, 6)); public static final Material SOLAR_SALT_HOT = new Material( "Solar Salt (Hot)", @@ -89,12 +83,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(POTASSIUM_NITRATE, 4), - new MaterialStack(SODIUM_NITRATE, 6) - }); - - + new MaterialStack(POTASSIUM_NITRATE, 4), + new MaterialStack(SODIUM_NITRATE, 6)); public static final Material STRONTIUM_OXIDE = new Material( "Strontium Oxide", @@ -109,10 +99,8 @@ public final class MISC_MATERIALS { "SrO", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); public static final Material SELENIUM_DIOXIDE = new Material( "Selenium Dioxide", @@ -124,10 +112,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SELENIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2) - }); + new MaterialStack(ELEMENT.getInstance().SELENIUM, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); public static final Material SELENIOUS_ACID = new Material( "Selenious Acid", @@ -139,11 +125,9 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(SELENIUM_DIOXIDE, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) - }); + new MaterialStack(SELENIUM_DIOXIDE, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); public static final Material HYDROGEN_CYANIDE = new Material( "Hydrogen Cyanide", @@ -155,11 +139,9 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().CARBON, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)); public static final Material CARBON_MONOXIDE = new Material( "Carbon Monoxide", @@ -171,10 +153,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); public static final Material CARBON_DIOXIDE = new Material( "Carbon Dioxide", @@ -186,10 +166,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); public static final Material WOODS_GLASS = new Material( "Wood's Glass", //Material Name @@ -204,12 +182,10 @@ public final class MISC_MATERIALS { "Si4Ba3Na2Ni", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SILICON, 40), - new MaterialStack(ELEMENT.getInstance().BARIUM, 30), - new MaterialStack(ELEMENT.getInstance().SODIUM, 20), - new MaterialStack(ELEMENT.getInstance().NICKEL, 10), - }); + new MaterialStack(ELEMENT.getInstance().SILICON, 40), + new MaterialStack(ELEMENT.getInstance().BARIUM, 30), + new MaterialStack(ELEMENT.getInstance().SODIUM, 20), + new MaterialStack(ELEMENT.getInstance().NICKEL, 10)); /* @@ -285,10 +261,8 @@ public final class MISC_MATERIALS { public static final Material WATER = new Material( "Water", MaterialState.PURE_LIQUID, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); //OH public static final Material HYDROXIDE = new Material( @@ -301,10 +275,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)); //NH3 public static final Material AMMONIA = new Material( @@ -317,10 +289,8 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3) - }); + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)); //NH4 public static final Material AMMONIUM = new Material( @@ -333,53 +303,41 @@ public final class MISC_MATERIALS { -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) - }); + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)); public static final Material HYDROGEN_CHLORIDE = new Material( "Hydrogen Chloride", MaterialState.PURE_GAS, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), - }); + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); public static final Material SODIUM_CHLORIDE = new Material( "Sodium Chloride", MaterialState.PURE_GAS, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), - }); + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); public static final Material SODIUM_HYDROXIDE = new Material( "Sodium Hydroxide", MaterialState.PURE_GAS, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(HYDROXIDE, 1), - }); + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(HYDROXIDE, 1)); public static final Material SALT_WATER = new Material( "Salt Water", MaterialState.PURE_LIQUID, - new MaterialStack[]{ - new MaterialStack(WATER, 3), - new MaterialStack(SODIUM_CHLORIDE, 1), - }); + new MaterialStack(WATER, 3), + new MaterialStack(SODIUM_CHLORIDE, 1)); public static final Material BRINE = new Material( "Brine", MaterialState.PURE_LIQUID, - new MaterialStack[]{ - new MaterialStack(SALT_WATER, 1), - new MaterialStack(SODIUM_CHLORIDE, 2), - }); + new MaterialStack(SALT_WATER, 1), + new MaterialStack(SODIUM_CHLORIDE, 2)); public static final Material STRONTIUM_HYDROXIDE = new Material( "Strontium Hydroxide", @@ -394,10 +352,8 @@ public final class MISC_MATERIALS { "Sr(OH)2", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), - new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) - }); + new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), + new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)); // Glue Chemicals @@ -413,11 +369,9 @@ public final class MISC_MATERIALS { "(CH3CO)2O", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 4), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 4), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); public static final Material CHLOROACETIC_ACID = new Material( "Chloroacetic Acid", @@ -431,12 +385,10 @@ public final class MISC_MATERIALS { "ClCH2-COOH", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); public static final Material DICHLOROACETIC_ACID = new Material( "Dichloroacetic Acid", @@ -450,12 +402,10 @@ public final class MISC_MATERIALS { "Cl2CH-COOH", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)); public static final Material TRICHLOROACETIC_ACID = new Material( "Trichloroacetic Acid", @@ -469,12 +419,10 @@ public final class MISC_MATERIALS { "Cl3C-COOH", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); public static final Material CHLOROACETIC_MIXTURE = new Material( "Chloroacetic Mixture", @@ -489,12 +437,10 @@ public final class MISC_MATERIALS { "Cl?H?C-COOH", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 6), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 6), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 6) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 6), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 6), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 6)); public static final Material SODIUM_CYANIDE = new Material( "Sodium Cyanide", @@ -508,11 +454,9 @@ public final class MISC_MATERIALS { "NaCN", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1) - }); + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(ELEMENT.getInstance().CARBON, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)); public static final Material CALCIUM_CHLORIDE = new Material( "Calcium Chloride", @@ -526,10 +470,8 @@ public final class MISC_MATERIALS { "CaCl2", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) - }); + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)); public static final Material CYANOACETIC_ACID = new Material( "Cyanoacetic Acid", @@ -543,12 +485,10 @@ public final class MISC_MATERIALS { "C3H3NO2", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 3), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 3), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); public static final Material SOLID_ACID_MIXTURE = new Material( "Solid Acid Catalyst Mixture", @@ -562,11 +502,9 @@ public final class MISC_MATERIALS { "?H2SO4?", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) - }); + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); public static final Material COPPER_SULFATE = new Material( "Copper(II) Sulfate", @@ -580,11 +518,9 @@ public final class MISC_MATERIALS { "CuSO4", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().COPPER, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) - }); + new MaterialStack(ELEMENT.getInstance().COPPER, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); public static final Material COPPER_SULFATE_HYDRATED = new Material( "Copper(II) Sulfate Pentahydrate", @@ -595,14 +531,12 @@ public final class MISC_MATERIALS { -1, //Protons -1, false, //Uses Blast furnace? - "CuSO4∙5H2O", + "CuSO4∙(H2O)5", 0, false, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().COPPER, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) - }); + new MaterialStack(ELEMENT.getInstance().COPPER, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); public static final Material ETHYL_CYANOACETATE = new Material( "Ethyl Cyanoacetate", @@ -616,12 +550,10 @@ public final class MISC_MATERIALS { "C5H7NO2", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); public static final Material CYANOACRYLATE_POLYMER = new Material( "Cyanoacrylate Polymer", @@ -635,12 +567,10 @@ public final class MISC_MATERIALS { "(-C6H7NO2-)n", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); public static final Material ETHYL_CYANOACRYLATE = new Material( "Ethyl Cyanoacrylate (Super Glue)", @@ -654,12 +584,10 @@ public final class MISC_MATERIALS { "C6H7NO2", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) - }); + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); public static final Material MUTATED_LIVING_SOLDER = new Material( "Mutated Living Solder", @@ -673,8 +601,6 @@ public final class MISC_MATERIALS { "?Sn?Bi?", 0, true, - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().TIN, 1), - new MaterialStack(ELEMENT.getInstance().BISMUTH, 1) - }); + new MaterialStack(ELEMENT.getInstance().TIN, 1), + new MaterialStack(ELEMENT.getInstance().BISMUTH, 1)); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index e209cd1c11..09e72eb1f7 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -211,6 +211,7 @@ public class RECIPES_GREGTECH { 1024, 5); + //3NO2 + H2O = 2HNO3 + NO CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(16), @@ -218,37 +219,37 @@ public class RECIPES_GREGTECH { }, new FluidStack[] { FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 3000), - FluidUtils.getDistilledWater(5000) + FluidUtils.getDistilledWater(1000) }, new ItemStack[] { }, new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 2000), - FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1500), + FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1000), }, 10 * 20, 480, 2); // Produce Boric Acid + //Na2B4O7·10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(21), - ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23), }, new FluidStack[] { FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000) }, new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4), }, new FluidStack[] { - FluidUtils.getFluidStack("boricacid", 2000), + FluidUtils.getFluidStack("boricacid", 4000), FluidUtils.getWater(5000) - }, - 20 * 30, + 20 * 30, MaterialUtils.getVoltageForTier(3), 3); @@ -417,7 +418,7 @@ public class RECIPES_GREGTECH { }, new FluidStack[] { - FluidUtils.getHydrofluoricAcid(4000) + FluidUtils.getHydrofluoricAcid(4500) }, 30 * 20, 480, @@ -428,7 +429,6 @@ public class RECIPES_GREGTECH { private static void fluidheaterRecipes() { GT_Values.RA.addFluidHeaterRecipe(CI.getNumberedCircuit(20), FluidUtils.getWater(1000), FluidUtils.getHotWater(1000), 30, 30); - } private static void vacuumFreezerRecipes() { @@ -1034,9 +1034,6 @@ public class RECIPES_GREGTECH { 20 * 40, 7680); - - - // Germanium Roasting CORE.RA.addBlastSmelterRecipe( new ItemStack[] { @@ -1050,7 +1047,6 @@ public class RECIPES_GREGTECH { 20 * 300, 4000); - // Ruthenium Roasting CORE.RA.addBlastSmelterRecipe( new ItemStack[] { @@ -1310,7 +1306,7 @@ public class RECIPES_GREGTECH { 2 * 20, 500); // EU - + //C8H10 = C8H8 + 2H CORE.RA.addDehydratorRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(18), @@ -1364,6 +1360,7 @@ public class RECIPES_GREGTECH { } private static void largeChemReactorRecipes() { //Styrene + //C8H10 = C8H8 + 2H CORE.RA.addMultiblockChemicalRecipe( new ItemStack[]{CI.getNumberedCircuit(24)}, new FluidStack[]{ @@ -1377,6 +1374,7 @@ public class RECIPES_GREGTECH { 30, 30); //Short-cut Styrene + //C6H6 + C2H4 = C8H8 + 2H CORE.RA.addMultiblockChemicalRecipe( new ItemStack[]{CI.getNumberedCircuit(24)}, new FluidStack[]{ @@ -1546,15 +1544,11 @@ public class RECIPES_GREGTECH { 120); - /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/ - - - /*CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), @@ -1570,15 +1564,10 @@ public class RECIPES_GREGTECH { */ - - - - CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(ModItems.itemRope, 6)}, null, ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), 1*20, 8); CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(CI.explosiveITNT, 2), ItemUtils.getSimpleStack(CI.explosiveTNT, 4), ELEMENT.getInstance().SULFUR.getDust(2), ELEMENT.getInstance().IRON.getFrameBox(1)}, null, ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3), 5*20, 60); CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(Items.nether_star), ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8), ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)}, null, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32), 30*20, 500); - ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); @@ -1623,10 +1612,6 @@ public class RECIPES_GREGTECH { GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1), 480, 480); GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1), 1820, 1820); - - - - //Low tier Charge Packs final ItemStack[] aPackBatteries = new ItemStack[] { @@ -1710,8 +1695,6 @@ public class RECIPES_GREGTECH { if (LoadedMods.Baubles) { - - // Turbine Housing Research Page CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(17), @@ -1739,7 +1722,6 @@ public class RECIPES_GREGTECH { 20 * 60 * 10, (int) GT_Values.V[7]); - // Supreme Pizza Gloves CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(19), @@ -1754,10 +1736,6 @@ public class RECIPES_GREGTECH { 30); } - - - - } private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA, @@ -1884,12 +1862,12 @@ public class RECIPES_GREGTECH { GT_Values.RA.addCentrifugeRecipe( CI.getNumberedAdvancedCircuit(2), - MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10), + MISC_MATERIALS.SOLAR_SALT_COLD.getCell(5), null, null, - MISC_MATERIALS.SODIUM_NITRATE.getDust(6), - MISC_MATERIALS.POTASSIUM_NITRATE.getDust(4), - CI.emptyCells(10), + MISC_MATERIALS.SODIUM_NITRATE.getDust(15), + MISC_MATERIALS.POTASSIUM_NITRATE.getDust(10), + CI.emptyCells(5), null, null, null, @@ -1900,31 +1878,30 @@ public class RECIPES_GREGTECH { } private static void mixerRecipes() { - + + //S + 2O = SO2 GT_Values.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 2000), - FluidUtils.getFluidStack("sulfurdioxide", 3000), + FluidUtils.getFluidStack("sulfurdioxide", 1000), null, 600, 60); GT_Values.RA.addMixerRecipe( CI.getNumberedAdvancedCircuit(2), - CI.emptyCells(10), - MISC_MATERIALS.SODIUM_NITRATE.getDust(6), - MISC_MATERIALS.POTASSIUM_NITRATE.getDust(4), + CI.emptyCells(5), + MISC_MATERIALS.SODIUM_NITRATE.getDust(15), + MISC_MATERIALS.POTASSIUM_NITRATE.getDust(10), null, null, - MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10), + MISC_MATERIALS.SOLAR_SALT_COLD.getCell(5), 20 * 10, 120); - - } private static void chemicalReactorRecipes() { @@ -1954,25 +1931,26 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 8), 20 * 20); + //KOH + HNO3 = KNO3 + H2O GT_Values.RA.addChemicalRecipe( - Materials.Potassium.getDust(1), + ItemUtils.getSimpleStack(GenericChem.mPotassiumHydroxide, 3), CI.getNumberedAdvancedCircuit(1), Materials.NitricAcid.getFluid(1000), - GT_Values.NF, - MISC_MATERIALS.POTASSIUM_NITRATE.getDust(1), - 100, - 30); + Materials.Water.getFluid(1000), + MISC_MATERIALS.POTASSIUM_NITRATE.getDust(5), + 100, + 30); + //Na2CO3 + 2HNO3 = 2NaNO3 + CO2 + H2O GT_Values.RA.addChemicalRecipe( - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), CI.getNumberedAdvancedCircuit(1), - Materials.NitricAcid.getFluid(1000), - GT_Values.NF, - MISC_MATERIALS.SODIUM_NITRATE.getDust(1), + Materials.NitricAcid.getFluid(2000), + Materials.CarbonDioxide.getGas(1000), + MISC_MATERIALS.SODIUM_NITRATE.getDust(10), 100, 30); - } private static void blastFurnaceRecipes() { @@ -1983,7 +1961,6 @@ public class RECIPES_GREGTECH { //ItemStack aOutput1, ItemStack aOutput2, //int aDuration, int aEUt, int aLevel) - //Synthetic Graphite GT_Values.RA.addBlastRecipe( CI.getNumberedCircuit(22), @@ -2029,7 +2006,6 @@ public class RECIPES_GREGTECH { } private static void benderRecipes() { - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { GT_Values.RA.addBenderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("ingotVanadium", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 1), 8, 16); @@ -2043,7 +2019,6 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 1)); GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9), ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1)); - CORE.RA.addCompressorRecipe(ItemList.FusionComputer_UV.get(9), GregtechItemList.Compressed_Fusion_Reactor.get(1), (int) GT_Values.V[7], (int) GT_Values.V[8]); } @@ -2381,10 +2356,6 @@ public class RECIPES_GREGTECH { (int) MaterialUtils.getVoltageForTier(7), 250); - - - - } private static void sifterRecipes() { diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 2e799b30e1..461ee1ea47 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -358,7 +358,6 @@ public class BioRecipes { 240, 2); - } private static void recipeWoodPellets() { @@ -419,7 +418,6 @@ public class BioRecipes { 120, 16); - } private static void recipeWoodBricks() { @@ -487,21 +485,21 @@ public class BioRecipes { var7, // Item Out var8, // Time var9); // Eu - */ + */ + //CH4O + CO = C2H4O2 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getGreenCatalyst(0) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethanol, 700), - FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 300), - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 2000), + FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 700), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 250), + FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 700), }, 120 * 20, 60, @@ -522,7 +520,6 @@ public class BioRecipes { 60 * 20, 16); - } @@ -733,17 +730,17 @@ public class BioRecipes { 32, 1); - } private static void recipePropionicAcid() { + //C2H4 + CO + H2O = C3H6O2 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getGreenCatalyst(0) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mEthylene, 500), - FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 500), + FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000), + FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 1000), FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, new ItemStack[] { @@ -786,6 +783,7 @@ public class BioRecipes { } private static void recipeSodiumHydroxide() { + //NaCl·H2O = NaOH + Cl + H CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(4) @@ -794,16 +792,17 @@ public class BioRecipes { FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000), }, new ItemStack[] { - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 1) + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mChlorine, 400), - FluidUtils.getFluidStack(BioRecipes.mHydrogen, 600), + FluidUtils.getFluidStack(BioRecipes.mChlorine, 1000), + FluidUtils.getFluidStack(BioRecipes.mHydrogen, 1000), }, 300 * 20, 120, 1); + //Na + H2O = NaOH + H CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(5), @@ -813,7 +812,7 @@ public class BioRecipes { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, new ItemStack[] { - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 5) + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000), @@ -825,23 +824,23 @@ public class BioRecipes { private static void recipeSodiumCarbonate() { - if (OreDictUtils.containsValidEntries("fuelCoke")) { + if (OreDictUtils.containsValidEntries("fuelCoke")) { + //Na2CO3 + Al2O3 =C= 2NaAlO2 + CO2 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(18), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 3), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 3), - ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 6) + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), + }, new ItemStack[] { - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 18) + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mHydrogen, 200), - FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1600), + FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), }, 120 * 20, 120, @@ -852,19 +851,18 @@ public class BioRecipes { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(18), - ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 6), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 4), - ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 6) + ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), + }, new ItemStack[] { - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 16) + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mHydrogen, 100), - FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1750), + FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), }, 180 * 20, 120, @@ -968,30 +966,30 @@ public class BioRecipes { ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 4), 20 * 30, 64); - - } private static void recipeAlumina() { + //2NaAlO2 + 2NaOH + 2CO2 = Al2O3 + 2Na2CO3 + H2O GT_Values.RA.addBlastRecipe( - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 24), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3), - FluidUtils.getFluidStack(mCarbonDioxide, 6000), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 6), + FluidUtils.getFluidStack(mCarbonDioxide, 2000), GT_Values.NF, - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 24), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 2), - 20 * 120, + ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 5), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 12), + 20 * 40, 120, 1200); } private static void recipeAluminium() { + //2Al2O3 + 3C = 4Al + 3CO2 GT_Values.RA.addBlastRecipe( - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 24), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 4), + ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 10), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 3), GT_Values.NF, - GT_Values.NF, - ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 24), + Materials.CarbonDioxide.getGas(3000), + ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, 20 * 120, 120, @@ -1055,7 +1053,6 @@ public class BioRecipes { private static void recipeSulfuricAcid() { - CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(7), @@ -1098,21 +1095,21 @@ public class BioRecipes { private static void recipeUrea() { - + //2NH3 + CO2 = CH4N2O + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(9), }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600), - FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 400), + FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 300), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mUrea, 400), - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 600), + FluidUtils.getFluidStack(BioRecipes.mUrea, 300), + FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 300), }, 5 * 20, 30, @@ -1289,18 +1286,20 @@ public class BioRecipes { private static void recipeBenzene() { + //6CH4 = C6H6 + 18H CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(19), CI.getGreenCatalyst(0), }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mMethane, 1000), + FluidUtils.getFluidStack(BioRecipes.mMethane, 6000), }, new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mBenzene, 500), + FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), + Materials.Hydrogen.getGas(18000) }, 8 * 20, 120, @@ -1309,6 +1308,7 @@ public class BioRecipes { private static void recipeStyrene() { + //C8H10 = C8H8 + 2H CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(20), @@ -1320,7 +1320,8 @@ public class BioRecipes { new ItemStack[] { }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mStyrene, 25), + FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), + Materials.Hydrogen.getGas(200) }, 16 * 20, 480, @@ -1417,8 +1418,6 @@ public class BioRecipes { } } return didInvoke; - - } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 84aebd1465..add5b512d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -19,7 +19,7 @@ public class RecipeLoader_AlgaeFarm { private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); - public static final void generateRecipes() { + public static void generateRecipes() { for (int i=0;i<10;i++) { getTieredRecipeFromCache(i, false); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index e66d6965e4..b7a333ac18 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,9 +1,5 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; -import static gtPlusPlus.core.material.MISC_MATERIALS.CYANOACETIC_ACID; -import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_CHLORIDE; - import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -11,19 +7,13 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.item.chemistry.NuclearChem; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; @@ -53,9 +43,9 @@ public class RecipeLoader_GlueLine { private static void chemicalPlantRecipes() { + //CO + C3H6O2 = C4H6O3 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 1) }, @@ -93,63 +83,66 @@ public class RecipeLoader_GlueLine { 1000, 4); + //Na2CO3 + NaCN + C2H3O2Cl + 2HCl = C3H3NO2 + 3NaCl + CO2 + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(19), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 2), - MISC_MATERIALS.SODIUM_CYANIDE.getDust(6) + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) }, new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) }, new ItemStack[] { - MISC_MATERIALS.CYANOACETIC_ACID.getDust(6) + MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), + Materials.Salt.getDust(6) }, new FluidStack[] { - FluidUtils.getFluidStack("dilutedhydrochloricacid_gt5u", 2000) + Materials.CarbonDioxide.getGas(1000), + GT_ModHandler.getWater(1000) }, 20*20, 1000, 4); - BioRecipes.mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid(); - + //CuSO4 + 5C3H3NO2 + 5C2H6O = CuSO4·5(H2O) + 5C5H7NO2 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 1), - MISC_MATERIALS.COPPER_SULFATE.getDust(1), - MISC_MATERIALS.CYANOACETIC_ACID.getDust(1) + MISC_MATERIALS.COPPER_SULFATE.getDust(6), + MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mEthanol, 100) + FluidUtils.getFluidStack(BioRecipes.mEthanol, 5000) }, new ItemStack[] { - MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(1) + MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11) }, new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100) + MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000) }, - 10*20, + 500*20, 6000, 5); + //C3H3NO2 + C2H6O = C5H7NO2 + H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(21), - MISC_MATERIALS.CYANOACETIC_ACID.getDust(1) + MISC_MATERIALS.CYANOACETIC_ACID.getDust(9) }, new FluidStack[] { - FluidUtils.getFluidStack(BioRecipes.mEthanol, 100) + FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000) }, new ItemStack[] { }, new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100) + MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000) }, - 100*20, + 1000*20, 6000, 5); @@ -174,6 +167,7 @@ public class RecipeLoader_GlueLine { 8000, 5); + //CH4 + NH3 + 3O = HCN + 3H2O CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedCircuit(23), @@ -182,7 +176,7 @@ public class RecipeLoader_GlueLine { new FluidStack[] { FluidUtils.getFluidStack("methane", 2000), FluidUtils.getFluidStack("ammonia", 2000), - FluidUtils.getFluidStack("oxygen", 3000) + FluidUtils.getFluidStack("oxygen", 6000) }, new ItemStack[] { }, @@ -196,56 +190,55 @@ public class RecipeLoader_GlueLine { } private static void chemicalReactorRecipes() { + //NaOH + HCN = NaCN + H2O GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(17), - ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 1), - MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(200), - FluidUtils.getWater(200), - MISC_MATERIALS.SODIUM_CYANIDE.getDust(1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3), + MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000), + FluidUtils.getWater(1000), + MISC_MATERIALS.SODIUM_CYANIDE.getDust(3), 10 * 20); + //CaCO3 + 2HCl = CaCl2 + CO2 + H2O if (LoadedMods.BartWorks) { GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(18), - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 1), - Materials.SaltWater.getFluid(1000L), - FluidUtils.getWater(1000), - Materials.SodiumCarbonate.getDust(1), - ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 1), + ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), + Materials.HydrochloricAcid.getFluid(2000L), + Materials.CarbonDioxide.getGas(1000), + ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 3), 5 * 20); } - else { GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(18), - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 1), - Materials.SaltWater.getFluid(1000L), - FluidUtils.getWater(1000), - Materials.SodiumCarbonate.getDust(1), - MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(1), + ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), + Materials.HydrochloricAcid.getFluid(2000L), + Materials.CarbonDioxide.getGas(1000), + MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(3), 5 * 20); } + //Cu + 2H2SO4 = CuSO4 + SO2 + 2H2O + //SO2 + 2H2O -> diluted sulfuric acid GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), - FluidUtils.getFluidStack("sulfuricacid", 500), - FluidUtils.getFluidStack("dilutedsulfuricacid", 500), - MISC_MATERIALS.COPPER_SULFATE.getDust(1), + FluidUtils.getFluidStack("sulfuricacid", 2000), + FluidUtils.getFluidStack("dilutedsulfuricacid", 1000), + MISC_MATERIALS.COPPER_SULFATE.getDust(6), 5 * 20); } private static void dehydratorRecipes() { CORE.RA.addDehydratorRecipe( new ItemStack[]{ - MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(1), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) + MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), }, null, - null, + GT_ModHandler.getWater(5000), new ItemStack[]{ - MISC_MATERIALS.COPPER_SULFATE.getDust(1), - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1) + MISC_MATERIALS.COPPER_SULFATE.getDust(6) }, new int[]{10000, 10000, 10000}, 300*20, |