diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/plugin/agrichem')
5 files changed, 677 insertions, 570 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 515c4ca8b8..a4bbd6e03a 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -135,43 +135,65 @@ public class BioRecipes { // 5.08 Salt Water Solution ;) if (!FluidUtils.doesFluidExist("saltwater")) { mSalineWater = FluidUtils - .generateFluidNoPrefix("saltwater", "Salt Water", 200, new short[] { 10, 30, 220, 100 }); + .generateFluidNoPrefix("saltwater", "Salt Water", 200, new short[] { 10, 30, 220, 100 }); } else { Materials aSaltWater = MaterialUtils.getMaterial("saltwater"); if (aSaltWater != null) { FluidStack aWaterStack = aSaltWater.getFluid(1); if (aWaterStack != null) { - mSalineWater = aSaltWater.getFluid(1).getFluid(); + mSalineWater = aSaltWater.getFluid(1) + .getFluid(); } } if (mSalineWater == null) { - mSalineWater = FluidUtils.getWildcardFluidStack("saltwater", 1).getFluid(); + mSalineWater = FluidUtils.getWildcardFluidStack("saltwater", 1) + .getFluid(); } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellSaltWater", 1) == null) { new BaseItemComponent("saltwater", "Salt Water", new short[] { 10, 30, 220 }); } } - mDistilledWater = FluidUtils.getDistilledWater(1).getFluid(); - mThermalWater = FluidUtils.getFluidStack("ic2hotwater", 1).getFluid(); - mAir = FluidUtils.getFluidStack("air", 1).getFluid(); - mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1).getFluid(); - mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1).getFluid(); - mEthylene = FluidUtils.getFluidStack("ethylene", 1).getFluid(); - mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid(); - mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid(); - mSulfuricAcid = FluidUtils.getFluidStack("sulfuricacid", 1).getFluid(); - mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid(); - mMethane = FluidUtils.getFluidStack("methane", 1).getFluid(); - mBenzene = FluidUtils.getFluidStack("benzene", 1).getFluid(); - mEthylbenzene = FluidUtils.getFluidStack("fluid.ethylbenzene", 1).getFluid(); - mStyrene = FluidUtils.getFluidStack("styrene", 1).getFluid(); - mMethanol = FluidUtils.getFluidStack("methanol", 1).getFluid(); - mLiquidPlastic = FluidUtils.getWildcardFluidStack("plastic", 1).getFluid(); - mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(1).getFluid(); - mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluidStack(1).getFluid(); - mChlorine = FluidUtils.getFluidStack("chlorine", 1).getFluid(); - mHydrogen = FluidUtils.getFluidStack("hydrogen", 1).getFluid(); + mDistilledWater = FluidUtils.getDistilledWater(1) + .getFluid(); + mThermalWater = FluidUtils.getFluidStack("ic2hotwater", 1) + .getFluid(); + mAir = FluidUtils.getFluidStack("air", 1) + .getFluid(); + mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1) + .getFluid(); + mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1) + .getFluid(); + mEthylene = FluidUtils.getFluidStack("ethylene", 1) + .getFluid(); + mEthanol = FluidUtils.getFluidStack("bioethanol", 1) + .getFluid(); + mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1) + .getFluid(); + mSulfuricAcid = FluidUtils.getFluidStack("sulfuricacid", 1) + .getFluid(); + mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1) + .getFluid(); + mMethane = FluidUtils.getFluidStack("methane", 1) + .getFluid(); + mBenzene = FluidUtils.getFluidStack("benzene", 1) + .getFluid(); + mEthylbenzene = FluidUtils.getFluidStack("fluid.ethylbenzene", 1) + .getFluid(); + mStyrene = FluidUtils.getFluidStack("styrene", 1) + .getFluid(); + mMethanol = FluidUtils.getFluidStack("methanol", 1) + .getFluid(); + mLiquidPlastic = FluidUtils.getWildcardFluidStack("plastic", 1) + .getFluid(); + mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(1) + .getFluid(); + mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluidStack(1) + .getFluid(); + mChlorine = FluidUtils.getFluidStack("chlorine", 1) + .getFluid(); + mHydrogen = FluidUtils.getFluidStack("hydrogen", 1) + .getFluid(); mAceticAcid = AgrichemFluids.mAceticAcid; mPropionicAcid = AgrichemFluids.mPropionicAcid; mUrea = AgrichemFluids.mUrea; @@ -227,229 +249,285 @@ public class BioRecipes { ItemUtils.registerFuel(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1), 4800); // Combustion Fuels - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellButanol", 1)) - .metadata(FUEL_VALUE, 400).metadata(FUEL_TYPE, 0).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellButanol", 1)) + .metadata(FUEL_VALUE, 400) + .metadata(FUEL_TYPE, 0) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); } private static void recipeGreenAlgae() { // Compost - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); // Turn into Cellulose GT_Values.RA.stdBuilder() - .itemInputs( - getGreenAlgaeRecipeChip(), - ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5)) - .duration(7 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); + .itemInputs(getGreenAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); } private static void recipeBrownAlgae() { // Compost - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); // Alginic acid - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)).duration(2 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(extractorRecipes); // Lithium Chloride GT_Values.RA.stdBuilder() - .itemInputs( - getBrownAlgaeRecipeChip(), - ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 20)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 5)).duration(6 * SECONDS) - .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes); + .itemInputs(getBrownAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 20)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 5)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(blastFurnaceRecipes); // Sodium Carbonate GT_Values.RA.stdBuilder() - .itemInputs( - getBrownAlgaeRecipeChip(), - ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 40)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 20)) - .fluidInputs(FluidUtils.getDistilledWater(2000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(getBrownAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 40)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 20)) + .fluidInputs(FluidUtils.getDistilledWater(2000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } private static void recipeGoldenBrownAlgae() { // Compost - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 1)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 1)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); // Turn into Cellulose GT_Values.RA.stdBuilder() - .itemInputs( - getGoldenBrownAlgaeRecipeChip(), - ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5)) - .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + .itemInputs( + getGoldenBrownAlgaeRecipeChip(), + ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); } private static void recipeRedAlgae() { // Compost - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 1)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)).duration(20 * SECONDS).eut(2) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 1)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); // Turn into Cellulose GT_Values.RA.stdBuilder() - .itemInputs(getRedAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 5)) - .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV / 2).addTo(assemblerRecipes); + .itemInputs(getRedAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 5)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV / 2) + .addTo(assemblerRecipes); } private static void recipeCelluloseFibre() { GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), - ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 10)).duration(10 * SECONDS) - .eut(16).addTo(UniversalChemical); + .itemInputs( + ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), + ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 10)) + .duration(10 * SECONDS) + .eut(16) + .addTo(UniversalChemical); // Craft into Wood Pellets GT_Values.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24)) - .duration(2 * SECONDS + 8 * TICKS).eut(8).addTo(assemblerRecipes); + .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24)) + .duration(2 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(assemblerRecipes); // Methanol Extraction - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) - .fluidOutputs(Materials.Methanol.getFluid(1000L)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) + .fluidOutputs(Materials.Methanol.getFluid(1000L)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(fluidExtractionRecipes); // Compost - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 3)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 3)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); // Plastic CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4), }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500), - FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidPlastic, (1000)), }, - 10 * 20, - 240, - 2); + new ItemStack[] { getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4), }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500), + FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidPlastic, (1000)), }, + 10 * 20, + 240, + 2); } private static void recipeWoodPellets() { // Shapeless Recipe RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1) }, - ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)); + new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1) }, + ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)); // Extruder Recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12), - ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 3)).duration(10 * SECONDS).eut(16) - .addTo(extruderRecipes); + .itemInputs( + ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12), + ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 3)) + .duration(10 * SECONDS) + .eut(16) + .addTo(extruderRecipes); // Assembly Recipe - GT_Values.RA.stdBuilder().itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)).duration(5 * SECONDS).eut(8) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)) + .duration(5 * SECONDS) + .eut(8) + .addTo(assemblerRecipes); // CO2 - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1)) - .fluidOutputs(FluidUtils.getFluidStack(mCarbonDioxide, 70)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1)) + .fluidOutputs(FluidUtils.getFluidStack(mCarbonDioxide, 70)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(fluidExtractionRecipes); // Add Charcoal Recipe if (Railcraft.isModLoaded()) { RailcraftUtils.addCokeOvenRecipe( - ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), - true, - true, - ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3), - GT_Values.NF, - 1200); - } - CORE.RA.addCokeOvenRecipe( ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), - getBioChip(3), - null, - GT_Values.NF, + true, + true, ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3), - 120, - 16); + GT_Values.NF, + 1200); + } + CORE.RA.addCokeOvenRecipe( + ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), + getBioChip(3), + null, + GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3), + 120, + 16); } private static void recipeWoodBricks() { // Assembler Recipe GT_Values.RA.stdBuilder() - .itemInputs(getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1)) - .duration(1 * MINUTES + 40 * SECONDS).eut(16).addTo(assemblerRecipes); + .itemInputs(getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); } private static void recipeCellulosePulp() { // Assembler Recipe GT_Values.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) - .itemOutputs(ItemUtils.getSimpleStack(Items.paper, 4)).duration(2 * SECONDS).eut(16) - .addTo(assemblerRecipes); + .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) + .itemOutputs(ItemUtils.getSimpleStack(Items.paper, 4)) + .duration(2 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); } private static void recipeCatalystCarrier() { // Assembler Recipe GT_Values.RA.stdBuilder() - .itemInputs( - getBioChip(20), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L)) - .itemOutputs(CI.getEmptyCatalyst(1)).duration(5 * MINUTES).eut(16).addTo(assemblerRecipes); + .itemInputs( + getBioChip(20), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L)) + .itemOutputs(CI.getEmptyCatalyst(1)) + .duration(5 * MINUTES) + .eut(16) + .addTo(assemblerRecipes); } private static void recipeAluminiumSilverCatalyst() { // Assembler Recipe GT_Values.RA.stdBuilder() - .itemInputs( - getBioChip(4), - CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L)) - .itemOutputs(CI.getGreenCatalyst(10)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); + .itemInputs( + getBioChip(4), + CI.getEmptyCatalyst(10), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L)) + .itemOutputs(CI.getGreenCatalyst(10)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } private static void recipeAceticAcid() { // CH4O + CO = C2H4O2 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getGreenCatalyst(0) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethanol, 700), - FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 700), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 700), }, - 120 * 20, - 60, - 1); + new ItemStack[] { CI.getGreenCatalyst(0) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethanol, 700), + FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 700), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 700), }, + 120 * 20, + 60, + 1); - GT_Values.RA.stdBuilder().itemInputs(CI.getNumberedBioCircuit(14)) - .fluidInputs(FluidUtils.getFluidStack(mFermentationBase, 1000)) - .fluidOutputs(FluidUtils.getFluidStack(mAceticAcid, 1000)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)).duration(60 * SECONDS).eut(16) - .noOptimize().addTo(chemicalDehydratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(CI.getNumberedBioCircuit(14)) + .fluidInputs(FluidUtils.getFluidStack(mFermentationBase, 1000)) + .fluidOutputs(FluidUtils.getFluidStack(mAceticAcid, 1000)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)) + .duration(60 * SECONDS) + .eut(16) + .noOptimize() + .addTo(chemicalDehydratorRecipes); } public static final HashSet<GT_ItemStack> mFruits = new HashSet<>(); @@ -513,31 +591,53 @@ public class BioRecipes { } if (ItemUtils.checkForInvalidItems(a)) { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(a, 10) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, - 30 * 20, - 2, - 0); + new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(a, 10) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, + 30 * 20, + 2, + 0); } } for (ItemStack a : aSeeds) { if (ItemUtils.checkForInvalidItems(a)) { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(a, 20) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, - 30 * 20, - 2, - 0); + new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(a, 20) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, + 30 * 20, + 2, + 0); } } // Sugar Cane CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32) }, + new ItemStack[] { getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, + 30 * 20, + 30, + 0); + + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { getBioChip(5), ItemUtils.getSimpleStack(Items.reeds, 32), + ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000), }, + 10 * 20, + 30, + 0); + + // Sugar Beet + if (OreDictUtils.containsValidEntries("cropSugarbeet")) { + + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, new ItemStack[] {}, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, @@ -545,108 +645,99 @@ public class BioRecipes { 30, 0); - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(5), ItemUtils.getSimpleStack(Items.reeds, 32), - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) }, + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), + ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), }, new ItemStack[] {}, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000), }, 10 * 20, 30, 0); - - // Sugar Beet - if (OreDictUtils.containsValidEntries("cropSugarbeet")) { - - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), }, - 30 * 20, - 30, - 0); - - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000), }, - 10 * 20, - 30, - 0); } // Produce Acetone, Butanol and Ethanol GT_Values.RA.stdBuilder() - .itemInputs( - getBioChip(5), - ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), - ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 16)) - .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 48000)) - .fluidOutputs( - FluidUtils.getFluidStack(BioRecipes.mButanol, 18000), - FluidUtils.getFluidStack(BioRecipes.mAcetone, 9000), - FluidUtils.getFluidStack(BioRecipes.mEthanol, 3000)) - .duration(100 * SECONDS).eut(32).specialValue(1).noOptimize().addTo(chemicalPlantRecipes); + .itemInputs( + getBioChip(5), + ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 16)) + .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 48000)) + .fluidOutputs( + FluidUtils.getFluidStack(BioRecipes.mButanol, 18000), + FluidUtils.getFluidStack(BioRecipes.mAcetone, 9000), + FluidUtils.getFluidStack(BioRecipes.mEthanol, 3000)) + .duration(100 * SECONDS) + .eut(32) + .specialValue(1) + .noOptimize() + .addTo(chemicalPlantRecipes); } private static void recipePropionicAcid() { // C2H4 + CO + H2O = C3H6O2 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getGreenCatalyst(0) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000), - FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 1000), - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 1000), }, - 10 * 20, - 60, - 1); + new ItemStack[] { CI.getGreenCatalyst(0) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000), + FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 1000), + FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 1000), }, + 10 * 20, + 60, + 1); } private static void recipeEthanol() { - GT_Values.RA.stdBuilder().itemInputs(BioRecipes.getBioChip(2)) - .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) - .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 100)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_MV / 2).addTo(distilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BioRecipes.getBioChip(2)) + .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) + .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 100)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV / 2) + .addTo(distilleryRecipes); } private static void recipeGoldenBrownCelluloseFiber() { - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5)) - .fluidOutputs(Materials.Ammonia.getGas(500)).duration(15 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5)) + .fluidOutputs(Materials.Ammonia.getGas(500)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(fluidExtractionRecipes); } private static void recipeRedCelluloseFiber() { - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 3)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV / 2).addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 3)) + .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV / 2) + .addTo(extractorRecipes); } private static void recipeSodiumHydroxide() { // NaCl·H2O = NaOH + Cl + H CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(4) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000), }, - new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mChlorine, 1000), - FluidUtils.getFluidStack(BioRecipes.mHydrogen, 1000), }, - 300 * 20, - 120, - 1); + new ItemStack[] { getBioChip(4) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000), }, + new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3) }, + new FluidStack[] { 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), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, - new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000), }, - 60 * 20, - 60, - 1); + new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, + new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000), }, + 60 * 20, + 60, + 1); } private static void recipeSodiumCarbonate() { @@ -654,33 +745,37 @@ public class BioRecipes { if (OreDictUtils.containsValidEntries("fuelCoke")) { // Na2CO3 + Al2O3 =C= 2NaAlO2 + CO2 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), - ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, - new FluidStack[] {}, - new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), }, - 120 * 20, - 120, - 1); - } - - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), - ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, + new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, new FluidStack[] {}, new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), }, - 180 * 20, + 120 * 20, 120, 1); + } + + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) }, + new FluidStack[] {}, + new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), }, + 180 * 20, + 120, + 1); } private static void recipePelletMold() { GregtechItemList.Pellet_Mold.set(ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 1)); - GT_Values.RA.stdBuilder().itemInputs(ALLOY.TUMBAGA.getBlock(1)).itemOutputs(GregtechItemList.Pellet_Mold.get(1)) - .duration(7 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_MV / 4 * 3).addTo(latheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ALLOY.TUMBAGA.getBlock(1)) + .itemOutputs(GregtechItemList.Pellet_Mold.get(1)) + .duration(7 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_MV / 4 * 3) + .addTo(latheRecipes); } private static void recipeAluminiumPellet() { @@ -745,167 +840,177 @@ public class BioRecipes { for (String aOreName : aOreNames) { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getNumberedBioCircuit(14), - ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName)) }, - new FluidStack[] { FluidUtils.getSteam(2000 * aOreData2.get(aOreName)) }, - new ItemStack[] { ItemUtils.getSimpleStack( - AgriculturalChem.mCleanAluminiumMix, - (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, - new FluidStack[] { FluidUtils.getFluidStack( - AgriculturalChem.RedMud, - 100 * (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, - 20 * 60, - aOreData1.get(aOreName), - aOreName.equals("Bauxite") ? 2 : 1); + new ItemStack[] { CI.getNumberedBioCircuit(14), + ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName)) }, + new FluidStack[] { FluidUtils.getSteam(2000 * aOreData2.get(aOreName)) }, + new ItemStack[] { ItemUtils.getSimpleStack( + AgriculturalChem.mCleanAluminiumMix, + (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, + new FluidStack[] { FluidUtils + .getFluidStack(AgriculturalChem.RedMud, 100 * (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, + 20 * 60, + aOreData1.get(aOreName), + aOreName.equals("Bauxite") ? 2 : 1); } GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mCleanAluminiumMix, 3), - ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) - .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 4)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV / 2).addTo(extruderRecipes); + .itemInputs( + ItemUtils.getSimpleStack(AgriculturalChem.mCleanAluminiumMix, 3), + ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) + .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 4)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV / 2) + .addTo(extruderRecipes); } private static void recipeAlumina() { // 2NaAlO2 + 2NaOH + 2CO2 = Al2O3 + 2Na2CO3 + H2O GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 6)) - .itemOutputs( - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 5), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 12)) - .fluidInputs(Materials.CarbonDioxide.getGas(2000L)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes); + .itemInputs( + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 6)) + .itemOutputs( + ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 5), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 12)) + .fluidInputs(Materials.CarbonDioxide.getGas(2000L)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(blastFurnaceRecipes); } private static void recipeAluminium() { // 2Al2O3 + 3C = 4Al + 3CO2 GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) - .fluidOutputs(Materials.CarbonDioxide.getGas(3000L)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1600).addTo(blastFurnaceRecipes); + .itemInputs( + ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 10), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) + .fluidOutputs(Materials.CarbonDioxide.getGas(3000L)) + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1600) + .addTo(blastFurnaceRecipes); } private static void recipeLithiumChloride() { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 8), - ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 2), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Potassium, 5)) - .outputChances(7500, 8000, 8500, 9000, 7500, 8500) - .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mAir, 4000)) - .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 500)).duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV / 2).addTo(multiblockChemicalReactorRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 8), + ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 2), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Potassium, 5)) + .outputChances(7500, 8000, 8500, 9000, 7500, 8500) + .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mAir, 4000)) + .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 500)) + .duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_MV / 2) + .addTo(multiblockChemicalReactorRecipes); if (OreDictUtils.containsValidEntries("dustPotash")) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potash, 10), - ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 7), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) - .outputChances(7500, 8000, 8500, 9000, 9000, 9000) - .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000)) - .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 250)).duration(1 * MINUTES) - .eut(TierEU.RECIPE_MV).addTo(multiblockChemicalReactorRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potash, 10), + ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 7), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) + .outputChances(7500, 8000, 8500, 9000, 9000, 9000) + .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000)) + .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 250)) + .duration(1 * MINUTES) + .eut(TierEU.RECIPE_MV) + .addTo(multiblockChemicalReactorRecipes); } } private static void recipeSulfuricAcid() { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10), - ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 6) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), }, - 50 * 20, - 60, - 1); + new ItemStack[] { getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10), + ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 6) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), }, + 50 * 20, + 60, + 1); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(7), - ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2), - ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), }, - 6 * 20, - 180, - 3); + new ItemStack[] { getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2), + ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), }, + 6 * 20, + 180, + 3); } 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, 300), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 300), - FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 300), }, - 5 * 20, - 30, - 1); + new ItemStack[] { getBioChip(9), }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600), + FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 300), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 300), + FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 300), }, + 5 * 20, + 30, + 1); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(9), }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), - FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 200), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 200) }, - 5 * 20, - 30, - 1); + new ItemStack[] { getBioChip(9), }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), + FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 200), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 200) }, + 5 * 20, + 30, + 1); } private static void recipeRawBioResin() { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5), - ItemUtils.getSimpleStack(Blocks.dirt, 1) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 100), }, - new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1), }, - new FluidStack[] {}, - 1 * 20, - 30, - 1); + new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5), + ItemUtils.getSimpleStack(Blocks.dirt, 1) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 100), }, + new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1), }, + new FluidStack[] {}, + 1 * 20, + 30, + 1); } private static void recipeLiquidResin() { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthanol, 200), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500), }, - 5 * 20, - 30, - 1); + new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthanol, 200), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500), }, + 5 * 20, + 30, + 1); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144), }, - new ItemStack[] { ItemUtils.getSimpleStack(Ic2Items.resin, 32) }, - new FluidStack[] {}, - 60 * 20, - 30, - 1); + new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144), }, + new ItemStack[] { ItemUtils.getSimpleStack(Ic2Items.resin, 32) }, + new FluidStack[] {}, + 60 * 20, + 30, + 1); } private static void recipeCompost() { @@ -913,237 +1018,235 @@ public class BioRecipes { if (Forestry.isModLoaded()) { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(11), - ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), - ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), }, - new ItemStack[] { aFert }, - new FluidStack[] {}, - 30 * 20, - 60, - 1); - } - - aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 32); - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), - ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) }, + new ItemStack[] { getBioChip(11), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), + ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) }, new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), }, new ItemStack[] { aFert }, new FluidStack[] {}, 30 * 20, 60, 1); + } + + aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 32); + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), + ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), }, + new ItemStack[] { aFert }, + new FluidStack[] {}, + 30 * 20, + 60, + 1); } private static void recipeMethane() { CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 500), }, - 5 * 20, - 64, - 1); + new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 500), }, + 5 * 20, + 64, + 1); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(13), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), - ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), - ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 4) }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 2000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 2000), }, - 10 * 20, - 60, - 1); + new ItemStack[] { getBioChip(13), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), + ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), + ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 4) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 2000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 2000), }, + 10 * 20, + 60, + 1); } private static void recipeBenzene() { // 6CH4 = C6H6 + 18H CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(19), CI.getGreenCatalyst(0), }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 6000), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), - Materials.Hydrogen.getGas(18000) }, - 8 * 20, - 120, - 2); + new ItemStack[] { getBioChip(19), CI.getGreenCatalyst(0), }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 6000), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), Materials.Hydrogen.getGas(18000) }, + 8 * 20, + 120, + 2); } private static void recipeStyrene() { // C8H10 = C8H8 + 2H CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { getBioChip(20), CI.getGreenCatalyst(0), }, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100), }, - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200) }, - 16 * 20, - 480, - 2); + new ItemStack[] { getBioChip(20), CI.getGreenCatalyst(0), }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100), }, + new ItemStack[] {}, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200) }, + 16 * 20, + 480, + 2); } private static void recipeBioChip() { GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L), - 0, - new Object[] { OrePrefixes.circuit.get(Materials.Primitive) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L), + 0, + new Object[] { OrePrefixes.circuit.get(Materials.Primitive) }); long bits = 0; addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]), - bits, - new Object[] { "d ", " P ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]), + bits, + new Object[] { "d ", " P ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]), - bits, - new Object[] { " d ", " P ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]), + bits, + new Object[] { " d ", " P ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 3L, new Object[0]), - bits, - new Object[] { " d", " P ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 3L, new Object[0]), + bits, + new Object[] { " d", " P ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 4L, new Object[0]), - bits, - new Object[] { " ", " Pd", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 4L, new Object[0]), + bits, + new Object[] { " ", " Pd", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 5L, new Object[0]), - bits, - new Object[] { " ", " P ", " d", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 5L, new Object[0]), + bits, + new Object[] { " ", " P ", " d", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 6L, new Object[0]), - bits, - new Object[] { " ", " P ", " d ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 6L, new Object[0]), + bits, + new Object[] { " ", " P ", " d ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 7L, new Object[0]), - bits, - new Object[] { " ", " P ", "d ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 7L, new Object[0]), + bits, + new Object[] { " ", " P ", "d ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 8L, new Object[0]), - bits, - new Object[] { " ", "dP ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 8L, new Object[0]), + bits, + new Object[] { " ", "dP ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 9L, new Object[0]), - bits, - new Object[] { "P d", " ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 9L, new Object[0]), + bits, + new Object[] { "P d", " ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 10L, new Object[0]), - bits, - new Object[] { "P ", " d", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 10L, new Object[0]), + bits, + new Object[] { "P ", " d", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 11L, new Object[0]), - bits, - new Object[] { "P ", " ", " d", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 11L, new Object[0]), + bits, + new Object[] { "P ", " ", " d", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 12L, new Object[0]), - bits, - new Object[] { "P ", " ", " d ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 12L, new Object[0]), + bits, + new Object[] { "P ", " ", " d ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 13L, new Object[0]), - bits, - new Object[] { " P", " ", " d", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 13L, new Object[0]), + bits, + new Object[] { " P", " ", " d", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 14L, new Object[0]), - bits, - new Object[] { " P", " ", " d ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 14L, new Object[0]), + bits, + new Object[] { " P", " ", " d ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 15L, new Object[0]), - bits, - new Object[] { " P", " ", "d ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 15L, new Object[0]), + bits, + new Object[] { " P", " ", "d ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 16L, new Object[0]), - bits, - new Object[] { " P", "d ", " ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 16L, new Object[0]), + bits, + new Object[] { " P", "d ", " ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 17L, new Object[0]), - bits, - new Object[] { " ", " ", "d P", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 17L, new Object[0]), + bits, + new Object[] { " ", " ", "d P", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 18L, new Object[0]), - bits, - new Object[] { " ", "d ", " P", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 18L, new Object[0]), + bits, + new Object[] { " ", "d ", " P", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 19L, new Object[0]), - bits, - new Object[] { "d ", " ", " P", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 19L, new Object[0]), + bits, + new Object[] { "d ", " ", " P", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 20L, new Object[0]), - bits, - new Object[] { " d ", " ", " P", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 20L, new Object[0]), + bits, + new Object[] { " d ", " ", " P", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 21L, new Object[0]), - bits, - new Object[] { "d ", " ", "P ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 21L, new Object[0]), + bits, + new Object[] { "d ", " ", "P ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 22L, new Object[0]), - bits, - new Object[] { " d ", " ", "P ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 22L, new Object[0]), + bits, + new Object[] { " d ", " ", "P ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 23L, new Object[0]), - bits, - new Object[] { " d", " ", "P ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 23L, new Object[0]), + bits, + new Object[] { " d", " ", "P ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); addCraftingRecipe( - GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 24L, new Object[0]), - bits, - new Object[] { " ", " d", "P ", 'P', - GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); + GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 24L, new Object[0]), + bits, + new Object[] { " ", " d", "P ", 'P', + GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) }); } public static boolean addCraftingRecipe(ItemStack aResult, long aBitMask, Object[] aRecipe) { Method mAddRecipe = ReflectionUtils.getMethod( - GT_ModHandler.class, - "addCraftingRecipe", - new Class[] { ItemStack.class, Enchantment[].class, int[].class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, Object[].class }); + GT_ModHandler.class, + "addCraftingRecipe", + new Class[] { ItemStack.class, Enchantment[].class, int[].class, boolean.class, boolean.class, + boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, + boolean.class, boolean.class, boolean.class, boolean.class, Object[].class }); boolean didInvoke = false; if (mAddRecipe != null) { try { didInvoke = (boolean) mAddRecipe.invoke( - null, - aResult, - new Enchantment[] {}, - new int[] {}, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - true, - aRecipe); + null, + aResult, + new Enchantment[] {}, + new int[] {}, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + false, + true, + aRecipe); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java index 8a0ae95061..bd72654f0a 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java @@ -25,27 +25,27 @@ public class AgrichemFluids { public static void init() { if (!FluidRegistry.isFluidRegistered("aceticacid")) { mAceticAcid = FluidUtils - .generateFluidNoPrefix("aceticacid", "Acetic Acid", 200, new short[] { 97, 168, 96, 100 }, true); + .generateFluidNoPrefix("aceticacid", "Acetic Acid", 200, new short[] { 97, 168, 96, 100 }, true); } else { mAceticAcid = FluidRegistry.getFluid("aceticacid"); } if (!FluidRegistry.isFluidRegistered("propionicacid")) { mPropionicAcid = FluidUtils.generateFluidNoPrefix( - "propionicacid", - "Propionic Acid", - 200, - new short[] { 198, 209, 148, 100 }, - true); + "propionicacid", + "Propionic Acid", + 200, + new short[] { 198, 209, 148, 100 }, + true); } else { mPropionicAcid = FluidRegistry.getFluid("propionicacid"); } if (!FluidRegistry.isFluidRegistered("fermentation.base")) { mFermentationBase = FluidUtils.generateFluidNoPrefix( - "fermentation.base", - "Fermentation Base", - 200, - new short[] { 107, 100, 63, 100 }, - true); + "fermentation.base", + "Fermentation Base", + 200, + new short[] { 107, 100, 63, 100 }, + true); } else { mFermentationBase = FluidRegistry.getFluid("fermentation.base"); } @@ -56,20 +56,20 @@ public class AgrichemFluids { } if (!FluidRegistry.isFluidRegistered("liquidresin")) { mLiquidResin = FluidUtils - .generateFluidNoPrefix("liquidresin", "Liquid Resin", 200, new short[] { 59, 58, 56, 100 }, true); + .generateFluidNoPrefix("liquidresin", "Liquid Resin", 200, new short[] { 59, 58, 56, 100 }, true); } else { mLiquidResin = FluidRegistry.getFluid("liquidresin"); } if (!FluidRegistry.isFluidRegistered("acetone")) { mAcetone = FluidUtils - .generateFluidNoPrefix("acetone", "Acetone", 200, new short[] { 59, 58, 56, 100 }, true); + .generateFluidNoPrefix("acetone", "Acetone", 200, new short[] { 59, 58, 56, 100 }, true); } else { mAcetone = FluidRegistry.getFluid("acetone"); } if (!FluidRegistry.isFluidRegistered("butanol")) { mButanol = FluidUtils - .generateFluidNoPrefix("butanol", "Butanol", 200, new short[] { 159, 58, 56, 100 }, true); + .generateFluidNoPrefix("butanol", "Butanol", 200, new short[] { 159, 58, 56, 100 }, true); } else { mButanol = FluidRegistry.getFluid("butanol"); } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index 399be59ff1..8a6d189898 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java @@ -60,7 +60,7 @@ public class ItemAgrichemBase extends Item { @Override public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, - boolean p_77663_5_) { + boolean p_77663_5_) { super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_); } @@ -87,7 +87,7 @@ public class ItemAgrichemBase extends Item { return mShowSodiumHydroxide; } else { if (OreDictUtils.containsValidEntries("dustSodiumHydroxide_GT5U") - || OreDictUtils.containsValidEntries("dustSodiumHydroxide")) { + || OreDictUtils.containsValidEntries("dustSodiumHydroxide")) { List<ItemStack> aTest = OreDictionary.getOres("dustSodiumHydroxide", false); if (aTest.isEmpty()) { aTest = OreDictionary.getOres("dustSodiumHydroxide_GT5U", false); @@ -162,7 +162,7 @@ public class ItemAgrichemBase extends Item { return true; } } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException e) {} + | InvocationTargetException e) {} } } return false; @@ -196,7 +196,8 @@ public class ItemAgrichemBase extends Item { @Override public double getDurabilityForDisplay(ItemStack aStack) { if (ItemUtils.isCatalyst(aStack)) { - if (aStack.getTagCompound() == null || aStack.getTagCompound().hasNoTags()) { + if (aStack.getTagCompound() == null || aStack.getTagCompound() + .hasNoTags()) { createCatalystNBT(aStack); } double currentDamage = getCatalystDamage(aStack); diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index b0d926a853..f34348a3af 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -49,8 +49,9 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { @Override public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, - boolean p_77663_5_) { - if (!p_77663_1_.hasTagCompound() || p_77663_1_.getTagCompound().hasNoTags()) { + boolean p_77663_5_) { + if (!p_77663_1_.hasTagCompound() || p_77663_1_.getTagCompound() + .hasNoTags()) { p_77663_1_ = initNBT(p_77663_1_); } super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_); @@ -66,7 +67,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { int aDam = aStack.getItemDamage(); try { aList.add(AlgaeDefinition.getByIndex(aDam).mSimpleName); - if (!aStack.hasTagCompound() || aStack.getTagCompound().hasNoTags()) { + if (!aStack.hasTagCompound() || aStack.getTagCompound() + .hasNoTags()) { aStack = initNBT(aStack); } else { NBTTagCompound aNBT = aStack.getTagCompound(); @@ -184,7 +186,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { @Override public AlgaeGeneticData getSpeciesData(ItemStack aStack) { NBTTagCompound aTag; - if (!aStack.hasTagCompound() || aStack.getTagCompound().hasNoTags()) { + if (!aStack.hasTagCompound() || aStack.getTagCompound() + .hasNoTags()) { aTag = new NBTTagCompound(); AlgaeGeneticData aGenes; if (aStack.getItemDamage() < 3 || aStack.getItemDamage() > 5) { @@ -201,16 +204,16 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { aSpeed = (float) (aDam == 3 ? 1f : aDam == 4 ? 1.5f : 2f); aGenes = new AlgaeGeneticData( - true, - true, - AlgaeDefinition.getByIndex(aDam).mSaltWater, - AlgaeDefinition.getByIndex(aDam).mFreshWater, - aTemp, - aFert, - aSpeed, - aLifespan, - 0, - new AutoMap<>()); + true, + true, + AlgaeDefinition.getByIndex(aDam).mSaltWater, + AlgaeDefinition.getByIndex(aDam).mFreshWater, + aTemp, + aFert, + aSpeed, + aLifespan, + 0, + new AutoMap<>()); aTag = aGenes.writeToNBT(); } } else { diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java index c11877b672..6b7b72aa71 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java @@ -31,8 +31,8 @@ public class AlgaeGeneticData { } public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh, - byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration, - AutoMap<AlgaeGrowthRequirement> aRequirements) { + byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration, + AutoMap<AlgaeGrowthRequirement> aRequirements) { mIsDominant = isDominant; mRequiresLight = requiresLight; mSaltWater = isSalt; |